mirror of
https://github.com/bitwarden/android.git
synced 2024-12-25 02:18:27 +03:00
settings enabled/disabled text
This commit is contained in:
parent
e8c776fe49
commit
a3716bc841
4 changed files with 23 additions and 8 deletions
|
@ -32,7 +32,8 @@
|
||||||
HorizontalOptions="End"
|
HorizontalOptions="End"
|
||||||
HorizontalTextAlignment="End"
|
HorizontalTextAlignment="End"
|
||||||
VerticalOptions="CenterAndExpand"
|
VerticalOptions="CenterAndExpand"
|
||||||
StyleClass="list-sub"/>
|
TextColor="{Binding SubLabelColor}"
|
||||||
|
StyleClass="list-sub" />
|
||||||
</StackLayout>
|
</StackLayout>
|
||||||
</ViewCell>
|
</ViewCell>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
|
|
|
@ -1,9 +1,17 @@
|
||||||
namespace Bit.App.Pages
|
using Bit.App.Resources;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using Xamarin.Forms;
|
||||||
|
|
||||||
|
namespace Bit.App.Pages
|
||||||
{
|
{
|
||||||
public class SettingsPageListItem
|
public class SettingsPageListItem
|
||||||
{
|
{
|
||||||
public string Icon { get; set; }
|
public string Icon { get; set; }
|
||||||
public string Name { get; set; }
|
public string Name { get; set; }
|
||||||
public string SubLabel { get; set; }
|
public string SubLabel { get; set; }
|
||||||
|
public bool SubLabelTextEnabled => SubLabel == AppResources.Enabled;
|
||||||
|
public Color SubLabelColor => SubLabelTextEnabled ?
|
||||||
|
(Color)Application.Current.Resources["SuccessColor"] :
|
||||||
|
(Color)Application.Current.Resources["MutedColor"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -281,13 +281,15 @@ namespace Bit.App.Pages
|
||||||
autofillItems.Add(new SettingsPageListItem
|
autofillItems.Add(new SettingsPageListItem
|
||||||
{
|
{
|
||||||
Name = AppResources.AutofillService,
|
Name = AppResources.AutofillService,
|
||||||
SubLabel = _deviceActionService.AutofillServiceEnabled() ? "✓" : null
|
SubLabel = _deviceActionService.AutofillServiceEnabled() ?
|
||||||
|
AppResources.Enabled : AppResources.Disabled
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
autofillItems.Add(new SettingsPageListItem
|
autofillItems.Add(new SettingsPageListItem
|
||||||
{
|
{
|
||||||
Name = AppResources.AutofillAccessibilityService,
|
Name = AppResources.AutofillAccessibilityService,
|
||||||
SubLabel = _deviceActionService.AutofillAccessibilityServiceRunning() ? "✓" : null
|
SubLabel = _deviceActionService.AutofillAccessibilityServiceRunning() ?
|
||||||
|
AppResources.Enabled : AppResources.Disabled
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -306,7 +308,11 @@ namespace Bit.App.Pages
|
||||||
var securityItems = new List<SettingsPageListItem>
|
var securityItems = new List<SettingsPageListItem>
|
||||||
{
|
{
|
||||||
new SettingsPageListItem { Name = AppResources.LockOptions, SubLabel = _lockOptionValue },
|
new SettingsPageListItem { Name = AppResources.LockOptions, SubLabel = _lockOptionValue },
|
||||||
new SettingsPageListItem { Name = AppResources.UnlockWithPIN, SubLabel = _pin ? "✓" : null },
|
new SettingsPageListItem
|
||||||
|
{
|
||||||
|
Name = AppResources.UnlockWithPIN,
|
||||||
|
SubLabel = _pin ? AppResources.Enabled : AppResources.Disabled
|
||||||
|
},
|
||||||
new SettingsPageListItem { Name = AppResources.LockNow },
|
new SettingsPageListItem { Name = AppResources.LockNow },
|
||||||
new SettingsPageListItem { Name = AppResources.TwoStepLogin }
|
new SettingsPageListItem { Name = AppResources.TwoStepLogin }
|
||||||
};
|
};
|
||||||
|
@ -315,7 +321,7 @@ namespace Bit.App.Pages
|
||||||
var item = new SettingsPageListItem
|
var item = new SettingsPageListItem
|
||||||
{
|
{
|
||||||
Name = string.Format(AppResources.UnlockWith, _fingerprintName),
|
Name = string.Format(AppResources.UnlockWith, _fingerprintName),
|
||||||
SubLabel = _fingerprint ? "✓" : null
|
SubLabel = _fingerprint ? AppResources.Enabled : AppResources.Disabled
|
||||||
};
|
};
|
||||||
securityItems.Insert(1, item);
|
securityItems.Insert(1, item);
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,7 +34,7 @@ namespace Bit.App.Pages
|
||||||
protected override async void OnAppearing()
|
protected override async void OnAppearing()
|
||||||
{
|
{
|
||||||
base.OnAppearing();
|
base.OnAppearing();
|
||||||
_broadcasterService.Subscribe(nameof(ViewPage), async (message) =>
|
_broadcasterService.Subscribe(nameof(ViewPage), (message) =>
|
||||||
{
|
{
|
||||||
if(message.Command == "syncCompleted")
|
if(message.Command == "syncCompleted")
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue