From d5d25d045366d909405049019ffe70e8c4977741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yoan=20BRUGI=C3=88RE?= <yobrugiere1>
Date: Wed, 24 May 2023 13:28:01 +0200
Subject: [PATCH] Nouveau header collection view

---
 Sources/Model/Manager.cs          |  36 +++++++++-
 Sources/Ohara/AppShell.xaml       |   4 +-
 Sources/Ohara/PageBestiaire.xaml  |  43 ++++--------
 Sources/Ohara/PageFDD.xaml        |  43 ++++--------
 Sources/Ohara/PageFavoris.xaml    | 106 +++++++++++++++---------------
 Sources/Ohara/PageFavoris.xaml.cs |   8 ++-
 6 files changed, 120 insertions(+), 120 deletions(-)

diff --git a/Sources/Model/Manager.cs b/Sources/Model/Manager.cs
index 7ffb8a8..8dfaa81 100644
--- a/Sources/Model/Manager.cs
+++ b/Sources/Model/Manager.cs
@@ -1,6 +1,8 @@
-using Model.Stub;
+using Microsoft.VisualBasic;
+using Model.Stub;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -12,9 +14,10 @@ namespace Model
     {
         public IDataManager DataManager { get; set; }
 
-
+        public ObservableCollection<Bateau> Bateaux { get; private set; } 
 
         public Manager() {
+            Bateaux = new ObservableCollection<Bateau>();
             DataManager = new StubManager();
         }
 
@@ -84,7 +87,36 @@ namespace Model
             }
             return listeFDD;
         }
+        public List<ObjetOhara> RechercheObjetOhara(string text, List<ObjetOhara> liste)
+        {
+            if (text == "")
+            {
+                return liste;
+            }
+            foreach (ObjetOhara f in liste.ToList())
+            {
+                bool correspondance = false;
+                int textPos = 0;
+                for (int i = 0; i < (f.Nom.Length); i++)
+                {
+                    if (string.Equals(text[textPos].ToString(), f.Nom[i].ToString(), StringComparison.OrdinalIgnoreCase))
+                    {
+                        textPos++;
+                    }
+                    if (textPos == text.Length)
+                    {
+                        correspondance = true;
+                        break;
+                    }
 
+                }
+                if (!correspondance)
+                {
+                    liste.Remove(f);
+                }
+            }
+            return liste;
+        }
         public List<ObjetOhara> GetFavoris()
         {
             List<ObjetOhara> listeFavoris = new List<ObjetOhara>();
diff --git a/Sources/Ohara/AppShell.xaml b/Sources/Ohara/AppShell.xaml
index 36a8ef4..3ba963e 100644
--- a/Sources/Ohara/AppShell.xaml
+++ b/Sources/Ohara/AppShell.xaml
@@ -17,13 +17,13 @@
         <Grid HeightRequest="200" BackgroundColor="Black" Margin="0,0,0,20">
            
             <Image Source="ohara2.png" Aspect="Fill" Opacity="0.8" />
-            <Label Text="Ohara" FontSize="33" TextColor="White" HorizontalOptions="Center" VerticalOptions="Center" FontAttributes="Bold/>
+            <Label Text="Ohara" FontSize="33" TextColor="White" HorizontalOptions="Center" VerticalOptions="Center" FontAttributes="Bold"/>
             <Line X1="0" Y1="0" X2="3000" Y2="0" StrokeThickness="5" Stroke="#72a3b3" VerticalOptions="End" />
         </Grid>
        
     </Shell.FlyoutHeader>
    
-    <ShellContent Title="Acceuil" ContentTemplate="{DataTemplate local:MainPage}"  />
+    <ShellContent Title="Accueil" ContentTemplate="{DataTemplate local:MainPage}"  />
     <ShellContent Title="Favoris" ContentTemplate="{DataTemplate local:PageFavoris}" />
     <ShellContent Title="Carte" ContentTemplate="{DataTemplate local:PageCarte}" />
     <ShellContent Title="Personnages" ContentTemplate="{DataTemplate local:PagePersonnage}" />
diff --git a/Sources/Ohara/PageBestiaire.xaml b/Sources/Ohara/PageBestiaire.xaml
index 5fb9aae..1173da4 100644
--- a/Sources/Ohara/PageBestiaire.xaml
+++ b/Sources/Ohara/PageBestiaire.xaml
@@ -9,37 +9,18 @@
 
 
         <CollectionView x:Name="listeBest" ItemsLayout="VerticalGrid, 4" EmptyView="Aucun résultat trouvé." SelectionMode="Single" SelectionChanged="listeBest_SelectionChanged">
-            <CollectionView.Header>
-                <Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" >
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="10*"/>
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions >
-                        <ColumnDefinition Width="20*"/>
-                        <ColumnDefinition Width="25*"/>
-                        <ColumnDefinition Width="10*"/>
-                        <ColumnDefinition Width="10*"/>
-                    </Grid.ColumnDefinitions>
-                    <SearchBar Placeholder="Rechercher..." BackgroundColor="#bfe5ef" Grid.Column="0" x:Name="searchBar" />
-
-                    <Frame Grid.Column="2" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" >
-                        <Label Text="Filtrer"  />
-
-                        <FlyoutBase.ContextFlyout>
-                            <MenuFlyout >
-                                <MenuFlyoutItem  x:Name="Logia"  Text="Logia" />
-                            </MenuFlyout>
-                        </FlyoutBase.ContextFlyout>
-
-                    </Frame>
-
-
-
-
-                    <Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="3">
-                        <Label Text="Trier" HorizontalTextAlignment="Center"  />
-                    </Frame>
-                </Grid>
+            <CollectionView.Header>
+                <Grid ColumnDefinitions="200,*,100,10,100" BackgroundColor="#72a3b3" Padding="10">
+                    <SearchBar x:Name="searchBar" Placeholder="Rechercher..." BackgroundColor="#bfe5ef" Grid.Column="0"/>
+                    <Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="2">
+                        <Label Text="Filtrer" HorizontalTextAlignment="Center" />
+                    </Frame>
+
+                    <Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="4">
+                        <Label Text="Trier" HorizontalTextAlignment="Center"  />
+                    </Frame>
+
+                </Grid>
             </CollectionView.Header>
             <CollectionView.ItemTemplate>
                 <DataTemplate>
diff --git a/Sources/Ohara/PageFDD.xaml b/Sources/Ohara/PageFDD.xaml
index 318705f..1145731 100644
--- a/Sources/Ohara/PageFDD.xaml
+++ b/Sources/Ohara/PageFDD.xaml
@@ -11,37 +11,18 @@
         <CollectionView.ItemsLayout>
             <GridItemsLayout Orientation="Vertical" Span="4" HorizontalItemSpacing="15" VerticalItemSpacing="15"/>
         </CollectionView.ItemsLayout>
-        <CollectionView.Header>
-            <Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" >
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="10*"/>
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions >
-                    <ColumnDefinition Width="20*"/>
-                    <ColumnDefinition Width="25*"/>
-                    <ColumnDefinition Width="10*"/>
-                    <ColumnDefinition Width="10*"/>
-                </Grid.ColumnDefinitions>
-                <SearchBar Placeholder="Rechercher..." BackgroundColor="#bfe5ef" Grid.Column="0" x:Name="searchBar" />
-
-                <Frame Grid.Column="2" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" >
-                    <Label Text="Filtrer"  />
-
-                    <FlyoutBase.ContextFlyout>
-                        <MenuFlyout >
-                            <MenuFlyoutItem  x:Name="Logia"  Text="Logia" />
-                        </MenuFlyout>
-                    </FlyoutBase.ContextFlyout>
-
-                </Frame>
-
-
-
-
-                <Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="3">
-                    <Label Text="Trier" HorizontalTextAlignment="Center"  />
-                </Frame>
-            </Grid>
+        <CollectionView.Header>
+            <Grid ColumnDefinitions="200,*,100,10,100" BackgroundColor="#72a3b3" Padding="10">
+                <SearchBar x:Name="searchBar" Placeholder="Rechercher..." BackgroundColor="#bfe5ef" Grid.Column="0"/>
+                <Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="2">
+                    <Label Text="Filtrer" HorizontalTextAlignment="Center" />
+                </Frame>
+
+                <Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="4">
+                    <Label Text="Trier" HorizontalTextAlignment="Center"  />
+                </Frame>
+
+            </Grid>
         </CollectionView.Header>
         <CollectionView.ItemTemplate >
             <DataTemplate >
diff --git a/Sources/Ohara/PageFavoris.xaml b/Sources/Ohara/PageFavoris.xaml
index 1234d22..367b89d 100644
--- a/Sources/Ohara/PageFavoris.xaml
+++ b/Sources/Ohara/PageFavoris.xaml
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="Ohara.PageFavoris"
-             Title="PageFavoris"
-            BackgroundColor="#e2edf1">
-
-    <CollectionView x:Name="listeFavs" SelectionMode="Single" SelectionChanged="listeFavs_SelectionChanged">
-        <CollectionView.ItemsLayout>
-            <GridItemsLayout Orientation="Vertical" Span="4" HorizontalItemSpacing="15" VerticalItemSpacing="15"/>
-        </CollectionView.ItemsLayout>
-        <CollectionView.Header>
-            <HorizontalStackLayout BackgroundColor="#72a3b3" Padding="10"  Spacing="80">
-                <SearchBar Placeholder="Rechercher..." BackgroundColor="#bfe5ef" WidthRequest="200"/>
-                <Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef">
-                    <Label Text="Filtrer" HorizontalTextAlignment="Center" />
-                </Frame>
-
-                <Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" >
-                    <Label Text="Trier" HorizontalTextAlignment="Center"  />
-                </Frame>
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Ohara.PageFavoris"
+             Title="PageFavoris"
+            BackgroundColor="#e2edf1">
+
+    <CollectionView x:Name="listeFavs" SelectionMode="Single" SelectionChanged="listeFavs_SelectionChanged">
+        <CollectionView.ItemsLayout>
+            <GridItemsLayout Orientation="Vertical" Span="4" HorizontalItemSpacing="15" VerticalItemSpacing="15"/>
+        </CollectionView.ItemsLayout>
+        <CollectionView.Header>
+            <Grid ColumnDefinitions="200,*,100,10,100" BackgroundColor="#72a3b3" Padding="10">
+                <SearchBar x:Name="searchBar" Placeholder="Rechercher..." BackgroundColor="#bfe5ef" Grid.Column="0"/>
+                <Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="2">
+                    <Label Text="Filtrer" HorizontalTextAlignment="Center" />
+                </Frame>
+
+                <Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="4">
+                    <Label Text="Trier" HorizontalTextAlignment="Center"  />
+                </Frame>
                 
-            </HorizontalStackLayout>
-        </CollectionView.Header>
-        <CollectionView.ItemTemplate>
-
-            <DataTemplate>
-
-
-                <Frame Style="{StaticResource frameObjet}">
-                    <StackLayout Orientation="Vertical" Padding="5">
-                        <Image
-                                    Source="{Binding Image}"
-                                    HeightRequest="290"
-                                    WidthRequest="290" />
-
-                        <Label
-                                    HorizontalOptions="Center"
-                                    VerticalOptions="Start"
-                                    HorizontalTextAlignment="Center"
-                                    Text="{Binding Nom}"
-                                         
-                                    FontSize="19"
-                                    TextColor="#72a3b3"
-                                    FontAttributes="Bold" />
-                    </StackLayout>
-                </Frame>
-
-
-
-
-            </DataTemplate>
-        </CollectionView.ItemTemplate>
-    </CollectionView>
+            </Grid>
+        </CollectionView.Header>
+        <CollectionView.ItemTemplate>
+
+            <DataTemplate>
+
+
+                <Frame Style="{StaticResource frameObjet}">
+                    <StackLayout Orientation="Vertical" Padding="5">
+                        <Image
+                                    Source="{Binding Image}"
+                                    HeightRequest="290"
+                                    WidthRequest="290" />
+
+                        <Label
+                                    HorizontalOptions="Center"
+                                    VerticalOptions="Start"
+                                    HorizontalTextAlignment="Center"
+                                    Text="{Binding Nom}"
+                                         
+                                    FontSize="19"
+                                    TextColor="#72a3b3"
+                                    FontAttributes="Bold" />
+                    </StackLayout>
+                </Frame>
+
+
+
+
+            </DataTemplate>
+        </CollectionView.ItemTemplate>
+    </CollectionView>
 </ContentPage>
\ No newline at end of file
diff --git a/Sources/Ohara/PageFavoris.xaml.cs b/Sources/Ohara/PageFavoris.xaml.cs
index 7b17aa6..f02747e 100644
--- a/Sources/Ohara/PageFavoris.xaml.cs
+++ b/Sources/Ohara/PageFavoris.xaml.cs
@@ -10,7 +10,13 @@ public partial class PageFavoris : ContentPage
     public PageFavoris()
 	{
 	    InitializeComponent();
-        listeFavs.ItemsSource = manager.GetFavoris();
+        listeFavs.ItemsSource = manager.GetFavoris();
+        void OnTextChanged(object sender, EventArgs e)
+        {
+            SearchBar searchBar = (SearchBar)sender;
+            listeFavs.ItemsSource = manager.RechercheObjetOhara(searchBar.Text, manager.GetFavoris());
+        }
+        searchBar.TextChanged += OnTextChanged;
 
     }
     async void listeFavs_SelectionChanged(object sender, SelectionChangedEventArgs e)