Skip to content

Improve Delete Account UI #1692

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fedemkr merged 2 commits into from
Dec 20, 2021
Merged

Improve Delete Account UI #1692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8dd59af
Updated Delete account view UI
fedemkr Dec 16, 2021
b08e1e9
Merge branch 'master' into delete-account-red-changes
fedemkr Dec 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Android/Resources/drawable/ic_warning.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
android:viewportWidth="22"
android:viewportHeight="19">
<path
android:fillColor="#175DDC"
android:fillColor="#dd4b39"
android:pathData="M19.16 18.71H2.64c-0.36 0-0.72-0.09-1.03-0.27c-0.31-0.2-0.57-0.46-0.74-0.78c-0.18-0.32-0.27-0.67-0.27-1.04c0-0.36 0.1-0.72 0.28-1.03L9.14 1.1C9.32 0.76 9.58 0.5 9.89 0.32c0.3-0.18 0.65-0.28 1-0.28c0.36 0 0.7 0.1 1.02 0.28c0.3 0.18 0.56 0.44 0.74 0.75l8.26 14.51c0.18 0.31 0.28 0.67 0.28 1.03c0 0.37-0.09 0.72-0.26 1.04c-0.18 0.32-0.44 0.59-0.75 0.78c-0.31 0.18-0.66 0.28-1.02 0.27zM10.9 1.38c-0.13 0-0.26 0.04-0.38 0.1c-0.11 0.07-0.2 0.16-0.27 0.28L1.99 16.27c-0.07 0.11-0.1 0.24-0.1 0.36C1.9 16.76 1.92 16.9 2 17c0.06 0.12 0.16 0.22 0.27 0.3c0.12 0.06 0.25 0.1 0.38 0.1h16.52c0.13 0 0.26-0.04 0.37-0.1c0.12-0.08 0.21-0.18 0.28-0.3c0.06-0.1 0.1-0.23 0.1-0.36c0-0.12-0.04-0.25-0.1-0.36l-8.26-14.5c-0.07-0.13-0.17-0.22-0.28-0.29c-0.11-0.06-0.24-0.1-0.37-0.1zm0 11.42c-0.17 0-0.34-0.07-0.46-0.2c-0.12-0.12-0.19-0.29-0.19-0.46v-6.1c0-0.18 0.07-0.35 0.2-0.47c0.11-0.13 0.28-0.2 0.45-0.2c0.17 0 0.33 0.07 0.45 0.2c0.12 0.12 0.19 0.3 0.19 0.47v6.1c0 0.17-0.07 0.34-0.19 0.47c-0.12 0.12-0.28 0.2-0.45 0.2zm0 3.3c0.42 0 0.76-0.36 0.76-0.8c0-0.43-0.34-0.78-0.76-0.78c-0.43 0-0.77 0.35-0.77 0.79c0 0.43 0.34 0.79 0.77 0.79z"/>
</vector>
51 changes: 38 additions & 13 deletions src/App/Pages/Accounts/DeleteAccountPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Grid.Row="3"
Text="{u:I18n DeleteAccount}"
StyleClass="btn-danger"
HorizontalOptions="Start"
Margin="0,26,0,0"
Padding="16,6"
VerticalOptions="Start"
Margin="0,20,0,0"
Padding="16,0"
CornerRadius="2"
TextTransform="Uppercase"
Clicked="Close_Clicked" />
Clicked="DeleteAccount_Clicked"/>
<Button
Text="{u:I18n DeleteAccount}"
Grid.Row="3"
Grid.Column="1"
Text="{u:I18n Cancel}"
StyleClass="btn-secondary"
TextColor="#99000000"
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>
Clicked="Close_Clicked" />
</Grid>
</ContentPage.Content>
</pages:BaseContentPage>
43 changes: 42 additions & 1 deletion src/App/Styles/Android.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 changes: 2 additions & 0 deletions src/App/Styles/Black.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions src/App/Styles/Dark.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions src/App/Styles/Light.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions src/App/Styles/Nord.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
49 changes: 48 additions & 1 deletion src/App/Styles/iOS.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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">
Expand Down Expand Up @@ -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>
2 changes: 1 addition & 1 deletion src/iOS/Resources/Assets.xcassets/ic_warning.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images": [
{
"filename": "ic_warning.pdf",
"filename": "ic_warning-1.pdf",
"idiom": "universal"
},
{
Expand Down
Binary file added src/iOS/Resources/Assets.xcassets/ic_warning.imageset/ic_warning-1.pdf
View file
Open in desktop
Binary file not shown.
Binary file removed src/iOS/Resources/Assets.xcassets/ic_warning.imageset/ic_warning.pdf
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion src/iOS/iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
<ImageAsset Include="Resources\Assets.xcassets\LaunchScreen.imageset\logo_white%402x.png" />
<ImageAsset Include="Resources\Assets.xcassets\LaunchScreen.imageset\logo_white%403x.png" />
<ImageAsset Include="Resources\Assets.xcassets\ic_warning.imageset\Contents.json" />
<ImageAsset Include="Resources\Assets.xcassets\ic_warning.imageset\ic_warning.pdf" />
<ImageAsset Include="Resources\Assets.xcassets\ic_warning.imageset\ic_warning-1.pdf" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
Expand Down