From 2f0d8d8243fea0c676fc4f8b40fd81c8dbe8f7ad Mon Sep 17 00:00:00 2001 From: Sawyer Blatz Date: Tue, 1 Oct 2019 12:50:39 -0700 Subject: [PATCH] For #5712: Updates text color for fill link from clipboard --- app/src/main/res/layout/fragment_search.xml | 2 +- app/src/main/res/values-night/colors.xml | 1 + app/src/main/res/values/attrs.xml | 1 + app/src/main/res/values/colors.xml | 4 ++++ app/src/main/res/values/styles.xml | 2 ++ 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml index 65eb57c81..2e9f0d08d 100644 --- a/app/src/main/res/layout/fragment_search.xml +++ b/app/src/main/res/layout/fragment_search.xml @@ -89,7 +89,7 @@ android:id="@+id/clipboard_url" android:layout_width="0dp" android:layout_height="wrap_content" - android:textColor="?accent" + android:textColor="?fillLinkFromClipboard" android:textAppearance="@style/Subtitle12TextStyle" android:maxLines="1" android:ellipsize="end" diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 909a96cb2..5e72edff7 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -29,6 +29,7 @@ @color/toolbar_center_gradient_dark_theme @color/toolbar_end_gradient_dark_theme @color/toolbar_divider_color_dark_theme + @color/accent_on_dark_background_normal_theme @color/collection_icon_color_violet_dark_theme diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 59d2be71c..788c798dc 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -36,6 +36,7 @@ + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index f5339c51e..f42aa7b2a 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -30,6 +30,7 @@ @color/foundation_light_theme @color/foundation_light_theme #CDCCCF + @color/accent_light_theme #FBFBFE @@ -58,6 +59,7 @@ @color/foundation_dark_theme @color/foundation_dark_theme #45444D + @color/accent_on_dark_background_normal_theme #FBFBFE @@ -83,6 +85,7 @@ #492E85 #383372 #403760 + @color/accent_on_dark_background_private_theme @color/primary_text_light_theme @@ -108,6 +111,7 @@ @color/toolbar_center_gradient_light_theme @color/toolbar_end_gradient_light_theme @color/toolbar_divider_color_light_theme + @color/fill_link_from_clipboard_light_theme #DFDFE3 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index d1cd2717a..7a131d733 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -49,6 +49,7 @@ @color/toolbar_center_gradient_normal_theme @color/toolbar_end_gradient_normal_theme @color/toolbar_divider_color_normal_theme + @color/fill_link_from_clipboard_normal_theme @drawable/ic_logo_wordmark_normal @@ -132,6 +133,7 @@ @color/toolbar_center_gradient_private_theme @color/toolbar_end_gradient_private_theme @color/toolbar_divider_color_private_theme + @color/fill_link_from_clipboard_private_theme @drawable/ic_logo_wordmark_private