From 9118f7a5abb88992b34d9bce01d8a5d9afab5caa Mon Sep 17 00:00:00 2001
From: Anthony RICHARD <Anthony.RICHARD@etu.uca.fr>
Date: Fri, 2 Jun 2023 19:00:32 +0200
Subject: [PATCH] =?UTF-8?q?popup=20suivre=20un=20jeu=20et=20popup=20pour?=
 =?UTF-8?q?=20le=20chagement=20sur=20info=20de=20l'utilisateur=20(reste=20?=
 =?UTF-8?q?plus=20qu'=C3=A0=20la=20mettre=20sur=20les=20boutons)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sources/Stim/AddGameMessagePopup.xaml.cs        | 17 -----------------
 Sources/Stim/AddGamePage.xaml.cs                |  2 +-
 Sources/Stim/DetailledPage.xaml.cs              |  4 +++-
 Sources/Stim/EntryPopup.xaml                    | 14 ++++++++++++++
 Sources/Stim/EntryPopup.xaml.cs                 | 17 +++++++++++++++++
 Sources/Stim/FollowPage.xaml                    |  6 +++---
 ...dGameMessagePopup.xaml => MessagePopup.xaml} |  7 ++++---
 Sources/Stim/MessagePopup.xaml.cs               | 17 +++++++++++++++++
 Sources/Stim/ProfilPage.xaml.cs                 |  8 ++++++++
 Sources/Stim/Stim.csproj                        |  9 ++++++---
 10 files changed, 73 insertions(+), 28 deletions(-)
 delete mode 100644 Sources/Stim/AddGameMessagePopup.xaml.cs
 create mode 100644 Sources/Stim/EntryPopup.xaml
 create mode 100644 Sources/Stim/EntryPopup.xaml.cs
 rename Sources/Stim/{AddGameMessagePopup.xaml => MessagePopup.xaml} (76%)
 create mode 100644 Sources/Stim/MessagePopup.xaml.cs

diff --git a/Sources/Stim/AddGameMessagePopup.xaml.cs b/Sources/Stim/AddGameMessagePopup.xaml.cs
deleted file mode 100644
index 6bbee1d..0000000
--- a/Sources/Stim/AddGameMessagePopup.xaml.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using CommunityToolkit.Maui.Views;
-
-namespace Stim;
-
-public partial class AddGameMessagePopup : Popup
-{
-	public AddGameMessagePopup(string message)
-	{
-		InitializeComponent();
-		placeholder.Text = message;
-	}
-
-	public void CloseButton(object sender, EventArgs e)
-	{
-		Close();
-	}
-}
\ No newline at end of file
diff --git a/Sources/Stim/AddGamePage.xaml.cs b/Sources/Stim/AddGamePage.xaml.cs
index 7655369..db7d2c8 100644
--- a/Sources/Stim/AddGamePage.xaml.cs
+++ b/Sources/Stim/AddGamePage.xaml.cs
@@ -34,7 +34,7 @@ public partial class AddGamePage : ContentPage
         }
         //      //if (_ImgPath!=null) NameEntry.Text + ".png";
         //      //System.IO.File.Copy(_ImgPath, /**/, true);
-        await this.ShowPopupAsync(new AddGameMessagePopup(message));
+        await this.ShowPopupAsync(new MessagePopup(message));
     }
 
     private async void Button_Clicked(object sender, EventArgs e)
diff --git a/Sources/Stim/DetailledPage.xaml.cs b/Sources/Stim/DetailledPage.xaml.cs
index cc3b869..ceae734 100644
--- a/Sources/Stim/DetailledPage.xaml.cs
+++ b/Sources/Stim/DetailledPage.xaml.cs
@@ -1,3 +1,4 @@
+using CommunityToolkit.Maui.Views;
 using Model;
 using StimPersistance;
 
@@ -39,8 +40,9 @@ public partial class DetailledPage : ContentPage
         //popup add review
     }
 
-    private void AddFollow(object sender, EventArgs e)
+    private async void AddFollow(object sender, EventArgs e)
     {
+        await this.ShowPopupAsync(new MessagePopup("Jeu ajouté dans les suivis !"));
         ((App)App.Current).Manager.CurrentUser.FollowAGame(CurrGame);
     }
 }
\ No newline at end of file
diff --git a/Sources/Stim/EntryPopup.xaml b/Sources/Stim/EntryPopup.xaml
new file mode 100644
index 0000000..2a0b30b
--- /dev/null
+++ b/Sources/Stim/EntryPopup.xaml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<toolkit:Popup xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+             x:Class="Stim.EntryPopup"
+               CanBeDismissedByTappingOutsideOfPopup="False">
+    <VerticalStackLayout>
+        <Grid ColumnDefinitions="*" RowDefinitions="auto, auto, auto">
+            <Label x:Name="LabelTxt"/>
+            <Entry Grid.Row="1"/>
+            <Button Grid.Row="2" x:Name="Entrytxt" Text="Valider" HorizontalOptions="Center" VerticalOptions="End" Background="{StaticResource Transparent}" Clicked="CloseButton"/>
+        </Grid>
+    </VerticalStackLayout>
+</toolkit:Popup>
diff --git a/Sources/Stim/EntryPopup.xaml.cs b/Sources/Stim/EntryPopup.xaml.cs
new file mode 100644
index 0000000..05fed6b
--- /dev/null
+++ b/Sources/Stim/EntryPopup.xaml.cs
@@ -0,0 +1,17 @@
+using CommunityToolkit.Maui.Views;
+
+namespace Stim;
+
+public partial class EntryPopup : Popup
+{
+	public EntryPopup(string fieldName)
+	{
+		InitializeComponent();
+        LabelTxt.Text = fieldName;
+	}
+
+    public void CloseButton(object sender, EventArgs e)
+    {
+        if (!string.IsNullOrWhiteSpace(Entrytxt.Text)) Close(Entrytxt.Text);
+    }
+}
\ No newline at end of file
diff --git a/Sources/Stim/FollowPage.xaml b/Sources/Stim/FollowPage.xaml
index 6211459..6e99c7b 100644
--- a/Sources/Stim/FollowPage.xaml
+++ b/Sources/Stim/FollowPage.xaml
@@ -16,10 +16,10 @@
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
 
-            <VerticalStackLayout BackgroundColor="Black" Grid.Column="0" Grid.Row="1"/>
-            <VerticalStackLayout BackgroundColor="Black" Grid.Column="2" Grid.Row="1"/>
+            <VerticalStackLayout BackgroundColor="Black" Grid.Column="0" Grid.RowSpan="2"/>
+            <VerticalStackLayout BackgroundColor="Black" Grid.Column="2" Grid.RowSpan="2"/>
 
-            <CollectionView ItemsSource="{Binding Followed_Games}" Grid.Column="1" SelectionChanged="GoToDetail">
+            <CollectionView ItemsSource="{Binding Followed_Games}" SelectionMode="Single" Grid.Column="1" SelectionChanged="GoToDetail">
                 <CollectionView.ItemTemplate>
                     <DataTemplate>
                         <Border HeightRequest="150">
diff --git a/Sources/Stim/AddGameMessagePopup.xaml b/Sources/Stim/MessagePopup.xaml
similarity index 76%
rename from Sources/Stim/AddGameMessagePopup.xaml
rename to Sources/Stim/MessagePopup.xaml
index c95c9f9..e11d84c 100644
--- a/Sources/Stim/AddGameMessagePopup.xaml
+++ b/Sources/Stim/MessagePopup.xaml
@@ -2,10 +2,11 @@
 <toolkit:Popup xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
-             x:Class="Stim.AddGameMessagePopup"
+             x:Class="Stim.MessagePopup"
              CanBeDismissedByTappingOutsideOfPopup ="False">
-    <VerticalStackLayout Background="{StaticResource Transparent}">
-        <Grid RowDefinitions="auto, *" ColumnDefinitions="*">
+
+    <VerticalStackLayout>
+        <Grid RowDefinitions="auto, auto" ColumnDefinitions="*">
             <Label x:Name="placeholder" Text="" HorizontalOptions="Center"/>
             <Button Grid.Row="1" Text="Fermer" HorizontalOptions="Center" VerticalOptions="End" Background="{StaticResource Transparent}" Clicked="CloseButton"/>
         </Grid>
diff --git a/Sources/Stim/MessagePopup.xaml.cs b/Sources/Stim/MessagePopup.xaml.cs
new file mode 100644
index 0000000..cb24256
--- /dev/null
+++ b/Sources/Stim/MessagePopup.xaml.cs
@@ -0,0 +1,17 @@
+using CommunityToolkit.Maui.Views;
+
+namespace Stim;
+
+public partial class MessagePopup : Popup
+{
+    public MessagePopup(string message)
+    {
+        InitializeComponent();
+        placeholder.Text = message;
+    }
+
+    public void CloseButton(object sender, EventArgs e)
+    {
+        Close();
+    }
+}
\ No newline at end of file
diff --git a/Sources/Stim/ProfilPage.xaml.cs b/Sources/Stim/ProfilPage.xaml.cs
index 2e88124..f7fcf8b 100644
--- a/Sources/Stim/ProfilPage.xaml.cs
+++ b/Sources/Stim/ProfilPage.xaml.cs
@@ -1,3 +1,4 @@
+using CommunityToolkit.Maui.Views;
 using Model;
 
 namespace Stim;
@@ -14,4 +15,11 @@ public partial class ProfilPage : ContentPage
     {
         ((App)App.Current).Manager.CurrentUser.RemoveAGame((sender as CollectionView).SelectedItem as Game);
     }
+
+    private async void ChangeUsername(object sender, EventArgs e)
+    {
+        var newName = await this.ShowPopupAsync(new EntryPopup("Username"));
+        if (string.IsNullOrWhiteSpace(newName as string)) await this.ShowPopupAsync(new MessagePopup("Nom d'utilisateur invalide"));
+        else ((App)App.Current).Manager.CurrentUser.ChangeUsername(newName as string);
+    }
 }
\ No newline at end of file
diff --git a/Sources/Stim/Stim.csproj b/Sources/Stim/Stim.csproj
index 6c8d998..7103552 100644
--- a/Sources/Stim/Stim.csproj
+++ b/Sources/Stim/Stim.csproj
@@ -77,9 +77,6 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <MauiXaml Update="AddGameMessagePopup.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
 	  <MauiXaml Update="AddGamePage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
@@ -89,12 +86,18 @@
 	  <MauiXaml Update="DetailledPage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="EntryPopup.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="LoginPage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
 	  <MauiXaml Update="Create.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="MessagePopup.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="UserInfo.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>