bitwarden/mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile synced 2025-12-26 13:13:28 +00:00
Code Issues Releases Wiki Activity

Updated Delete account view UI (#1692)

Browse Source
This commit is contained in:
Federico Maccaroni
2021-12-20 12:31:12 -03:00
committed by GitHub
parent 6164c764b4
commit b28e265ed4
12 changed files with 261 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/App/Pages/Accounts/DeleteAccountPage.xaml
View File

@@ -15,42 +15,67 @@
<ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
</ContentPage.ToolbarItems>
<ContentPage.Resources>
<Style TargetType="Label" x:Key="lblDescription">
<Setter Property="FontSize" Value="{OnPlatform Android=Large, iOS=Small}" />
</Style>
</ContentPage.Resources>
<ContentPage.Content>
<StackLayout Padding="20, 30" Spacing="0">
<Grid Padding="20, 30" RowSpacing="0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Image
Source="ic_warning"
WidthRequest="28"
HeightRequest="25"
HorizontalOptions="Start" />
<Label
Grid.Row="1"
Grid.ColumnSpan="2"
Text="{u:I18n DeletingYourAccountIsPermanent}"
HorizontalOptions="Start"
StyleClass="text-body"
StyleClass="title-danger"
Margin="0,15,0,0"/>
<Label
Grid.Row="2"
Grid.ColumnSpan="2"
Text="{u:I18n DeleteAccountExplanation}"
Style="{StaticResource lblDescription}"
HorizontalOptions="Start"
Margin="0,6,50,0"
Opacity="0.6" />
<Button
Text="{u:I18n Cancel}"
StyleClass="btn-primary"
HorizontalOptions="Start"
Margin="0,26,0,0"
Padding="16,6"
CornerRadius="2"
TextTransform="Uppercase"
Clicked="Close_Clicked" />
<Button
Grid.Row="3"
Text="{u:I18n DeleteAccount}"
StyleClass="btn-secondary"
TextColor="#99000000"
StyleClass="btn-danger"
HorizontalOptions="Start"
Margin="0,12,0,0"
Padding="16,6"
VerticalOptions="Start"
Margin="0,20,0,0"
Padding="16,0"
CornerRadius="2"
TextTransform="Uppercase"
Clicked="DeleteAccount_Clicked"/>
</StackLayout>
<Button
Grid.Row="3"
Grid.Column="1"
Text="{u:I18n Cancel}"
StyleClass="btn-secondary"
HorizontalOptions="Start"
VerticalOptions="Start"
Margin="0,20,0,0"
Padding="16,0"
CornerRadius="2"
TextTransform="Uppercase"
Clicked="Close_Clicked" />
</Grid>
</ContentPage.Content>
</pages:BaseContentPage>

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

@@ -161,7 +161,39 @@
<Setter Property="BorderWidth"
Value="1" />
<Setter Property="TextColor"
Value="{DynamicResource ButtonTextColor}" />
Value="{DynamicResource ButtonTextColorOpacity}" />
<Setter Property="FontSize"
Value="Medium" />
<Setter Property="CornerRadius"
Value="5" />
<Setter Property="VisualStateManager.VisualStateGroups">
<VisualStateGroupList>
<VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal" />
<VisualState x:Name="Disabled">
<VisualState.Setters>
<Setter Property="TextColor"
Value="{DynamicResource ButtonTextColorDisabled}" />
<Setter Property="BackgroundColor"
Value="{DynamicResource ButtonBackgroundColorDisabled}" />
<Setter Property="BorderColor"
Value="{DynamicResource ButtonBackgroundColorDisabled}" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
</VisualStateGroupList>
</Setter>
</Style>
<Style TargetType="Button"
Class="btn-danger">
<Setter Property="BackgroundColor"
Value="{DynamicResource DangerColor}" />
<Setter Property="BorderColor"
Value="{DynamicResource DangerColor}" />
<Setter Property="BorderWidth"
Value="1" />
<Setter Property="TextColor"
Value="{DynamicResource ButtonPrimaryTextColor}" />
<Setter Property="FontSize"
Value="Medium" />
<Setter Property="CornerRadius"
@@ -288,4 +320,13 @@
<Setter Property="FontSize"
Value="25" />
</Style>
<Style TargetType="Label"
ApplyToDerivedTypes="True"
Class="title-danger">
<Setter Property="TextColor"
Value="{DynamicResource DangerColor}" />
<Setter Property="FontSize"
Value="Title" />
</Style>
</ResourceDictionary>

2
src/App/Styles/Black.xaml
View File

@@ -13,6 +13,7 @@
<Color x:Key="PasswordSpecialColor">#ff7c70</Color>
<Color x:Key="ButtonColor">#e0e0e0</Color>
<Color x:Key="InputPlaceholderColor">#707070</Color>
<Color x:Key="DangerPressedColor">#ff715e</Color>
<Color x:Key="BackgroundColor">#000000</Color>
<Color x:Key="SplashBackgroundColor">#000000</Color>
@@ -57,6 +58,7 @@
<Color x:Key="ButtonBorderColor">#898989</Color>
<Color x:Key="ButtonTextColor">#ffffff</Color>
<Color x:Key="ButtonTextColorDisabled">#aaaaaa</Color>
<Color x:Key="ButtonTextColorOpacity">#99ffffff</Color>
<Color x:Key="FabColor">#52bdfb</Color>
<Color x:Key="FabPressedColor">#3ea1da</Color>

2
src/App/Styles/Dark.xaml
View File

@@ -13,6 +13,7 @@
<Color x:Key="PasswordSpecialColor">#ff7c70</Color>
<Color x:Key="ButtonColor">#e0e0e0</Color>
<Color x:Key="InputPlaceholderColor">#707070</Color>
<Color x:Key="DangerPressedColor">#ff715e</Color>
<Color x:Key="BackgroundColor">#303030</Color>
<Color x:Key="SplashBackgroundColor">#222222</Color>
@@ -57,6 +58,7 @@
<Color x:Key="ButtonBorderColor">#898989</Color>
<Color x:Key="ButtonTextColor">#ffffff</Color>
<Color x:Key="ButtonTextColorDisabled">#aaaaaa</Color>
<Color x:Key="ButtonTextColorOpacity">#99ffffff</Color>
<Color x:Key="FabColor">#52bdfb</Color>
<Color x:Key="FabPressedColor">#3ea1da</Color>

2
src/App/Styles/Light.xaml
View File

@@ -13,6 +13,7 @@
<Color x:Key="PasswordSpecialColor">#c40800</Color>
<Color x:Key="ButtonColor">#175DDC</Color>
<Color x:Key="InputPlaceholderColor">#d0d0d0</Color>
<Color x:Key="DangerPressedColor">#9a0007</Color>
<Color x:Key="BackgroundColor">#ffffff</Color>
<Color x:Key="SplashBackgroundColor">#ffffff</Color>
@@ -57,6 +58,7 @@
<Color x:Key="ButtonBorderColor">#aaaaaa</Color>
<Color x:Key="ButtonTextColor">#000000</Color>
<Color x:Key="ButtonTextColorDisabled">#aaaaaa</Color>
<Color x:Key="ButtonTextColorOpacity">#99000000</Color>
<Color x:Key="FabColor">#175DDC</Color>
<Color x:Key="FabPressedColor">#3883af</Color>

2
src/App/Styles/Nord.xaml
View File

@@ -13,6 +13,7 @@
<Color x:Key="PasswordSpecialColor">#d08770</Color>
<Color x:Key="ButtonColor">#d8dee9</Color>
<Color x:Key="InputPlaceholderColor">#7b88a1</Color>
<Color x:Key="DangerPressedColor">#953C44</Color>
<Color x:Key="BackgroundColor">#3b4252</Color>
<Color x:Key="SplashBackgroundColor">#2e3440</Color>
@@ -57,6 +58,7 @@
<Color x:Key="ButtonBorderColor">#5E6A82</Color>
<Color x:Key="ButtonTextColor">#e5e9f0</Color>
<Color x:Key="ButtonTextColorDisabled">#aaaaaa</Color>
<Color x:Key="ButtonTextColorOpacity">#99e5e9f0</Color>
<Color x:Key="FabColor">#81a1c1</Color>
<Color x:Key="FabPressedColor">#81a1c1</Color>

49
src/App/Styles/iOS.xaml
View File

@@ -181,7 +181,7 @@
<Setter Property="BorderWidth"
Value="1" />
<Setter Property="TextColor"
Value="{DynamicResource ButtonTextColor}" />
Value="{DynamicResource ButtonTextColorOpacity}" />
<Setter Property="FontSize"
Value="Medium" />
<Setter Property="CornerRadius"
@@ -210,6 +210,44 @@
</VisualStateGroupList>
</Setter>
</Style>
<Style TargetType="Button"
Class="btn-danger">
<Setter Property="BackgroundColor"
Value="{DynamicResource DangerColor}" />
<Setter Property="BorderColor"
Value="{DynamicResource DangerColor}" />
<Setter Property="BorderWidth"
Value="1" />
<Setter Property="TextColor"
Value="{DynamicResource ButtonPrimaryTextColor}" />
<Setter Property="FontSize"
Value="Medium" />
<Setter Property="CornerRadius"
Value="5" />
<Setter Property="VisualStateManager.VisualStateGroups">
<VisualStateGroupList>
<VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal" />
<VisualState x:Name="Pressed">
<VisualState.Setters>
<Setter Property="BackgroundColor"
Value="{DynamicResource DangerPressedColor}" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="Disabled">
<VisualState.Setters>
<Setter Property="TextColor"
Value="{DynamicResource ButtonTextColorDisabled}" />
<Setter Property="BackgroundColor"
Value="{DynamicResource ButtonBackgroundColorDisabled}" />
<Setter Property="BorderColor"
Value="{DynamicResource ButtonBackgroundColorDisabled}" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
</VisualStateGroupList>
</Setter>
</Style>
<Style TargetType="Button"
ApplyToDerivedTypes="True"
Class="btn-icon-platform">
@@ -307,4 +345,13 @@
<Setter Property="Padding"
Value="0, 10, 0, 5" />
</Style>
<Style TargetType="Label"
ApplyToDerivedTypes="True"
Class="title-danger">
<Setter Property="TextColor"
Value="{DynamicResource DangerColor}" />
<Setter Property="FontSize"
Value="Medium" />
</Style>
</ResourceDictionary>