From 4da519f0e3e4cd291f7a6c551c7825e8a38f2961 Mon Sep 17 00:00:00 2001
From: anperederi <antoine.perederii@etu.uca.fr>
Date: Wed, 17 May 2023 15:09:15 +0200
Subject: [PATCH] Rebuild Category view

---
 src/Banquale/Banquale/AppShell.xaml.cs        |  6 +--
 src/Banquale/Banquale/Views/BalanceView.xaml  |  6 +++
 .../Banquale/Views/BalanceView.xaml.cs        |  5 +++
 src/Banquale/Banquale/Views/CategoryPage.xaml | 37 +++++++------------
 src/Banquale/Banquale/Views/CategoryView.xaml | 11 +++---
 5 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/src/Banquale/Banquale/AppShell.xaml.cs b/src/Banquale/Banquale/AppShell.xaml.cs
index 2a5a288..e678a75 100644
--- a/src/Banquale/Banquale/AppShell.xaml.cs
+++ b/src/Banquale/Banquale/AppShell.xaml.cs
@@ -9,9 +9,9 @@ public partial class AppShell : Shell
 		InitializeComponent();
         Routing.RegisterRoute("balance/categorydetails", typeof(CategoryPage));
         Routing.RegisterRoute("newpagedetails", typeof(NewPage1));
-        //Routing.RegisterRoute("menu/requestdetails", typeof(RequestPage));
-        //Routing.RegisterRoute("menu/ribdetails", typeof(RibPage));
-        //Routing.RegisterRoute("menu/transferdetails", typeof(TransferPage));
+        Routing.RegisterRoute("menu/requestdetails", typeof(RequestPage));
+        Routing.RegisterRoute("menu/ribdetails", typeof(RibPage));
+        Routing.RegisterRoute("menu/transferdetails", typeof(TransferPage));
     }
 
 }
diff --git a/src/Banquale/Banquale/Views/BalanceView.xaml b/src/Banquale/Banquale/Views/BalanceView.xaml
index 5d35cf9..0f040c5 100644
--- a/src/Banquale/Banquale/Views/BalanceView.xaml
+++ b/src/Banquale/Banquale/Views/BalanceView.xaml
@@ -11,6 +11,12 @@
             ColumnDefinitions="40, 3*, *"
             Margin="20, 5, 20, 5"
             HorizontalOptions="Fill">
+
+            <Grid.GestureRecognizers>
+                <TapGestureRecognizer
+                                  Tapped="OnButtonClicked"
+                                  NumberOfTapsRequired="1" />
+            </Grid.GestureRecognizers>
             
                 <Image Source="dotnet_bot.png"
                        Grid.Column="0"
diff --git a/src/Banquale/Banquale/Views/BalanceView.xaml.cs b/src/Banquale/Banquale/Views/BalanceView.xaml.cs
index d80fbe4..b05bcc6 100644
--- a/src/Banquale/Banquale/Views/BalanceView.xaml.cs
+++ b/src/Banquale/Banquale/Views/BalanceView.xaml.cs
@@ -6,4 +6,9 @@ public partial class BalanceView : ContentView
 	{
 		InitializeComponent();
 	}
+
+	public async void OnButtonClicked(object sender, EventArgs e)
+    {
+        await Shell.Current.Navigation.PushAsync(new CategoryPage());
+    }
 }
diff --git a/src/Banquale/Banquale/Views/CategoryPage.xaml b/src/Banquale/Banquale/Views/CategoryPage.xaml
index 2196407..a852228 100644
--- a/src/Banquale/Banquale/Views/CategoryPage.xaml
+++ b/src/Banquale/Banquale/Views/CategoryPage.xaml
@@ -1,4 +1,4 @@
-<?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.CategoryPage"
@@ -6,27 +6,18 @@
              Title="CategoryPage"
              BackgroundColor="White">
     
-    
-    <Grid RowDefinitions="*,*,*,*,*,*,*,*,*,*,*,*,2*">
-        
-        
-        <ImageButton Source="back_arrow_icon.svg" Grid.Row="0" HorizontalOptions="Start"/>
-
-        <local:CategoryView Grid.Row="2"/>
-        <local:CategoryView Grid.Row="3"/>
-        <local:CategoryView Grid.Row="4"/>
-        <local:CategoryView Grid.Row="5"/>
-        <local:CategoryView Grid.Row="6"/>
-        <local:CategoryView Grid.Row="7"/>
-        <local:CategoryView Grid.Row="8"/>
-        <local:CategoryView Grid.Row="9"/>
-        <local:CategoryView Grid.Row="10"/>
-        <local:CategoryView Grid.Row="11"/>
-
-        <VerticalStackLayout Grid.Row="12">
-            <BoxView HorizontalOptions="FillAndExpand"
-                 HeightRequest="1.3"/>
+        <VerticalStackLayout
+            VerticalOptions="Center" >
+            <local:CategoryView />
+            <local:CategoryView />
+            <local:CategoryView />
+            <local:CategoryView />
+            <local:CategoryView />
+            <local:CategoryView />
+            <local:CategoryView />
+            <local:CategoryView />
+            <local:CategoryView />
+            <local:CategoryView />
         </VerticalStackLayout>
-        
-    </Grid>
+
 </ContentPage>
\ No newline at end of file
diff --git a/src/Banquale/Banquale/Views/CategoryView.xaml b/src/Banquale/Banquale/Views/CategoryView.xaml
index 4f70d72..b9d2060 100644
--- a/src/Banquale/Banquale/Views/CategoryView.xaml
+++ b/src/Banquale/Banquale/Views/CategoryView.xaml
@@ -1,18 +1,19 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?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.CategoryView">
     
     <VerticalStackLayout>
-        <BoxView HorizontalOptions="FillAndExpand"
-                 HeightRequest="1.3"/>
+
+        <BoxView BackgroundColor="Black"
+                 HorizontalOptions="FillAndExpand"
+                 HeightRequest="1.3"
+                 Margin="20, 0, 20, 0"/>
 
         <Grid Margin="20, 5, 20, 5"
             HorizontalOptions="Fill">
-
             <Label
                 Text="Catégorie"
-                TextColor="Black"
                 HorizontalOptions="Center"
                 VerticalOptions="Center"/>
         </Grid>