From 5c092c1ef1acc1ea11667b052f6e4aa1739deb33 Mon Sep 17 00:00:00 2001
From: Jeff Boek <jeff@jeffboek.com>
Date: Fri, 20 Sep 2019 13:07:01 -0700
Subject: [PATCH] For #561 - Adds shadow/highlightto the bottom bar

---
 .../org/mozilla/fenix/home/HomeFragment.kt    |  3 +++
 .../drawable/home_bottom_bar_background.xml   | 17 ++++++++++++++
 ...te_home_bottom_bar_background_gradient.xml | 22 +++++++++++++++++++
 app/src/main/res/layout/fragment_home.xml     | 13 +++++++++--
 app/src/main/res/values/attrs.xml             |  1 +
 app/src/main/res/values/colors.xml            |  1 +
 app/src/main/res/values/styles.xml            |  2 ++
 7 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/drawable/home_bottom_bar_background.xml
 create mode 100644 app/src/main/res/drawable/private_home_bottom_bar_background_gradient.xml

diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index 8c3686349..e9fa19ac6 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -287,6 +287,9 @@ class HomeFragment : Fragment() {
                 )
             }
         }
+
+        // We need the shadow to be above the components.
+        bottomBarShadow.bringToFront()
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/res/drawable/home_bottom_bar_background.xml b/app/src/main/res/drawable/home_bottom_bar_background.xml
new file mode 100644
index 000000000..b57a92a7e
--- /dev/null
+++ b/app/src/main/res/drawable/home_bottom_bar_background.xml
@@ -0,0 +1,17 @@
+<?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/. -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+<item>
+    <shape>
+        <solid android:color="@color/foundation_normal_theme" />
+    </shape>
+</item>
+<item android:height="1dp" >
+    <shape android:shape="rectangle">
+        <solid android:color="#1AFFFFFF" />
+    </shape>
+</item>
+</layer-list>
diff --git a/app/src/main/res/drawable/private_home_bottom_bar_background_gradient.xml b/app/src/main/res/drawable/private_home_bottom_bar_background_gradient.xml
new file mode 100644
index 000000000..8bce2c24f
--- /dev/null
+++ b/app/src/main/res/drawable/private_home_bottom_bar_background_gradient.xml
@@ -0,0 +1,22 @@
+<?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/. -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+<item>
+    <shape>
+        <gradient
+            android:angle="45"
+            android:startColor="#7529A7"
+            android:centerColor="#492E85"
+            android:endColor="#383372"
+            android:type="linear" />
+    </shape>
+</item>
+<item android:height="1dp" >
+    <shape android:shape="rectangle">
+        <solid android:color="#1AFFFFFF" />
+    </shape>
+</item>
+</layer-list>
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index efc1b4241..135ad0550 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -53,11 +53,20 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintEnd_toStartOf="parent" />
 
+        <View
+            android:id="@+id/bottomBarShadow"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:background="@color/bottom_bar_shadow"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintBottom_toTopOf="@id/bottom_bar"/>
+
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/bottom_bar"
             android:layout_width="match_parent"
             android:layout_height="60dp"
-            android:background="?homeBackground"
+            android:background="?bottomBarBackground"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent">
@@ -67,7 +76,7 @@
                 android:transitionName="toolbar_wrapper_transition"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
+                android:layout_marginStart="8dp"
                 android:layout_marginTop="16dp"
                 android:layout_marginBottom="16dp"
                 android:layout_marginEnd="8dp"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 52a560a6f..59d2be71c 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -27,6 +27,7 @@
 
     <!-- Misc -->
     <attr name="homeBackground" format="reference"/>
+    <attr name="bottomBarBackground" format="reference"/>
     <attr name="privateBrowsingButtonBackground" format="reference" />
     <attr name="privateBrowsingButtonAccent" format="reference" />
     <attr name="fenixLogo" format="reference" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f3267e29a..e17bfd779 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -189,6 +189,7 @@
     <color name="text_scale_example_text_color">#232749</color>
     <color name="sync_error_background_color">#FFF36E</color>
     <color name="sync_error_text_color">#960E18</color>
+    <color name="bottom_bar_shadow">#1A000000</color>
 
     <!-- Reader View colors -->
     <color name="mozac_feature_readerview_text_color">@color/primary_text_light_theme</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e6b907fe9..d1cd2717a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -53,6 +53,7 @@
         <!-- Drawables -->
         <item name="fenixLogo">@drawable/ic_logo_wordmark_normal</item>
         <item name="homeBackground">@color/foundation_normal_theme</item>
+        <item name="bottomBarBackground">@drawable/home_bottom_bar_background</item>
         <item name="privateBrowsingButtonBackground">@android:color/transparent</item>
         <item name="privateBrowsingButtonAccent">@color/primary_text_normal_theme</item>
         <item name="shieldLottieFile">@raw/shield_json</item>
@@ -135,6 +136,7 @@
         <!-- Drawables -->
         <item name="fenixLogo">@drawable/ic_logo_wordmark_private</item>
         <item name="homeBackground">@drawable/private_home_background_gradient</item>
+        <item name="bottomBarBackground">@drawable/private_home_bottom_bar_background_gradient</item>
         <item name="privateBrowsingButtonBackground">@color/primary_text_private_theme</item>
         <item name="privateBrowsingButtonAccent">@color/above_private_theme</item>
         <item name="shieldLottieFile">@raw/shield_json_dark</item>