From a064a6cf9b9379b405c042dfabcbac80d290e5dd Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 2 Jul 2019 19:35:01 -0400 Subject: [PATCH] theme updates to extensions --- src/iOS.Autofill/LoginListViewController.cs | 1 + src/iOS.Autofill/LoginSearchViewController.cs | 10 +++++++++- src/iOS.Core/Controllers/ExtendedUITableViewSource.cs | 2 ++ src/iOS.Core/Utilities/ThemeHelpers.cs | 4 ++++ src/iOS.Core/Views/SwitchTableViewCell.cs | 5 ++++- 5 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/iOS.Autofill/LoginListViewController.cs b/src/iOS.Autofill/LoginListViewController.cs index 633e918ef..7d042e5ad 100644 --- a/src/iOS.Autofill/LoginListViewController.cs +++ b/src/iOS.Autofill/LoginListViewController.cs @@ -58,6 +58,7 @@ namespace Bit.iOS.Autofill { searchLoginController.Context = Context; searchLoginController.CPViewController = CPViewController; + searchLoginController.FromList = true; } } } diff --git a/src/iOS.Autofill/LoginSearchViewController.cs b/src/iOS.Autofill/LoginSearchViewController.cs index 55723f6c0..991306706 100644 --- a/src/iOS.Autofill/LoginSearchViewController.cs +++ b/src/iOS.Autofill/LoginSearchViewController.cs @@ -18,6 +18,7 @@ namespace Bit.iOS.Autofill public Context Context { get; set; } public CredentialProviderViewController CPViewController { get; set; } + public bool FromList { get; set; } public async override void ViewDidLoad() { @@ -39,7 +40,14 @@ namespace Bit.iOS.Autofill partial void CancelBarButton_Activated(UIBarButtonItem sender) { - CPViewController.CompleteRequest(); + if(FromList) + { + DismissViewController(true, null); + } + else + { + CPViewController.CompleteRequest(); + } } partial void AddBarButton_Activated(UIBarButtonItem sender) diff --git a/src/iOS.Core/Controllers/ExtendedUITableViewSource.cs b/src/iOS.Core/Controllers/ExtendedUITableViewSource.cs index 852f284ee..fa08ec180 100644 --- a/src/iOS.Core/Controllers/ExtendedUITableViewSource.cs +++ b/src/iOS.Core/Controllers/ExtendedUITableViewSource.cs @@ -11,6 +11,7 @@ namespace Bit.iOS.Core.Views if(headerView != null && headerView is UITableViewHeaderFooterView hv && hv.TextLabel != null) { hv.TextLabel.TextColor = ThemeHelpers.MutedColor; + hv.BackgroundColor = ThemeHelpers.ListHeaderBackgroundColor; } } @@ -19,6 +20,7 @@ namespace Bit.iOS.Core.Views if(footerView != null && footerView is UITableViewHeaderFooterView fv && fv.TextLabel != null) { fv.TextLabel.TextColor = ThemeHelpers.MutedColor; + fv.BackgroundColor = ThemeHelpers.ListHeaderBackgroundColor; } } } diff --git a/src/iOS.Core/Utilities/ThemeHelpers.cs b/src/iOS.Core/Utilities/ThemeHelpers.cs index d26ec1b35..a163df3d1 100644 --- a/src/iOS.Core/Utilities/ThemeHelpers.cs +++ b/src/iOS.Core/Utilities/ThemeHelpers.cs @@ -14,6 +14,7 @@ namespace Bit.iOS.Core.Utilities public static UIColor TextColor = Xamarin.Forms.Color.FromHex("#000000").ToUIColor(); public static UIColor PlaceholderColor = Xamarin.Forms.Color.FromHex("#d0d0d0").ToUIColor(); public static UIColor SeparatorColor = Xamarin.Forms.Color.FromHex("#dddddd").ToUIColor(); + public static UIColor ListHeaderBackgroundColor = Xamarin.Forms.Color.FromHex("#efeff4").ToUIColor(); public static UIColor NavBarBackgroundColor = Xamarin.Forms.Color.FromHex("#3c8dbc").ToUIColor(); public static UIColor NavBarTextColor = Xamarin.Forms.Color.FromHex("#ffffff").ToUIColor(); @@ -65,6 +66,7 @@ namespace Bit.iOS.Core.Utilities TextColor = whiteColor; PlaceholderColor = Xamarin.Forms.Color.FromHex("#707070").ToUIColor(); SeparatorColor = Xamarin.Forms.Color.FromHex("#191919").ToUIColor(); + ListHeaderBackgroundColor = Xamarin.Forms.Color.FromHex("#222222").ToUIColor(); NavBarBackgroundColor = Xamarin.Forms.Color.FromHex("#212121").ToUIColor(); NavBarTextColor = whiteColor; } @@ -80,6 +82,7 @@ namespace Bit.iOS.Core.Utilities TextColor = whiteColor; PlaceholderColor = Xamarin.Forms.Color.FromHex("#707070").ToUIColor(); SeparatorColor = Xamarin.Forms.Color.FromHex("#282828").ToUIColor(); + ListHeaderBackgroundColor = blackColor; NavBarBackgroundColor = blackColor; NavBarTextColor = whiteColor; } @@ -93,6 +96,7 @@ namespace Bit.iOS.Core.Utilities TextColor = Xamarin.Forms.Color.FromHex("#e5e9f0").ToUIColor(); PlaceholderColor = Xamarin.Forms.Color.FromHex("#7b88a1").ToUIColor(); SeparatorColor = Xamarin.Forms.Color.FromHex("#2e3440").ToUIColor(); + ListHeaderBackgroundColor = Xamarin.Forms.Color.FromHex("#2e3440").ToUIColor(); NavBarBackgroundColor = Xamarin.Forms.Color.FromHex("#2e3440").ToUIColor(); NavBarTextColor = Xamarin.Forms.Color.FromHex("#e5e9f0").ToUIColor(); } diff --git a/src/iOS.Core/Views/SwitchTableViewCell.cs b/src/iOS.Core/Views/SwitchTableViewCell.cs index da2ce7ba3..a4a5e8388 100644 --- a/src/iOS.Core/Views/SwitchTableViewCell.cs +++ b/src/iOS.Core/Views/SwitchTableViewCell.cs @@ -12,7 +12,10 @@ namespace Bit.iOS.Core.Views { TextLabel.Text = labelName; TextLabel.TextColor = ThemeHelpers.TextColor; - Switch.TintColor = ThemeHelpers.MutedColor; + if(!ThemeHelpers.LightTheme) + { + Switch.TintColor = ThemeHelpers.MutedColor; + } Switch.OnTintColor = ThemeHelpers.PrimaryColor; AccessoryView = Switch;