From a7d6ad51627f739279ce823340645c0a2877750d Mon Sep 17 00:00:00 2001 From: krlvm <51774833+krlvm@users.noreply.github.com> Date: Mon, 29 Mar 2021 14:44:29 +0300 Subject: [PATCH] Fix Subscription Picker's Toolbar colors --- .../res/layout/dialog_feed_group_create.xml | 3 ++- .../res/layout/picker_subscription_item.xml | 2 +- .../main/res/layout/toolbar_search_layout.xml | 5 ++--- .../main/res/menu/menu_feed_group_dialog.xml | 1 + app/src/main/res/values/attrs.xml | 1 + app/src/main/res/values/styles.xml | 9 +------- app/src/main/res/values/styles_misc.xml | 21 +++++++++++++++++++ 7 files changed, 29 insertions(+), 13 deletions(-) diff --git a/app/src/main/res/layout/dialog_feed_group_create.xml b/app/src/main/res/layout/dialog_feed_group_create.xml index 1dbf8e761..e849524b0 100644 --- a/app/src/main/res/layout/dialog_feed_group_create.xml +++ b/app/src/main/res/layout/dialog_feed_group_create.xml @@ -108,7 +108,8 @@ android:id="@+id/subscriptions_header_toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" - android:gravity="center_vertical"> + android:gravity="center_vertical" + android:theme="@style/ContrastToolbarTheme"> diff --git a/app/src/main/res/layout/toolbar_search_layout.xml b/app/src/main/res/layout/toolbar_search_layout.xml index d24944e2f..e2b0ed4cb 100644 --- a/app/src/main/res/layout/toolbar_search_layout.xml +++ b/app/src/main/res/layout/toolbar_search_layout.xml @@ -18,12 +18,11 @@ android:focusable="true" android:focusableInTouchMode="true" android:hint="@string/search" - android:textColor="@color/white" + android:textColor="?attr/toolbarSearchColor" android:imeOptions="actionSearch|flagNoFullscreen" android:inputType="textFilter|textNoSuggestions" android:maxLines="1" android:nextFocusDown="@+id/suggestions_list" - android:theme="@style/WhiteAccentTheme" tools:ignore="RtlHardcoded" /> diff --git a/app/src/main/res/menu/menu_feed_group_dialog.xml b/app/src/main/res/menu/menu_feed_group_dialog.xml index 38473e4d5..b0c1e494d 100644 --- a/app/src/main/res/menu/menu_feed_group_dialog.xml +++ b/app/src/main/res/menu/menu_feed_group_dialog.xml @@ -7,6 +7,7 @@ android:id="@+id/action_search" android:icon="@drawable/ic_search" android:title="@string/search" + app:iconTint="@color/contrastColor" app:showAsAction="always" tools:ignore="AlwaysShowAction" /> diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 43fcb2db0..d349cb96f 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -15,6 +15,7 @@ + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 9100de20a..1c0d0b63c 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -13,6 +13,7 @@ - - diff --git a/app/src/main/res/values/styles_misc.xml b/app/src/main/res/values/styles_misc.xml index 275374fcf..fafa01310 100644 --- a/app/src/main/res/values/styles_misc.xml +++ b/app/src/main/res/values/styles_misc.xml @@ -62,6 +62,22 @@ + + @@ -79,4 +95,9 @@ @color/contrastColor + + +