From cdaf78cbbc594aa5a9c3d28a4ce9745bfe32a5f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= Date: Tue, 8 Oct 2024 12:39:44 +0100 Subject: [PATCH] Activity list: Adjust padding and colors --- .../main/res/layout/activity_list_dashboard_item.xml | 2 +- app/src/main/res/layout/activity_list_item.xml | 11 ++++++----- .../res/layout/activity_summary_dashboard_item.xml | 2 +- app/src/main/res/values/colors.xml | 4 +++- app/src/main/res/values/styles.xml | 4 ++++ 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/app/src/main/res/layout/activity_list_dashboard_item.xml b/app/src/main/res/layout/activity_list_dashboard_item.xml index e89cc4002..0efb54315 100644 --- a/app/src/main/res/layout/activity_list_dashboard_item.xml +++ b/app/src/main/res/layout/activity_list_dashboard_item.xml @@ -127,6 +127,6 @@ android:layout_below="@id/activity_list_summary_dashboard" android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/value_line_color_transparent" + android:background="?attr/row_separator" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_list_item.xml b/app/src/main/res/layout/activity_list_item.xml index 431f3f1e5..6383f9fdf 100644 --- a/app/src/main/res/layout/activity_list_item.xml +++ b/app/src/main/res/layout/activity_list_item.xml @@ -11,10 +11,10 @@ android:id="@+id/list_item_subparent_layout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingStart="5dp" - android:paddingTop="5dp" - android:paddingEnd="5dp" - android:paddingBottom="5dp" + android:paddingStart="10dp" + android:paddingTop="10dp" + android:paddingEnd="10dp" + android:paddingBottom="10dp" android:background="?attr/selectableItemBackground" android:orientation="horizontal"> @@ -57,6 +57,7 @@ android:id="@+id/line_layout_activity_icon" android:layout_width="50dp" android:layout_height="50dp" + android:layout_marginEnd="5dp" android:contentDescription="@string/candidate_item_device_image" android:padding="8dp" app:srcCompat="@drawable/ic_activity_unknown" /> @@ -280,6 +281,6 @@ android:layout_below="@id/list_item_subparent_layout" android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/value_line_color_transparent" + android:background="?attr/row_separator" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_summary_dashboard_item.xml b/app/src/main/res/layout/activity_summary_dashboard_item.xml index b6c631c45..fccb0485f 100644 --- a/app/src/main/res/layout/activity_summary_dashboard_item.xml +++ b/app/src/main/res/layout/activity_summary_dashboard_item.xml @@ -471,6 +471,6 @@ android:layout_below="@id/summary_dashboard" android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/value_line_color_transparent" + android:background="?attr/row_separator" /> \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 8c863b5c2..d8e9409db 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -63,9 +63,11 @@ #00c9bf #858585 - #70858585 + #ffe2e2e5 + #19808080 #19808080 + #FFEDEDED #545254 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 9837817ed..3510312e6 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -31,6 +31,7 @@ @color/chart_activity_light @color/chart_not_worn_light @color/alternate_row_background_light + @color/row_separator_light @color/chart_heartrate_fill #2196f3 @@ -73,6 +74,7 @@ @color/chart_activity_dark @color/chart_not_worn_dark @color/alternate_row_background_dark + @color/row_separator_dark @color/alternate_row_background_dark #2196f3 @@ -101,6 +103,7 @@ ?attr/colorSurface ?attr/colorOnSurface ?attr/colorSecondaryContainer + @color/row_separator_light ?attr/colorSurface @style/AppPreferenceThemeOverlay ?attr/colorSurface @@ -120,6 +123,7 @@ ?attr/colorSurface ?attr/colorOnSurface ?attr/colorSecondaryContainer + @color/row_separator_dark ?attr/colorSurface @style/AppPreferenceThemeOverlay ?attr/colorSurface