From 8b12a07fb8d4283cddf0cb03104378c2105c78fa Mon Sep 17 00:00:00 2001
From: Matheo HERSAN <mahersan>
Date: Fri, 5 May 2023 16:52:42 +0200
Subject: [PATCH 1/2] Added better navigation and modification in AppShell.xaml

---
 MangaMap/AppShell.xaml                        | 45 +++++++-----
 MangaMap/MangaMap.csproj                      |  3 +
 MangaMap/Views/Composants/StyleBouton.xaml    | 12 ++++
 MangaMap/Views/Composants/StyleBouton.xaml.cs | 14 ++++
 MangaMap/Views/homePage.xaml                  | 72 +++++--------------
 MangaMap/Views/homePage.xaml.cs               |  3 +-
 6 files changed, 76 insertions(+), 73 deletions(-)
 create mode 100644 MangaMap/Views/Composants/StyleBouton.xaml
 create mode 100644 MangaMap/Views/Composants/StyleBouton.xaml.cs

diff --git a/MangaMap/AppShell.xaml b/MangaMap/AppShell.xaml
index d9797d4..1c3a15d 100644
--- a/MangaMap/AppShell.xaml
+++ b/MangaMap/AppShell.xaml
@@ -5,32 +5,39 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:local="clr-namespace:MangaMap"
     xmlns:Views="clr-namespace:MangaMap.Views"
-    Shell.FlyoutBehavior="Flyout"
+    Shell.FlyoutBehavior="Disabled"
     Shell.NavBarIsVisible="False">
 
-    <ShellContent
-        Title="Home"
-        ContentTemplate="{DataTemplate Views:homePage}"
+    <TabBar>
+        <ShellContent
+            Title="Home"
+            ContentTemplate="{DataTemplate Views:homePage}"
         Route="MainPage" />
 
-    <ShellContent
-        Title="Inscription"
-        ContentTemplate="{DataTemplate Views:signUpPage}" />
+        <ShellContent
+            Title="Inscription"
+            ContentTemplate="{DataTemplate Views:signUpPage}" />
 
-    <ShellContent
-        Title="Connection"
-        ContentTemplate="{DataTemplate Views:loginPage}" />
+        <ShellContent
+            Title="Connection"
+            ContentTemplate="{DataTemplate Views:loginPage}" />
 
-    <ShellContent
-        Title="Paramètres"
-        ContentTemplate="{DataTemplate Views:settingsPage}" />
+        <ShellContent
+            Title="Paramètres"
+            ContentTemplate="{DataTemplate Views:settingsPage}" />
 
-    <ShellContent
-        Title="Liste"
-        ContentTemplate="{DataTemplate Views:listPage}" />
+        <ShellContent
+            Title="Liste"
+            ContentTemplate="{DataTemplate Views:listPage}" />
 
-    <ShellContent
-        Title="Fiche Exemple"
-        ContentTemplate="{DataTemplate Views:ficheAnime}" />
+    </TabBar>
 
+    <FlyoutItem>
+
+        <ShellContent
+            Title="Fiche Exemple"
+            ContentTemplate="{DataTemplate Views:ficheAnime}" />
+
+    </FlyoutItem>
+    
 </Shell>
\ No newline at end of file
diff --git a/MangaMap/MangaMap.csproj b/MangaMap/MangaMap.csproj
index d595fae..6838886 100644
--- a/MangaMap/MangaMap.csproj
+++ b/MangaMap/MangaMap.csproj
@@ -73,6 +73,9 @@
 	  <MauiXaml Update="Resources\Theme\DarkTheme.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Views\Composants\StyleBouton.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Views\homePage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
diff --git a/MangaMap/Views/Composants/StyleBouton.xaml b/MangaMap/Views/Composants/StyleBouton.xaml
new file mode 100644
index 0000000..3df2ca1
--- /dev/null
+++ b/MangaMap/Views/Composants/StyleBouton.xaml
@@ -0,0 +1,12 @@
+<?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="MangaMap.Views.Composants.StyleBouton">
+
+    <ImageButton
+                Style="{StaticResource ImageAnime}"
+                BackgroundColor="Red"
+                Source="test2.png"
+                Clicked="ButtonIsPressed"/>
+
+</ContentView>
diff --git a/MangaMap/Views/Composants/StyleBouton.xaml.cs b/MangaMap/Views/Composants/StyleBouton.xaml.cs
new file mode 100644
index 0000000..94bf0f5
--- /dev/null
+++ b/MangaMap/Views/Composants/StyleBouton.xaml.cs
@@ -0,0 +1,14 @@
+namespace MangaMap.Views.Composants;
+
+public partial class StyleBouton : ContentView
+{
+	public StyleBouton()
+	{
+		InitializeComponent();
+	}
+
+	private async void ButtonIsPressed(object sender, EventArgs e)
+	{
+		await Shell.Current.Navigation.PushAsync(new ficheAnime());
+	}
+}
\ No newline at end of file
diff --git a/MangaMap/Views/homePage.xaml b/MangaMap/Views/homePage.xaml
index e73c1de..a2e1ffb 100644
--- a/MangaMap/Views/homePage.xaml
+++ b/MangaMap/Views/homePage.xaml
@@ -3,7 +3,9 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:local="clr-namespace:MangaMap"
              xmlns:modeles="clr-namespace:MangaMap.Model"
-             x:Class="MangaMap.Views.homePage">
+             x:Class="MangaMap.Views.homePage"
+             xmlns:views="clr-namespace:MangaMap.Views.Composants">
+
 
     <ContentPage.BindingContext>
         <modeles:Manager/>
@@ -32,11 +34,7 @@
                 HorizontalOptions="Center">
 
 
-                    <ImageButton
-                    Style="{StaticResource ImageAnime}"
-                    BackgroundColor="Red"
-                    Source="test2.png"
-                    />
+                    <views:StyleBouton/>
 
                     <ImageButton
                 Style="{StaticResource ImageAnime}"
@@ -44,13 +42,9 @@
                         Source="test.jpg"
                     />
 
-                    <ImageButton
-                Style="{StaticResource ImageAnime}"
-                BackgroundColor="Blue"/>
+                    <views:StyleBouton/>
 
-                    <ImageButton
-                Style="{StaticResource ImageAnime}"
-                BackgroundColor="Purple"/>
+                    <views:StyleBouton/>
 
                 </HorizontalStackLayout>
 
@@ -58,22 +52,13 @@
                 Spacing="100"
                 HorizontalOptions="Center">
 
-                    <ImageButton
-                        Style="{StaticResource ImageAnime}"
-                        BackgroundColor="Purple"
-                        />
+                    <views:StyleBouton/>
 
-                    <ImageButton
-                    Style="{StaticResource ImageAnime}"
-                    BackgroundColor="Green"/>
+                    <views:StyleBouton/>
 
-                    <ImageButton
-                    Style="{StaticResource ImageAnime}"
-                    BackgroundColor="Gray"/>
+                    <views:StyleBouton/>
 
-                    <ImageButton
-                    Style="{StaticResource ImageAnime}"
-                    BackgroundColor="Yellow"/>
+                    <views:StyleBouton/>
 
                 </HorizontalStackLayout>
 
@@ -81,22 +66,12 @@
                 Spacing="100"
                 HorizontalOptions="Center">
 
-                    <ImageButton
-                        Style="{StaticResource ImageAnime}"
-                        BackgroundColor="Red"
-                        />
+                    <views:StyleBouton/>
 
-                    <ImageButton
-                    Style="{StaticResource ImageAnime}"
-                    BackgroundColor="Orange"/>
-
-                    <ImageButton
-                    Style="{StaticResource ImageAnime}"
-                    BackgroundColor="Blue"/>
+                    <views:StyleBouton/>
+                    <views:StyleBouton/>
 
-                    <ImageButton
-                    Style="{StaticResource ImageAnime}"
-                    BackgroundColor="Purple"/>
+                    <views:StyleBouton/>
 
 
                 </HorizontalStackLayout>
@@ -105,27 +80,18 @@
                 Spacing="100"
                 HorizontalOptions="Center">
 
-                    <ImageButton
-                        Style="{StaticResource ImageAnime}"
-                        BackgroundColor="Purple"
-                        />
+                    <views:StyleBouton/>
 
-                    <ImageButton
-                    Style="{StaticResource ImageAnime}"
-                        BackgroundColor="Red"
-                        />
+                    <views:StyleBouton/>
 
-                    <ImageButton
-                    Style="{StaticResource ImageAnime}"
-                    BackgroundColor="Gray"/>
+                    <views:StyleBouton/>
 
-                    <ImageButton
-                    Style="{StaticResource ImageAnime}"
-                    BackgroundColor="Yellow"/>
+                    <views:StyleBouton/>
 
                 </HorizontalStackLayout>
 
                 <ListView x:Name="a1" ItemsSource="{Binding Utilisateurs}">
+                    
                     <ListView.ItemTemplate>
                         <DataTemplate>
                             <ViewCell>
diff --git a/MangaMap/Views/homePage.xaml.cs b/MangaMap/Views/homePage.xaml.cs
index 832d230..3ba8911 100644
--- a/MangaMap/Views/homePage.xaml.cs
+++ b/MangaMap/Views/homePage.xaml.cs
@@ -10,5 +10,6 @@ public partial class homePage : ContentPage
 	{
 		InitializeComponent();
 		a1.BindingContext = my_manager;
-	}
+
+    }
 }
\ No newline at end of file

From 9c4c2b0c17625008870253d6eac3ce4e3e2396bc Mon Sep 17 00:00:00 2001
From: Matheo HERSAN <mahersan>
Date: Fri, 5 May 2023 17:04:01 +0200
Subject: [PATCH 2/2] Deleted folders

---
 MangaMap/MangaMap.csproj        | 20 +++++++++++++++-----
 MangaMap/Views/homePage.xaml.cs |  1 -
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/MangaMap/MangaMap.csproj b/MangaMap/MangaMap.csproj
index 6838886..4618528 100644
--- a/MangaMap/MangaMap.csproj
+++ b/MangaMap/MangaMap.csproj
@@ -48,6 +48,21 @@
 		<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <AndroidResource Remove="Component\**" />
+	  <AndroidResource Remove="NewFolder\**" />
+	  <Compile Remove="Component\**" />
+	  <Compile Remove="NewFolder\**" />
+	  <EmbeddedResource Remove="Component\**" />
+	  <EmbeddedResource Remove="NewFolder\**" />
+	  <MauiCss Remove="Component\**" />
+	  <MauiCss Remove="NewFolder\**" />
+	  <MauiXaml Remove="Component\**" />
+	  <MauiXaml Remove="NewFolder\**" />
+	  <None Remove="Component\**" />
+	  <None Remove="NewFolder\**" />
+	</ItemGroup>
+
 	<ItemGroup>
 	  <None Remove="Resources\Images\logo.png" />
 	  <None Remove="Resources\Images\test.jpg" />
@@ -93,9 +108,4 @@
 	  </MauiXaml>
 	</ItemGroup>
 
-	<ItemGroup>
-	  <Folder Include="Component\" />
-	  <Folder Include="NewFolder\" />
-	</ItemGroup>
-
 </Project>
diff --git a/MangaMap/Views/homePage.xaml.cs b/MangaMap/Views/homePage.xaml.cs
index 3ba8911..4226b92 100644
--- a/MangaMap/Views/homePage.xaml.cs
+++ b/MangaMap/Views/homePage.xaml.cs
@@ -10,6 +10,5 @@ public partial class homePage : ContentPage
 	{
 		InitializeComponent();
 		a1.BindingContext = my_manager;
-
     }
 }
\ No newline at end of file