From 5c45064fbbac761e4af18ec0d827c50b42b2e3a5 Mon Sep 17 00:00:00 2001
From: Jeff Boek <jeff@jeffboek.com>
Date: Tue, 23 Apr 2019 12:26:19 -0700
Subject: [PATCH] For #1843 - Fixes color for dialog overlay

---
 ...llection_background.xml => scrim_background.xml} |  4 ++--
 app/src/main/res/layout/collection_tab_list_row.xml |  2 +-
 .../res/layout/component_collection_creation.xml    |  5 +++--
 .../main/res/layout/fragment_create_collection.xml  |  7 ++++++-
 app/src/main/res/values-night/colors.xml            |  2 ++
 app/src/main/res/values/attrs.xml                   |  3 +++
 app/src/main/res/values/colors.xml                  | 10 ++++++++++
 app/src/main/res/values/styles.xml                  | 13 ++++++++-----
 8 files changed, 35 insertions(+), 11 deletions(-)
 rename app/src/main/res/drawable/{create_collection_background.xml => scrim_background.xml} (82%)

diff --git a/app/src/main/res/drawable/create_collection_background.xml b/app/src/main/res/drawable/scrim_background.xml
similarity index 82%
rename from app/src/main/res/drawable/create_collection_background.xml
rename to app/src/main/res/drawable/scrim_background.xml
index 977845c7d..580d0c9e4 100644
--- a/app/src/main/res/drawable/create_collection_background.xml
+++ b/app/src/main/res/drawable/scrim_background.xml
@@ -4,7 +4,7 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
-        android:startColor="#F5393473"
-        android:endColor="#F520123A"
+        android:startColor="?scrimStart"
+        android:endColor="?scrimEnd"
         android:angle="45" />
 </shape>
diff --git a/app/src/main/res/layout/collection_tab_list_row.xml b/app/src/main/res/layout/collection_tab_list_row.xml
index ccb03ccca..512ef656e 100644
--- a/app/src/main/res/layout/collection_tab_list_row.xml
+++ b/app/src/main/res/layout/collection_tab_list_row.xml
@@ -61,7 +61,7 @@
             android:textColor="?primaryText"
             android:textSize="15sp"
             app:layout_constraintStart_toEndOf="@id/favicon_image"
-            app:layout_constraintEnd_toEndOf="@id/hostname"
+            app:layout_constraintEnd_toStartOf="@id/tab_selected_checkbox"
             app:layout_constraintTop_toBottomOf="@id/hostname"
             app:layout_constraintBottom_toBottomOf="parent"/>
 
diff --git a/app/src/main/res/layout/component_collection_creation.xml b/app/src/main/res/layout/component_collection_creation.xml
index a0a3826b1..c9cf41995 100644
--- a/app/src/main/res/layout/component_collection_creation.xml
+++ b/app/src/main/res/layout/component_collection_creation.xml
@@ -15,7 +15,8 @@
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:drawableStart="@drawable/mozac_ic_back"
         android:textAppearance="@style/HeaderTextStyle"
-        android:textColor="?foundation"
+        android:textColor="@color/neutral_text"
+        android:drawableTint="@color/neutral_text"
         android:drawablePadding="8dp"
         android:text="@string/create_collection_select_tabs"
         android:textSize="20sp"
@@ -31,7 +32,7 @@
         android:textSize="16sp"
         android:text="Select All"
         android:textAllCaps="false"
-        android:textColor="?foundation"
+        android:textColor="@color/neutral_text"
         android:layout_margin="16dp"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
diff --git a/app/src/main/res/layout/fragment_create_collection.xml b/app/src/main/res/layout/fragment_create_collection.xml
index 863f74062..624f01c00 100644
--- a/app/src/main/res/layout/fragment_create_collection.xml
+++ b/app/src/main/res/layout/fragment_create_collection.xml
@@ -1,9 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/create_collection_wrapper"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/create_collection_background"
+    android:background="@drawable/scrim_background"
     tools:context="org.mozilla.fenix.collections.CreateCollectionFragment">
 
 </FrameLayout>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 3079501e1..dc095d157 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -17,4 +17,6 @@
     <color name="neutral_faded_normal_theme">@color/neutral_faded_dark_theme</color>
     <color name="shadow_normal_theme">@color/shadow_dark_theme</color>
     <color name="destructive_normal_theme">@color/destructive_dark_theme</color>
+    <color name="scrimStart_normal_theme">@color/scrimStart_dark_theme</color>
+    <color name="scrimEnd_normal_theme">@color/scrimStart_dark_theme</color>
 </resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index ea698ff30..3caf6afe5 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -18,6 +18,9 @@
     <attr name="shadow" format="reference" />
     <attr name="destructive" format="reference"/>
 
+    <attr name="scrimStart" format="reference"/>
+    <attr name="scrimEnd" format="reference"/>
+
     <!-- Misc -->
     <attr name="homeBackground" format="reference"/>
     <attr name="privateBrowsingButtonBackground" format="reference" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 2b4d33d5f..bdec44b11 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -17,6 +17,8 @@
     <color name="neutral_faded_light_theme">@color/photonGrey20</color>
     <color name="shadow_light_theme">#1F000000</color>
     <color name="destructive_light_theme">@color/photonRed60</color>
+    <color name="scrimStart_light_theme">#F5393473</color>
+    <color name="scrimEnd_light_theme">#F520123A</color>
 
     <!-- Dark theme color palette -->
     <color name="primary_text_dark_theme">#FBFBFE</color>
@@ -32,6 +34,8 @@
     <color name="neutral_faded_dark_theme">#1FEDEDF0</color>
     <color name="shadow_dark_theme">#050505</color>
     <color name="destructive_dark_theme">#FF4F5E</color>
+    <color name="scrimStart_dark_theme">#F520123A</color>
+    <color name="scrimEnd_dark_theme">#F515141A</color>
 
     <!-- Private theme color palette -->
     <color name="primary_text_private_theme">#FBFBFE</color>
@@ -47,6 +51,8 @@
     <color name="neutral_faded_private_theme">#1FEDEDF0</color>
     <color name="shadow_private_theme">#2B1067</color>
     <color name="destructive_private_theme">#FF4F5E</color>
+    <color name="scrimStart_private_theme">#F520123A</color>
+    <color name="scrimEnd_private_theme">#F515141A</color>
 
     <!-- Normal theme colors for light mode -->
     <color name="primary_text_normal_theme">@color/primary_text_light_theme</color>
@@ -62,6 +68,8 @@
     <color name="neutral_faded_normal_theme">@color/neutral_faded_light_theme</color>
     <color name="shadow_normal_theme">@color/shadow_light_theme</color>
     <color name="destructive_normal_theme">@color/destructive_light_theme</color>
+    <color name="scrimStart_normal_theme">@color/scrimStart_light_theme</color>
+    <color name="scrimEnd_normal_theme">@color/scrimEnd_light_theme</color>
 
     <!-- Bookmark buttons -->
     <color name="bookmark_favicon_background">#DFDFE3</color>
@@ -104,4 +112,6 @@
     <!-- <color name="private_browsing_button_accent_color">#722291</color> -->
     <color name="private_browsing_button_accent_color">@color/foundation_private_theme</color>
     <color name="white_color">#FBFBFE</color>
+
+    <color name="neutral_text">@color/white_color</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 40b6fa7cb..f40cd9b39 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -28,6 +28,8 @@
         <item name="neutralFaded">@color/neutral_faded_normal_theme</item>
         <item name="shadow">@color/shadow_normal_theme</item>
         <item name="destructive">@color/destructive_normal_theme</item>
+        <item name="scrimStart">@color/scrimStart_normal_theme</item>
+        <item name="scrimEnd">@color/scrimStart_normal_theme</item>
 
         <!-- Drawables -->
         <item name="fenixLogo">@drawable/ic_logo_wordmark_normal</item>
@@ -62,6 +64,8 @@
         <item name="neutralFaded">@color/neutral_faded_private_theme</item>
         <item name="shadow">@color/shadow_private_theme</item>
         <item name="destructive">@color/destructive_private_theme</item>
+        <item name="scrimStart">@color/scrimStart_private_theme</item>
+        <item name="scrimEnd">@color/scrimStart_private_theme</item>
 
         <!-- Drawables -->
         <item name="fenixLogo">@drawable/ic_logo_wordmark_private</item>
@@ -108,12 +112,11 @@
         <item name="android:paddingEnd">24dp</item>
     </style>
 
-
-    <style name="CreateCollectionDialogStyle" parent="Theme.AppCompat.DayNight.NoActionBar">
-        <item name="android:colorControlNormal">?accentBright</item>
-        <item name="android:colorControlActivated">?accentBright</item>
-        <item name="android:colorControlHighlight">?accent</item>
+    <style name="CreateCollectionDialogStyle" parent="NormalTheme">
         <item name="android:textAppearance">@style/TextAppearance.AppCompat</item>
+        <item name="android:colorControlNormal">?accentHighContrast</item>
+        <item name="android:colorControlActivated">?accentHighContrast</item>
+        <item name="android:colorControlHighlight">?accent</item>
 
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowAnimationStyle">@style/Animation.Design.BottomSheetDialog</item>