From e1efccd73f7d5958afdf1c62a607c2772373b556 Mon Sep 17 00:00:00 2001
From: ImNicolasTheDev <nicolas.blondeau0304@gmail.com>
Date: Thu, 8 Jun 2023 00:39:09 +0200
Subject: [PATCH] =?UTF-8?q?Fix=20de=20tr=C3=A8s=20nombreux=20bug=20pour=20?=
 =?UTF-8?q?les=20Conseils,=20ajout=20de=20la=20fonctionalit=C3=A9=20de=20r?=
 =?UTF-8?q?efresh=20la=20scrollView,=20et=20ajout=20des=20boutons=20pour?=
 =?UTF-8?q?=20chaque=20commentaire,=20avec=20de=20nombreuses=20VisualState?=
 =?UTF-8?q?s=20(aussi=20correction=20de=20Model.User=20en=20le=20nom=20r?=
 =?UTF-8?q?=C3=A9el=20de=20l'utilisateur=20hahaha)=20:tada:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sources/Vues/SearchMob.xaml    | 34 +++++++++++---------
 Sources/Vues/SearchMob.xaml.cs | 59 +++++++++++++---------------------
 2 files changed, 42 insertions(+), 51 deletions(-)

diff --git a/Sources/Vues/SearchMob.xaml b/Sources/Vues/SearchMob.xaml
index 8680dbb..a8f7941 100644
--- a/Sources/Vues/SearchMob.xaml
+++ b/Sources/Vues/SearchMob.xaml
@@ -196,24 +196,29 @@
                     <!-- Conseils -->
                     <Border Grid.Row="3" Style="{StaticResource sectionStyle}">
                         <StackLayout>
+                            <Label TextDecorations="Underline" Text="Conseils :" FontSize="Medium"/>
                             <!-- Bouton d'ajout de conseil -->
-                            <Button x:Name="ButtonAddConseil" IsVisible="False" Text="Ajouter un conseil" Grid.Row="0" Grid.Column="1" Clicked="OnAddConseilClicked" />
-                            <StackLayout x:Name="AddConseilLayout" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" IsVisible="False">
-                                <Editor x:Name="texteConseilEntry" Placeholder="Texte du conseil" PlaceholderColor="{StaticResource Gray500}"/>
-                                <Button Text="Valider" Clicked="OnValiderConseilClicked" />
-                                <Button Text="Annuler" Clicked="OnExitConseilClicked" />
-                            </StackLayout>
-                            <ListView x:Name="ListViewConseils" ItemsSource="{Binding ListConseils}" Grid.Row="1">
+                            <Button x:Name="ButtonAddConseil" HorizontalOptions="End" IsVisible="False" Text="Ajouter un conseil" Grid.Row="0" Grid.Column="1" Clicked="OnAddConseilClicked" />
+                            <VerticalStackLayout x:Name="AddConseilLayout" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" IsVisible="False">
+                                <Editor x:Name="texteConseilEntry" TextChanged="texteConseilEntry_TextChanged" AutoSize="TextChanges" Placeholder="Texte du conseil" PlaceholderColor="{StaticResource Gray500}"/>
+                                <Grid ColumnDefinitions="*,*" HorizontalOptions="CenterAndExpand">
+                                    <Button Grid.Column="0" Text="Valider" Clicked="OnValiderConseilClicked" />
+                                    <Button Grid.Column="1" Text="Annuler" Clicked="OnExitConseilClicked" />
+                                </Grid>
+                            </VerticalStackLayout>
+                            <ListView x:Name="ListViewConseils" VerticalOptions="Fill" ItemsSource="{Binding ListConseils}" Grid.Row="1">
                                 <ListView.ItemTemplate>
                                     <DataTemplate>
                                         <ViewCell>
-                                            <Grid ColumnDefinitions="*, Auto" HeightRequest="15">
+                                            <Grid ColumnDefinitions="*, Auto" MinimumHeightRequest="50" HorizontalOptions="Fill" BackgroundColor="Transparent"> <!-- LA je ne comprends pas : pour que les VisualStates 
+                                                fonctionnent sur tout le grid, et pas que sur le texte du label, il faut rajouter un background?? Bizarre...-->
+                                                
                                                 <VisualStateManager.VisualStateGroups>
                                                     <VisualStateGroupList>
                                                         <VisualStateGroup x:Name="CommonStates">
                                                             <VisualState x:Name="PointerOver">
                                                                 <VisualState.Setters>
-                                                                    <Setter TargetName="ConseilOptions" Property="IsVisible" 
+                                                                    <Setter TargetName="ConseilOptions" Property="IsVisible"
                                                                             Value="true" />
                                                                 </VisualState.Setters>
                                                             </VisualState>
@@ -226,22 +231,21 @@
                                                         </VisualStateGroup>
                                                     </VisualStateGroupList>
                                                 </VisualStateManager.VisualStateGroups>
+                                                
                                                 <HorizontalStackLayout Grid.Column="0" VerticalOptions="Center" HorizontalOptions="Fill">
                                                     <Label BindingContext="{Binding Auteur}" Text="{Binding Pseudo, StringFormat=' {0} :'}" Grid.Column="0"/>
                                                     <Label Text="{Binding Texte, StringFormat=' {0}'}" Grid.Column="1" />
                                                 </HorizontalStackLayout>
+
                                                 <HorizontalStackLayout x:Name="ConseilOptions" Grid.Column="1" IsVisible="False">
-                                                    <ImageButton Scale="0.8" BackgroundColor="Transparent" Source="pencil.png" HeightRequest="15" WidthRequest="15"/>
-                                                    <ImageButton Scale="0.8" BackgroundColor="Transparent" Source="bin.png" HeightRequest="15" WidthRequest="15"/>
+                                                    <ImageButton CornerRadius="6" Scale="0.8" Source="pencil.png" HeightRequest="15" WidthRequest="15"/>
+                                                    <ImageButton CornerRadius="6" Scale="0.8" Source="bin.png" HeightRequest="15" WidthRequest="15"/>
                                                 </HorizontalStackLayout>
+                                            
                                             </Grid>
                                         </ViewCell>
                                     </DataTemplate>
                                 </ListView.ItemTemplate>
-                                <ListView.GestureRecognizers>
-                                    <PointerGestureRecognizer PointerEntered="PointerGestureRecognizer_PointerEntered">
-                                    </PointerGestureRecognizer>
-                                </ListView.GestureRecognizers>
                             </ListView>
                         </StackLayout>
                     </Border>
diff --git a/Sources/Vues/SearchMob.xaml.cs b/Sources/Vues/SearchMob.xaml.cs
index 157a267..33b4f71 100644
--- a/Sources/Vues/SearchMob.xaml.cs
+++ b/Sources/Vues/SearchMob.xaml.cs
@@ -1,11 +1,11 @@
 using Microsoft.Maui.Controls;
+using Microsoft.Maui.Layouts;
 using Model;
 using Persistance;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
 
-
 namespace Vues;
 
 public partial class SearchMob : ContentPage, INotifyPropertyChanged
@@ -45,35 +45,33 @@ public partial class SearchMob : ContentPage, INotifyPropertyChanged
         }
     }
 
+    public void refreshScrollView()
+    {
+        ScrollLayoutThatNeedsToBeRefreshed.IsVisible = false;
+        ScrollLayoutThatNeedsToBeRefreshed.IsVisible = true;
+    }
 	public void OnClick(object sender, ItemTappedEventArgs e)
 	{
 		(App.Current as App).MonstreSelectionne = e.Item as Monstre;
         imageCollection.Source = imageLinkConverter((App.Current as App).MonstreSelectionne.AppearanceList.First());
+        refreshScrollView();
     }
     private void OnAddConseilClicked(object sender, EventArgs e)
     {
-        var button = sender as Button;
-
         // Afficher les champs à remplir pour ajouter un conseil
-        //FAIRE UN FUCKING X:NAME :>
-        var addConseilLayout = button?.Parent?.FindByName<StackLayout>("AddConseilLayout");
-        if (addConseilLayout != null)
+        if (!AddConseilLayout.IsVisible)
         {
-            ScrollLayoutThatNeedsToBeRefreshed.IsVisible = false;
-            addConseilLayout.IsVisible = true;
-            ScrollLayoutThatNeedsToBeRefreshed.IsVisible = true;
+            AddConseilLayout.IsVisible = true;
+            texteConseilEntry.Text = null;
+            refreshScrollView();
         }
     }
 
     private void OnValiderConseilClicked(object sender, EventArgs e)
     {
-        var button = sender as Button;
-        //FAIRE UN FUCKING ICI AUSSI X:NAME :>
-        var addConseilLayout = button?.Parent?.FindByName<StackLayout>("AddConseilLayout");
-
-        if (addConseilLayout != null)
+        if (AddConseilLayout != null)
         {
-            var texteConseil = texteConseilEntry.Text;
+            string texteConseil = texteConseilEntry.Text;
             // Ajouter le nouveau conseil à la liste des conseils du monstre sélectionné
             var selectedMonstre = (App.Current as App).MonstreSelectionne;
             if (selectedMonstre != null && !string.IsNullOrWhiteSpace(texteConseil))
@@ -81,18 +79,16 @@ public partial class SearchMob : ContentPage, INotifyPropertyChanged
                 var nouveauConseil = new Conseil((App.Current as App).User, texteConseil, selectedMonstre);
                 selectedMonstre.ListConseils.Add(nouveauConseil);
             }
-            texteConseilEntry.Text = string.Empty;
-            addConseilLayout.IsVisible = false;
+            texteConseilEntry.Text = null;
+            AddConseilLayout.IsVisible = false;
         }
+        refreshScrollView();
     }
 
     private void OnExitConseilClicked(object sender, EventArgs e)
     {
-        var button = sender as Button;
-        var addConseilLayout = button?.Parent?.FindByName<StackLayout>("AddConseilLayout");
-        var texteConseilEntry = addConseilLayout.Children[1] as Editor;
-        texteConseilEntry.Text = string.Empty;
-        addConseilLayout.IsVisible = false;
+        texteConseilEntry.Text = null;
+        AddConseilLayout.IsVisible = false;
     }
 
     private string imageLinkConverter(string imageLink)
@@ -106,21 +102,12 @@ public partial class SearchMob : ContentPage, INotifyPropertyChanged
     {
         appearanceSelected = e.Item as string;
         imageCollection.Source = imageLinkConverter(appearanceSelected);
-
     }
 
-    private void FilterClicked(object sender, EventArgs e) // Afficher les filtres
+    private void FilterClicked(object sender, EventArgs e)
     {
-        var button = sender as Button;
-        var afficherFiltres = button?.Parent?.FindByName<HorizontalStackLayout>("HorizonFilterClicked");
-        if (afficherFiltres.IsVisible)
-        {
-            afficherFiltres.IsVisible = false;
-        }
-        else
-        {
-            afficherFiltres.IsVisible |= true;
-        }
+        // Inverse la valeur booléenne de IsVisible => Permet d'afficher ou non les boutons de filtrage
+        HorizonFilterClicked.IsVisible = !HorizonFilterClicked.IsVisible;
     }
 
     private void UpdateAffichMobs()
@@ -152,8 +139,8 @@ public partial class SearchMob : ContentPage, INotifyPropertyChanged
         SearchText = e.NewTextValue;
     }
 
-    private void PointerGestureRecognizer_PointerEntered(object sender, PointerEventArgs e)
+    private void texteConseilEntry_TextChanged(object sender, TextChangedEventArgs e)
     {
-        //ConseilOptions.IsVisible = true;
+        (ScrollLayoutThatNeedsToBeRefreshed as IView).InvalidateMeasure(); //Permet de recalculer la taille de la scrollView
     }
 }
\ No newline at end of file