From cd60c3da2aef1667182e934d868f65e71b82620e Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Wed, 12 Jun 2019 09:13:13 -0400
Subject: [PATCH] fixed size icons

---
 src/Android/Android.csproj                    |  1 +
 src/Android/Effects/FixedSizeEffect.cs        | 26 +++++++++++++++++++
 .../Renderers/CipherViewCellRenderer.cs       |  2 +-
 .../CipherViewCell/CipherViewCell.xaml        |  2 +-
 src/App/Effects/FixedSizeEffect.cs            | 11 ++++++++
 .../Vault/GroupingsPage/GroupingsPage.xaml    | 13 +++++++---
 src/App/Styles/Android.xaml                   |  6 +++++
 src/App/Styles/Base.xaml                      |  2 --
 8 files changed, 55 insertions(+), 8 deletions(-)
 create mode 100644 src/Android/Effects/FixedSizeEffect.cs
 create mode 100644 src/App/Effects/FixedSizeEffect.cs

diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj
index a514138f6..29f1d56e5 100644
--- a/src/Android/Android.csproj
+++ b/src/Android/Android.csproj
@@ -110,6 +110,7 @@
     <Compile Include="Autofill\FilledItem.cs" />
     <Compile Include="Autofill\Parser.cs" />
     <Compile Include="Autofill\SavedItem.cs" />
+    <Compile Include="Effects\FixedSizeEffect.cs" />
     <Compile Include="Effects\SelectableLabelEffect.cs" />
     <Compile Include="Effects\TabBarEffect.cs" />
     <Compile Include="Migration\AndroidKeyStoreStorageService.cs" />
diff --git a/src/Android/Effects/FixedSizeEffect.cs b/src/Android/Effects/FixedSizeEffect.cs
new file mode 100644
index 000000000..8d31aac8a
--- /dev/null
+++ b/src/Android/Effects/FixedSizeEffect.cs
@@ -0,0 +1,26 @@
+using Android.Support.Design.BottomNavigation;
+using Android.Support.Design.Widget;
+using Android.Views;
+using Android.Widget;
+using Bit.Droid.Effects;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+
+[assembly: ExportEffect(typeof(FixedSizeEffect), "FixedSizeEffect")]
+namespace Bit.Droid.Effects
+{
+    public class FixedSizeEffect : PlatformEffect
+    {
+        protected override void OnAttached()
+        {
+            if(Element is Label label && Control is TextView textView)
+            {
+                textView.SetTextSize(Android.Util.ComplexUnitType.Pt, (float)label.FontSize);
+            }
+        }
+
+        protected override void OnDetached()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Android/Renderers/CipherViewCellRenderer.cs b/src/Android/Renderers/CipherViewCellRenderer.cs
index d93e12172..774fd40dc 100644
--- a/src/Android/Renderers/CipherViewCellRenderer.cs
+++ b/src/Android/Renderers/CipherViewCellRenderer.cs
@@ -118,7 +118,7 @@ namespace Bit.Droid.Renderers
             MoreButton.Typeface = _miTypeface;
 
             var small = (float)Device.GetNamedSize(NamedSize.Small, typeof(Label));
-            Icon.SetTextSize(ComplexUnitType.Sp, 22.0952380952381F);
+            Icon.SetTextSize(ComplexUnitType.Pt, 10);
             Name.SetTextSize(ComplexUnitType.Sp, (float)Device.GetNamedSize(NamedSize.Medium, typeof(Label)));
             SubTitle.SetTextSize(ComplexUnitType.Sp, small);
             SharedIcon.SetTextSize(ComplexUnitType.Sp, small);
diff --git a/src/App/Controls/CipherViewCell/CipherViewCell.xaml b/src/App/Controls/CipherViewCell/CipherViewCell.xaml
index 44991a3d1..696223100 100644
--- a/src/App/Controls/CipherViewCell/CipherViewCell.xaml
+++ b/src/App/Controls/CipherViewCell/CipherViewCell.xaml
@@ -32,7 +32,7 @@
                             Grid.RowSpan="2"
                             HorizontalOptions="Center"
                             VerticalOptions="Center"
-                            StyleClass="list-icon" />
+                            StyleClass="list-icon, list-icon-platform" />
         <ff:CachedImage x:Name="_image"
                         Grid.Column="0"
                         Grid.Row="0"
diff --git a/src/App/Effects/FixedSizeEffect.cs b/src/App/Effects/FixedSizeEffect.cs
new file mode 100644
index 000000000..4484872f3
--- /dev/null
+++ b/src/App/Effects/FixedSizeEffect.cs
@@ -0,0 +1,11 @@
+using Xamarin.Forms;
+
+namespace Bit.App.Effects
+{
+    public class FixedSizeEffect : RoutingEffect
+    {
+        public FixedSizeEffect()
+            : base("Bitwarden.FixedSizeEffect")
+        { }
+    }
+}
diff --git a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
index c7a312f2a..484bc7998 100644
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
@@ -4,6 +4,7 @@
              x:Class="Bit.App.Pages.GroupingsPage"
              xmlns:pages="clr-namespace:Bit.App.Pages"
              xmlns:u="clr-namespace:Bit.App.Utilities"
+             xmlns:effects="clr-namespace:Bit.App.Effects"
              xmlns:controls="clr-namespace:Bit.App.Controls"
              xmlns:fab="clr-namespace:Refractored.FabControl;assembly=Refractored.FabControl"
              x:DataType="pages:GroupingsPageViewModel"
@@ -21,7 +22,7 @@
     <ContentPage.Resources>
         <ResourceDictionary>
             <u:InverseBoolConverter x:Key="inverseBool" />
-            
+
             <ToolbarItem x:Name="_syncItem" x:Key="syncItem" Text="{u:I18n Sync}"
                          Clicked="Sync_Clicked" Order="Secondary" />
             <ToolbarItem x:Name="_lockItem" x:Key="lockItem" Text="{u:I18n Lock}"
@@ -45,7 +46,11 @@
                         <controls:FaLabel Text="{Binding Icon, Mode=OneWay}"
                                           HorizontalOptions="Start"
                                           VerticalOptions="Center"
-                                          StyleClass="list-icon" />
+                                          StyleClass="list-icon, list-icon-platform">
+                            <controls:FaLabel.Effects>
+                                <effects:FixedSizeEffect />
+                            </controls:FaLabel.Effects>
+                        </controls:FaLabel>
                         <Label Text="{Binding Name, Mode=OneWay}"
                                LineBreakMode="TailTruncation"
                                HorizontalOptions="StartAndExpand"
@@ -59,7 +64,7 @@
                     </StackLayout>
                 </ViewCell>
             </DataTemplate>
-            
+
             <pages:GroupingsPageListItemSelector x:Key="listItemDataTemplateSelector"
                                                  CipherTemplate="{StaticResource cipherTemplate}"
                                                  GroupTemplate="{StaticResource groupTemplate}" />
@@ -95,7 +100,7 @@
                     <x:Arguments>
                         <ListViewCachingStrategy>RecycleElement</ListViewCachingStrategy>
                     </x:Arguments>
-                    
+
                     <ListView.GroupHeaderTemplate>
                         <DataTemplate x:DataType="pages:GroupingsPageListGroup">
                             <ViewCell>
diff --git a/src/App/Styles/Android.xaml b/src/App/Styles/Android.xaml
index faf67ffce..2fef13d8e 100644
--- a/src/App/Styles/Android.xaml
+++ b/src/App/Styles/Android.xaml
@@ -67,6 +67,12 @@
     <Style TargetType="Grid"
            Class="list-row-platform">
     </Style>
+    <Style TargetType="Label"
+           Class="list-icon-platform"
+           ApplyToDerivedTypes="True">
+        <Setter Property="FontSize"
+                Value="10" />
+    </Style>
     <Style TargetType="Button"
            ApplyToDerivedTypes="True"
            Class="list-row-button-platform">
diff --git a/src/App/Styles/Base.xaml b/src/App/Styles/Base.xaml
index 8871db9ef..785eacc29 100644
--- a/src/App/Styles/Base.xaml
+++ b/src/App/Styles/Base.xaml
@@ -223,8 +223,6 @@
                 Value="Center" />
         <Setter Property="VerticalTextAlignment"
                 Value="Center" />
-        <Setter Property="FontSize"
-                Value="22.0952380952381" />
         <Setter Property="TextColor"
                 Value="{StaticResource MutedColor}" />
     </Style>