From fd09833df1156f1325481f78bca2e3aaf65404ad Mon Sep 17 00:00:00 2001 From: Kyle Spearrin <kyle.spearrin@gmail.com> Date: Wed, 17 Aug 2016 21:49:03 -0400 Subject: [PATCH] Revert micro sizes on android --- src/App/Controls/FormEntryCell.cs | 5 ----- src/App/Controls/FormPickerCell.cs | 1 - src/App/Controls/LabeledDetailCell.cs | 1 - src/App/Controls/LabeledValueCell.cs | 5 ----- src/App/Pages/Tools/ToolsPage.cs | 1 - src/App/Pages/Vault/VaultListSitesPage.cs | 5 ++--- 6 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/App/Controls/FormEntryCell.cs b/src/App/Controls/FormEntryCell.cs index 4e7852a4c..9530591af 100644 --- a/src/App/Controls/FormEntryCell.cs +++ b/src/App/Controls/FormEntryCell.cs @@ -23,11 +23,6 @@ namespace Bit.App.Controls Style = (Style)Application.Current.Resources["text-muted"], HorizontalOptions = LayoutOptions.FillAndExpand }; - - if(Device.OS == TargetPlatform.Android) - { - Label.FontSize = Device.GetNamedSize(NamedSize.Micro, typeof(Label)); - } } Entry = new ExtendedEntry diff --git a/src/App/Controls/FormPickerCell.cs b/src/App/Controls/FormPickerCell.cs index b949ac15d..c6c720db7 100644 --- a/src/App/Controls/FormPickerCell.cs +++ b/src/App/Controls/FormPickerCell.cs @@ -37,7 +37,6 @@ namespace Bit.App.Controls if(Device.OS == TargetPlatform.Android) { - Label.FontSize = Device.GetNamedSize(NamedSize.Micro, typeof(Label)); stackLayout.Spacing = 0; } diff --git a/src/App/Controls/LabeledDetailCell.cs b/src/App/Controls/LabeledDetailCell.cs index 355cd11bf..087e5d120 100644 --- a/src/App/Controls/LabeledDetailCell.cs +++ b/src/App/Controls/LabeledDetailCell.cs @@ -43,7 +43,6 @@ namespace Bit.App.Controls if(Device.OS == TargetPlatform.Android) { Label.TextColor = Color.Black; - Detail.FontSize = Device.GetNamedSize(NamedSize.Micro, typeof(Label)); } View = containerStackLayout; diff --git a/src/App/Controls/LabeledValueCell.cs b/src/App/Controls/LabeledValueCell.cs index 9bd32f256..d4b9f0365 100644 --- a/src/App/Controls/LabeledValueCell.cs +++ b/src/App/Controls/LabeledValueCell.cs @@ -31,11 +31,6 @@ namespace Bit.App.Controls Style = (Style)Application.Current.Resources["text-muted"] }; - if(Device.OS == TargetPlatform.Android) - { - Label.FontSize = Device.GetNamedSize(NamedSize.Micro, typeof(Label)); - } - labelValueStackLayout.Children.Add(Label); } diff --git a/src/App/Pages/Tools/ToolsPage.cs b/src/App/Pages/Tools/ToolsPage.cs index 8313632a9..00a79b655 100644 --- a/src/App/Pages/Tools/ToolsPage.cs +++ b/src/App/Pages/Tools/ToolsPage.cs @@ -109,7 +109,6 @@ namespace Bit.App.Pages if(Device.OS == TargetPlatform.Android) { - detail.FontSize = Device.GetNamedSize(NamedSize.Micro, typeof(Label)); label.TextColor = Color.Black; } diff --git a/src/App/Pages/Vault/VaultListSitesPage.cs b/src/App/Pages/Vault/VaultListSitesPage.cs index 8f0b7393b..dd4bbf98d 100644 --- a/src/App/Pages/Vault/VaultListSitesPage.cs +++ b/src/App/Pages/Vault/VaultListSitesPage.cs @@ -78,7 +78,8 @@ namespace Bit.App.Pages ItemsSource = PresentationFolders, HasUnevenRows = true, GroupHeaderTemplate = new DataTemplate(() => new VaultListHeaderViewCell(this)), - ItemTemplate = new DataTemplate(() => new VaultListViewCell(this)) + ItemTemplate = new DataTemplate(() => new VaultListViewCell(this)), + BackgroundColor = Color.White }; if(Device.OS == TargetPlatform.iOS) @@ -390,8 +391,6 @@ namespace Bit.App.Pages Button.Image = "more"; Button.Command = new Command(() => ShowMore()); Button.BackgroundColor = Color.Transparent; - - BackgroundColor = Color.White; } public VaultListPageModel.Site SiteParameter