Upstream/bitwarden-mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile.git synced 2024-11-16 10:35:27 +01:00
Code Issues Projects Releases Wiki Activity

PS-70 Fixed android button overlapping bug by adding button styling to a Frame view and placing a label inside. Fixed Color on scanner page.

Browse Source
This commit is contained in:
André Bispo 2022-06-23 17:17:59 +01:00
parent 6aeec4a89a
commit a6069ef37b
3 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/App/Pages/Vault/AddEditPage.xaml
View File

@ -191,23 +191,26 @@
StyleClass="box-label"
Grid.Row="0"
Grid.Column="0" />
<Button
IsVisible="{Binding HasTotpValue, Converter={StaticResource inverseBool}}"
Grid.Row="1"
Grid.Column="0"
Grid.ColumnSpan="3"
Clicked="ScanTotp_Clicked"/>
<controls:IconLabel
Text="{Binding SetupTotpText}"
<Frame
IsVisible="{Binding HasTotpValue, Converter={StaticResource inverseBool}}"
Margin="0,5,0,0"
HorizontalOptions="Center"
StyleClass="btn-icon-row"
HorizontalOptions="FillAndExpand"
VerticalOptions="FillAndExpand"
VerticalTextAlignment="Center"
Padding="0"
Grid.Row="1"
Grid.Column="0"
Grid.ColumnSpan="3" />
Grid.ColumnSpan="3">
<Frame.GestureRecognizers>
<TapGestureRecognizer Tapped="ScanTotp_Clicked" />
</Frame.GestureRecognizers>
<controls:IconLabel
Text="{Binding SetupTotpText}"
Margin="0,15,0,15"
HorizontalOptions="Center"
VerticalOptions="FillAndExpand"
VerticalTextAlignment="Center" />
</Frame>
<controls:MonoEntry
x:Name="_loginTotpEntry"
Text="{Binding Cipher.Login.Totp}"

2
src/App/Pages/Vault/ScanPageViewModel.cs
View File

@ -50,7 +50,7 @@ namespace Bit.App.Pages
fs.Spans.Add(new Span
{
Text = ShowScanner ? AppResources.CannotScanQRCode : AppResources.CannotAddAuthenticatorKey,
TextColor = ThemeManager.GetResourceColor("BackgroundColor")
TextColor = ThemeManager.GetResourceColor("TitleTextColor")
});
fs.Spans.Add(new Span
{

25
src/App/Styles/Android.xaml
View File

@ -79,9 +79,32 @@
<Setter Property="StepperForegroundColor"
Value="{DynamicResource StepperForegroundColor}" />
</Style>
<Style TargetType="Frame"
Class="btn-icon-row">
<Setter Property="BackgroundColor"
Value="{DynamicResource ButtonBackgroundColor}" />
<Setter Property="BorderColor"
Value="{DynamicResource ButtonBorderColor}" />
<Setter Property="CornerRadius"
Value="5" />
<Setter Property="Margin"
Value="0, 5, 0, 0" />
<Setter Property="VisualStateManager.VisualStateGroups">
<VisualStateGroupList>
<VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal" />
<VisualState x:Name="Disabled">
<VisualState.Setters>
<Setter Property="BackgroundColor"
Value="{DynamicResource ButtonBackgroundColorDisabled}" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
</VisualStateGroupList>
</Setter>
</Style>
<!-- Buttons -->
<Style TargetType="Button">
<Setter Property="BackgroundColor"
Value="{DynamicResource ButtonBackgroundColor}" />