vaultwarden
/
Bitwarden-app-android-iphone-ios
mirror of https://github.com/bitwarden/mobile
1
0
Fork 0
Code Issues 2 Releases Wiki Activity

set colors for cipher view cell

This commit is contained in:
Kyle Spearrin 2019-06-08 22:29:22 -04:00
parent 81cd2e26f4
commit 337965a7f7
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Android/Renderers/CipherViewCellRenderer.cs
View File

@ -23,6 +23,9 @@ namespace Bit.Droid.Renderers
{ {
private static Typeface _faTypeface; private static Typeface _faTypeface;
private static Typeface _miTypeface; private static Typeface _miTypeface;
private static Android.Graphics.Color _textColor;
private static Android.Graphics.Color _mutedColor;
private static Android.Graphics.Color _disabledIconColor;
private AndroidCipherCell _cell; private AndroidCipherCell _cell;
@ -37,6 +40,22 @@ namespace Bit.Droid.Renderers
{ {
_miTypeface = Typeface.CreateFromAsset(context.Assets, "MaterialIcons_Regular.ttf"); _miTypeface = Typeface.CreateFromAsset(context.Assets, "MaterialIcons_Regular.ttf");
} }
if(_textColor == default(Android.Graphics.Color))
{
_textColor = ((Xamarin.Forms.Color)Xamarin.Forms.Application.Current.Resources["TextColor"])
.ToAndroid();
}
if(_mutedColor == default(Android.Graphics.Color))
{
_mutedColor = ((Xamarin.Forms.Color)Xamarin.Forms.Application.Current.Resources["MutedColor"])
.ToAndroid();
}
if(_disabledIconColor == default(Android.Graphics.Color))
{
_disabledIconColor =
((Xamarin.Forms.Color)Xamarin.Forms.Application.Current.Resources["DisabledIconColor"])
.ToAndroid();
}
var cipherCell = item as CipherViewCell; var cipherCell = item as CipherViewCell;
_cell = convertView as AndroidCipherCell; _cell = convertView as AndroidCipherCell;
@ -50,6 +69,7 @@ namespace Bit.Droid.Renderers
} }
cipherCell.PropertyChanged += CellPropertyChanged; cipherCell.PropertyChanged += CellPropertyChanged;
_cell.UpdateCell(cipherCell); _cell.UpdateCell(cipherCell);
_cell.UpdateColors(_textColor, _mutedColor, _disabledIconColor);
return _cell; return _cell;
} }
@ -156,6 +176,17 @@ namespace Bit.Droid.Renderers
} }
} }
public void UpdateColors(Android.Graphics.Color textColor, Android.Graphics.Color mutedColor,
Android.Graphics.Color iconDisabledColor)
{
Name.SetTextColor(textColor);
SubTitle.SetTextColor(mutedColor);
Icon.SetTextColor(mutedColor);
SharedIcon.SetTextColor(mutedColor);
AttachmentsIcon.SetTextColor(mutedColor);
MoreButton.SetTextColor(iconDisabledColor);
}
private void MoreButton_Click(object sender, EventArgs e) private void MoreButton_Click(object sender, EventArgs e)
{ {
if(CipherViewCell.ButtonCommand?.CanExecute(CipherViewCell.Cipher) ?? false) if(CipherViewCell.ButtonCommand?.CanExecute(CipherViewCell.Cipher) ?? false)

1
src/App/Styles/Base.xaml
View File

@ -2,7 +2,6 @@
<ResourceDictionary xmlns="http://xamarin.com/schemas/2014/forms" <ResourceDictionary xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Bit.App.Styles.Base" x:Class="Bit.App.Styles.Base"
xmlns:android="clr-namespace:Xamarin.Forms.PlatformConfiguration.AndroidSpecific;assembly=Xamarin.Forms.Core"
xmlns:fab="clr-namespace:Refractored.FabControl;assembly=Refractored.FabControl" xmlns:fab="clr-namespace:Refractored.FabControl;assembly=Refractored.FabControl"
xmlns:controls="clr-namespace:Bit.App.Controls"> xmlns:controls="clr-namespace:Bit.App.Controls">