From 21aea219269c770a56edb45ed23bfc3b7758b7cc Mon Sep 17 00:00:00 2001
From: anperederi <antoine.perederii@etu.uca.fr>
Date: Tue, 23 May 2023 11:34:19 +0200
Subject: [PATCH] :art: :wrench: Add views folders in balancepage, categorypage
 and menutransferpage

---
 src/Banquale/Banquale/AppShell.xaml                         | 6 ++++--
 src/Banquale/Banquale/AppShell.xaml.cs                      | 5 +++--
 src/Banquale/Banquale/Banquale.csproj                       | 4 ++++
 src/Banquale/Banquale/Views/{ => Balance}/BalancePage.xaml  | 4 ++--
 .../Banquale/Views/{ => Balance}/BalancePage.xaml.cs        | 2 +-
 src/Banquale/Banquale/Views/{ => Balance}/BalanceView.xaml  | 2 +-
 .../Banquale/Views/{ => Balance}/BalanceView.xaml.cs        | 2 +-
 .../Banquale/Views/{ => Category}/CategoryPage.xaml         | 6 +++---
 .../Banquale/Views/{ => Category}/CategoryPage.xaml.cs      | 2 +-
 .../Banquale/Views/{ => Category}/CategoryView.xaml         | 4 ++--
 .../Banquale/Views/{ => Category}/CategoryView.xaml.cs      | 2 +-
 src/Banquale/Banquale/Views/NewPage1.xaml.cs                | 2 +-
 .../Banquale/Views/{ => Transfer}/MenuTransferPage.xaml     | 2 +-
 .../Banquale/Views/{ => Transfer}/MenuTransferPage.xaml.cs  | 2 +-
 src/Banquale/Banquale/Views/{ => Transfer}/RequestPage.xaml | 2 +-
 .../Banquale/Views/{ => Transfer}/RequestPage.xaml.cs       | 2 +-
 src/Banquale/Banquale/Views/{ => Transfer}/RibPage.xaml     | 2 +-
 src/Banquale/Banquale/Views/{ => Transfer}/RibPage.xaml.cs  | 2 +-
 .../Banquale/Views/{ => Transfer}/TransferPage.xaml         | 2 +-
 .../Banquale/Views/{ => Transfer}/TransferPage.xaml.cs      | 2 +-
 20 files changed, 32 insertions(+), 25 deletions(-)
 rename src/Banquale/Banquale/Views/{ => Balance}/BalancePage.xaml (97%)
 rename src/Banquale/Banquale/Views/{ => Balance}/BalancePage.xaml.cs (93%)
 rename src/Banquale/Banquale/Views/{ => Balance}/BalanceView.xaml (94%)
 rename src/Banquale/Banquale/Views/{ => Balance}/BalanceView.xaml.cs (73%)
 rename src/Banquale/Banquale/Views/{ => Category}/CategoryPage.xaml (84%)
 rename src/Banquale/Banquale/Views/{ => Category}/CategoryPage.xaml.cs (74%)
 rename src/Banquale/Banquale/Views/{ => Category}/CategoryView.xaml (84%)
 rename src/Banquale/Banquale/Views/{ => Category}/CategoryView.xaml.cs (74%)
 rename src/Banquale/Banquale/Views/{ => Transfer}/MenuTransferPage.xaml (94%)
 rename src/Banquale/Banquale/Views/{ => Transfer}/MenuTransferPage.xaml.cs (93%)
 rename src/Banquale/Banquale/Views/{ => Transfer}/RequestPage.xaml (96%)
 rename src/Banquale/Banquale/Views/{ => Transfer}/RequestPage.xaml.cs (89%)
 rename src/Banquale/Banquale/Views/{ => Transfer}/RibPage.xaml (98%)
 rename src/Banquale/Banquale/Views/{ => Transfer}/RibPage.xaml.cs (71%)
 rename src/Banquale/Banquale/Views/{ => Transfer}/TransferPage.xaml (96%)
 rename src/Banquale/Banquale/Views/{ => Transfer}/TransferPage.xaml.cs (89%)

diff --git a/src/Banquale/Banquale/AppShell.xaml b/src/Banquale/Banquale/AppShell.xaml
index 846730f..6a0dbdc 100644
--- a/src/Banquale/Banquale/AppShell.xaml
+++ b/src/Banquale/Banquale/AppShell.xaml
@@ -4,6 +4,8 @@
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:views="clr-namespace:Banquale.Views"
+    xmlns:balance="clr-namespace:Banquale.Views.Balance"
+    xmlns:transfer="clr-namespace:Banquale.Views.Transfer"
     Shell.FlyoutBehavior="Disabled">
 
 
@@ -14,13 +16,13 @@
 
         <ShellContent
             Title="Solde"
-            ContentTemplate="{DataTemplate views:BalancePage}"
+            ContentTemplate="{DataTemplate balance:BalancePage}"
             Route="balance"
             Icon="home.png"/>
 
         <ShellContent
             Title="Transactions"
-            ContentTemplate="{DataTemplate views:MenuTransferPage}"
+            ContentTemplate="{DataTemplate transfer:MenuTransferPage}"
             Route="menu"
             Icon="transactions.png"/>
 
diff --git a/src/Banquale/Banquale/AppShell.xaml.cs b/src/Banquale/Banquale/AppShell.xaml.cs
index e678a75..c40fd50 100644
--- a/src/Banquale/Banquale/AppShell.xaml.cs
+++ b/src/Banquale/Banquale/AppShell.xaml.cs
@@ -1,5 +1,6 @@
 using Banquale.Views;
-
+using Banquale.Views.Category;
+using Banquale.Views.Transfer;
 namespace Banquale;
 
 public partial class AppShell : Shell
@@ -8,7 +9,7 @@ public partial class AppShell : Shell
 	{
 		InitializeComponent();
         Routing.RegisterRoute("balance/categorydetails", typeof(CategoryPage));
-        Routing.RegisterRoute("newpagedetails", typeof(NewPage1));
+        Routing.RegisterRoute("balance/newpagedetails", typeof(NewPage1));
         Routing.RegisterRoute("menu/requestdetails", typeof(RequestPage));
         Routing.RegisterRoute("menu/ribdetails", typeof(RibPage));
         Routing.RegisterRoute("menu/transferdetails", typeof(TransferPage));
diff --git a/src/Banquale/Banquale/Banquale.csproj b/src/Banquale/Banquale/Banquale.csproj
index 3f03349..1b49c41 100644
--- a/src/Banquale/Banquale/Banquale.csproj
+++ b/src/Banquale/Banquale/Banquale.csproj
@@ -66,6 +66,8 @@
 	  <None Remove="Resources\Images\helpIcon.svg" />
 	  <None Remove="Stub\" />
 	  <None Remove="DataContractPersistance\" />
+	  <None Remove="Views\Balance\" />
+	  <None Remove="Views\Category\" />
 	</ItemGroup>
 	<ItemGroup>
 	  <MauiXaml Remove="Resources\Images\Images.xaml" />
@@ -78,5 +80,7 @@
 	  <Folder Include="Persistances\" />
 	  <Folder Include="Stub\" />
 	  <Folder Include="DataContractPersistance\" />
+	  <Folder Include="Views\Balance\" />
+	  <Folder Include="Views\Category\" />
 	</ItemGroup>
 </Project>
diff --git a/src/Banquale/Banquale/Views/BalancePage.xaml b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml
similarity index 97%
rename from src/Banquale/Banquale/Views/BalancePage.xaml
rename to src/Banquale/Banquale/Views/Balance/BalancePage.xaml
index 0c929c2..e2cc3bc 100644
--- a/src/Banquale/Banquale/Views/BalancePage.xaml
+++ b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml
@@ -1,9 +1,9 @@
 <?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"
+             xmlns:local="clr-namespace:Banquale.Views.Balance"
              xmlns:model="clr-namespace:Banquale.Model"
-             x:Class="Banquale.Views.BalancePage"
+             x:Class="Banquale.Views.Balance.BalancePage"
              Title="BalancePage"
              Shell.NavBarIsVisible="False">
     
diff --git a/src/Banquale/Banquale/Views/BalancePage.xaml.cs b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml.cs
similarity index 93%
rename from src/Banquale/Banquale/Views/BalancePage.xaml.cs
rename to src/Banquale/Banquale/Views/Balance/BalancePage.xaml.cs
index dc3b4e5..23703f2 100644
--- a/src/Banquale/Banquale/Views/BalancePage.xaml.cs
+++ b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml.cs
@@ -1,5 +1,5 @@
 using Banquale.Model;
-namespace Banquale.Views;
+namespace Banquale.Views.Balance;
 
 
 public partial class BalancePage : ContentPage
diff --git a/src/Banquale/Banquale/Views/BalanceView.xaml b/src/Banquale/Banquale/Views/Balance/BalanceView.xaml
similarity index 94%
rename from src/Banquale/Banquale/Views/BalanceView.xaml
rename to src/Banquale/Banquale/Views/Balance/BalanceView.xaml
index 5d35cf9..12fbb8e 100644
--- a/src/Banquale/Banquale/Views/BalanceView.xaml
+++ b/src/Banquale/Banquale/Views/Balance/BalanceView.xaml
@@ -1,7 +1,7 @@
 <?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">
+             x:Class="Banquale.Views.Balance.BalanceView">
     <VerticalStackLayout>
         <BoxView BackgroundColor="Black"
                  HorizontalOptions="FillAndExpand"
diff --git a/src/Banquale/Banquale/Views/BalanceView.xaml.cs b/src/Banquale/Banquale/Views/Balance/BalanceView.xaml.cs
similarity index 73%
rename from src/Banquale/Banquale/Views/BalanceView.xaml.cs
rename to src/Banquale/Banquale/Views/Balance/BalanceView.xaml.cs
index d80fbe4..83825f6 100644
--- a/src/Banquale/Banquale/Views/BalanceView.xaml.cs
+++ b/src/Banquale/Banquale/Views/Balance/BalanceView.xaml.cs
@@ -1,4 +1,4 @@
-namespace Banquale.Views;
+namespace Banquale.Views.Balance;
 
 public partial class BalanceView : ContentView
 {
diff --git a/src/Banquale/Banquale/Views/CategoryPage.xaml b/src/Banquale/Banquale/Views/Category/CategoryPage.xaml
similarity index 84%
rename from src/Banquale/Banquale/Views/CategoryPage.xaml
rename to src/Banquale/Banquale/Views/Category/CategoryPage.xaml
index 2196407..01b9213 100644
--- a/src/Banquale/Banquale/Views/CategoryPage.xaml
+++ b/src/Banquale/Banquale/Views/Category/CategoryPage.xaml
@@ -1,8 +1,8 @@
-<?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"
-             xmlns:local="clr-namespace:Banquale.Views"
+             x:Class="Banquale.Views.Category.CategoryPage"
+             xmlns:local="clr-namespace:Banquale.Views.Category"
              Title="CategoryPage"
              BackgroundColor="White">
     
diff --git a/src/Banquale/Banquale/Views/CategoryPage.xaml.cs b/src/Banquale/Banquale/Views/Category/CategoryPage.xaml.cs
similarity index 74%
rename from src/Banquale/Banquale/Views/CategoryPage.xaml.cs
rename to src/Banquale/Banquale/Views/Category/CategoryPage.xaml.cs
index 268f7b5..6cb87d0 100644
--- a/src/Banquale/Banquale/Views/CategoryPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/Category/CategoryPage.xaml.cs
@@ -1,4 +1,4 @@
-namespace Banquale.Views;
+namespace Banquale.Views.Category;
 
 public partial class CategoryPage : ContentPage
 {
diff --git a/src/Banquale/Banquale/Views/CategoryView.xaml b/src/Banquale/Banquale/Views/Category/CategoryView.xaml
similarity index 84%
rename from src/Banquale/Banquale/Views/CategoryView.xaml
rename to src/Banquale/Banquale/Views/Category/CategoryView.xaml
index 4f70d72..bcdb30c 100644
--- a/src/Banquale/Banquale/Views/CategoryView.xaml
+++ b/src/Banquale/Banquale/Views/Category/CategoryView.xaml
@@ -1,7 +1,7 @@
-<?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">
+             x:Class="Banquale.Views.Category.CategoryView">
     
     <VerticalStackLayout>
         <BoxView HorizontalOptions="FillAndExpand"
diff --git a/src/Banquale/Banquale/Views/CategoryView.xaml.cs b/src/Banquale/Banquale/Views/Category/CategoryView.xaml.cs
similarity index 74%
rename from src/Banquale/Banquale/Views/CategoryView.xaml.cs
rename to src/Banquale/Banquale/Views/Category/CategoryView.xaml.cs
index 35349b7..e7559fc 100644
--- a/src/Banquale/Banquale/Views/CategoryView.xaml.cs
+++ b/src/Banquale/Banquale/Views/Category/CategoryView.xaml.cs
@@ -1,4 +1,4 @@
-namespace Banquale.Views;
+namespace Banquale.Views.Category;
 
 public partial class CategoryView : ContentView
 {
diff --git a/src/Banquale/Banquale/Views/NewPage1.xaml.cs b/src/Banquale/Banquale/Views/NewPage1.xaml.cs
index 26c8ea1..cf18828 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 Navigation.PopAsync();
+        await Shell.Current.GoToAsync("//balance");
     }
 
 }
diff --git a/src/Banquale/Banquale/Views/MenuTransferPage.xaml b/src/Banquale/Banquale/Views/Transfer/MenuTransferPage.xaml
similarity index 94%
rename from src/Banquale/Banquale/Views/MenuTransferPage.xaml
rename to src/Banquale/Banquale/Views/Transfer/MenuTransferPage.xaml
index 6a30353..7cac1d7 100644
--- a/src/Banquale/Banquale/Views/MenuTransferPage.xaml
+++ b/src/Banquale/Banquale/Views/Transfer/MenuTransferPage.xaml
@@ -1,7 +1,7 @@
 <?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.MenuTransferPage"
+             x:Class="Banquale.Views.Transfer.MenuTransferPage"
              Shell.NavBarIsVisible="False">
 
     <Grid RowDefinitions="auto, auto"
diff --git a/src/Banquale/Banquale/Views/MenuTransferPage.xaml.cs b/src/Banquale/Banquale/Views/Transfer/MenuTransferPage.xaml.cs
similarity index 93%
rename from src/Banquale/Banquale/Views/MenuTransferPage.xaml.cs
rename to src/Banquale/Banquale/Views/Transfer/MenuTransferPage.xaml.cs
index 8c3f1f5..0831b73 100644
--- a/src/Banquale/Banquale/Views/MenuTransferPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/Transfer/MenuTransferPage.xaml.cs
@@ -1,4 +1,4 @@
-namespace Banquale.Views;
+namespace Banquale.Views.Transfer;
 
 public partial class MenuTransferPage : ContentPage
 {
diff --git a/src/Banquale/Banquale/Views/RequestPage.xaml b/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml
similarity index 96%
rename from src/Banquale/Banquale/Views/RequestPage.xaml
rename to src/Banquale/Banquale/Views/Transfer/RequestPage.xaml
index 488b9df..e43cf29 100644
--- a/src/Banquale/Banquale/Views/RequestPage.xaml
+++ b/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml
@@ -1,7 +1,7 @@
 <?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.RequestPage">
+             x:Class="Banquale.Views.Transfer.RequestPage">
 
     <VerticalStackLayout VerticalOptions="Center">
 
diff --git a/src/Banquale/Banquale/Views/RequestPage.xaml.cs b/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml.cs
similarity index 89%
rename from src/Banquale/Banquale/Views/RequestPage.xaml.cs
rename to src/Banquale/Banquale/Views/Transfer/RequestPage.xaml.cs
index 42ea9f5..835b90c 100644
--- a/src/Banquale/Banquale/Views/RequestPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml.cs
@@ -1,5 +1,5 @@
 using Banquale.Model;
-namespace Banquale.Views;
+namespace Banquale.Views.Transfer;
 
 public partial class RequestPage : ContentPage
 {
diff --git a/src/Banquale/Banquale/Views/RibPage.xaml b/src/Banquale/Banquale/Views/Transfer/RibPage.xaml
similarity index 98%
rename from src/Banquale/Banquale/Views/RibPage.xaml
rename to src/Banquale/Banquale/Views/Transfer/RibPage.xaml
index a483622..e1c79b2 100644
--- a/src/Banquale/Banquale/Views/RibPage.xaml
+++ b/src/Banquale/Banquale/Views/Transfer/RibPage.xaml
@@ -1,7 +1,7 @@
 <?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.RibPage">
+             x:Class="Banquale.Views.Transfer.RibPage">
 
     <VerticalStackLayout>
 
diff --git a/src/Banquale/Banquale/Views/RibPage.xaml.cs b/src/Banquale/Banquale/Views/Transfer/RibPage.xaml.cs
similarity index 71%
rename from src/Banquale/Banquale/Views/RibPage.xaml.cs
rename to src/Banquale/Banquale/Views/Transfer/RibPage.xaml.cs
index 9ba5967..2700a2d 100644
--- a/src/Banquale/Banquale/Views/RibPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/Transfer/RibPage.xaml.cs
@@ -1,4 +1,4 @@
-namespace Banquale.Views;
+namespace Banquale.Views.Transfer;
 
 public partial class RibPage : ContentPage
 {
diff --git a/src/Banquale/Banquale/Views/TransferPage.xaml b/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml
similarity index 96%
rename from src/Banquale/Banquale/Views/TransferPage.xaml
rename to src/Banquale/Banquale/Views/Transfer/TransferPage.xaml
index dfcc212..fe79fbb 100644
--- a/src/Banquale/Banquale/Views/TransferPage.xaml
+++ b/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml
@@ -1,7 +1,7 @@
 <?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.TransferPage">
+             x:Class="Banquale.Views.Transfer.TransferPage">
 
     <VerticalStackLayout VerticalOptions="Center">
 
diff --git a/src/Banquale/Banquale/Views/TransferPage.xaml.cs b/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml.cs
similarity index 89%
rename from src/Banquale/Banquale/Views/TransferPage.xaml.cs
rename to src/Banquale/Banquale/Views/Transfer/TransferPage.xaml.cs
index 1b81d3b..b2b4f88 100644
--- a/src/Banquale/Banquale/Views/TransferPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml.cs
@@ -1,5 +1,5 @@
 using Banquale.Model;
-namespace Banquale.Views;
+namespace Banquale.Views.Transfer;
 
 public partial class TransferPage : ContentPage
 {