mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-10-31 23:25:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

theme updates to extensions

Browse source
This commit is contained in:
Kyle Spearrin 2019-07-02 19:35:01 -04:00
parent 7953a9a3ce
commit a064a6cf9b
5 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/iOS.Autofill/LoginListViewController.cs
View file

@ -58,6 +58,7 @@ namespace Bit.iOS.Autofill
{ {
searchLoginController.Context = Context; searchLoginController.Context = Context;
searchLoginController.CPViewController = CPViewController; searchLoginController.CPViewController = CPViewController;
searchLoginController.FromList = true;
} }
} }
} }

10
src/iOS.Autofill/LoginSearchViewController.cs
View file

@ -18,6 +18,7 @@ namespace Bit.iOS.Autofill
public Context Context { get; set; } public Context Context { get; set; }
public CredentialProviderViewController CPViewController { get; set; } public CredentialProviderViewController CPViewController { get; set; }
public bool FromList { get; set; }
public async override void ViewDidLoad() public async override void ViewDidLoad()
{ {
@ -39,7 +40,14 @@ namespace Bit.iOS.Autofill
partial void CancelBarButton_Activated(UIBarButtonItem sender) partial void CancelBarButton_Activated(UIBarButtonItem sender)
{ {
CPViewController.CompleteRequest(); if(FromList)
{
DismissViewController(true, null);
}
else
{
CPViewController.CompleteRequest();
}
} }
partial void AddBarButton_Activated(UIBarButtonItem sender) partial void AddBarButton_Activated(UIBarButtonItem sender)

2
src/iOS.Core/Controllers/ExtendedUITableViewSource.cs
View file

@ -11,6 +11,7 @@ namespace Bit.iOS.Core.Views
if(headerView != null && headerView is UITableViewHeaderFooterView hv && hv.TextLabel != null) if(headerView != null && headerView is UITableViewHeaderFooterView hv && hv.TextLabel != null)
{ {
hv.TextLabel.TextColor = ThemeHelpers.MutedColor; 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) if(footerView != null && footerView is UITableViewHeaderFooterView fv && fv.TextLabel != null)
{ {
fv.TextLabel.TextColor = ThemeHelpers.MutedColor; fv.TextLabel.TextColor = ThemeHelpers.MutedColor;
fv.BackgroundColor = ThemeHelpers.ListHeaderBackgroundColor;
} }
} }
} }

4
src/iOS.Core/Utilities/ThemeHelpers.cs
View file

@ -14,6 +14,7 @@ namespace Bit.iOS.Core.Utilities
public static UIColor TextColor = Xamarin.Forms.Color.FromHex("#000000").ToUIColor(); public static UIColor TextColor = Xamarin.Forms.Color.FromHex("#000000").ToUIColor();
public static UIColor PlaceholderColor = Xamarin.Forms.Color.FromHex("#d0d0d0").ToUIColor(); public static UIColor PlaceholderColor = Xamarin.Forms.Color.FromHex("#d0d0d0").ToUIColor();
public static UIColor SeparatorColor = Xamarin.Forms.Color.FromHex("#dddddd").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 NavBarBackgroundColor = Xamarin.Forms.Color.FromHex("#3c8dbc").ToUIColor();
public static UIColor NavBarTextColor = Xamarin.Forms.Color.FromHex("#ffffff").ToUIColor(); public static UIColor NavBarTextColor = Xamarin.Forms.Color.FromHex("#ffffff").ToUIColor();
@ -65,6 +66,7 @@ namespace Bit.iOS.Core.Utilities
TextColor = whiteColor; TextColor = whiteColor;
PlaceholderColor = Xamarin.Forms.Color.FromHex("#707070").ToUIColor(); PlaceholderColor = Xamarin.Forms.Color.FromHex("#707070").ToUIColor();
SeparatorColor = Xamarin.Forms.Color.FromHex("#191919").ToUIColor(); SeparatorColor = Xamarin.Forms.Color.FromHex("#191919").ToUIColor();
ListHeaderBackgroundColor = Xamarin.Forms.Color.FromHex("#222222").ToUIColor();
NavBarBackgroundColor = Xamarin.Forms.Color.FromHex("#212121").ToUIColor(); NavBarBackgroundColor = Xamarin.Forms.Color.FromHex("#212121").ToUIColor();
NavBarTextColor = whiteColor; NavBarTextColor = whiteColor;
} }
@ -80,6 +82,7 @@ namespace Bit.iOS.Core.Utilities
TextColor = whiteColor; TextColor = whiteColor;
PlaceholderColor = Xamarin.Forms.Color.FromHex("#707070").ToUIColor(); PlaceholderColor = Xamarin.Forms.Color.FromHex("#707070").ToUIColor();
SeparatorColor = Xamarin.Forms.Color.FromHex("#282828").ToUIColor(); SeparatorColor = Xamarin.Forms.Color.FromHex("#282828").ToUIColor();
ListHeaderBackgroundColor = blackColor;
NavBarBackgroundColor = blackColor; NavBarBackgroundColor = blackColor;
NavBarTextColor = whiteColor; NavBarTextColor = whiteColor;
} }
@ -93,6 +96,7 @@ namespace Bit.iOS.Core.Utilities
TextColor = Xamarin.Forms.Color.FromHex("#e5e9f0").ToUIColor(); TextColor = Xamarin.Forms.Color.FromHex("#e5e9f0").ToUIColor();
PlaceholderColor = Xamarin.Forms.Color.FromHex("#7b88a1").ToUIColor(); PlaceholderColor = Xamarin.Forms.Color.FromHex("#7b88a1").ToUIColor();
SeparatorColor = Xamarin.Forms.Color.FromHex("#2e3440").ToUIColor(); SeparatorColor = Xamarin.Forms.Color.FromHex("#2e3440").ToUIColor();
ListHeaderBackgroundColor = Xamarin.Forms.Color.FromHex("#2e3440").ToUIColor();
NavBarBackgroundColor = Xamarin.Forms.Color.FromHex("#2e3440").ToUIColor(); NavBarBackgroundColor = Xamarin.Forms.Color.FromHex("#2e3440").ToUIColor();
NavBarTextColor = Xamarin.Forms.Color.FromHex("#e5e9f0").ToUIColor(); NavBarTextColor = Xamarin.Forms.Color.FromHex("#e5e9f0").ToUIColor();
} }

5
src/iOS.Core/Views/SwitchTableViewCell.cs
View file

@ -12,7 +12,10 @@ namespace Bit.iOS.Core.Views
{ {
TextLabel.Text = labelName; TextLabel.Text = labelName;
TextLabel.TextColor = ThemeHelpers.TextColor; TextLabel.TextColor = ThemeHelpers.TextColor;
Switch.TintColor = ThemeHelpers.MutedColor; if(!ThemeHelpers.LightTheme)
{
Switch.TintColor = ThemeHelpers.MutedColor;
}
Switch.OnTintColor = ThemeHelpers.PrimaryColor; Switch.OnTintColor = ThemeHelpers.PrimaryColor;
AccessoryView = Switch; AccessoryView = Switch;