From 120e179fb8e36852d61cecabc8c396a950cdcc11 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kspearrin@users.noreply.github.com>
Date: Wed, 11 Mar 2020 09:46:48 -0400
Subject: [PATCH] Move tab bar colors to styles (#764)

---
 src/App/Pages/TabsPage.cs                 | 10 +++-------
 src/App/Styles/Base.xaml                  |  4 ++++
 src/iOS/Renderers/CustomTabbedRenderer.cs |  4 ----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/App/Pages/TabsPage.cs b/src/App/Pages/TabsPage.cs
index ddf4c6115..a2961bd30 100644
--- a/src/App/Pages/TabsPage.cs
+++ b/src/App/Pages/TabsPage.cs
@@ -15,21 +15,21 @@ namespace Bit.App.Pages
             _groupingsPage = new NavigationPage(new GroupingsPage(true, previousPage: previousPage))
             {
                 Title = AppResources.MyVault,
-                Icon = "lock.png"
+                IconImageSource = "lock.png"
             };
             Children.Add(_groupingsPage);
 
             _generatorPage = new NavigationPage(new GeneratorPage(true, null, this))
             {
                 Title = AppResources.Generator,
-                Icon = "refresh.png"
+                IconImageSource = "refresh.png"
             };
             Children.Add(_generatorPage);
 
             var settingsPage = new NavigationPage(new SettingsPage(this))
             {
                 Title = AppResources.Settings,
-                Icon = "cog.png"
+                IconImageSource = "cog.png"
             };
             Children.Add(settingsPage);
 
@@ -41,10 +41,6 @@ namespace Bit.App.Pages
                     Xamarin.Forms.PlatformConfiguration.AndroidSpecific.ToolbarPlacement.Bottom);
                 Xamarin.Forms.PlatformConfiguration.AndroidSpecific.TabbedPage.SetIsSwipePagingEnabled(this, false);
                 Xamarin.Forms.PlatformConfiguration.AndroidSpecific.TabbedPage.SetIsSmoothScrollEnabled(this, false);
-                Xamarin.Forms.PlatformConfiguration.AndroidSpecific.TabbedPage.SetBarSelectedItemColor(this,
-                    (Color)Application.Current.Resources["TabBarSelectedItemColor"]);
-                Xamarin.Forms.PlatformConfiguration.AndroidSpecific.TabbedPage.SetBarItemColor(this,
-                    (Color)Application.Current.Resources["TabBarItemColor"]);
             }
 
             if(appOptions?.GeneratorTile ?? false)
diff --git a/src/App/Styles/Base.xaml b/src/App/Styles/Base.xaml
index 9b5a55ca5..9f6da9954 100644
--- a/src/App/Styles/Base.xaml
+++ b/src/App/Styles/Base.xaml
@@ -65,6 +65,10 @@
            ApplyToDerivedTypes="True">
         <Setter Property="BarBackgroundColor"
                 Value="{StaticResource TabBarBackgroundColor}" />
+        <Setter Property="SelectedTabColor"
+                Value="{StaticResource TabBarSelectedItemColor}" />
+        <Setter Property="UnselectedTabColor"
+                Value="{StaticResource TabBarItemColor}" />
     </Style>
   <Style TargetType="NavigationPage"
          ApplyToDerivedTypes="True">
diff --git a/src/iOS/Renderers/CustomTabbedRenderer.cs b/src/iOS/Renderers/CustomTabbedRenderer.cs
index fece9696c..868a9a8cb 100644
--- a/src/iOS/Renderers/CustomTabbedRenderer.cs
+++ b/src/iOS/Renderers/CustomTabbedRenderer.cs
@@ -12,10 +12,6 @@ namespace Bit.iOS.Renderers
             base.OnElementChanged(e);
             TabBar.Translucent = false;
             TabBar.Opaque = true;
-            TabBar.SelectedImageTintColor =
-                ((Color)Xamarin.Forms.Application.Current.Resources["TabBarSelectedItemColor"]).ToUIColor();
-            TabBar.UnselectedItemTintColor =
-                ((Color)Xamarin.Forms.Application.Current.Resources["TabBarItemColor"]).ToUIColor();
         }
     }
 }