tweaks to accessibility changes

This commit is contained in:
Kyle Spearrin 2020-01-10 15:42:50 -05:00
parent 9f06c9a051
commit eb16025800
2 changed files with 10 additions and 8 deletions

View file

@ -56,7 +56,7 @@
<StackLayout IsVisible="{Binding Enabled, Converter={StaticResource inverseBool}}" <StackLayout IsVisible="{Binding Enabled, Converter={StaticResource inverseBool}}"
VerticalOptions="CenterAndExpand" VerticalOptions="CenterAndExpand"
HorizontalOptions="Center" HorizontalOptions="Center"
Spacing="20"> Spacing="10">
<Image Source="accessibility_step1.png" <Image Source="accessibility_step1.png"
HorizontalOptions="Center" HorizontalOptions="Center"
WidthRequest="300" WidthRequest="300"
@ -67,7 +67,7 @@
StyleClass="text-sm" /> StyleClass="text-sm" />
<Image Source="accessibility_step2.png" <Image Source="accessibility_step2.png"
HorizontalOptions="Center" HorizontalOptions="Center"
Margin="0, 20, 0, 0" Margin="0, 10, 0, 0"
WidthRequest="300" WidthRequest="300"
HeightRequest="67" /> HeightRequest="67" />
<Label Text="{u:I18n BitwardenAutofillServiceStep2}" <Label Text="{u:I18n BitwardenAutofillServiceStep2}"
@ -78,7 +78,7 @@
<StackLayout IsVisible="{Binding EnabledWithoutPermission}" <StackLayout IsVisible="{Binding EnabledWithoutPermission}"
VerticalOptions="CenterAndExpand" VerticalOptions="CenterAndExpand"
HorizontalOptions="Center" HorizontalOptions="Center"
Spacing="20"> Spacing="10">
<Image Source="accessibility_permission.png" <Image Source="accessibility_permission.png"
HorizontalOptions="Center" HorizontalOptions="Center"
WidthRequest="300" WidthRequest="300"
@ -91,7 +91,7 @@
<StackLayout IsVisible="{Binding EnabledAndPermitted}" <StackLayout IsVisible="{Binding EnabledAndPermitted}"
VerticalOptions="CenterAndExpand" VerticalOptions="CenterAndExpand"
HorizontalOptions="Center" HorizontalOptions="Center"
Spacing="20"> Spacing="10">
<Image Source="accessibility_overlay.png" <Image Source="accessibility_overlay.png"
HorizontalOptions="Center" HorizontalOptions="Center"
WidthRequest="300" WidthRequest="300"
@ -101,14 +101,16 @@
LineBreakMode="WordWrap" LineBreakMode="WordWrap"
StyleClass="text-sm" /> StyleClass="text-sm" />
</StackLayout> </StackLayout>
<Button Text="{u:I18n BitwardenAutofillServiceOpenAccessibilitySettings}" <StackLayout Spacing="10">
<Button Text="{u:I18n BitwardenAutofillServiceOpenAccessibilitySettings}"
Clicked="Settings_Clicked" Clicked="Settings_Clicked"
HorizontalOptions="Fill" HorizontalOptions="Fill"
VerticalOptions="End"></Button> VerticalOptions="End"></Button>
<Button Text="{u:I18n BitwardenAutofillServiceOpenOverlayPermissionSettings}" <Button Text="{u:I18n BitwardenAutofillServiceOpenOverlayPermissionSettings}"
Clicked="OverlayPermissionSettings_Clicked" Clicked="OverlayPermissionSettings_Clicked"
HorizontalOptions="Fill" HorizontalOptions="Fill"
VerticalOptions="End"></Button> VerticalOptions="End"></Button>
</StackLayout>
</StackLayout> </StackLayout>
</ScrollView> </ScrollView>

View file

@ -39,9 +39,9 @@ namespace Bit.App.Pages
}); });
} }
public bool EnabledWithoutPermission => _enabled && !_permitted; public bool EnabledWithoutPermission => Enabled && !Permitted;
public bool EnabledAndPermitted => _enabled && _permitted; public bool EnabledAndPermitted => Enabled && Permitted;
public void OpenSettings() public void OpenSettings()
{ {