From dc91624597a312098185cddad55706ced0a306ea Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 20 Jun 2019 16:02:39 -0400
Subject: [PATCH] some listview styling for iOS

---
 .../CipherViewCell/CipherViewCell.xaml        |  2 +-
 .../Settings/SettingsPage/SettingsPage.xaml   | 13 +++--
 .../Vault/GroupingsPage/GroupingsPage.xaml    | 17 +++---
 .../Vault/GroupingsPage/GroupingsPage.xaml.cs |  8 +++
 src/App/Styles/Android.xaml                   | 19 +++++++
 src/App/Styles/Base.xaml                      | 11 ++--
 src/App/Styles/iOS.xaml                       | 55 +++++++++++++++++++
 7 files changed, 107 insertions(+), 18 deletions(-)

diff --git a/src/App/Controls/CipherViewCell/CipherViewCell.xaml b/src/App/Controls/CipherViewCell/CipherViewCell.xaml
index 696223100..9c5d7f51d 100644
--- a/src/App/Controls/CipherViewCell/CipherViewCell.xaml
+++ b/src/App/Controls/CipherViewCell/CipherViewCell.xaml
@@ -76,7 +76,7 @@
             IsVisible="{Binding Cipher.HasAttachments, Mode=OneWay}" />
 
         <controls:MiButton
-            Text="&#xe5d4;"
+            Text="&#xe5d3;"
             StyleClass="list-row-button, list-row-button-platform, btn-disabled"
             Clicked="ImageButton_Clicked"
             Grid.Column="4"
diff --git a/src/App/Pages/Settings/SettingsPage/SettingsPage.xaml b/src/App/Pages/Settings/SettingsPage/SettingsPage.xaml
index 4dee1c0fe..ba6808bf3 100644
--- a/src/App/Pages/Settings/SettingsPage/SettingsPage.xaml
+++ b/src/App/Pages/Settings/SettingsPage/SettingsPage.xaml
@@ -47,7 +47,8 @@
     <ListView
         ItemsSource="{Binding GroupedItems}"
         VerticalOptions="FillAndExpand"
-        HasUnevenRows="true"
+        HasUnevenRows="True"
+        RowHeight="-1"
         ItemTemplate="{StaticResource listItemDataTemplateSelector}"
         IsGroupingEnabled="True"
         ItemSelected="RowSelected"
@@ -56,14 +57,16 @@
         <ListView.GroupHeaderTemplate>
             <DataTemplate x:DataType="pages:SettingsPageListGroup">
                 <ViewCell>
-                    <StackLayout Padding="0" Spacing="0">
-                        <BoxView StyleClass="list-section-separator"
-                                 IsVisible="{Binding First, Converter={StaticResource inverseBool}}" />
-                        <StackLayout StyleClass="list-row-header">
+                    <StackLayout Padding="0" Spacing="0" VerticalOptions="FillAndExpand">
+                        <BoxView
+                          StyleClass="list-section-separator-top, list-section-separator-top-platform"
+                          IsVisible="{Binding First, Converter={StaticResource inverseBool}}" />
+                        <StackLayout StyleClass="list-row-header, list-row-header-platform">
                             <Label
                                 Text="{Binding Name}"
                                 StyleClass="list-header, list-header-platform" />
                         </StackLayout>
+                      <BoxView StyleClass="list-section-separator-bottom, list-section-separator-bottom-platform" />
                     </StackLayout>
                 </ViewCell>
             </DataTemplate>
diff --git a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
index f06cd0f69..39e83152b 100644
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
@@ -95,9 +95,10 @@
                     IsVisible="{Binding ShowList}"
                     ItemsSource="{Binding GroupedItems}"
                     VerticalOptions="FillAndExpand"
-                    HasUnevenRows="true"
+                    HasUnevenRows="True"
+                    RowHeight="-1"
                     RefreshCommand="{Binding RefreshCommand}"
-                    IsPullToRefreshEnabled="true"
+                    IsPullToRefreshEnabled="True"
                     IsRefreshing="{Binding Refreshing}"
                     ItemTemplate="{StaticResource listItemDataTemplateSelector}"
                     IsGroupingEnabled="True"
@@ -109,11 +110,12 @@
 
                     <ListView.GroupHeaderTemplate>
                         <DataTemplate x:DataType="pages:GroupingsPageListGroup">
-                            <ViewCell>
-                                <StackLayout Spacing="0" Padding="0">
-                                    <BoxView StyleClass="list-section-separator"
-                                             IsVisible="{Binding First, Converter={StaticResource inverseBool}}" />
-                                    <StackLayout StyleClass="list-row-header">
+                            <ViewCell BindingContextChanged="HeaderBindingContextChanged">
+                                <StackLayout Spacing="0" Padding="0" VerticalOptions="FillAndExpand">
+                                    <BoxView
+                                        StyleClass="list-section-separator-top, list-section-separator-top-platform"
+                                        IsVisible="{Binding First, Converter={StaticResource inverseBool}}" />
+                                    <StackLayout StyleClass="list-row-header, list-row-header-platform">
                                         <Label
                                             Text="{Binding Name}"
                                             StyleClass="list-header, list-header-platform" />
@@ -121,6 +123,7 @@
                                             Text="{Binding ItemCount}"
                                             StyleClass="list-header-sub" />
                                     </StackLayout>
+                                    <BoxView StyleClass="list-section-separator-bottom, list-section-separator-bottom-platform" />
                                 </StackLayout>
                             </ViewCell>
                         </DataTemplate>
diff --git a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs
index 31ea51c53..4d37a34a1 100644
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs
@@ -245,5 +245,13 @@ namespace Bit.App.Pages
                 await Navigation.PushModalAsync(new NavigationPage(page));
             }
         }
+
+        private void HeaderBindingContextChanged(object sender, EventArgs e)
+        {
+            if(Device.RuntimePlatform == Device.iOS && sender is ViewCell cell)
+            {
+                // cell.Height = 50;
+            }
+        }
     }
 }
diff --git a/src/App/Styles/Android.xaml b/src/App/Styles/Android.xaml
index 2fef13d8e..c947d54ce 100644
--- a/src/App/Styles/Android.xaml
+++ b/src/App/Styles/Android.xaml
@@ -52,6 +52,13 @@
         <Setter Property="SeparatorColor"
                 Value="Transparent" />
     </Style>
+    <Style TargetType="StackLayout"
+           Class="list-row-header-platform">
+        <Setter Property="Padding"
+                Value="10, 12" />
+        <Setter Property="VerticalOptions"
+                Value="CenterAndExpand" />
+    </Style>
     <Style TargetType="Label"
            Class="list-header-platform">
         <Setter Property="TextColor"
@@ -61,6 +68,18 @@
         <Setter Property="FontAttributes"
                 Value="Bold" />
     </Style>
+    <Style TargetType="BoxView"
+           Class="list-section-separator-top-platform">
+        <Setter Property="Color"
+                Value="{StaticResource ListItemBorderColor}" />
+    </Style>
+    <Style TargetType="BoxView"
+           Class="list-section-separator-bottom-platform">
+        <Setter Property="Color"
+                Value="Transparent" />
+        <Setter Property="IsVisible"
+                Value="False" />
+    </Style>
     <Style TargetType="StackLayout"
            Class="list-row-platform">
     </Style>
diff --git a/src/App/Styles/Base.xaml b/src/App/Styles/Base.xaml
index 785eacc29..67ba85dc6 100644
--- a/src/App/Styles/Base.xaml
+++ b/src/App/Styles/Base.xaml
@@ -141,8 +141,6 @@
     </Style>
     <Style TargetType="StackLayout"
            Class="list-row-header">
-        <Setter Property="Padding"
-                Value="10, 12" />
         <Setter Property="Orientation"
                 Value="Horizontal" />
     </Style>
@@ -181,11 +179,14 @@
                 Value="2, 5, 0, 5" />
     </Style>
     <Style TargetType="BoxView"
-           Class="list-section-separator">
+           Class="list-section-separator-top">
+        <Setter Property="HeightRequest"
+                Value="1" />
+    </Style>
+    <Style TargetType="BoxView"
+           Class="list-section-separator-bottom">
         <Setter Property="HeightRequest"
                 Value="1" />
-        <Setter Property="Color"
-                Value="{StaticResource ListItemBorderColor}" />
     </Style>
     <Style TargetType="Label"
            Class="list-title">
diff --git a/src/App/Styles/iOS.xaml b/src/App/Styles/iOS.xaml
index ad876bd2c..e3194e30d 100644
--- a/src/App/Styles/iOS.xaml
+++ b/src/App/Styles/iOS.xaml
@@ -12,4 +12,59 @@
         <Setter Property="PlaceholderColor"
                 Value="{StaticResource InputPlaceholderColor}" />
     </Style>
+    
+    <!-- List -->
+
+    <Style TargetType="ListView"
+           Class="list-platform"
+           ApplyToDerivedTypes="True">
+        <Setter Property="SeparatorColor"
+                Value="{StaticResource ListItemBorderColor}" />
+    </Style>
+    <Style TargetType="StackLayout"
+           Class="list-row-header-platform">
+        <Setter Property="Padding"
+                Value="10, 0, 10, 5" />
+        <Setter Property="VerticalOptions"
+                Value="EndAndExpand" />
+    </Style>
+    <Style TargetType="Label"
+           Class="list-header-platform">
+        <Setter Property="TextColor"
+                Value="{StaticResource ListHeaderTextColor}" />
+        <Setter Property="FontSize"
+                Value="Small" />
+    </Style>
+    <Style TargetType="BoxView"
+           Class="list-section-separator-top-platform">
+        <Setter Property="Color"
+                Value="{StaticResource ListItemBorderColor}" />
+    </Style>
+    <Style TargetType="BoxView"
+           Class="list-section-separator-bottom-platform">
+        <Setter Property="Color"
+                Value="{StaticResource ListItemBorderColor}" />
+        <Setter Property="Margin"
+                Value="0, 0, 0, -1" />
+    </Style>
+    <Style TargetType="StackLayout"
+           Class="list-row-platform">
+    </Style>
+    <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">
+        <Setter Property="WidthRequest"
+                Value="37" />
+        <Setter Property="FontSize"
+                Value="25" />
+    </Style>
 </ResourceDictionary>