From cf0b7db3dade01b06ca916ae898d102543584b27 Mon Sep 17 00:00:00 2001 From: Fahim Salam Chowdhury Date: Thu, 16 Feb 2023 10:53:46 +0600 Subject: [PATCH] 1069-Fix_widget_theme issue: https://gitlab.e.foundation/e/os/backlog/-/issues/1069 Fix widget colors --- app/src/main/res/layout/widget_entry.xml | 2 +- app/src/main/res/layout/widget_note_list.xml | 2 +- app/src/main/res/layout/widget_single_note.xml | 2 +- app/src/main/res/layout/widget_single_note_content.xml | 2 +- app/src/main/res/values/colors.xml | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/layout/widget_entry.xml b/app/src/main/res/layout/widget_entry.xml index 2e23497cc..a39905847 100644 --- a/app/src/main/res/layout/widget_entry.xml +++ b/app/src/main/res/layout/widget_entry.xml @@ -27,7 +27,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_weight="1" - android:textColor="@color/color_default_primary_text" + android:textColor="@color/widget_foreground" android:ellipsize="end" android:gravity="center_vertical" android:lines="1" diff --git a/app/src/main/res/layout/widget_note_list.xml b/app/src/main/res/layout/widget_note_list.xml index a34f14cd8..9c4199d80 100644 --- a/app/src/main/res/layout/widget_note_list.xml +++ b/app/src/main/res/layout/widget_note_list.xml @@ -23,7 +23,7 @@ android:layout_height="match_parent" android:gravity="center" android:text="@string/widget_note_list_placeholder" - android:textColor="@color/fg_default_high" + android:textColor="@color/widget_foreground" tools:visibility="gone" /> diff --git a/app/src/main/res/layout/widget_single_note.xml b/app/src/main/res/layout/widget_single_note.xml index 5543901bf..79089f337 100644 --- a/app/src/main/res/layout/widget_single_note.xml +++ b/app/src/main/res/layout/widget_single_note.xml @@ -20,7 +20,7 @@ android:gravity="center" android:padding="@dimen/spacer_1x" android:text="@string/widget_single_note_placeholder_tv" - android:textColor="@color/color_default_primary_text" + android:textColor="@color/widget_foreground" android:textAlignment="center" /> diff --git a/app/src/main/res/layout/widget_single_note_content.xml b/app/src/main/res/layout/widget_single_note_content.xml index cf4bda23d..bd6227afc 100644 --- a/app/src/main/res/layout/widget_single_note_content.xml +++ b/app/src/main/res/layout/widget_single_note_content.xml @@ -5,5 +5,5 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:lineSpacingMultiplier="@dimen/note_line_spacing" - android:textColor="@color/color_default_primary_text" + android:textColor="@color/widget_foreground" tools:text="@tools:sample/lorem/random" /> \ 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 80fdf4472..5de03b526 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -37,6 +37,6 @@ @color/primary_dark - #ddffffff - #222222 + @color/e_background + @color/e_primary_text_color -- GitLab