From 90dc6dbea9793f9afede80e6a156e54a0d5f30fa Mon Sep 17 00:00:00 2001
From: HMatheo <hersan.matheo@gmail.com>
Date: Wed, 31 May 2023 21:17:22 +0200
Subject: [PATCH] Enhancement listPage

---
 MangaMap/CustomHeader.xaml.cs    | 40 +++++++++++++-------------
 MangaMap/Views/homePage.xaml.cs  |  7 ++---
 MangaMap/Views/listPage.xaml     | 49 ++++++++++++++++++++++++++++----
 MangaMap/Views/loginPage.xaml.cs |  2 +-
 4 files changed, 68 insertions(+), 30 deletions(-)

diff --git a/MangaMap/CustomHeader.xaml.cs b/MangaMap/CustomHeader.xaml.cs
index 11f0a0d..62e1b05 100644
--- a/MangaMap/CustomHeader.xaml.cs
+++ b/MangaMap/CustomHeader.xaml.cs
@@ -3,29 +3,29 @@ namespace MangaMap;
 
 public partial class NewContent1 : ContentView
 {
-	public NewContent1()
-	{
-		InitializeComponent();
-	}
+    public NewContent1()
+    {
+        InitializeComponent();
+    }
 
-	async void ImageButton_Clicked(System.Object sender, System.EventArgs e)
-	{
-		//Navigation.PushAsync(new homePage());
-		await Shell.Current.GoToAsync("//page/homePage");
+    async void ImageButton_Clicked(System.Object sender, System.EventArgs e)
+    {
+        //Navigation.PushAsync(new homePage());
+        await Shell.Current.GoToAsync("//page/homePage");
     }
 
-	async void SettingButton_Clicked(object sender, System.EventArgs e)
-	{
-		await Shell.Current.GoToAsync("//page/secondaire/settingsPage");
-	}
+    async void SettingButton_Clicked(object sender, System.EventArgs e)
+    {
+        await Shell.Current.GoToAsync("//page/secondaire/settingsPage");
+    }
 
-	async void AccountButton_Clicked(object sender, System.EventArgs e)
-	{
-		await Shell.Current.GoToAsync("//page/secondaire/connexionPage");
-	}
+    async void AccountButton_Clicked(object sender, System.EventArgs e)
+    {
+        await Shell.Current.GoToAsync("//page/secondaire/connexionPage");
+    }
 
-	async void ListButton_Clicked(object sender, System.EventArgs e)
-	{
-		await Shell.Current.GoToAsync("//page/secondaire/listPage");
-	}
+    async void ListButton_Clicked(object sender, System.EventArgs e)
+    {
+        await Shell.Current.GoToAsync("//page/secondaire/listPage");
+    }
 }
\ No newline at end of file
diff --git a/MangaMap/Views/homePage.xaml.cs b/MangaMap/Views/homePage.xaml.cs
index 5f6624a..cd441b9 100644
--- a/MangaMap/Views/homePage.xaml.cs
+++ b/MangaMap/Views/homePage.xaml.cs
@@ -8,11 +8,11 @@ public partial class homePage : ContentPage
     public Manager my_manager => (App.Current as App).MyManager;
 
     public homePage()
-	{
+    {
         InitializeComponent();
-		BindingContext = my_manager;
+        BindingContext = my_manager;
         chargerSerie();
-	}
+    }
 
     private async void AnimeImageClicked(object sender, EventArgs e)
     {
@@ -65,4 +65,3 @@ public partial class homePage : ContentPage
     }
 
 }
-
diff --git a/MangaMap/Views/listPage.xaml b/MangaMap/Views/listPage.xaml
index a03e3f2..1c5eda9 100644
--- a/MangaMap/Views/listPage.xaml
+++ b/MangaMap/Views/listPage.xaml
@@ -36,7 +36,7 @@
                             <VerticalStackLayout BindableLayout.ItemsSource="{Binding UtilisateurActuel.ListeOeuvreEnVisionnage}" Spacing="10">
                                 <BindableLayout.ItemTemplate>
                                     <DataTemplate>
-                                        <Grid Margin="20,0,20,0" ColumnDefinitions="*,*,300,300">
+                                        <Grid Margin="20,0,20,20" ColumnDefinitions="*,*,300,300">
                                             <ImageButton Grid.Column="0" Source="{Binding Affiche}" Style="{StaticResource ImageAnime}" HorizontalOptions="Start"/>
                                             <Label Grid.Column="1" Text="{Binding Nom}" TextColor="White" FontSize="Medium" VerticalOptions="Center" Margin="15"/>
                                             <Label Grid.Column="2" Text="4/5" TextColor="White" FontSize="Medium" VerticalOptions="Center" HorizontalOptions="Center"/>
@@ -75,11 +75,11 @@
                             <VerticalStackLayout BindableLayout.ItemsSource="{Binding UtilisateurActuel.ListeOeuvreDejaVu}" Spacing="10">
                                 <BindableLayout.ItemTemplate>
                                     <DataTemplate>
-                                        <Grid Margin="20,0,20,0" ColumnDefinitions="*,*,300,300">
-                                            <ImageButton Grid.Column="0" Source="{Binding Affiche}" BackgroundColor="#FFFFFF" WidthRequest="100" HeightRequest="100" HorizontalOptions="Start"/>
+                                        <Grid Margin="20,0,20,20" ColumnDefinitions="*,*,300,300">
+                                            <ImageButton Grid.Column="0" Source="{Binding Affiche}" Style="{StaticResource ImageAnime}" HorizontalOptions="Start"/>
                                             <Label Grid.Column="1" Text="{Binding Nom}" FontSize="Medium" VerticalOptions="Center" Margin="15"/>
-                                            <Label Grid.Column="2" Text="4/5" VerticalOptions="Center" HorizontalOptions="Center"/>
-                                            <Label Grid.Column="3" Text="10/85" VerticalOptions="Center" HorizontalOptions="End"/>
+                                            <Label Grid.Column="2" Text="4/5" FontSize="Medium" VerticalOptions="Center" HorizontalOptions="Center"/>
+                                            <Label Grid.Column="3" Text="10/85" FontSize="Medium" VerticalOptions="Center" HorizontalOptions="End"/>
                                         </Grid>
                                     </DataTemplate>
                                 </BindableLayout.ItemTemplate>
@@ -89,6 +89,45 @@
                     </Grid>
                 </Frame>
 
+                <Label Text="Plan to Watch" TextColor="White" FontSize="Large" Margin="50,10,0,0" Grid.Row="2"/>
+
+                <Frame Grid.Row="3" BackgroundColor="Black" Margin="20" BorderColor="Black">
+                    <Grid BackgroundColor="#333333" >
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" />
+                        </Grid.RowDefinitions>
+
+                        <Grid Margin="20" Grid.Row="0" ColumnDefinitions="*,300,300">
+                            <Label Grid.Column="0"
+                           Text="Titre" FontSize="Large" TextColor="White"
+                           HorizontalOptions="Start" VerticalOptions="Center"/>
+                            <Label Grid.Column="1"
+                           Text="Score" FontSize="Large" TextColor="White"
+                           HorizontalOptions="Center" VerticalOptions="Center"/>
+                            <Label Grid.Column="2"
+                           Text="Progression" FontSize="Large" TextColor="White"
+                           HorizontalOptions="End" VerticalOptions="Center"/>
+                        </Grid>
+
+                        <ScrollView Grid.Row="1" VerticalScrollBarVisibility="Always">
+                            <VerticalStackLayout BindableLayout.ItemsSource="{Binding UtilisateurActuel. ListeOeuvrePourPlusTard}" Spacing="10">
+                                <BindableLayout.ItemTemplate>
+                                    <DataTemplate>
+                                        <Grid Margin="20,0,20,20" ColumnDefinitions="*,*,300,300">
+                                            <ImageButton Grid.Column="0" Source="{Binding Affiche}" Style="{StaticResource ImageAnime}" HorizontalOptions="Start"/>
+                                            <Label Grid.Column="1" Text="{Binding Nom}" FontSize="Medium" VerticalOptions="Center" Margin="15"/>
+                                            <Label Grid.Column="2" Text="4/5" FontSize="Medium" VerticalOptions="Center" HorizontalOptions="Center"/>
+                                            <Label Grid.Column="3" Text="10/85" FontSize="Medium" VerticalOptions="Center" HorizontalOptions="End"/>
+                                        </Grid>
+                                    </DataTemplate>
+                                </BindableLayout.ItemTemplate>
+                            </VerticalStackLayout>
+                        </ScrollView>
+
+                    </Grid>
+                </Frame>
+
             </VerticalStackLayout>
 
         </ScrollView>
diff --git a/MangaMap/Views/loginPage.xaml.cs b/MangaMap/Views/loginPage.xaml.cs
index efd5ca1..06e5ec7 100644
--- a/MangaMap/Views/loginPage.xaml.cs
+++ b/MangaMap/Views/loginPage.xaml.cs
@@ -49,7 +49,7 @@ public partial class loginPage : ContentPage
         // On garde l'utilisateur qui vient de se connecter pour accéder à ses informations
         my_manager.UtilisateurActuel = utilisateur;
         // Rediriger l'utilisateur vers la page principale
-        await Navigation.PushAsync(new homePage());
+        await Shell.Current.GoToAsync("//page/homePage");                                                                                                                                   
     }
 
 }