From 201c874875553de0eb3235a0bc4c856da9d99f39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yoan=20BRUGI=C3=88RE?= <yobrugiere1>
Date: Sat, 29 Apr 2023 11:56:22 +0200
Subject: [PATCH] =?UTF-8?q?Correction=20du=20bug=20avec=20InitializeCompon?=
 =?UTF-8?q?ent=20+=20d=C3=A9but=20manager?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sources/Model/IDataManager.cs              | 18 ++++++++++++
 Sources/Model/Manager.cs                   | 12 ++++++++
 Sources/Ohara/Ohara.csproj                 | 16 ++++-------
 Sources/Ohara/PageFDD.xaml                 |  6 ++--
 Sources/Ohara/PageIle.xaml                 | 14 +---------
 Sources/Ohara/PageIle.xaml.cs              | 32 +++++++++++++---------
 Sources/Ohara/Resources/Styles/Styles.xaml | 11 ++++++--
 7 files changed, 69 insertions(+), 40 deletions(-)
 create mode 100644 Sources/Model/IDataManager.cs
 create mode 100644 Sources/Model/Manager.cs

diff --git a/Sources/Model/IDataManager.cs b/Sources/Model/IDataManager.cs
new file mode 100644
index 0000000..9575d14
--- /dev/null
+++ b/Sources/Model/IDataManager.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+    public interface IDataManager
+    {
+        IEnumerable<Bateau> RecupererBateau();
+        IEnumerable<Bestiaire> RecupererBestiaire();
+        IEnumerable<Equipage> RecupererEquipage();
+        IEnumerable<FruitDuDemon> RecupererFruit();
+        IEnumerable<Ile> RecupererIle();
+        IEnumerable<Personnage> RecupererPersonnage();
+    }
+}
diff --git a/Sources/Model/Manager.cs b/Sources/Model/Manager.cs
new file mode 100644
index 0000000..e88378b
--- /dev/null
+++ b/Sources/Model/Manager.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+    internal class Manager
+    {
+    }
+}
diff --git a/Sources/Ohara/Ohara.csproj b/Sources/Ohara/Ohara.csproj
index 019f3b6..6055149 100644
--- a/Sources/Ohara/Ohara.csproj
+++ b/Sources/Ohara/Ohara.csproj
@@ -48,16 +48,6 @@
 		<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
 	</ItemGroup>
 
-	<ItemGroup>
-	  <MauiXaml Remove="PageIle.xaml" />
-	</ItemGroup>
-
-	<ItemGroup>
-	  <EmbeddedResource Include="PageIle.xaml">
-	    <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-	  </EmbeddedResource>
-	</ItemGroup>
-
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
 	</ItemGroup>
@@ -91,6 +81,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <MauiXaml Update="PageIle.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="PageCarte.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
@@ -115,6 +108,9 @@
 	  <MauiXaml Update="PageBateau.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="PageIle.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	</ItemGroup>
 
 </Project>
diff --git a/Sources/Ohara/PageFDD.xaml b/Sources/Ohara/PageFDD.xaml
index 87e7788..42607b5 100644
--- a/Sources/Ohara/PageFDD.xaml
+++ b/Sources/Ohara/PageFDD.xaml
@@ -55,13 +55,15 @@
                 </Frame>
             </Grid>
 
-            <CollectionView x:Name="listeFDD" Style="{StaticResource RespCollection}">
+            <CollectionView x:Name="listeFDD" ItemsLayout="VerticalGrid, 4">
                 <CollectionView.ItemTemplate>
                     <DataTemplate>
-                        <Grid Padding="20" ColumnSpacing="20" RowSpacing="20">
+                        <Grid Padding="20" ColumnSpacing="20" RowSpacing="20"  >
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="25*"/>
+                              
                             </Grid.ColumnDefinitions>
+                           
                             
                             <Frame CornerRadius="25"
                                         BackgroundColor="#e2edf1"
diff --git a/Sources/Ohara/PageIle.xaml b/Sources/Ohara/PageIle.xaml
index 6cde6e2..e838de1 100644
--- a/Sources/Ohara/PageIle.xaml
+++ b/Sources/Ohara/PageIle.xaml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?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.PageIle"
@@ -125,18 +125,6 @@
                 </CollectionView>
             </ScrollView>
         </VerticalStackLayout>
-
-
-
-        <!--<Rectangle WidthRequest="200" HeightRequest="300" HorizontalOptions="Start"   BackgroundColor="#72a3b3">
-            <Rectangle.Fill>
-                <LinearGradientBrush StartPoint="0,0.5" EndPoint="1,0.5">
-                    <GradientStop Color="#cdffd8" Offset="0.0" />-->
-        <!--<GradientStop Color="#94b9ff" Offset="1.0" /></LinearGradientBrush></Rectangle.Fill></Rectangle>-->
-
-
-
-
     </Grid>
 
 
diff --git a/Sources/Ohara/PageIle.xaml.cs b/Sources/Ohara/PageIle.xaml.cs
index 9866785..2464390 100644
--- a/Sources/Ohara/PageIle.xaml.cs
+++ b/Sources/Ohara/PageIle.xaml.cs
@@ -1,28 +1,37 @@
-using Model.Stub;
+using Model.Stub;
 using Model;
 
 namespace Ohara;
 
 public partial class PageIle : ContentPage
 {
-    public PageIle()
-    {
-
-        InitializeComponent();
+	public PageIle()
+	{
+		InitializeComponent();
         List<Ile> ile = StubIle.RecupererIle().ToList();
 
+
         listeIle.ItemsSource = ile;
     }
 
-    private async void Hyperlink_FDD(object sender, EventArgs e)
+    private void listeFDD_ScrollToRequested(object sender, ScrollToRequestEventArgs e)
     {
-        await Navigation.PushAsync(new PageFDD());
+
+    }
+
+    private async void Hyperlink_Accueil(object sender, EventArgs e)
+    {
+        await Navigation.PushAsync(new MainPage());
     }
 
     private async void Hyperlink_Equip(object sender, EventArgs e)
     {
         await Navigation.PushAsync(new PageEquipage());
     }
+    private async void Hyperlink_FDD(object sender, EventArgs e)
+    {
+        await Navigation.PushAsync(new PageFDD());
+    }
     private async void Hyperlink_Perso(object sender, EventArgs e)
     {
         await Navigation.PushAsync(new PagePersonnage());
@@ -31,16 +40,13 @@ public partial class PageIle : ContentPage
     {
         await Navigation.PushAsync(new PageCarte());
     }
-    private async void Hyperlink_Accueil(object sender, EventArgs e)
+    private async void Hyperlink_Bateau(object sender, EventArgs e)
     {
-        await Navigation.PushAsync(new MainPage());
+        await Navigation.PushAsync(new PageBateau());
     }
     private async void Hyperlink_Bestiaire(object sender, EventArgs e)
     {
         await Navigation.PushAsync(new PageBestiaire());
     }
-    private async void Hyperlink_Bateau(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageBateau());
-    }
+    
 }
\ No newline at end of file
diff --git a/Sources/Ohara/Resources/Styles/Styles.xaml b/Sources/Ohara/Resources/Styles/Styles.xaml
index 207465c..ba43b25 100644
--- a/Sources/Ohara/Resources/Styles/Styles.xaml
+++ b/Sources/Ohara/Resources/Styles/Styles.xaml
@@ -480,6 +480,8 @@
                         <VisualState.Setters>
                             <Setter Property="ItemsLayout"
                                     Value="VerticalGrid, 1" />
+                            <Setter Property="BackgroundColor"
+                                    Value="Green"/>
                         </VisualState.Setters>
                     </VisualState>
                     <VisualState x:Name="Moyen">
@@ -489,15 +491,20 @@
                         <VisualState.Setters>
                             <Setter Property="ItemsLayout"
                                     Value="VerticalGrid, 2" />
+                            
+                            <Setter Property="BackgroundColor"
+                                    Value="Blue"/>
                         </VisualState.Setters>
                     </VisualState>
                     <VisualState x:Name="Grand">
                         <VisualState.StateTriggers>
-                            <AdaptiveTrigger MinWindowWidth="960" />
+                            <AdaptiveTrigger MinWindowWidth="900" />
                         </VisualState.StateTriggers>
                         <VisualState.Setters>
                             <Setter Property="ItemsLayout"
-                                    Value="VerticalGrid, 4" />
+                                    Value="HorizontalList" />
+                            <Setter Property="BackgroundColor"
+                                    Value="Red"/>
                         </VisualState.Setters>
                     </VisualState>
                 </VisualStateGroup>