From d6412fa976d125e6c5762fbbd9ee2104d1ff346b Mon Sep 17 00:00:00 2001
From: Manuel Martin <manmartin@mozilla.com>
Date: Sat, 21 Dec 2019 00:48:23 +0100
Subject: [PATCH] URL Bar styles fixes (#2517)

* Fixes url bar icons private mode style

* Keep the url bar outline with children are pressed
---
 .../vrbrowser/ui/views/NavigationURLBar.java  |  4 +++
 .../res/drawable/url_background_outline.xml   | 16 ++++++++++++
 .../url_background_private_outline.xml        | 16 ++++++++++++
 .../res/drawable/url_button_end_private.xml   | 25 +++++++++++++++++++
 .../res/drawable/url_button_icon_color.xml    |  9 -------
 .../main/res/drawable/url_button_private.xml  | 22 ++++++++++++++++
 .../res/drawable/url_button_start_private.xml | 25 +++++++++++++++++++
 app/src/main/res/layout/keyboard.xml          |  4 +--
 app/src/main/res/layout/navigation_url.xml    |  2 +-
 app/src/main/res/values/styles.xml            | 18 ++++++++++---
 10 files changed, 126 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/res/drawable/url_button_end_private.xml
 delete mode 100644 app/src/main/res/drawable/url_button_icon_color.xml
 create mode 100644 app/src/main/res/drawable/url_button_private.xml
 create mode 100644 app/src/main/res/drawable/url_button_start_private.xml

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java
index 580a93044..1e6df4210 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java
@@ -418,6 +418,10 @@ private void setIsBookmarked(boolean aValue) {
     }
 
     public void setPrivateMode(boolean isEnabled) {
+        mBinding.bookmarkButton.setPrivateMode(isEnabled);
+        mBinding.microphoneButton.setPrivateMode(isEnabled);
+        mBinding.clearButton.setPrivateMode(isEnabled);
+
         mBinding.setIsPrivateMode(isEnabled);
     }
 
diff --git a/app/src/main/res/drawable/url_background_outline.xml b/app/src/main/res/drawable/url_background_outline.xml
index c3ee73b8e..4b9065198 100644
--- a/app/src/main/res/drawable/url_background_outline.xml
+++ b/app/src/main/res/drawable/url_background_outline.xml
@@ -38,6 +38,22 @@
             </item>
         </layer-list>
     </item>
+    <item android:state_pressed="true">
+        <layer-list>
+            <item>
+                <shape android:shape="rectangle">
+                    <corners android:radius="20dp" />
+                    <stroke android:width="@dimen/blur_radius" android:color="@color/azure_blur" />
+                </shape>
+            </item>
+            <item android:start="@dimen/blur_radius_half" android:end="@dimen/blur_radius_half" android:top="@dimen/blur_radius_half" android:bottom="@dimen/blur_radius_half">
+                <shape android:shape="rectangle">
+                    <corners android:radius="20dp" />
+                    <stroke android:width="2dp" android:color="@color/azure" />
+                </shape>
+            </item>
+        </layer-list>
+    </item>
     <item android:state_hovered="false" android:state_pressed="false">
         <shape android:shape="rectangle">
             <corners android:radius="20dp" />
diff --git a/app/src/main/res/drawable/url_background_private_outline.xml b/app/src/main/res/drawable/url_background_private_outline.xml
index d1b461fb7..823b4acf1 100644
--- a/app/src/main/res/drawable/url_background_private_outline.xml
+++ b/app/src/main/res/drawable/url_background_private_outline.xml
@@ -38,6 +38,22 @@
             </item>
         </layer-list>
     </item>
+    <item android:state_pressed="true">
+        <layer-list>
+            <item>
+                <shape android:shape="rectangle">
+                    <corners android:radius="20dp" />
+                    <stroke android:width="@dimen/blur_radius" android:color="@color/azure_blur" />
+                </shape>
+            </item>
+            <item android:start="@dimen/blur_radius_half" android:end="@dimen/blur_radius_half" android:top="@dimen/blur_radius_half" android:bottom="@dimen/blur_radius_half">
+                <shape android:shape="rectangle">
+                    <corners android:radius="20dp" />
+                    <stroke android:width="2dp" android:color="@color/azure" />
+                </shape>
+            </item>
+        </layer-list>
+    </item>
     <item android:state_hovered="false" android:state_pressed="false">
         <shape android:shape="rectangle">
             <corners android:radius="20dp" />
diff --git a/app/src/main/res/drawable/url_button_end_private.xml b/app/src/main/res/drawable/url_button_end_private.xml
new file mode 100644
index 000000000..bd498eace
--- /dev/null
+++ b/app/src/main/res/drawable/url_button_end_private.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false">
+        <shape android:shape="rectangle">
+            <corners android:bottomRightRadius="20dp" android:topRightRadius="20dp" />
+            <solid android:color="@android:color/transparent"/>
+        </shape>
+    </item>
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <corners android:bottomRightRadius="20dp" android:topRightRadius="20dp" />
+            <solid android:color="@color/blackberry"/>
+            <stroke android:width="@dimen/blur_radius" android:color="@color/blackberry_blur" />
+        </shape>
+    </item>
+    <item android:state_hovered="true" android:state_pressed="false">
+        <shape android:shape="rectangle">
+            <corners android:bottomRightRadius="20dp" android:topRightRadius="20dp" />
+            <solid android:color="@color/fog"/>
+            <stroke android:width="@dimen/blur_radius" android:color="@color/fog_blur" />
+        </shape>
+    </item>
+    <item android:state_hovered="false" android:state_pressed="false" android:drawable="@android:color/transparent" >
+    </item>
+</selector>
diff --git a/app/src/main/res/drawable/url_button_icon_color.xml b/app/src/main/res/drawable/url_button_icon_color.xml
deleted file mode 100644
index af1298c81..000000000
--- a/app/src/main/res/drawable/url_button_icon_color.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false"
-        android:color="@color/void_color"/>
-    <item android:state_pressed="true"
-        android:color="@color/fog"/>
-    <item android:state_hovered="true"
-        android:color="@color/asphalt"/>
-    <item android:color="@color/fog"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/url_button_private.xml b/app/src/main/res/drawable/url_button_private.xml
new file mode 100644
index 000000000..583b741fd
--- /dev/null
+++ b/app/src/main/res/drawable/url_button_private.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false">
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/transparent" />
+        </shape>
+    </item>
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/blackberry"/>
+            <stroke android:width="@dimen/blur_radius" android:color="@color/blackberry_blur" />
+        </shape>
+    </item>
+    <item android:state_hovered="true" android:state_pressed="false">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/fog"/>
+            <stroke android:width="@dimen/blur_radius" android:color="@color/fog_blur" />
+        </shape>
+    </item>
+    <item android:state_hovered="false" android:state_pressed="false" android:drawable="@android:color/transparent" >
+    </item>
+</selector>
diff --git a/app/src/main/res/drawable/url_button_start_private.xml b/app/src/main/res/drawable/url_button_start_private.xml
new file mode 100644
index 000000000..c59702a8b
--- /dev/null
+++ b/app/src/main/res/drawable/url_button_start_private.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false">
+        <shape android:shape="rectangle">
+            <corners android:bottomLeftRadius="20dp" android:topLeftRadius="20dp" />
+            <solid android:color="@android:color/transparent"/>
+        </shape>
+    </item>
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <corners android:bottomLeftRadius="20dp" android:topLeftRadius="20dp" />
+            <solid android:color="@color/blackberry"/>
+            <stroke android:width="@dimen/blur_radius" android:color="@color/blackberry_blur" />
+        </shape>
+    </item>
+    <item android:state_hovered="true" android:state_pressed="false">
+        <shape android:shape="rectangle">
+            <corners android:bottomLeftRadius="20dp" android:topLeftRadius="20dp" />
+            <solid android:color="@color/fog"/>
+            <stroke android:width="@dimen/blur_radius" android:color="@color/fog_blur" />
+        </shape>
+    </item>
+    <item android:state_hovered="false" android:state_pressed="false" android:drawable="@android:color/transparent" >
+    </item>
+</selector>
diff --git a/app/src/main/res/layout/keyboard.xml b/app/src/main/res/layout/keyboard.xml
index 2c3c1bf66..7b1c1f14d 100644
--- a/app/src/main/res/layout/keyboard.xml
+++ b/app/src/main/res/layout/keyboard.xml
@@ -21,7 +21,7 @@
                     android:layout_height="@dimen/keyboard_key_width"
                     android:layout_marginStart="0dp"
                     android:layout_marginEnd="@dimen/keyboard_layout_padding"
-                    app:tintColorList="@drawable/url_button_icon_color"
+                    app:tintColorList="@drawable/main_button_icon_color"
                     android:padding="10dp"
                     android:src="@drawable/ic_icon_exit"
                     android:scaleType="fitCenter"
@@ -33,7 +33,7 @@
                     android:layout_marginStart="0dp"
                     android:layout_marginEnd="@dimen/keyboard_layout_padding"
                     android:layout_marginTop="4dp"
-                    app:tintColorList="@drawable/url_button_icon_color"
+                    app:tintColorList="@drawable/main_button_icon_color"
                     android:padding="10dp"
                     android:src="@drawable/ic_icon_move"
                     android:scaleType="fitCenter"
diff --git a/app/src/main/res/layout/navigation_url.xml b/app/src/main/res/layout/navigation_url.xml
index 491a2293c..7959eeca2 100644
--- a/app/src/main/res/layout/navigation_url.xml
+++ b/app/src/main/res/layout/navigation_url.xml
@@ -84,7 +84,7 @@
                     android:id="@+id/microphoneButton"
                     style="@style/urlBarIconTheme"
                     android:layout_width="@{(isLibraryVisible || isSpecialUrl) ? @dimen/url_bar_last_item_width : @dimen/url_bar_item_width}"
-                    android:background="@{(isLibraryVisible || isSpecialUrl) ? @drawable/url_button_end : @drawable/url_button}"
+                    android:background="@{(isLibraryVisible || isSpecialUrl) ? (isPrivateMode ? @drawable/url_button_end_private : @drawable/url_button_end) : (isPrivateMode ? @drawable/url_button_private : @drawable/url_button)}"
                     android:src="@drawable/ic_icon_microphone"
                     android:tint="@color/fog"
                     android:tooltipText="@string/voice_search_tooltip"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 64f3d7a62..21ee7b76d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -174,29 +174,41 @@
 
     <style name="urlBarIconTheme">
         <item name="android:background">@drawable/url_button</item>
-        <item name="tintColorList">@drawable/url_button_icon_color</item>
         <item name="android:layout_width">@dimen/url_bar_item_width</item>
         <item name="android:layout_height">match_parent</item>
         <item name="android:scaleType">centerInside</item>
         <item name="android:gravity">center</item>
+        <item name="privateModeBackground">@drawable/url_button_private</item>
+        <item name="tintColorList">@drawable/main_button_icon_color</item>
+        <item name="privateModeTintColorList">@drawable/main_button_icon_color_private</item>
+        <item name="activeModeTintColorList">@drawable/main_button_icon_color_active</item>
+        <item name="notificationModeTintColorList">@drawable/main_button_icon_color_notification</item>
     </style>
 
     <style name="urlBarIconThemeStart">
         <item name="android:background">@drawable/url_button_start</item>
-        <item name="tintColorList">@drawable/url_button_icon_color</item>
         <item name="android:layout_width">@dimen/url_bar_first_item_width</item>
         <item name="android:layout_height">match_parent</item>
         <item name="android:scaleType">centerInside</item>
         <item name="android:gravity">center</item>
+        <item name="privateModeBackground">@drawable/url_button_start_private</item>
+        <item name="tintColorList">@drawable/main_button_icon_color</item>
+        <item name="privateModeTintColorList">@drawable/main_button_icon_color_private</item>
+        <item name="activeModeTintColorList">@drawable/main_button_icon_color_active</item>
+        <item name="notificationModeTintColorList">@drawable/main_button_icon_color_notification</item>
     </style>
 
     <style name="urlBarIconThemeEnd">
         <item name="android:background">@drawable/url_button_end</item>
-        <item name="tintColorList">@drawable/url_button_icon_color</item>
         <item name="android:layout_width">@dimen/url_bar_last_item_width</item>
         <item name="android:layout_height">match_parent</item>
         <item name="android:scaleType">centerInside</item>
         <item name="android:gravity">center</item>
+        <item name="privateModeBackground">@drawable/url_button_end_private</item>
+        <item name="tintColorList">@drawable/main_button_icon_color</item>
+        <item name="privateModeTintColorList">@drawable/main_button_icon_color_private</item>
+        <item name="activeModeTintColorList">@drawable/main_button_icon_color_active</item>
+        <item name="notificationModeTintColorList">@drawable/main_button_icon_color_notification</item>
     </style>
 
     <style name="scrollbar">