From afe5df0f8cf90f3015f74da3cfbd71cc5a8502fa Mon Sep 17 00:00:00 2001
From: anperederi <antoine.perederii@etu.uca.fr>
Date: Wed, 19 Apr 2023 10:53:53 +0200
Subject: [PATCH] ajout de modifs sur la page de solde

---
 src/Banquale/Banquale/App.xaml                |   7 +
 src/Banquale/Banquale/AppShell.xaml           |  19 ++-
 src/Banquale/Banquale/Banquale.csproj         |   6 +
 .../Banquale/Resources/Styles/Colors.xaml     |  10 +-
 src/Banquale/Banquale/Views/BalancePage.xaml  | 135 +++++++++++++++++-
 src/Banquale/Banquale/Views/BalanceView.xaml  |  35 +++++
 .../Banquale/Views/BalanceView.xaml.cs        |   9 ++
 7 files changed, 208 insertions(+), 13 deletions(-)
 create mode 100644 src/Banquale/Banquale/Views/BalanceView.xaml
 create mode 100644 src/Banquale/Banquale/Views/BalanceView.xaml.cs

diff --git a/src/Banquale/Banquale/App.xaml b/src/Banquale/Banquale/App.xaml
index 9b1f1c8..71a2823 100644
--- a/src/Banquale/Banquale/App.xaml
+++ b/src/Banquale/Banquale/App.xaml
@@ -4,12 +4,19 @@
              xmlns:local="clr-namespace:Banquale"
              x:Class="Banquale.App">
     <Application.Resources>
+
         <ResourceDictionary>
+
             <ResourceDictionary.MergedDictionaries>
+
                 <ResourceDictionary Source="Resources/Styles/Colors.xaml" />
                 <ResourceDictionary Source="Resources/Styles/Styles.xaml" />
+                
             </ResourceDictionary.MergedDictionaries>
+
         </ResourceDictionary>
+
     </Application.Resources>
+
 </Application>
 
diff --git a/src/Banquale/Banquale/AppShell.xaml b/src/Banquale/Banquale/AppShell.xaml
index 395b7b0..0c0b25b 100644
--- a/src/Banquale/Banquale/AppShell.xaml
+++ b/src/Banquale/Banquale/AppShell.xaml
@@ -3,13 +3,22 @@
     x:Class="Banquale.AppShell"
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:local="clr-namespace:Banquale:Views"
+    xmlns:local="clr-namespace:Banquale.Views"
     Shell.FlyoutBehavior="Disabled">
 
-    <ShellContent
-        Title="Solde"
-        ContentTemplate="{DataTemplate local:BalancePage}"
-        Route="MainPage" />
+    <TabBar>
+
+        <ShellContent
+            Title="Solde"
+            ContentTemplate="{DataTemplate local:BalancePage}"
+            Route="Views" />
+
+        <ShellContent
+            Title="Solde"
+            ContentTemplate="{DataTemplate local:BalancePage}"
+            Route="Views" />
+
+    </TabBar>
 
 </Shell>
 
diff --git a/src/Banquale/Banquale/Banquale.csproj b/src/Banquale/Banquale/Banquale.csproj
index 0bfb0cf..0a91136 100644
--- a/src/Banquale/Banquale/Banquale.csproj
+++ b/src/Banquale/Banquale/Banquale.csproj
@@ -33,6 +33,9 @@
 	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0-ios|AnyCPU'">
 	  <CreatePackage>false</CreatePackage>
 	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0-ios|AnyCPU'">
+	  <CreatePackage>false</CreatePackage>
+	</PropertyGroup>
 	<ItemGroup>
 		<!-- App Icon -->
 		<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
@@ -57,4 +60,7 @@
 	<ItemGroup>
 	  <Folder Include="Views\" />
 	</ItemGroup>
+	<ItemGroup>
+	  <MauiXaml Remove="Resources\Images\Images.xaml" />
+	</ItemGroup>
 </Project>
diff --git a/src/Banquale/Banquale/Resources/Styles/Colors.xaml b/src/Banquale/Banquale/Resources/Styles/Colors.xaml
index e4a7a43..8773b91 100644
--- a/src/Banquale/Banquale/Resources/Styles/Colors.xaml
+++ b/src/Banquale/Banquale/Resources/Styles/Colors.xaml
@@ -4,11 +4,19 @@
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
 
-    <Color x:Key="Primary">#512BD4</Color>
+    <Color x:Key="Primary">#074bab</Color>
+    <Color x:Key="PrimaryDark">#074bab</Color>
+
+    <Color x:Key="LightBackground">#FFF</Color>
+    <Color x:Key="Darkground">#000</Color>
+
     <Color x:Key="Secondary">#DFD8F7</Color>
     <Color x:Key="Tertiary">#2B0B98</Color>
+
     <Color x:Key="White">White</Color>
     <Color x:Key="Black">Black</Color>
+
+
     <Color x:Key="Gray100">#E1E1E1</Color>
     <Color x:Key="Gray200">#C8C8C8</Color>
     <Color x:Key="Gray300">#ACACAC</Color>
diff --git a/src/Banquale/Banquale/Views/BalancePage.xaml b/src/Banquale/Banquale/Views/BalancePage.xaml
index ade9fd7..0607922 100644
--- a/src/Banquale/Banquale/Views/BalancePage.xaml
+++ b/src/Banquale/Banquale/Views/BalancePage.xaml
@@ -1,12 +1,133 @@
 <?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"
+             xmlns:local="clr-namespace:Banquale.Views"
              x:Class="Banquale.Views.BalancePage"
-             Title="BalancePage">
-    <VerticalStackLayout>
-        <Label 
-            Text="Welcome to .NET MAUI!"
-            VerticalOptions="Center" 
-            HorizontalOptions="Center" />
-    </VerticalStackLayout>
+             Title="BalancePage"
+             >
+    <Grid RowDefinitions="auto, *">
+        <Grid BackgroundColor="Beige"
+              HorizontalOptions="Center"
+              HeightRequest="100"
+              MaximumHeightRequest="150"
+              WidthRequest="230"
+              RowDefinitions="auto, 35, *"
+              ColumnDefinitions="250, auto"
+              Grid.Row="0"
+              Margin="30"
+              >
+
+            <Label
+                Text="Compte Professionnel"
+                HorizontalOptions="Center"
+                BackgroundColor="AliceBlue"
+                Margin="0, 15, 0, 0"/>
+            <Label
+                Text="Mme Perotte"
+                Grid.Row="1"
+                Grid.ColumnSpan="2"
+                HorizontalOptions="Center"
+                BackgroundColor="SaddleBrown"/> <!-- colspan permet de redefinir la taille de la colonne -->
+            
+            <Grid ColumnDefinitions="*, *" Grid.Row="2" >
+                <Label
+                    Text="Solde"
+                    WidthRequest="75"
+                    HorizontalOptions="Center"/>
+                <Label
+                    Text="1999,00 €"
+                    Grid.Column="1"
+                    MinimumWidthRequest="70"
+                    HorizontalOptions="Center"/>
+
+            </Grid>
+                
+
+        </Grid>
+        <ScrollView
+            Grid.Row="1">
+        <FlexLayout JustifyContent="Center"
+                    AlignItems="Start"
+                    AlignContent="Start"
+                    Direction="Row"
+                    Wrap="Wrap">
+            <local:BalanceView />
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView />
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView />
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView />
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView />
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+            <local:BalanceView/>
+        </FlexLayout>
+        </ScrollView>
+
+    </Grid>
 </ContentPage>
diff --git a/src/Banquale/Banquale/Views/BalanceView.xaml b/src/Banquale/Banquale/Views/BalanceView.xaml
new file mode 100644
index 0000000..adc70c5
--- /dev/null
+++ b/src/Banquale/Banquale/Views/BalanceView.xaml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Banquale.Views.BalanceView">
+    <VerticalStackLayout>
+        <BoxView BackgroundColor="Black"
+                 HorizontalOptions="FillAndExpand"
+                 HeightRequest="1.3"
+                 Margin="20, 0, 20, 0"/>
+        <Grid
+            ColumnDefinitions="40, 3*, *"
+            Margin="20, 5, 20, 5"
+            HorizontalOptions="Fill">
+            
+            <Image Source="dotnet_bot.png"
+                   Grid.Column="0"
+                   MaximumHeightRequest="30"/>
+            <Label
+                Text="Depense"
+                Grid.Column="1"
+                VerticalOptions="Center"
+                Margin="10, 0, 0, 0"/>
+            <Label
+                Text="Prix"
+                Grid.Column="2"
+                VerticalOptions="Center"
+                HorizontalOptions="End"
+                Margin="0, 0, 20, 0"/>
+        </Grid>
+
+
+
+    </VerticalStackLayout>
+</ContentView>
+
diff --git a/src/Banquale/Banquale/Views/BalanceView.xaml.cs b/src/Banquale/Banquale/Views/BalanceView.xaml.cs
new file mode 100644
index 0000000..d80fbe4
--- /dev/null
+++ b/src/Banquale/Banquale/Views/BalanceView.xaml.cs
@@ -0,0 +1,9 @@
+namespace Banquale.Views;
+
+public partial class BalanceView : ContentView
+{
+	public BalanceView()
+	{
+		InitializeComponent();
+	}
+}