diff --git a/Sources/Modèle/Conseil.cs b/Sources/Modèle/Conseil.cs
index c55a289..2ddd772 100644
--- a/Sources/Modèle/Conseil.cs
+++ b/Sources/Modèle/Conseil.cs
@@ -53,7 +53,7 @@ namespace Model
Texte = texte;
LeMonstre = leMonstre;
}
- // Pour afficher les conseils.
+ // FONCTION A DEPLACER -> Dans la console, ON AFFICHE RIEN DANS LE MODEL !!!
public void affichConseil()
{
Console.WriteLine($"Id : {Id}");
diff --git a/Sources/Vues/Resources/Images/bin.png b/Sources/Vues/Resources/Images/bin.png
index 94352c2..129cbc4 100644
Binary files a/Sources/Vues/Resources/Images/bin.png and b/Sources/Vues/Resources/Images/bin.png differ
diff --git a/Sources/Vues/Resources/Images/pencil.png b/Sources/Vues/Resources/Images/pencil.png
index be08287..ea8aaf4 100644
Binary files a/Sources/Vues/Resources/Images/pencil.png and b/Sources/Vues/Resources/Images/pencil.png differ
diff --git a/Sources/Vues/SearchMob.xaml b/Sources/Vues/SearchMob.xaml
index ef956bb..3523a4f 100644
--- a/Sources/Vues/SearchMob.xaml
+++ b/Sources/Vues/SearchMob.xaml
@@ -156,7 +156,7 @@
-
+
@@ -178,10 +178,10 @@
-
+
-
+
@@ -196,28 +196,66 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Sources/Vues/SearchMob.xaml.cs b/Sources/Vues/SearchMob.xaml.cs
index b9c1565..270298a 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
@@ -41,39 +41,38 @@ public partial class SearchMob : ContentPage, INotifyPropertyChanged
imageCollection.BindingContext = this;
if ((Application.Current as App).User != null)
{
-
+ ButtonAddConseil.IsVisible = true;
}
}
+ 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());
+ AddConseilLayout.IsVisible = false;
+ 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("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("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 +80,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("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 +103,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("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()
@@ -151,4 +139,9 @@ public partial class SearchMob : ContentPage, INotifyPropertyChanged
{
SearchText = e.NewTextValue;
}
+
+ private void texteConseilEntry_TextChanged(object sender, TextChangedEventArgs e)
+ {
+ (ScrollLayoutThatNeedsToBeRefreshed as IView).InvalidateMeasure(); //Permet de recalculer la taille de la scrollView
+ }
}
\ No newline at end of file