From 3e3c63a29cfb671677e3cd3df514e97143bd1627 Mon Sep 17 00:00:00 2001
From: anperederi <antoine.perederii@etu.uca.fr>
Date: Tue, 23 May 2023 18:52:56 +0200
Subject: [PATCH] :boom: introduce theme an style :art: and rebuild navigation
 connection :truck:

---
 src/Banquale/Banquale/App.xaml                |   2 +-
 src/Banquale/Banquale/AppShell.xaml           |   4 +-
 src/Banquale/Banquale/Banquale.csproj         |   2 -
 .../Banquale/Resources/Styles/Colors.xaml     |   6 +-
 .../Banquale/Resources/Styles/Styles.xaml     | 145 +++++++++---------
 .../Banquale/Resources/Themes/DarkTheme.xaml  |  12 --
 .../Resources/Themes/DarkTheme.xaml.cs        |   9 --
 .../Banquale/Resources/Themes/LightTheme.xaml |  12 --
 .../Resources/Themes/LightTheme.xaml.cs       |   9 --
 .../Banquale/Views/Balance/BalancePage.xaml   |   6 +-
 .../Views/Balance/BalancePage.xaml.cs         |   1 +
 .../Banquale/Views/Category/CategoryView.xaml |   3 +-
 .../Banquale/Views/ConnectionPage.xaml        |  12 +-
 .../Banquale/Views/ConnectionPage.xaml.cs     |   2 +-
 .../Banquale/Views/SwitchAccountPage.xaml     |  41 +----
 .../Banquale/Views/SwitchAccountPage.xaml.cs  |   6 +
 .../Banquale/Views/SwitchAccountView.xaml     |  23 +--
 .../Banquale/Views/SwitchAccountView.xaml.cs  |   2 +-
 .../Banquale/Views/TransactionsPage.xaml      |  17 +-
 19 files changed, 114 insertions(+), 200 deletions(-)
 delete mode 100644 src/Banquale/Banquale/Resources/Themes/DarkTheme.xaml
 delete mode 100644 src/Banquale/Banquale/Resources/Themes/DarkTheme.xaml.cs
 delete mode 100644 src/Banquale/Banquale/Resources/Themes/LightTheme.xaml
 delete mode 100644 src/Banquale/Banquale/Resources/Themes/LightTheme.xaml.cs

diff --git a/src/Banquale/Banquale/App.xaml b/src/Banquale/Banquale/App.xaml
index a2cf886..c38d844 100644
--- a/src/Banquale/Banquale/App.xaml
+++ b/src/Banquale/Banquale/App.xaml
@@ -8,9 +8,9 @@
 
             <ResourceDictionary.MergedDictionaries>
 
+                <!--    Only light theme    -->
                 <ResourceDictionary Source="Resources/Styles/Colors.xaml" />
                 <ResourceDictionary Source="Resources/Styles/Styles.xaml" />
-                <ResourceDictionary Source="Resources/Themes/LightTheme.xaml" />
                 
             </ResourceDictionary.MergedDictionaries>
 
diff --git a/src/Banquale/Banquale/AppShell.xaml b/src/Banquale/Banquale/AppShell.xaml
index 6a0dbdc..d85c7cd 100644
--- a/src/Banquale/Banquale/AppShell.xaml
+++ b/src/Banquale/Banquale/AppShell.xaml
@@ -9,8 +9,8 @@
     Shell.FlyoutBehavior="Disabled">
 
 
-        <!--<ShellContent ContentTemplate="{DataTemplate views:ConnectionPage}"
-                      Route="connection"/>-->
+        <ShellContent ContentTemplate="{DataTemplate views:ConnectionPage}"
+                      Route="connection"/>
 
     <TabBar>
 
diff --git a/src/Banquale/Banquale/Banquale.csproj b/src/Banquale/Banquale/Banquale.csproj
index 644ae23..aa1e458 100644
--- a/src/Banquale/Banquale/Banquale.csproj
+++ b/src/Banquale/Banquale/Banquale.csproj
@@ -66,7 +66,6 @@
 	  <None Remove="Resources\Images\helpIcon.svg" />
 	  <None Remove="Stub\" />
 	  <None Remove="DataContractPersistance\" />
-	  <None Remove="Resources\Theme\" />
 	  <None Remove="Views\Balance\" />
 	  <None Remove="Views\Category\" />
 	</ItemGroup>
@@ -81,7 +80,6 @@
 	  <Folder Include="Persistances\" />
 	  <Folder Include="Stub\" />
 	  <Folder Include="DataContractPersistance\" />
-	  <Folder Include="Resources\Theme\" />
 	  <Folder Include="Views\Balance\" />
 	  <Folder Include="Views\Category\" />
 	</ItemGroup>
diff --git a/src/Banquale/Banquale/Resources/Styles/Colors.xaml b/src/Banquale/Banquale/Resources/Styles/Colors.xaml
index a8f8c4f..7c05e2e 100644
--- a/src/Banquale/Banquale/Resources/Styles/Colors.xaml
+++ b/src/Banquale/Banquale/Resources/Styles/Colors.xaml
@@ -5,13 +5,11 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
 
     <Color x:Key="Primary">#aad7aa</Color>
-    <Color x:Key="PrimaryDark">#074bab</Color>
 
-    <Color x:Key="LightBackground">#FFF</Color>
-    <Color x:Key="Darkground">#000</Color>
+    <Color x:Key="Background">#FFF</Color>
 
     <Color x:Key="Secondary">#DFD8F7</Color>
-    <Color x:Key="Tertiary">#2B0B98</Color>
+    <Color x:Key="Tertiary">#aad7aa</Color>
 
     <Color x:Key="White">White</Color>
     <Color x:Key="Black">Black</Color>
diff --git a/src/Banquale/Banquale/Resources/Styles/Styles.xaml b/src/Banquale/Banquale/Resources/Styles/Styles.xaml
index b88aed6..2971d61 100644
--- a/src/Banquale/Banquale/Resources/Styles/Styles.xaml
+++ b/src/Banquale/Banquale/Resources/Styles/Styles.xaml
@@ -5,39 +5,40 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
 
     <Style TargetType="ActivityIndicator">
-        <Setter Property="Color" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
+        <Setter Property="Color" Value="{StaticResource Primary}" />
     </Style>
 
     <Style TargetType="IndicatorView">
-        <Setter Property="IndicatorColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}"/>
-        <Setter Property="SelectedIndicatorColor" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray100}}"/>
+        <Setter Property="IndicatorColor" Value="{StaticResource Gray200}"/>
+        <Setter Property="SelectedIndicatorColor" Value="{StaticResource Gray950}"/>
     </Style>
 
     <Style TargetType="Border">
-        <Setter Property="Stroke" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
+        <Setter Property="Stroke" Value="{StaticResource Gray200}" />
         <Setter Property="StrokeShape" Value="Rectangle"/>
         <Setter Property="StrokeThickness" Value="1"/>
     </Style>
 
     <Style TargetType="BoxView">
-        <Setter Property="Color" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray200}}" />
+        <Setter Property="Color" Value="{StaticResource Gray950}" />
     </Style>
 
     <Style TargetType="Button">
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Primary}}" />
-        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
+        <Setter Property="TextColor" Value="{StaticResource White}" />
+        <Setter Property="BackgroundColor" Value="{StaticResource Primary}" />
         <Setter Property="FontFamily" Value="OpenSansRegular"/>
         <Setter Property="FontSize" Value="14"/>
         <Setter Property="CornerRadius" Value="8"/>
         <Setter Property="Padding" Value="14,10"/>
+        <Setter Property="BorderColor" Value="Red"/>
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
                     <VisualState x:Name="Normal" />
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray200}}" />
-                            <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray600}}" />
+                            <Setter Property="TextColor" Value="{StaticResource Gray950}" />
+                            <Setter Property="BackgroundColor" Value="{StaticResource Gray200}" />
                         </VisualState.Setters>
                     </VisualState>
                 </VisualStateGroup>
@@ -46,14 +47,14 @@
     </Style>
 
     <Style TargetType="CheckBox">
-        <Setter Property="Color" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
+        <Setter Property="Color" Value="{StaticResource Primary}" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
                     <VisualState x:Name="Normal" />
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="Color" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
+                            <Setter Property="Color" Value="{StaticResource Gray300}" />
                         </VisualState.Setters>
                     </VisualState>
                 </VisualStateGroup>
@@ -62,7 +63,7 @@
     </Style>
 
     <Style TargetType="DatePicker">
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
+        <Setter Property="TextColor" Value="{StaticResource Gray900}" />
         <Setter Property="BackgroundColor" Value="Transparent" />
         <Setter Property="FontFamily" Value="OpenSansRegular"/>
         <Setter Property="FontSize" Value="14"/>
@@ -72,7 +73,7 @@
                     <VisualState x:Name="Normal" />
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
+                            <Setter Property="TextColor" Value="{StaticResource Gray200}" />
                         </VisualState.Setters>
                     </VisualState>
                 </VisualStateGroup>
@@ -81,18 +82,18 @@
     </Style>
 
     <Style TargetType="Editor">
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
+        <Setter Property="TextColor" Value="Black" />
         <Setter Property="BackgroundColor" Value="Transparent" />
         <Setter Property="FontFamily" Value="OpenSansRegular"/>
         <Setter Property="FontSize" Value="14" />
-        <Setter Property="PlaceholderColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
+        <Setter Property="PlaceholderColor" Value="{StaticResource Gray200}" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
                     <VisualState x:Name="Normal" />
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
+                            <Setter Property="TextColor" Value="{StaticResource Gray300}" />
                         </VisualState.Setters>
                     </VisualState>
                 </VisualStateGroup>
@@ -101,18 +102,18 @@
     </Style>
 
     <Style TargetType="Entry">
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
+        <Setter Property="TextColor" Value="Black" />
         <Setter Property="BackgroundColor" Value="Transparent" />
         <Setter Property="FontFamily" Value="OpenSansRegular"/>
         <Setter Property="FontSize" Value="14" />
-        <Setter Property="PlaceholderColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
+        <Setter Property="PlaceholderColor" Value="{StaticResource Gray200}" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
                     <VisualState x:Name="Normal" />
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
+                            <Setter Property="TextColor" Value="{StaticResource Gray300}" />
                         </VisualState.Setters>
                     </VisualState>
                 </VisualStateGroup>
@@ -122,7 +123,7 @@
 
     <Style TargetType="Frame">
         <Setter Property="HasShadow" Value="False" />
-        <Setter Property="BorderColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray950}}" />
+        <Setter Property="BorderColor" Value="{StaticResource Gray200}" />
         <Setter Property="CornerRadius" Value="8" />
     </Style>
 
@@ -146,7 +147,7 @@
     </Style>
 
     <Style TargetType="Label">
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
+        <Setter Property="TextColor" Value="{StaticResource Gray900}" />
         <Setter Property="FontFamily" Value="OpenSansRegular" />
         <Setter Property="FontSize" Value="14" />
         <Setter Property="VisualStateManager.VisualStateGroups">
@@ -155,7 +156,7 @@
                     <VisualState x:Name="Normal" />
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
+                            <Setter Property="TextColor" Value="{StaticResource Gray300}" />
                         </VisualState.Setters>
                     </VisualState>
                 </VisualStateGroup>
@@ -164,13 +165,13 @@
     </Style>
 
     <Style TargetType="ListView">
-        <Setter Property="SeparatorColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
-        <Setter Property="RefreshControlColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />
+        <Setter Property="SeparatorColor" Value="{StaticResource Gray200}" />
+        <Setter Property="RefreshControlColor" Value="{StaticResource Gray900}" />
     </Style>
 
     <Style TargetType="Picker">
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
-        <Setter Property="TitleColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />
+        <Setter Property="TextColor" Value="{StaticResource Gray900}" />
+        <Setter Property="TitleColor" Value="{StaticResource Gray900}" />
         <Setter Property="BackgroundColor" Value="Transparent" />
         <Setter Property="FontFamily" Value="OpenSansRegular"/>
         <Setter Property="FontSize" Value="14"/>
@@ -180,8 +181,8 @@
                     <VisualState x:Name="Normal" />
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
-                            <Setter Property="TitleColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
+                            <Setter Property="TextColor" Value="{StaticResource Gray300}" />
+                            <Setter Property="TitleColor" Value="{StaticResource Gray300}" />
                         </VisualState.Setters>
                     </VisualState>
                 </VisualStateGroup>
@@ -190,14 +191,14 @@
     </Style>
 
     <Style TargetType="ProgressBar">
-        <Setter Property="ProgressColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
+        <Setter Property="ProgressColor" Value="{StaticResource Primary}" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
                     <VisualState x:Name="Normal" />
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="ProgressColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
+                            <Setter Property="ProgressColor" Value="{StaticResource Gray300}" />
                         </VisualState.Setters>
                     </VisualState>
                 </VisualStateGroup>
@@ -207,7 +208,7 @@
 
     <Style TargetType="RadioButton">
         <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
+        <Setter Property="TextColor" Value="Black" />
         <Setter Property="FontFamily" Value="OpenSansRegular"/>
         <Setter Property="FontSize" Value="14"/>
         <Setter Property="VisualStateManager.VisualStateGroups">
@@ -216,7 +217,7 @@
                     <VisualState x:Name="Normal" />
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
+                            <Setter Property="TextColor" Value="{StaticResource Gray300}" />
                         </VisualState.Setters>
                     </VisualState>
                 </VisualStateGroup>
@@ -225,11 +226,11 @@
     </Style>
 
     <Style TargetType="RefreshView">
-        <Setter Property="RefreshColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />
+        <Setter Property="RefreshColor" Value="{StaticResource Gray900}" />
     </Style>
 
     <Style TargetType="SearchBar">
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
+        <Setter Property="TextColor" Value="{StaticResource Gray900}" />
         <Setter Property="PlaceholderColor" Value="{StaticResource Gray500}" />
         <Setter Property="CancelButtonColor" Value="{StaticResource Gray500}" />
         <Setter Property="BackgroundColor" Value="Transparent" />
@@ -241,8 +242,8 @@
                     <VisualState x:Name="Normal" />
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
-                            <Setter Property="PlaceholderColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
+                            <Setter Property="TextColor" Value="{StaticResource Gray300}" />
+                            <Setter Property="PlaceholderColor" Value="{StaticResource Gray300}" />
                         </VisualState.Setters>
                     </VisualState>
                 </VisualStateGroup>
@@ -251,7 +252,7 @@
     </Style>
 
     <Style TargetType="SearchHandler">
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
+        <Setter Property="TextColor" Value="{StaticResource Gray900}" />
         <Setter Property="PlaceholderColor" Value="{StaticResource Gray500}" />
         <Setter Property="BackgroundColor" Value="Transparent" />
         <Setter Property="FontFamily" Value="OpenSansRegular" />
@@ -262,8 +263,8 @@
                     <VisualState x:Name="Normal" />
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
-                            <Setter Property="PlaceholderColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
+                            <Setter Property="TextColor" Value="{StaticResource Gray300}" />
+                            <Setter Property="PlaceholderColor" Value="{StaticResource Gray300}" />
                         </VisualState.Setters>
                     </VisualState>
                 </VisualStateGroup>
@@ -274,23 +275,23 @@
     <Style TargetType="Shadow">
         <Setter Property="Radius" Value="15" />
         <Setter Property="Opacity" Value="0.5" />
-        <Setter Property="Brush" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource White}}" />
+        <Setter Property="Brush" Value="{StaticResource White}" />
         <Setter Property="Offset" Value="10,10" />
     </Style>
 
     <Style TargetType="Slider">
-        <Setter Property="MinimumTrackColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
-        <Setter Property="MaximumTrackColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray600}}" />
-        <Setter Property="ThumbColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
+        <Setter Property="MinimumTrackColor" Value="{StaticResource Primary}" />
+        <Setter Property="MaximumTrackColor" Value="{StaticResource Gray200}" />
+        <Setter Property="ThumbColor" Value="{StaticResource Primary}" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
                     <VisualState x:Name="Normal" />
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="MinimumTrackColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}"/>
-                            <Setter Property="MaximumTrackColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}"/>
-                            <Setter Property="ThumbColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}"/>
+                            <Setter Property="MinimumTrackColor" Value="{StaticResource Gray300}"/>
+                            <Setter Property="MaximumTrackColor" Value="{StaticResource Gray300}"/>
+                            <Setter Property="ThumbColor" Value="{StaticResource Gray300}"/>
                         </VisualState.Setters>
                     </VisualState>
                 </VisualStateGroup>
@@ -299,11 +300,11 @@
     </Style>
 
     <Style TargetType="SwipeItem">
-        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" />
+        <Setter Property="BackgroundColor" Value="{StaticResource White}" />
     </Style>
 
     <Style TargetType="Switch">
-        <Setter Property="OnColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
+        <Setter Property="OnColor" Value="{StaticResource Primary}" />
         <Setter Property="ThumbColor" Value="{StaticResource White}" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
@@ -311,19 +312,19 @@
                     <VisualState x:Name="Normal" />
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="OnColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
-                            <Setter Property="ThumbColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
+                            <Setter Property="OnColor" Value="{StaticResource Gray300}" />
+                            <Setter Property="ThumbColor" Value="{StaticResource Gray300}" />
                         </VisualState.Setters>
                     </VisualState>
                     <VisualState x:Name="On">
                         <VisualState.Setters>
-                            <Setter Property="OnColor" Value="{AppThemeBinding Light={StaticResource Secondary}, Dark={StaticResource Gray200}}" />
-                            <Setter Property="ThumbColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
+                            <Setter Property="OnColor" Value="{StaticResource Secondary}" />
+                            <Setter Property="ThumbColor" Value="{StaticResource Primary}" />
                         </VisualState.Setters>
                     </VisualState>
                     <VisualState x:Name="Off">
                         <VisualState.Setters>
-                            <Setter Property="ThumbColor" Value="{AppThemeBinding Light={StaticResource Gray400}, Dark={StaticResource Gray500}}" />
+                            <Setter Property="ThumbColor" Value="{StaticResource Gray400}" />
                         </VisualState.Setters>
                     </VisualState>
                 </VisualStateGroup>
@@ -332,7 +333,7 @@
     </Style>
 
     <Style TargetType="TimePicker">
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
+        <Setter Property="TextColor" Value="{StaticResource Gray900}" />
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="FontFamily" Value="OpenSansRegular"/>
         <Setter Property="FontSize" Value="14"/>
@@ -342,7 +343,7 @@
                     <VisualState x:Name="Normal" />
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
+                            <Setter Property="TextColor" Value="{StaticResource Gray300}" />
                         </VisualState.Setters>
                     </VisualState>
                 </VisualStateGroup>
@@ -352,33 +353,33 @@
 
     <Style TargetType="Page" ApplyToDerivedTypes="True">
         <Setter Property="Padding" Value="0"/>
-        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" />
+        <Setter Property="BackgroundColor" Value="{StaticResource White}" />
     </Style>
 
     <Style TargetType="Shell" ApplyToDerivedTypes="True">
-        <Setter Property="Shell.BackgroundColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource Gray950}}" />
-        <Setter Property="Shell.ForegroundColor" Value="{OnPlatform WinUI={StaticResource Primary}, Default={StaticResource White}}" />
-        <Setter Property="Shell.TitleColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource White}}" />
-        <Setter Property="Shell.DisabledColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray950}}" />
-        <Setter Property="Shell.UnselectedColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray200}}" />
+        <Setter Property="Shell.BackgroundColor" Value="{StaticResource Primary}" />
+        <Setter Property="Shell.ForegroundColor" Value="{StaticResource Gray900}" />
+        <Setter Property="Shell.TitleColor" Value="{StaticResource White}" />
+        <Setter Property="Shell.DisabledColor" Value="{StaticResource Gray200}" />
+        <Setter Property="Shell.UnselectedColor" Value="{StaticResource Gray200}" />
         <Setter Property="Shell.NavBarHasShadow" Value="False" />
-        <Setter Property="Shell.TabBarBackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" />
-        <Setter Property="Shell.TabBarForegroundColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
-        <Setter Property="Shell.TabBarTitleColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
-        <Setter Property="Shell.TabBarUnselectedColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />
+        <Setter Property="Shell.TabBarBackgroundColor" Value="{StaticResource White}" />
+        <Setter Property="Shell.TabBarForegroundColor" Value="{StaticResource Primary}" />
+        <Setter Property="Shell.TabBarTitleColor" Value="{StaticResource Primary}" />
+        <Setter Property="Shell.TabBarUnselectedColor" Value="{StaticResource Gray900}" />
     </Style>
 
     <Style TargetType="NavigationPage">
-        <Setter Property="BarBackgroundColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource Gray950}}" />
-        <Setter Property="BarTextColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource White}}" />
-        <Setter Property="IconColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource White}}" />
+        <Setter Property="BarBackgroundColor" Value="{StaticResource Primary}" />
+        <Setter Property="BarTextColor" Value="{StaticResource Gray200}" />
+        <Setter Property="IconColor" Value="{StaticResource Gray200}" />
     </Style>
 
     <Style TargetType="TabbedPage">
-        <Setter Property="BarBackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Gray950}}" />
-        <Setter Property="BarTextColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
-        <Setter Property="UnselectedTabColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray950}}" />
-        <Setter Property="SelectedTabColor" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray200}}" />
+        <Setter Property="BarBackgroundColor" Value="White" />
+        <Setter Property="BarTextColor" Value="{StaticResource Primary}" />
+        <Setter Property="UnselectedTabColor" Value="{StaticResource Gray200}" />
+        <Setter Property="SelectedTabColor" Value="{StaticResource Gray950}" />
     </Style>
 
 </ResourceDictionary>
diff --git a/src/Banquale/Banquale/Resources/Themes/DarkTheme.xaml b/src/Banquale/Banquale/Resources/Themes/DarkTheme.xaml
deleted file mode 100644
index 842ea7f..0000000
--- a/src/Banquale/Banquale/Resources/Themes/DarkTheme.xaml
+++ /dev/null
@@ -1,12 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-                    x:Class="Banquale.Resources.Themes.DarkTheme">
-    <Color x:Key="PageBackgroundColor">Black</Color>
-    <Color x:Key="NavigationBarColor">Teal</Color>
-    <Color x:Key="PrimaryColor">Teal</Color>
-    <Color x:Key="SecondaryColor">Green</Color>
-    <Color x:Key="PrimaryTextColor">Red</Color>
-    <Color x:Key="SecondaryTextColor">Purple</Color>
-    <Color x:Key="TertiaryTextColor">Black</Color>
-    <Color x:Key="TransparentColor">Transparent</Color>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Banquale/Banquale/Resources/Themes/DarkTheme.xaml.cs b/src/Banquale/Banquale/Resources/Themes/DarkTheme.xaml.cs
deleted file mode 100644
index d59102e..0000000
--- a/src/Banquale/Banquale/Resources/Themes/DarkTheme.xaml.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Banquale.Resources.Themes;
-
-public partial class DarkTheme : ResourceDictionary
-{
-	public DarkTheme()
-	{
-		InitializeComponent();
-	}
-}
diff --git a/src/Banquale/Banquale/Resources/Themes/LightTheme.xaml b/src/Banquale/Banquale/Resources/Themes/LightTheme.xaml
deleted file mode 100644
index 9ca25aa..0000000
--- a/src/Banquale/Banquale/Resources/Themes/LightTheme.xaml
+++ /dev/null
@@ -1,12 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-                    x:Class="Banquale.Resources.Themes.LightTheme">
-    <Color x:Key="PageBackgroundColor">White</Color>
-    <Color x:Key="NavigationBarColor">WhiteSmoke</Color>
-    <Color x:Key="PrimaryColor">WhiteSmoke</Color>
-    <Color x:Key="SecondaryColor">Black</Color>
-    <Color x:Key="PrimaryTextColor">Black</Color>
-    <Color x:Key="SecondaryTextColor">White</Color>
-    <Color x:Key="TertiaryTextColor">Gray</Color>
-    <Color x:Key="TransparentColor">Transparent</Color>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Banquale/Banquale/Resources/Themes/LightTheme.xaml.cs b/src/Banquale/Banquale/Resources/Themes/LightTheme.xaml.cs
deleted file mode 100644
index 098ee46..0000000
--- a/src/Banquale/Banquale/Resources/Themes/LightTheme.xaml.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Banquale.Resources.Themes;
-
-public partial class LightTheme : ResourceDictionary
-{
-	public LightTheme()
-	{
-		InitializeComponent();
-	}
-}
diff --git a/src/Banquale/Banquale/Views/Balance/BalancePage.xaml b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml
index e2cc3bc..da494c2 100644
--- a/src/Banquale/Banquale/Views/Balance/BalancePage.xaml
+++ b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml
@@ -43,13 +43,11 @@
 
                 <Label
                     Text="Solde"
-                    WidthRequest="75"
-                    TextColor="Black"
-                    HorizontalOptions="Center"/>
+                    Margin="0, 0, 50, 0"/>
                 <Label
                     Text="{Binding CustomersList[0].AccountsList[0].Balance} "
                     Grid.Column="1"
-                    Margin="0, 0, 5, 0"/>
+                    Margin="50, 0, 5, 0"/>
 
                 <Label Text="€"
                        Grid.Column="2"/>
diff --git a/src/Banquale/Banquale/Views/Balance/BalancePage.xaml.cs b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml.cs
index 23703f2..6fddb0e 100644
--- a/src/Banquale/Banquale/Views/Balance/BalancePage.xaml.cs
+++ b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml.cs
@@ -1,4 +1,5 @@
 using Banquale.Model;
+
 namespace Banquale.Views.Balance;
 
 
diff --git a/src/Banquale/Banquale/Views/Category/CategoryView.xaml b/src/Banquale/Banquale/Views/Category/CategoryView.xaml
index 146a906..21166d5 100644
--- a/src/Banquale/Banquale/Views/Category/CategoryView.xaml
+++ b/src/Banquale/Banquale/Views/Category/CategoryView.xaml
@@ -5,8 +5,7 @@
     
     <VerticalStackLayout>
 
-        <BoxView BackgroundColor="Black"
-                 HorizontalOptions="FillAndExpand"
+        <BoxView HorizontalOptions="FillAndExpand"
                  HeightRequest="1.3"
                  Margin="20, 0, 20, 0"/>
 
diff --git a/src/Banquale/Banquale/Views/ConnectionPage.xaml b/src/Banquale/Banquale/Views/ConnectionPage.xaml
index 8db4386..a4b41e2 100644
--- a/src/Banquale/Banquale/Views/ConnectionPage.xaml
+++ b/src/Banquale/Banquale/Views/ConnectionPage.xaml
@@ -3,14 +3,11 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Banquale.Views.ConnectionPage"
              Title="ConnectionPage"
-             BackgroundColor="White"
              Shell.NavBarIsVisible="False">
 
     <StackLayout>
-        <Frame BackgroundColor="#C8C8C8" CornerRadius="20" Margin="20, 250, 20, 0">
+        <Frame CornerRadius="20" Margin="20, 250, 20, 0">
             <Entry Placeholder="Identifiant"
-                   PlaceholderColor="#6E6E6E"
-                   TextColor="#212121"
                    MaxLength="20"
                    MinimumWidthRequest="275"
                    HorizontalOptions="CenterAndExpand"
@@ -18,10 +15,8 @@
                    FontSize="Large"/>
         </Frame>
 
-        <Frame BackgroundColor="#C8C8C8" CornerRadius="10" Margin="20, 75, 20, 0">
+        <Frame CornerRadius="10" Margin="20, 75, 20, 0">
             <Entry Placeholder="Mot de passe"
-                   PlaceholderColor="#6E6E6E"
-                   TextColor="#212121"
                    IsPassword="True"
                    MinimumWidthRequest="275"
                    MaxLength="20"
@@ -32,10 +27,7 @@
 
         <Button Text="Se connecter"
             BorderWidth="2"
-            BorderColor="Black"
             HorizontalOptions="Fill"
-            BackgroundColor="Gray"
-            TextColor="Black"
             MinimumHeightRequest="75"
             Margin="10,75,10,0"
             FontSize="Large"
diff --git a/src/Banquale/Banquale/Views/ConnectionPage.xaml.cs b/src/Banquale/Banquale/Views/ConnectionPage.xaml.cs
index a94e5d3..6a850d3 100644
--- a/src/Banquale/Banquale/Views/ConnectionPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/ConnectionPage.xaml.cs
@@ -9,7 +9,7 @@ public partial class ConnectionPage : ContentPage
 
     public async void Connection_Clicked(Object sender, EventArgs e)
     {
-        await Shell.Current.GoToAsync("///balance");
+        await Navigation.PushModalAsync(new SwitchAccountPage());
     }
 
 }
\ No newline at end of file
diff --git a/src/Banquale/Banquale/Views/SwitchAccountPage.xaml b/src/Banquale/Banquale/Views/SwitchAccountPage.xaml
index b4fcee6..a854de7 100644
--- a/src/Banquale/Banquale/Views/SwitchAccountPage.xaml
+++ b/src/Banquale/Banquale/Views/SwitchAccountPage.xaml
@@ -4,7 +4,6 @@
              xmlns:local="clr-namespace:Banquale.Views"
              x:Class="Banquale.Views.SwitchAccountPage"
              Title="SwitchAccountPage"
-             BackgroundColor="White"
              Shell.NavBarIsVisible="False">
 
                     
@@ -30,43 +29,19 @@
 
     </StackLayout>-->
     
-    <Grid RowDefinitions="3*, 2*, *, 2*, *, 2*, 3*">
+    <Grid RowDefinitions="2*, 2*, *">
 
-        <Grid Grid.Row="1">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="15*"/>
-                <ColumnDefinition Width="*"/>
-            </Grid.ColumnDefinitions>
+            <local:SwitchAccountView Grid.Row="0"/>
 
-            <local:SwitchAccountView Grid.Column="1"/>
-        </Grid>
-
-        <Grid Grid.Row="3">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="15*"/>
-                <ColumnDefinition Width="*"/>
-            </Grid.ColumnDefinitions>
-            <local:SwitchAccountView Grid.Column="1"/>
-        </Grid>
-
-        <Grid Grid.Row="5">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="15*"/>
-                <ColumnDefinition Width="*"/>
-            </Grid.ColumnDefinitions>
-            <Button Grid.Column="1" Text="Déconnexion"
-                BorderWidth="2"
-                BorderColor="Black"
+            <local:SwitchAccountView Grid.Row="1"/>
+        
+            <Button
+                Text="Déconnexion"
+                Grid.Row="2"
                 HorizontalOptions="Fill"
-                BackgroundColor="Gray"
-                TextColor="Black"
                 MinimumHeightRequest="75"
                 MinimumWidthRequest="375"
-                FontSize="Large"/>
-        </Grid>
+                Clicked="DisconnectionClicked"/>
 
     </Grid>
 </ContentPage>
\ No newline at end of file
diff --git a/src/Banquale/Banquale/Views/SwitchAccountPage.xaml.cs b/src/Banquale/Banquale/Views/SwitchAccountPage.xaml.cs
index b82d56d..53947dc 100644
--- a/src/Banquale/Banquale/Views/SwitchAccountPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/SwitchAccountPage.xaml.cs
@@ -6,4 +6,10 @@ public partial class SwitchAccountPage : ContentPage
 	{
 		InitializeComponent();
 	}
+
+    async void DisconnectionClicked(System.Object sender, System.EventArgs e)
+    {
+        await Shell.Current.GoToAsync("///connection");
+    }
+
 }
\ No newline at end of file
diff --git a/src/Banquale/Banquale/Views/SwitchAccountView.xaml b/src/Banquale/Banquale/Views/SwitchAccountView.xaml
index 542cdef..53ec778 100644
--- a/src/Banquale/Banquale/Views/SwitchAccountView.xaml
+++ b/src/Banquale/Banquale/Views/SwitchAccountView.xaml
@@ -2,22 +2,13 @@
 <ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Banquale.Views.SwitchAccountView">
-    <ContentView.Resources>
-        <Style TargetType="Button">
-            <Setter Property="BorderColor" Value="Black" />
-            <Setter Property="BorderWidth" Value="2" />
-            <Setter Property="BackgroundColor" Value="Gray" />
-            <Setter Property="TextColor" Value="Black" />
-            <Setter Property="FontSize" Value="Large" />
-            <Setter Property="MinimumHeightRequest" Value="75" />
-            <Setter Property="HorizontalOptions" Value="Fill" />
-            <Setter Property="VerticalOptions" Value="Center"/>
-            <Setter Property="LineBreakMode" Value="WordWrap" />
-        </Style>
-    </ContentView.Resources>
 
-    <Button Text=" Compte Personnel &#x0a; Mme Tatouille "
-            Clicked="Transfer_Clicked"/>
-    <!-- &#x0a; sert à faire un retour à la ligne--> 
+    <VerticalStackLayout>
+
+        <Button Text=" Compte Personnel &#x0a; Mme Tatouille "
+                Clicked="Transfer_Clicked"/>
+        <!-- &#x0a; sert à faire un retour à la ligne-->
+
+    </VerticalStackLayout>
 
 </ContentView>
diff --git a/src/Banquale/Banquale/Views/SwitchAccountView.xaml.cs b/src/Banquale/Banquale/Views/SwitchAccountView.xaml.cs
index 5645fb6..b575284 100644
--- a/src/Banquale/Banquale/Views/SwitchAccountView.xaml.cs
+++ b/src/Banquale/Banquale/Views/SwitchAccountView.xaml.cs
@@ -9,7 +9,7 @@ public partial class SwitchAccountView : ContentView
 
     public async void Transfer_Clicked(object sender, EventArgs e)
     {
-        await Shell.Current.GoToAsync("///connection");
+        await Shell.Current.GoToAsync("//balance");
     }
 
 }
\ No newline at end of file
diff --git a/src/Banquale/Banquale/Views/TransactionsPage.xaml b/src/Banquale/Banquale/Views/TransactionsPage.xaml
index 0dcd117..f3ac00a 100644
--- a/src/Banquale/Banquale/Views/TransactionsPage.xaml
+++ b/src/Banquale/Banquale/Views/TransactionsPage.xaml
@@ -1,16 +1,14 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Banquale.Views.TransactionsPage"
-             Title="TransactionsPage"
-             BackgroundColor="White">
+             Title="TransactionsPage">
     
     <Grid RowDefinitions="2*, *, 0*, *, 0*, *, *, *, *, *, *">
         
         <Grid Grid.Row="1"  ColumnDefinitions="2*, *, 2*">
             <Label Grid.Column="1"
                    Text="Prix"
-                   TextColor="Black"
                    HorizontalOptions="Center"
                    FontSize="Large"/>
         </Grid>
@@ -18,23 +16,22 @@
         <Grid Grid.Row="3" ColumnDefinitions="*, *, *">
             <Label Grid.Column="1"
                    Text="poiuytreza"
-                   TextColor="Black"
                    HorizontalOptions="Center"/>
         </Grid>
 
         <Grid Grid.Row="5" ColumnDefinitions="*, 4*, *">
-            <Button Grid.Column="1" Text="Categorie" TextColor="Black" FontSize="Medium" BackgroundColor="Gray"/>
+            <Button Grid.Column="1" Text="Categorie" FontSize="Medium" />
         </Grid>
 
         <Grid Grid.Row="7" RowDefinitions="auto, *, *" ColumnDefinitions="*, auto, *">
-            <Label Grid.Row="0" Grid.Column="1" TextColor="Black" Text="  Paiment par carte &#x0a;4859 **** **** 9985" VerticalOptions="Center"/>
+            <Label Grid.Row="0" Grid.Column="1" Text="  Paiment par carte &#x0a;4859 **** **** 9985" VerticalOptions="Center"/>
             <BoxView Grid.Row="1" Grid.Column="1" HorizontalOptions="FillAndExpand"
-                 HeightRequest="1.3" Color="Black"/>
-            <Label Grid.Row="2" Grid.Column="1" Text="En date du 15/06/2023" TextColor="Black"/>
+                 HeightRequest="1.3"/>
+            <Label Grid.Row="2" Grid.Column="1" Text="En date du 15/06/2023"/>
         </Grid>
 
         <Grid Grid.Row="9" ColumnDefinitions="*, 4*, *">
-            <Button Grid.Column="1" Text="Faire opposition" BackgroundColor="Gray" TextColor="Black"/>
+            <Button Grid.Column="1" Text="Faire opposition"/>
         </Grid>
         
     </Grid>