From 1705a21f685eb73b4336eb7ab1a00b70f2681dbf Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Sat, 22 Jun 2019 09:45:54 -0400
Subject: [PATCH] slider styling

---
 src/Android/Renderers/ExtendedSliderRenderer.cs | 9 ++++++++-
 src/App/Styles/Base.xaml                        | 4 ++--
 src/App/Styles/Black.xaml                       | 3 ++-
 src/App/Styles/Dark.xaml                        | 3 ++-
 src/App/Styles/Light.xaml                       | 5 +++--
 src/App/Styles/Nord.xaml                        | 3 ++-
 6 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/Android/Renderers/ExtendedSliderRenderer.cs b/src/Android/Renderers/ExtendedSliderRenderer.cs
index 9580d1eb8..0f6962782 100644
--- a/src/Android/Renderers/ExtendedSliderRenderer.cs
+++ b/src/Android/Renderers/ExtendedSliderRenderer.cs
@@ -23,7 +23,14 @@ namespace Bit.Droid.Renderers
                 var t = ResourcesCompat.GetDrawable(Resources, Resource.Drawable.slider_thumb, null);
                 if(t is GradientDrawable thumb)
                 {
-                    thumb.SetColor(view.ThumbColor.ToAndroid());
+                    if(view.ThumbColor == Color.Default)
+                    {
+                        thumb.SetColor(Color.White.ToAndroid());
+                    }
+                    else
+                    {
+                        thumb.SetColor(view.ThumbColor.ToAndroid());
+                    }
                     thumb.SetStroke(3, view.ThumbBorderColor.ToAndroid());
                     Control.SetThumb(thumb);
                 }
diff --git a/src/App/Styles/Base.xaml b/src/App/Styles/Base.xaml
index 68ba2afdf..f9c80a725 100644
--- a/src/App/Styles/Base.xaml
+++ b/src/App/Styles/Base.xaml
@@ -62,9 +62,9 @@
     </Style>
     <Style TargetType="controls:ExtendedSlider">
         <Setter Property="MinimumTrackColor"
-                Value="{StaticResource SliderTrackColor}" />
+                Value="{StaticResource SliderTrackMinColor}" />
         <Setter Property="MaximumTrackColor"
-                Value="{StaticResource SliderTrackColor}" />
+                Value="{StaticResource SliderTrackMaxColor}" />
         <Setter Property="ThumbColor"
                 Value="{StaticResource SliderThumbColor}" />
         <Setter Property="ThumbBorderColor"
diff --git a/src/App/Styles/Black.xaml b/src/App/Styles/Black.xaml
index 3b001c239..77a0ab6be 100644
--- a/src/App/Styles/Black.xaml
+++ b/src/App/Styles/Black.xaml
@@ -31,7 +31,8 @@
 
     <Color x:Key="SliderThumbColor">#B9B9B9</Color>
     <Color x:Key="SliderThumbBorderColor">#000000</Color>
-    <Color x:Key="SliderTrackColor">#52bdfb</Color>
+    <Color x:Key="SliderTrackMinColor">#52bdfb</Color>
+    <Color x:Key="SliderTrackMaxColor">#52bdfb</Color>
 
     <Color x:Key="ButtonTextColor">#000000</Color>
     <Color x:Key="ButtonBackgroundColor">#dddddd</Color>
diff --git a/src/App/Styles/Dark.xaml b/src/App/Styles/Dark.xaml
index 7a61d558b..a924f05b2 100644
--- a/src/App/Styles/Dark.xaml
+++ b/src/App/Styles/Dark.xaml
@@ -31,7 +31,8 @@
 
     <Color x:Key="SliderThumbColor">#B9B9B9</Color>
     <Color x:Key="SliderThumbBorderColor">#000000</Color>
-    <Color x:Key="SliderTrackColor">#52bdfb</Color>
+    <Color x:Key="SliderTrackMinColor">#52bdfb</Color>
+    <Color x:Key="SliderTrackMaxColor">#52bdfb</Color>
 
     <Color x:Key="ButtonTextColor">#000000</Color>
     <Color x:Key="ButtonBackgroundColor">#dddddd</Color>
diff --git a/src/App/Styles/Light.xaml b/src/App/Styles/Light.xaml
index 04ea169a1..a292e79b1 100644
--- a/src/App/Styles/Light.xaml
+++ b/src/App/Styles/Light.xaml
@@ -29,9 +29,10 @@
     <Color x:Key="ListHeaderTextColor">#3c8dbc</Color>
     <Color x:Key="ListHeaderBackgroundColor">#efeff4</Color>
 
-    <Color x:Key="SliderThumbColor">#ffffff</Color>
+    <Color x:Key="SliderThumbColor">Default</Color>
     <Color x:Key="SliderThumbBorderColor">#b5b5b5</Color>
-    <Color x:Key="SliderTrackColor">#dddddd</Color>
+    <Color x:Key="SliderTrackMinColor">#3c8dbc</Color>
+    <Color x:Key="SliderTrackMaxColor">#dddddd</Color>
 
     <Color x:Key="ButtonTextColor">#000000</Color>
     <Color x:Key="ButtonBackgroundColor">#dddddd</Color>
diff --git a/src/App/Styles/Nord.xaml b/src/App/Styles/Nord.xaml
index 1cafe054f..3ffa5e94e 100644
--- a/src/App/Styles/Nord.xaml
+++ b/src/App/Styles/Nord.xaml
@@ -31,7 +31,8 @@
 
     <Color x:Key="SliderThumbColor">#e5e9f0</Color>
     <Color x:Key="SliderThumbBorderColor">#2e3440</Color>
-    <Color x:Key="SliderTrackColor">#81a1c1</Color>
+    <Color x:Key="SliderTrackMinColor">#81a1c1</Color>
+    <Color x:Key="SliderTrackMaxColor">#81a1c1</Color>
 
     <Color x:Key="ButtonTextColor">#000000</Color>
     <Color x:Key="ButtonBackgroundColor">#dddddd</Color>