Skip to content
Snippets Groups Projects
Unverified Commit 4faf340b authored by Mohamed's avatar Mohamed Committed by GitHub
Browse files

Small UI polishing (Dev) (#2738)


* Badge color white as per design

* Remove divider and use elevation and common style

* Remove elevation to match design and CheckIns screen

* adapted gradient corners

Co-authored-by: default avatarI502720 <axel.herbstreith@sap.com>
parent e531e089
No related branches found
No related tags found
No related merge requests found
...@@ -117,6 +117,7 @@ class MainActivity : AppCompatActivity(), HasAndroidInjector { ...@@ -117,6 +117,7 @@ class MainActivity : AppCompatActivity(), HasAndroidInjector {
if (count > 0) { if (count > 0) {
val badge = getOrCreateBadge(targetId) val badge = getOrCreateBadge(targetId)
badge.number = count badge.number = count
badge.badgeTextColor = getColor(android.R.color.white)
} else { } else {
removeBadge(targetId) removeBadge(targetId)
} }
......
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="135"
android:centerColor="#6C648C"
android:endColor="#3C8CBB"
android:startColor="#A93F45" />
</shape>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<corners
android:radius="0dp"
android:bottomLeftRadius="@dimen/radius_card"
android:bottomRightRadius="@dimen/radius_card"
android:topLeftRadius="@dimen/radius_card"
android:topRightRadius="@dimen/radius_card" />
<gradient <gradient
android:angle="135" android:angle="135"
android:centerColor="#6C648C" android:centerColor="#6C648C"
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="270dp" android:layout_height="270dp"
app:layout_collapseMode="parallax" app:layout_collapseMode="parallax"
app:srcCompat="@drawable/trace_location_view_cardhighlight_gradient_all_corners" /> app:srcCompat="@drawable/trace_location_view_cardhighlight_gradient" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="270dp" android:layout_height="270dp"
app:layout_collapseMode="parallax" app:layout_collapseMode="parallax"
app:srcCompat="@drawable/trace_location_view_cardhighlight_gradient_all_corners" /> app:srcCompat="@drawable/trace_location_view_cardhighlight_gradient" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
......
...@@ -9,24 +9,16 @@ ...@@ -9,24 +9,16 @@
<com.google.android.material.appbar.MaterialToolbar <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" style="@style/CWAToolbar.BackArrow"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:elevation="2dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:navigationIcon="@drawable/ic_back"
app:title="@string/tracelocation_organizer_category_title" app:title="@string/tracelocation_organizer_category_title"
tools:subtitle="@string/tracelocation_organizer_category_craft_title" /> tools:subtitle="@string/tracelocation_organizer_category_craft_title" />
<View
android:id="@+id/toolbar_divider"
android:layout_width="0dp"
android:layout_height="@dimen/card_divider"
android:background="@color/colorHairline"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/toolbar" />
<ScrollView <ScrollView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
...@@ -35,7 +27,7 @@ ...@@ -35,7 +27,7 @@
app:layout_constraintBottom_toTopOf="@id/button_submit" app:layout_constraintBottom_toTopOf="@id/button_submit"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/toolbar_divider"> app:layout_constraintTop_toBottomOf="@id/toolbar">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
android:id="@+id/expandedImage" android:id="@+id/expandedImage"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:src="@drawable/trace_location_view_cardhighlight_gradient_all_corners" android:src="@drawable/trace_location_view_cardhighlight_gradient"
app:layout_collapseMode="parallax" /> app:layout_collapseMode="parallax" />
<LinearLayout <LinearLayout
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/contact_diary_background" android:background="@drawable/contact_diary_background"
android:elevation="@dimen/elevation_weak"
android:focusable="true" android:focusable="true"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
...@@ -24,9 +23,9 @@ ...@@ -24,9 +23,9 @@
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view" android:id="@+id/recycler_view"
android:clipToPadding="false"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:clipToPadding="false"
android:paddingBottom="@dimen/spacing_huge" android:paddingBottom="@dimen/spacing_huge"
android:visibility="gone" android:visibility="gone"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment