From 16127c31a891a69272355ea48fd254247311dbbd Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Wed, 3 Apr 2019 11:17:13 -0700
Subject: [PATCH] For #1049 - Add photon gradient drawable for progressbar

---
 CHANGELOG.md                                  |  1 +
 .../main/res/drawable/progress_gradient.xml   | 22 +++++++++++++++++++
 app/src/main/res/values-night/colors.xml      |  1 +
 app/src/main/res/values/attrs.xml             |  1 +
 app/src/main/res/values/colors.xml            |  2 ++
 app/src/main/res/values/styles.xml            |  8 ++++++-
 6 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/drawable/progress_gradient.xml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac2be5c86..e4b1d4a22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - #208 - Added normal browsing dark mode (advised to use attrs from now on for most referenced colors)
 - #957 - Adds telemetry for the context menu
 - #1036 - Adds telemetry for Find in Page
+- #1049 - Add style for progress bar with gradient drawable
 
 ### Changed
 ### Removed
\ No newline at end of file
diff --git a/app/src/main/res/drawable/progress_gradient.xml b/app/src/main/res/drawable/progress_gradient.xml
new file mode 100644
index 000000000..5ad75fd03
--- /dev/null
+++ b/app/src/main/res/drawable/progress_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 android:id="@android:id/background">
+        <shape>
+            <solid android:color="?attr/unloadedProgressColor" />
+        </shape>
+    </item>
+
+    <item android:id="@android:id/progress">
+        <clip>
+            <shape>
+                <gradient
+                    android:centerColor="#F10366"
+                    android:endColor="#FF9100"
+                    android:startColor="#6173FF" />
+            </shape>
+        </clip>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 83556834d..3f147fd57 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -19,6 +19,7 @@
 
     <!-- Browser -->
     <color name="browserToolbarBackground_normal_theme">@color/background_dark_theme</color>
+    <color name="unloaded_progress_normal_theme">#42414D</color>
 
     <!-- home -->
     <color name="history_header_normal_theme">@color/off_white</color>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index a822adcdd..d9966f4b8 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -47,6 +47,7 @@
     <attr name="navigationBarColorBrowser" format="reference" />
     <attr name="quickActionPullTabColor" format="reference" />
     <attr name="quickActionBackgroundColor" format="reference" />
+    <attr name="unloadedProgressColor" format="reference" />
 
     <!-- History Fragment -->
     <attr name="historyURLColor" format="reference" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a49c12f64..1140eeb14 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -39,6 +39,7 @@
     <color name="homeBackgroundBottomGradient_normal_theme">@color/off_white</color>
     <color name="privateBrowsingButtonTint_normal_theme">@color/menu_button_tint_normal_theme</color>
     <color name="browserToolbarBackground_normal_theme">@color/off_white</color>
+    <color name="unloaded_progress_normal_theme">#E0E0E6</color>
 
     <color name="searchBackground_normal_theme">@color/off_white</color>
     <color name="search_stroke_normal">#c5c8d7</color>
@@ -87,6 +88,7 @@
     <color name="history_header_private_theme">@color/photonGrey40</color>
     <color name="history_title_private_theme">@color/off_white</color>
     <color name="history_url_private_theme">@color/photonGrey40</color>
+    <color name="unloaded_progress_private_theme">#4f4e75</color>
 
     <!-- Library Colors -->
     <color name="library_sessions_icon_background">#B9F0FD</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0667ecbcc..59040f3c0 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -14,11 +14,11 @@
         <item name="toolbarColor">@color/toolbar_normal_theme</item>
         <item name="colorPrimary">@color/color_primary</item>
         <item name="colorAccent">@color/session_border_color</item>
+        <item name="android:progressBarStyleHorizontal">@style/progressBarStyleHorizontal</item>
         <item name="primaryTextColor">@color/text_color_normal_theme</item>
         <item name="secondaryTextColor">@color/secondary_text_color_normal_theme</item>
         <item name="colorPrimaryDark">@color/background_dark_theme</item>
 
-
         <!-- Toggle colors activated and off -->
         <item name="colorControlActivated">@color/toggle_activated_normal_theme</item>
         <item name="colorSwitchThumbNormal">@color/colorSwitchThumbNormal_normal_theme</item>
@@ -64,6 +64,7 @@
         <item name="browserToolbarMenuIcons">@color/icons_normal_theme</item>
         <item name="quickActionPullTabColor">@color/quick_action_pull_tab</item>
         <item name="quickActionBackgroundColor">@color/quick_action_background_normal_theme</item>
+        <item name="unloadedProgressColor">@color/unloaded_progress_normal_theme</item>
 
         <!-- History fragment colors -->
         <item name="historyTitleColor">@color/history_title_normal_theme</item>
@@ -127,6 +128,7 @@
         <item name="browserToolbarMenuIcons">@color/icons_dark_mode</item>
         <item name="quickActionPullTabColor">@color/off_white</item>
         <item name="quickActionBackgroundColor">@color/quick_action_background_private_theme</item>
+        <item name="unloadedProgressColor">@color/unloaded_progress_private_theme</item>
 
         <!-- History fragment colors -->
         <item name="historyTitleColor">@color/history_title_private_theme</item>
@@ -216,4 +218,8 @@
     <style name="ListItemTextStyle" parent="TextAppearance.MaterialComponents.Subtitle1">
         <item name="android:textColor">?attr/libraryListItemTextColor</item>
     </style>
+
+    <style name="progressBarStyleHorizontal" parent="@style/Widget.AppCompat.ProgressBar.Horizontal">
+        <item name="android:progressDrawable">@drawable/progress_gradient</item>
+    </style>
 </resources>