Removed colors

nblockchain · Feb 5, 2023 · 3901e73 · 3901e73
1 parent b5d764f
commit 3901e73
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 19 deletions.
diff --git a/src/GWallet.Frontend.XF/BalancesPage.xaml b/src/GWallet.Frontend.XF/BalancesPage.xaml
@@ -16,26 +16,26 @@
                 <Image HeightRequest="80"
                        WidthRequest="80"
                        Margin="0,0,0,10"
-                       Source="logo_512x512.png"/>
+                       x:Name="logoInSidemenu"/>
 
                 <StackLayout Spacing="15" Orientation="Horizontal">
-                    <Label TextColor="#BF0C27" VerticalOptions="Center" FontFamily="Icons" Text="&#x23;"/>
+                    <Label VerticalOptions="Center" FontFamily="Icons" Text="#"/>
                     <Label Text="Check you still remember your payment password"/>
                     <StackLayout.GestureRecognizers>
                         <TapGestureRecognizer CommandParameter="Check you still remember your payment password" Tapped="OpenSettings_Tapped"/>
                     </StackLayout.GestureRecognizers>
                 </StackLayout>
 
                 <StackLayout Spacing="15" Orientation="Horizontal">
-                    <Label TextColor="#BF0C27" VerticalOptions="Center" FontFamily="Icons" Text="&#x23;"/>
+                    <Label VerticalOptions="Center" FontFamily="Icons" Text="#"/>
                     <Label Text="Check you still remember your secret recovery phrase"/>
                     <StackLayout.GestureRecognizers>
                         <TapGestureRecognizer CommandParameter="Check you still remember your secret recovery phrase" Tapped="OpenSettings_Tapped"/>
                     </StackLayout.GestureRecognizers>
                 </StackLayout>
 
                 <StackLayout Spacing="15" Orientation="Horizontal">
-                    <Label TextColor="#BF0C27" VerticalOptions="Center" FontFamily="Icons" Text="&#x23;"/>
+                    <Label VerticalOptions="Center" FontFamily="Icons" Text="#"/>
                     <Label Text="Wipe your current wallet, in order to start from scratch"/>
                     <StackLayout.GestureRecognizers>
                         <TapGestureRecognizer CommandParameter="Wipe your current wallet, in order to start from scratch" Tapped="OpenSettings_Tapped"/>
@@ -54,16 +54,15 @@
                      VerticalOptions="FillAndExpand">
 
             <!-- Settings icon-->
-            <Button TextColor="#111"
+            <ImageButton TextColor="#111"
+                    x:Name="settingsIcon"
                     BackgroundColor="Transparent"
                     FontFamily="Icons"
-                    Text="&#xf1de;"
-                    FontSize="20"
-                    Padding="10"
-                    HeightRequest="40"
-                    WidthRequest="40"
+                    Padding="0"
+                    HeightRequest="30"
+                    WidthRequest="30"
                     HorizontalOptions="Start"
-                    Margin="20,10,20,0"
+                    Margin="10,10,0,0"
                     Clicked="OpenFlyout_Clicked"/>
 
 

diff --git a/src/GWallet.Frontend.XF/SettingsPage.xaml b/src/GWallet.Frontend.XF/SettingsPage.xaml
@@ -21,8 +21,6 @@
                        Placeholder="Type your password"/>
 
                 <Button Text="Check my password"
-                        BackgroundColor="#BF0C27"
-                        TextColor="White"
                         Clicked="OnCheckPasswordButtonClicked"
                         HorizontalOptions="FillAndExpand">
                     <Button.Triggers>
@@ -57,7 +55,6 @@
                     <Entry x:Name="dateOfBirthLabel"
                            Placeholder="Choose your date of birth"
                            BackgroundColor="Transparent"
-                           TextColor="#252525"
                            VerticalOptions="Center"
                            InputTransparent="True"
                            IsEnabled="False"/>
@@ -68,8 +65,6 @@
                        Placeholder="Type your email"/>
 
                 <Button Text="Check my secret recovery phrase"
-                        BackgroundColor="#BF0C27"
-                        TextColor="White"
                         Clicked="OnCheckPasswordButtonClicked"
                         HorizontalOptions="FillAndExpand">
                     <Button.Triggers>
@@ -104,12 +99,9 @@
                          IsVisible="false">
 
                 <Label Text="If you want to remove accounts, the recommended way is to archive them, not wipe the whole wallet."
-                       TextColor="#A9A9A9"
                        HorizontalTextAlignment="Center"/>
 
                 <Button Text="I want to do it anyway"
-                        BackgroundColor="#BF0C27"
-                        TextColor="White"
                         Clicked="OnWipeWalletButtonClicked"
                         HorizontalOptions="FillAndExpand">
                 </Button>