From 44782b1ddffcda017e91047321317c9d76874c6e Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 20 Jun 2019 17:05:28 -0400
Subject: [PATCH] header upper on iOS

---
 src/App/Pages/Accounts/EnvironmentPage.xaml |  4 ++--
 src/App/Pages/Generator/GeneratorPage.xaml  |  2 +-
 src/App/Pages/Settings/OptionsPage.xaml     |  4 ++--
 src/App/Pages/Vault/AddEditPage.xaml        | 14 ++++++-------
 src/App/Pages/Vault/AttachmentsPage.xaml    |  2 +-
 src/App/Pages/Vault/SharePage.xaml          |  2 +-
 src/App/Pages/Vault/ViewPage.xaml           | 10 +++++-----
 src/App/Styles/iOS.xaml                     | 22 +++++++++++++++++++--
 src/App/Utilities/I18nExtension.cs          |  8 +++++++-
 9 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/src/App/Pages/Accounts/EnvironmentPage.xaml b/src/App/Pages/Accounts/EnvironmentPage.xaml
index d78da40ba..2f9312675 100644
--- a/src/App/Pages/Accounts/EnvironmentPage.xaml
+++ b/src/App/Pages/Accounts/EnvironmentPage.xaml
@@ -21,7 +21,7 @@
         <StackLayout Spacing="20">
             <StackLayout StyleClass="box">
                 <StackLayout StyleClass="box-row-header">
-                    <Label Text="{u:I18n SelfHostedEnvironment}"
+                    <Label Text="{u:I18n SelfHostedEnvironment, Header=True}"
                            StyleClass="box-header, box-header-platform" />
                 </StackLayout>
                 <StackLayout StyleClass="box-row">
@@ -42,7 +42,7 @@
             </StackLayout>
             <StackLayout StyleClass="box">
                 <StackLayout StyleClass="box-row-header">
-                    <Label Text="{u:I18n CustomEnvironment}"
+                    <Label Text="{u:I18n CustomEnvironment, Header=True}"
                            StyleClass="box-header, box-header-platform" />
                 </StackLayout>
                 <StackLayout StyleClass="box-row">
diff --git a/src/App/Pages/Generator/GeneratorPage.xaml b/src/App/Pages/Generator/GeneratorPage.xaml
index c115b4648..307cd8af4 100644
--- a/src/App/Pages/Generator/GeneratorPage.xaml
+++ b/src/App/Pages/Generator/GeneratorPage.xaml
@@ -52,7 +52,7 @@
             </StackLayout>
             <StackLayout StyleClass="box">
                 <StackLayout StyleClass="box-row-header">
-                    <Label Text="{u:I18n Options}"
+                    <Label Text="{u:I18n Options, Header=True}"
                            StyleClass="box-header, box-header-platform" />
                 </StackLayout>
                 <StackLayout StyleClass="box-row, box-row-input">
diff --git a/src/App/Pages/Settings/OptionsPage.xaml b/src/App/Pages/Settings/OptionsPage.xaml
index fe0c1edf0..3a1a46475 100644
--- a/src/App/Pages/Settings/OptionsPage.xaml
+++ b/src/App/Pages/Settings/OptionsPage.xaml
@@ -96,7 +96,7 @@
             </StackLayout>
             <StackLayout StyleClass="box" IsVisible="{Binding ShowAndroidAutofillSettings}">
                 <StackLayout StyleClass="box-row-header">
-                    <Label Text="{u:I18n AutofillService}"
+                    <Label Text="{u:I18n AutofillService, Header=True}"
                             StyleClass="box-header, box-header-platform" />
                 </StackLayout>
                 <StackLayout StyleClass="box-row, box-row-switch">
@@ -134,7 +134,7 @@
             </StackLayout>
             <StackLayout StyleClass="box" IsVisible="{Binding ShowAndroidAccessibilitySettings}">
                 <StackLayout StyleClass="box-row-header">
-                    <Label Text="{u:I18n AutofillAccessibilityService}"
+                    <Label Text="{u:I18n AutofillAccessibilityService, Header=True}"
                             StyleClass="box-header, box-header-platform" />
                 </StackLayout>
                 <StackLayout StyleClass="box-row, box-row-switch">
diff --git a/src/App/Pages/Vault/AddEditPage.xaml b/src/App/Pages/Vault/AddEditPage.xaml
index 61c57aa4a..70df83ec2 100644
--- a/src/App/Pages/Vault/AddEditPage.xaml
+++ b/src/App/Pages/Vault/AddEditPage.xaml
@@ -57,7 +57,7 @@
         <StackLayout Spacing="20">
             <StackLayout StyleClass="box">
                 <StackLayout StyleClass="box-row-header">
-                    <Label Text="{u:I18n ItemInformation}"
+                    <Label Text="{u:I18n ItemInformation, Header=True}"
                            StyleClass="box-header, box-header-platform" />
                 </StackLayout>
                 <StackLayout StyleClass="box-row, box-row-input"
@@ -421,7 +421,7 @@
             </StackLayout>
             <StackLayout StyleClass="box" IsVisible="{Binding IsLogin}">
                 <StackLayout StyleClass="box-row-header">
-                    <Label Text="{u:I18n URIs}"
+                    <Label Text="{u:I18n URIs, Header=True}"
                            StyleClass="box-header, box-header-platform" />
                 </StackLayout>
                 <controls:RepeaterView ItemsSource="{Binding Uris}">
@@ -464,7 +464,7 @@
             </StackLayout>
             <StackLayout StyleClass="box">
                 <StackLayout StyleClass="box-row-header">
-                    <Label Text="{u:I18n Miscellaneous}"
+                    <Label Text="{u:I18n Miscellaneous, Header=True}"
                            StyleClass="box-header, box-header-platform" />
                 </StackLayout>
                 <StackLayout StyleClass="box-row, box-row-input">
@@ -491,7 +491,7 @@
             </StackLayout>
             <StackLayout StyleClass="box">
                 <StackLayout StyleClass="box-row-header">
-                    <Label Text="{u:I18n Notes}"
+                    <Label Text="{u:I18n Notes, Header=True}"
                            StyleClass="box-header, box-header-platform" />
                 </StackLayout>
                 <StackLayout StyleClass="box-row, box-row-input">
@@ -504,7 +504,7 @@
             </StackLayout>
             <StackLayout StyleClass="box">
                 <StackLayout StyleClass="box-row-header">
-                    <Label Text="{u:I18n CustomFields}"
+                    <Label Text="{u:I18n CustomFields, Header=True}"
                            StyleClass="box-header, box-header-platform" />
                 </StackLayout>
                 <controls:RepeaterView ItemsSource="{Binding Fields}">
@@ -584,7 +584,7 @@
             </StackLayout>
             <StackLayout StyleClass="box" IsVisible="{Binding EditMode, Converter={StaticResource inverseBool}}">
                 <StackLayout StyleClass="box-row-header">
-                    <Label Text="{u:I18n Ownership}"
+                    <Label Text="{u:I18n Ownership, Header=True}"
                            StyleClass="box-header, box-header-platform" />
                 </StackLayout>
                 <StackLayout StyleClass="box-row, box-row-input">
@@ -600,7 +600,7 @@
             </StackLayout>
             <StackLayout StyleClass="box" IsVisible="{Binding ShowCollections}">
                 <StackLayout StyleClass="box-row-header">
-                    <Label Text="{u:I18n Collections}"
+                    <Label Text="{u:I18n Collections, Header=True}"
                            StyleClass="box-header, box-header-platform" />
                 </StackLayout>
                 <StackLayout Spacing="0" Padding="0"
diff --git a/src/App/Pages/Vault/AttachmentsPage.xaml b/src/App/Pages/Vault/AttachmentsPage.xaml
index f01b0caa3..9c2e20596 100644
--- a/src/App/Pages/Vault/AttachmentsPage.xaml
+++ b/src/App/Pages/Vault/AttachmentsPage.xaml
@@ -64,7 +64,7 @@
             </StackLayout>
             <StackLayout StyleClass="box">
                 <StackLayout StyleClass="box-row-header">
-                    <Label Text="{u:I18n AddNewAttachment}"
+                    <Label Text="{u:I18n AddNewAttachment, Header=True}"
                             StyleClass="box-header, box-header-platform" />
                 </StackLayout>
                 <StackLayout StyleClass="box-row">
diff --git a/src/App/Pages/Vault/SharePage.xaml b/src/App/Pages/Vault/SharePage.xaml
index 69b851b5f..d05df94f7 100644
--- a/src/App/Pages/Vault/SharePage.xaml
+++ b/src/App/Pages/Vault/SharePage.xaml
@@ -49,7 +49,7 @@
             <StackLayout StyleClass="box"
                          IsVisible="{Binding OrganizationId, Converter={StaticResource notNull}}">
                 <StackLayout StyleClass="box-row-header">
-                    <Label Text="{u:I18n Collections}"
+                    <Label Text="{u:I18n Collections, Header=True}"
                            StyleClass="box-header, box-header-platform" />
                 </StackLayout>
                 <StackLayout StyleClass="box-row"
diff --git a/src/App/Pages/Vault/ViewPage.xaml b/src/App/Pages/Vault/ViewPage.xaml
index 91773a7cd..403aa2322 100644
--- a/src/App/Pages/Vault/ViewPage.xaml
+++ b/src/App/Pages/Vault/ViewPage.xaml
@@ -48,7 +48,7 @@
                 <StackLayout Spacing="20" x:Name="_mainLayout">
                     <StackLayout StyleClass="box">
                         <StackLayout StyleClass="box-row-header">
-                            <Label Text="{u:I18n ItemInformation}"
+                            <Label Text="{u:I18n ItemInformation, Header=True}"
                                    StyleClass="box-header, box-header-platform" />
                         </StackLayout>
                         <StackLayout StyleClass="box-row">
@@ -418,7 +418,7 @@
                     </StackLayout>
                     <StackLayout StyleClass="box" IsVisible="{Binding ShowUris}">
                         <StackLayout StyleClass="box-row-header">
-                            <Label Text="{u:I18n URIs}"
+                            <Label Text="{u:I18n URIs, Header=True}"
                                    StyleClass="box-header, box-header-platform" />
                         </StackLayout>
                         <controls:RepeaterView ItemsSource="{Binding Cipher.Login.Uris}">
@@ -479,7 +479,7 @@
                     <StackLayout StyleClass="box"
                                  IsVisible="{Binding Cipher.Notes, Converter={StaticResource stringHasValue}}">
                         <StackLayout StyleClass="box-row-header">
-                            <Label Text="{u:I18n Notes}"
+                            <Label Text="{u:I18n Notes, Header=True}"
                                    StyleClass="box-header, box-header-platform" />
                         </StackLayout>
                         <StackLayout StyleClass="box-row">
@@ -496,7 +496,7 @@
                     </StackLayout>
                     <StackLayout StyleClass="box" IsVisible="{Binding Cipher.HasFields}">
                         <StackLayout StyleClass="box-row-header">
-                            <Label Text="{u:I18n CustomFields}"
+                            <Label Text="{u:I18n CustomFields, Header=True}"
                                    StyleClass="box-header, box-header-platform" />
                         </StackLayout>
                         <controls:RepeaterView ItemsSource="{Binding Fields}">
@@ -569,7 +569,7 @@
                     </StackLayout>
                     <StackLayout StyleClass="box" IsVisible="{Binding ShowAttachments}">
                         <StackLayout StyleClass="box-row-header">
-                            <Label Text="{u:I18n Attachments}"
+                            <Label Text="{u:I18n Attachments, Header=True}"
                                    StyleClass="box-header, box-header-platform" />
                         </StackLayout>
                         <controls:RepeaterView ItemsSource="{Binding Cipher.Attachments}">
diff --git a/src/App/Styles/iOS.xaml b/src/App/Styles/iOS.xaml
index cc754975e..80211e027 100644
--- a/src/App/Styles/iOS.xaml
+++ b/src/App/Styles/iOS.xaml
@@ -31,7 +31,7 @@
     <Style TargetType="Label"
            Class="list-header-platform">
         <Setter Property="TextColor"
-                Value="{StaticResource ListHeaderTextColor}" />
+                Value="{StaticResource MutedColor}" />
         <Setter Property="FontSize"
                 Value="Small" />
     </Style>
@@ -63,7 +63,25 @@
            ApplyToDerivedTypes="True"
            Class="list-row-button-platform">
         <Setter Property="WidthRequest"
-                Value="40" />
+                Value="37" />
+        <Setter Property="FontSize"
+                Value="25" />
+    </Style>
+
+    <!-- Box -->
+
+    <Style TargetType="Label"
+           Class="box-header-platform">
+        <Setter Property="TextColor"
+                Value="{StaticResource MutedColor}" />
+        <Setter Property="FontSize"
+                Value="Small" />
+    </Style>
+    <Style TargetType="Button"
+           ApplyToDerivedTypes="True"
+           Class="box-row-button-platform">
+        <Setter Property="WidthRequest"
+                Value="37" />
         <Setter Property="FontSize"
                 Value="25" />
     </Style>
diff --git a/src/App/Utilities/I18nExtension.cs b/src/App/Utilities/I18nExtension.cs
index 232ddb2af..39897d391 100644
--- a/src/App/Utilities/I18nExtension.cs
+++ b/src/App/Utilities/I18nExtension.cs
@@ -20,10 +20,16 @@ namespace Bit.App.Utilities
         public string P1 { get; set; }
         public string P2 { get; set; }
         public string P3 { get; set; }
+        public bool Header { get; set; }
 
         public object ProvideValue(IServiceProvider serviceProvider)
         {
-            return _i18nService.T(Id, P1, P2, P3);
+            var val = _i18nService.T(Id, P1, P2, P3);
+            if(Header && Device.RuntimePlatform == Device.iOS)
+            {
+                return val.ToUpper();
+            }
+            return val;
         }
     }
 }