From f981b8930852e87cf3d45690ca215c5127f68933 Mon Sep 17 00:00:00 2001
From: letuaillon <leo.TUAILLON@etu.uca.fr>
Date: Wed, 3 May 2023 18:19:41 +0200
Subject: [PATCH] navigation ajustments

---
 App.xaml.cs                 |  2 +-
 AppShell.xaml               |  2 +-
 AppShell.xaml.cs            |  6 +-----
 Pages/FavoritesPage.xaml    |  7 -------
 Pages/FavoritesPage.xaml.cs |  5 +----
 Pages/HomePage.xaml.cs      |  2 +-
 Pages/MorePage.xaml.cs      |  4 ++--
 Pages/MyRecipesPage.xaml    |  3 ++-
 Pages/MyRecipesPage.xaml.cs |  7 ++++++-
 Pages/ProfilePage.xaml      |  3 ++-
 Pages/ProfilePage.xaml.cs   |  4 ++++
 Pages/RecipePage.xaml       |  2 +-
 Pages/RecipePage.xaml.cs    |  4 ++--
 Pages/SearchPage.xaml       |  2 +-
 Pages/SearchPage.xaml.cs    |  4 ++--
 ShoopNCook.sln              |  6 ------
 Tests/Tests.csproj          | 25 -------------------------
 Tests/UnitTest1.cs          | 11 -----------
 Tests/Usings.cs             |  1 -
 Views/RecipeView.xaml.cs    |  4 +++-
 20 files changed, 30 insertions(+), 74 deletions(-)
 delete mode 100644 Tests/Tests.csproj
 delete mode 100644 Tests/UnitTest1.cs
 delete mode 100644 Tests/Usings.cs

diff --git a/App.xaml.cs b/App.xaml.cs
index 0919730..5fb511b 100644
--- a/App.xaml.cs
+++ b/App.xaml.cs
@@ -11,7 +11,7 @@ public partial class App : Application
 
         Account account = getUserAccount();
 
-        MainPage = new NavigationPage(new HomePage());
+        MainPage = new AppShell();
     }
 
     private Account getUserAccount()
diff --git a/AppShell.xaml b/AppShell.xaml
index 3f7ca5f..6e0a9ee 100644
--- a/AppShell.xaml
+++ b/AppShell.xaml
@@ -17,7 +17,6 @@
             Title="More"
             ContentTemplate="{DataTemplate pages:Splash}"
             Route="Splash"
-            Icon="more.svg"
             IsVisible="False"/>
         
         <ShellContent
@@ -48,6 +47,7 @@
             Route="More"
             Icon="more.svg"/>
     </TabBar>
+    
     <FlyoutItem Title="Search">
         <ShellContent
             Title="Search Page"
diff --git a/AppShell.xaml.cs b/AppShell.xaml.cs
index 5a36e73..373ef48 100644
--- a/AppShell.xaml.cs
+++ b/AppShell.xaml.cs
@@ -8,10 +8,6 @@ public partial class AppShell : Shell
 	public AppShell()
 	{
 		InitializeComponent();
-        ShowSplashPage();
-    }
-    private async void ShowSplashPage()
-    {
-        await Navigation.PushModalAsync(new Splash());
+        
     }
 }
diff --git a/Pages/FavoritesPage.xaml b/Pages/FavoritesPage.xaml
index a980ddf..4bc78ac 100644
--- a/Pages/FavoritesPage.xaml
+++ b/Pages/FavoritesPage.xaml
@@ -15,13 +15,6 @@
             ColumnDefinitions="*"
             MaximumHeightRequest="60">
 
-            <ImageButton 
-                Grid.Column="0" 
-                HeightRequest="50"
-                WidthRequest="50"
-                Source="arrow_back.svg"
-                HorizontalOptions="Start"
-                Clicked="OnSyncButtonClicked"/>
 
             <Label 
                 Grid.Column="0"
diff --git a/Pages/FavoritesPage.xaml.cs b/Pages/FavoritesPage.xaml.cs
index f9ece58..636662e 100644
--- a/Pages/FavoritesPage.xaml.cs
+++ b/Pages/FavoritesPage.xaml.cs
@@ -6,8 +6,5 @@ public partial class FavoritesPage : ContentPage
     {
         InitializeComponent();
     }
-    private async void OnSyncButtonClicked(object sender, EventArgs e)
-    {
-        await Shell.Current.GoToAsync("//HomePage");
-    }
+    
 }
\ No newline at end of file
diff --git a/Pages/HomePage.xaml.cs b/Pages/HomePage.xaml.cs
index f4bfc1a..e245dde 100644
--- a/Pages/HomePage.xaml.cs
+++ b/Pages/HomePage.xaml.cs
@@ -8,6 +8,6 @@ public partial class HomePage : ContentPage
 	}
     private async void OnSyncButtonClicked(object sender, EventArgs e)
     {
-        await Shell.Current.GoToAsync("//Search");
+        await Shell.Current.Navigation.PushAsync(new SearchPage());
     }
 }
\ No newline at end of file
diff --git a/Pages/MorePage.xaml.cs b/Pages/MorePage.xaml.cs
index cf5bf22..5162808 100644
--- a/Pages/MorePage.xaml.cs
+++ b/Pages/MorePage.xaml.cs
@@ -14,12 +14,12 @@ public partial class MorePage : ContentPage
     }
     private async void OnMyRecipesButtonTapped(object sender, EventArgs e)
     {
-        await Shell.Current.GoToAsync("//MyRecipe");
+        await Shell.Current.Navigation.PushAsync(new MyRecipesPage());
     }
     
     private async void OnEditProfileButtonTapped(object sender, EventArgs e)
     {
-        await Shell.Current.GoToAsync("//EditProfile");
+        await Shell.Current.Navigation.PushAsync(new ProfilePage());
     }
     
     private async void OnLogoutButtonTapped(object sender, EventArgs e)
diff --git a/Pages/MyRecipesPage.xaml b/Pages/MyRecipesPage.xaml
index 33ae85a..907c9ff 100644
--- a/Pages/MyRecipesPage.xaml
+++ b/Pages/MyRecipesPage.xaml
@@ -17,7 +17,8 @@
                 HeightRequest="50"
                 WidthRequest="50"
                 Source="arrow_back.svg"
-                HorizontalOptions="Start"/>
+                HorizontalOptions="Start"
+                Clicked="OnBackButtonClicked"/>
             
             <Label 
                 Grid.Column="0"
diff --git a/Pages/MyRecipesPage.xaml.cs b/Pages/MyRecipesPage.xaml.cs
index 9e0f53a..cc7982c 100644
--- a/Pages/MyRecipesPage.xaml.cs
+++ b/Pages/MyRecipesPage.xaml.cs
@@ -4,6 +4,11 @@ public partial class MyRecipesPage : ContentPage
 {
 	public MyRecipesPage()
 	{
-		InitializeComponent();
+        InitializeComponent();
+
 	}
+    private async void OnBackButtonClicked(object sender, EventArgs e)
+    {
+        await Navigation.PopAsync();
+    }
 }
\ No newline at end of file
diff --git a/Pages/ProfilePage.xaml b/Pages/ProfilePage.xaml
index fa1e736..db55716 100644
--- a/Pages/ProfilePage.xaml
+++ b/Pages/ProfilePage.xaml
@@ -22,7 +22,8 @@
                     HeightRequest="50"
                     WidthRequest="50"
                     Source="arrow_back.svg"
-                    HorizontalOptions="Start"/>
+                    HorizontalOptions="Start"
+                    Clicked="OnBackButtonClicked"/>
 
                 <Label 
                     Grid.Column="0"
diff --git a/Pages/ProfilePage.xaml.cs b/Pages/ProfilePage.xaml.cs
index 52470f6..86b31c0 100644
--- a/Pages/ProfilePage.xaml.cs
+++ b/Pages/ProfilePage.xaml.cs
@@ -6,4 +6,8 @@ public partial class ProfilePage : ContentPage
 	{
 		InitializeComponent();
 	}
+    private async void OnBackButtonClicked(object sender, EventArgs e)
+    {
+        await Navigation.PopAsync();
+    }
 }
\ No newline at end of file
diff --git a/Pages/RecipePage.xaml b/Pages/RecipePage.xaml
index 2c5df71..c3ad0d6 100644
--- a/Pages/RecipePage.xaml
+++ b/Pages/RecipePage.xaml
@@ -24,7 +24,7 @@
                     AlignItems="Center">
                     <ImageButton 
                         Source="arrow_back.svg"
-                        Clicked="OnSyncButtonClicked"/>
+                        Clicked="OnBackButtonClicked"/>
                     <Label 
                         Style="{StaticResource h1}"
                         x:Name="RecipeName"
diff --git a/Pages/RecipePage.xaml.cs b/Pages/RecipePage.xaml.cs
index 8668dea..2edc5c0 100644
--- a/Pages/RecipePage.xaml.cs
+++ b/Pages/RecipePage.xaml.cs
@@ -95,9 +95,9 @@ public partial class RecipePage : ContentPage
             Favorite.Source = ImageSource.FromFile("hearth_off.svg");
         }
     }
-    private async void OnSyncButtonClicked(object sender, EventArgs e)
+    private async void OnBackButtonClicked(object sender, EventArgs e)
     {
-        await Shell.Current.GoToAsync("//Search");
+        await Navigation.PopAsync();
     }
 
 }
\ No newline at end of file
diff --git a/Pages/SearchPage.xaml b/Pages/SearchPage.xaml
index e02ae95..9cc5e11 100644
--- a/Pages/SearchPage.xaml
+++ b/Pages/SearchPage.xaml
@@ -23,7 +23,7 @@
                 WidthRequest="50"
                 Source="arrow_back.svg"
                 HorizontalOptions="Start"
-                Clicked="OnSyncButtonClicked"/>
+                Clicked="OnBackButtonClicked"/>
 
             <Label 
                 Grid.Column="0"
diff --git a/Pages/SearchPage.xaml.cs b/Pages/SearchPage.xaml.cs
index 1fa43e0..aa6ae33 100644
--- a/Pages/SearchPage.xaml.cs
+++ b/Pages/SearchPage.xaml.cs
@@ -6,8 +6,8 @@ public partial class SearchPage : ContentPage
 	{
 		InitializeComponent();
 	}
-    private async void OnSyncButtonClicked(object sender, EventArgs e)
+    private async void OnBackButtonClicked(object sender, EventArgs e)
     {
-        await Shell.Current.GoToAsync("//HomePage");
+        await Navigation.PopAsync();
     }
 }
\ No newline at end of file
diff --git a/ShoopNCook.sln b/ShoopNCook.sln
index 23ce2b1..75a7ef6 100644
--- a/ShoopNCook.sln
+++ b/ShoopNCook.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 17.0.31611.283
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShoopNCook", "ShoopNCook.csproj", "{8ED2FB1D-C04D-478D-9271-CC91FE110396}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{D93F5FCA-0362-49F5-8EB5-CB3D5371DC50}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -19,10 +17,6 @@ Global
 		{8ED2FB1D-C04D-478D-9271-CC91FE110396}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8ED2FB1D-C04D-478D-9271-CC91FE110396}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8ED2FB1D-C04D-478D-9271-CC91FE110396}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{D93F5FCA-0362-49F5-8EB5-CB3D5371DC50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D93F5FCA-0362-49F5-8EB5-CB3D5371DC50}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D93F5FCA-0362-49F5-8EB5-CB3D5371DC50}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D93F5FCA-0362-49F5-8EB5-CB3D5371DC50}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
deleted file mode 100644
index ebb0e4c..0000000
--- a/Tests/Tests.csproj
+++ /dev/null
@@ -1,25 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
-
-</Project>
diff --git a/Tests/UnitTest1.cs b/Tests/UnitTest1.cs
deleted file mode 100644
index 393dc42..0000000
--- a/Tests/UnitTest1.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Tests
-{
-    public class UnitTest1
-    {
-        [Fact]
-        public void Test1()
-        {
-            Assert.Equal(1, 2);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Tests/Usings.cs b/Tests/Usings.cs
deleted file mode 100644
index 8c927eb..0000000
--- a/Tests/Usings.cs
+++ /dev/null
@@ -1 +0,0 @@
-global using Xunit;
\ No newline at end of file
diff --git a/Views/RecipeView.xaml.cs b/Views/RecipeView.xaml.cs
index 77f38a8..ed1b99c 100644
--- a/Views/RecipeView.xaml.cs
+++ b/Views/RecipeView.xaml.cs
@@ -1,3 +1,5 @@
+using ShoopNCook.Pages;
+
 namespace ShoopNCook.Views;
 
 public partial class RecipeView : ContentView
@@ -45,6 +47,6 @@ public partial class RecipeView : ContentView
 	}
     private async void OnRecipeTapped(object sender, EventArgs e)
     {
-        await Shell.Current.GoToAsync("//RecipePage");
+        await Shell.Current.Navigation.PushAsync(new RecipePage());
     }
 }
\ No newline at end of file