From deaa28402776114a2ad904301cdd332a5b5dfab2 Mon Sep 17 00:00:00 2001
From: anperederi <antoine.perederii@etu.uca.fr>
Date: Wed, 24 May 2023 15:27:42 +0200
Subject: [PATCH] redesign navigation on the app

---
 .../Banquale/Resources/Styles/Styles.xaml     |  2 +-
 .../Banquale/Views/Balance/BalancePage.xaml   | 13 +++--
 .../Views/Balance/BalancePage.xaml.cs         |  8 +--
 .../Views/Balance/BalanceView.xaml.cs         |  2 +-
 src/Banquale/Banquale/Views/NewPage1.xaml.cs  |  2 +-
 .../Banquale/Views/TransactionsPage.xaml      | 58 ++++++++++++++++++-
 .../Banquale/Views/TransactionsPage.xaml.cs   | 12 ++++
 .../Banquale/Views/Transfer/RibPage.xaml      |  4 +-
 8 files changed, 85 insertions(+), 16 deletions(-)

diff --git a/src/Banquale/Banquale/Resources/Styles/Styles.xaml b/src/Banquale/Banquale/Resources/Styles/Styles.xaml
index 2971d61..c361149 100644
--- a/src/Banquale/Banquale/Resources/Styles/Styles.xaml
+++ b/src/Banquale/Banquale/Resources/Styles/Styles.xaml
@@ -359,7 +359,7 @@
     <Style TargetType="Shell" ApplyToDerivedTypes="True">
         <Setter Property="Shell.BackgroundColor" Value="{StaticResource Primary}" />
         <Setter Property="Shell.ForegroundColor" Value="{StaticResource Gray900}" />
-        <Setter Property="Shell.TitleColor" Value="{StaticResource White}" />
+        <Setter Property="Shell.TitleColor" Value="{StaticResource Gray900}" />
         <Setter Property="Shell.DisabledColor" Value="{StaticResource Gray200}" />
         <Setter Property="Shell.UnselectedColor" Value="{StaticResource Gray200}" />
         <Setter Property="Shell.NavBarHasShadow" Value="False" />
diff --git a/src/Banquale/Banquale/Views/Balance/BalancePage.xaml b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml
index da494c2..dcef43b 100644
--- a/src/Banquale/Banquale/Views/Balance/BalancePage.xaml
+++ b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml
@@ -18,6 +18,12 @@
               Grid.Row="0"
               Margin="30">
 
+            <Grid.GestureRecognizers>
+                <TapGestureRecognizer
+                                  Tapped="Balance_Clicked"
+                                  NumberOfTapsRequired="1" />
+            </Grid.GestureRecognizers>
+
             <Label
                 Text="Compte Professionnel"
                 HorizontalOptions="Center"
@@ -52,8 +58,7 @@
                 <Label Text="€"
                        Grid.Column="2"/>
 
-            </Grid>
-                
+            </Grid>    
 
         </Grid>
         
@@ -65,10 +70,6 @@
                     Direction="Row"
                     Wrap="Wrap">
 
-            <Button Text="NewPage1"
-                    Clicked="OnButtonClicked"
-                    MinimumWidthRequest="250"/>
-
             <local:BalanceView/>
             <local:BalanceView/>
             <local:BalanceView/>
diff --git a/src/Banquale/Banquale/Views/Balance/BalancePage.xaml.cs b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml.cs
index 6fddb0e..cf24b02 100644
--- a/src/Banquale/Banquale/Views/Balance/BalancePage.xaml.cs
+++ b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml.cs
@@ -14,9 +14,9 @@ public partial class BalancePage : ContentPage
         //BindingContext = new Account(999, "Tatouille", "FR76 9161 9581 6296 8415 2361 004");
     }
 
-    public async void OnButtonClicked(object sender, EventArgs e)
-	{
-		await Shell.Current.Navigation.PushAsync(new NewPage1());
-	}
+    public async void Balance_Clicked(object sender, EventArgs e)
+    {
+        await Shell.Current.Navigation.PushAsync(new NewPage1());
+    }
 
 }
diff --git a/src/Banquale/Banquale/Views/Balance/BalanceView.xaml.cs b/src/Banquale/Banquale/Views/Balance/BalanceView.xaml.cs
index 918a005..d030f1b 100644
--- a/src/Banquale/Banquale/Views/Balance/BalanceView.xaml.cs
+++ b/src/Banquale/Banquale/Views/Balance/BalanceView.xaml.cs
@@ -10,6 +10,6 @@ public partial class BalanceView : ContentView
 
 	public async void OnButtonClicked(object sender, EventArgs e)
     {
-        await Shell.Current.Navigation.PushAsync(new CategoryPage());
+        await Shell.Current.Navigation.PushAsync(new TransactionsPage());
     }
 }
diff --git a/src/Banquale/Banquale/Views/NewPage1.xaml.cs b/src/Banquale/Banquale/Views/NewPage1.xaml.cs
index cf18828..54bf099 100644
--- a/src/Banquale/Banquale/Views/NewPage1.xaml.cs
+++ b/src/Banquale/Banquale/Views/NewPage1.xaml.cs
@@ -26,7 +26,7 @@ public partial class NewPage1 : ContentPage
 
     public async void ArrowBack(object sender, EventArgs e)
     {
-        await Shell.Current.GoToAsync("//balance");
+        await Shell.Current.Navigation.PopAsync();
     }
 
 }
diff --git a/src/Banquale/Banquale/Views/TransactionsPage.xaml b/src/Banquale/Banquale/Views/TransactionsPage.xaml
index f3ac00a..4a60037 100644
--- a/src/Banquale/Banquale/Views/TransactionsPage.xaml
+++ b/src/Banquale/Banquale/Views/TransactionsPage.xaml
@@ -4,7 +4,7 @@
              x:Class="Banquale.Views.TransactionsPage"
              Title="TransactionsPage">
     
-    <Grid RowDefinitions="2*, *, 0*, *, 0*, *, *, *, *, *, *">
+    <!--<Grid RowDefinitions="2*, *, 0*, *, 0*, *, *, *, *, *, *">
         
         <Grid Grid.Row="1"  ColumnDefinitions="2*, *, 2*">
             <Label Grid.Column="1"
@@ -34,5 +34,59 @@
             <Button Grid.Column="1" Text="Faire opposition"/>
         </Grid>
         
-    </Grid>
+    </Grid>-->
+
+    <VerticalStackLayout VerticalOptions="Center">
+        <Label
+            Grid.Column="1"
+            Text="Prix"
+            HorizontalOptions="Center"
+            FontSize="Large"
+            Margin="0, 0, 0, 50"/>
+
+        <Label
+            Grid.Column="1"
+            Text="poiuytreza"
+            HorizontalOptions="Center"
+            Margin="0, 50, 0, 50"/>
+
+        <Button
+            Grid.Column="1"
+            Text="Categorie"
+            FontSize="Medium"
+            Margin="0, 50, 0, 50"
+            Clicked="Categ_Clicked"/>
+
+        <Grid RowDefinitions="auto, *, auto"
+              ColumnDefinitions="*, auto, *"
+              Margin="0, 50, 0, 50">
+
+            <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"
+                Margin="0, 5, 0, 5"/>
+
+            <Label
+                Grid.Row="2"
+                Grid.Column="1"
+                Text="En date du 15/06/2023"/>
+
+        </Grid>
+
+        <Button
+            Grid.Column="1"
+            Text="Faire opposition"
+            Margin="0, 50, 0, 0"
+            Clicked="Objection_Clicked"/>
+
+    </VerticalStackLayout>
+
 </ContentPage>
\ No newline at end of file
diff --git a/src/Banquale/Banquale/Views/TransactionsPage.xaml.cs b/src/Banquale/Banquale/Views/TransactionsPage.xaml.cs
index e1cbfda..22afa09 100644
--- a/src/Banquale/Banquale/Views/TransactionsPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/TransactionsPage.xaml.cs
@@ -1,3 +1,4 @@
+using Banquale.Views.Category;
 namespace Banquale.Views;
 
 public partial class TransactionsPage : ContentPage
@@ -6,4 +7,15 @@ public partial class TransactionsPage : ContentPage
 	{
 		InitializeComponent();
 	}
+
+    async void Categ_Clicked(System.Object sender, System.EventArgs e)
+    {
+        await Shell.Current.Navigation.PushAsync(new CategoryPage());
+    }
+
+    async void Objection_Clicked(System.Object sender, System.EventArgs e)
+    {
+        await Shell.Current.Navigation.PopAsync();
+    }
+
 }
\ No newline at end of file
diff --git a/src/Banquale/Banquale/Views/Transfer/RibPage.xaml b/src/Banquale/Banquale/Views/Transfer/RibPage.xaml
index e1c79b2..102d7fd 100644
--- a/src/Banquale/Banquale/Views/Transfer/RibPage.xaml
+++ b/src/Banquale/Banquale/Views/Transfer/RibPage.xaml
@@ -116,10 +116,12 @@
 
         <Label Text="M BOURAUD DESCHAMPS" />
 
-        <Button Text="Télécharger le RIB"
+        <!--<Button Text="Télécharger le RIB"
                 HeightRequest="150"
                 WidthRequest="300" />
 
+        It's not functionnal today  -->
+
     </VerticalStackLayout>
 
 </ContentPage>