From dcfdfb5b0a1f69436fcaec1de6905a4a2dac234d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yoan=20BRUGI=C3=88RE?= <yobrugiere1>
Date: Wed, 26 Apr 2023 15:34:15 +0200
Subject: [PATCH] =?UTF-8?q?Page=20info=20=C3=A9quipage=20+=20Scroll=20view?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sources/Ohara/AppShell.xaml            |   2 +-
 Sources/Ohara/Ohara.csproj             |   6 ++
 Sources/Ohara/PageFDD.xaml             |  71 +++++++-------
 Sources/Ohara/PageInfoEquipage.xaml    | 128 +++++++++++++++++++++++++
 Sources/Ohara/PageInfoEquipage.xaml.cs |  18 ++++
 5 files changed, 190 insertions(+), 35 deletions(-)
 create mode 100644 Sources/Ohara/PageInfoEquipage.xaml
 create mode 100644 Sources/Ohara/PageInfoEquipage.xaml.cs

diff --git a/Sources/Ohara/AppShell.xaml b/Sources/Ohara/AppShell.xaml
index d21618c..e684220 100644
--- a/Sources/Ohara/AppShell.xaml
+++ b/Sources/Ohara/AppShell.xaml
@@ -13,7 +13,7 @@
     
     
     <ShellContent
-        ContentTemplate="{DataTemplate local:PageEquipage}"
+        ContentTemplate="{DataTemplate local:PageFDD}"
         Route="PageEquipage" />
         
 
diff --git a/Sources/Ohara/Ohara.csproj b/Sources/Ohara/Ohara.csproj
index 9ed02fb..9b39ac1 100644
--- a/Sources/Ohara/Ohara.csproj
+++ b/Sources/Ohara/Ohara.csproj
@@ -57,6 +57,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <Compile Update="PageInfoEquipage.xaml.cs">
+	    <DependentUpon>PageInfoEquipage.xaml</DependentUpon>
+	  </Compile>
 	  <Compile Update="PageEquipage.xaml.cs">
 	    <DependentUpon>PageEquipage.xaml</DependentUpon>
 	  </Compile>
@@ -72,6 +75,9 @@
 	  <MauiXaml Update="NewPage2.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="PageInfoEquipage.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="PageFDD.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
diff --git a/Sources/Ohara/PageFDD.xaml b/Sources/Ohara/PageFDD.xaml
index 8d60200..68c393b 100644
--- a/Sources/Ohara/PageFDD.xaml
+++ b/Sources/Ohara/PageFDD.xaml
@@ -53,41 +53,44 @@
                     <Label Text="Trier" HorizontalTextAlignment="Center"  />
                 </Frame>
             </Grid>
+            <Frame BackgroundColor="#e2edf1">
+                <ScrollView Orientation="Vertical" VerticalScrollBarVisibility="Always">
+                    <CollectionView x:Name="listeFDD"  ItemsLayout="VerticalGrid, 4">
+                        <CollectionView.ItemTemplate>
+                            <DataTemplate>
+                                <Grid Padding="10" ColumnSpacing="10" RowSpacing="20">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="25*"/>
+                                    </Grid.ColumnDefinitions>
+                                    <Image
+                                    Source="{Binding Image}"
+                                    HeightRequest="300"
+                                    WidthRequest="300" />
 
-            <CollectionView x:Name="listeFDD" ItemsUpdatingScrollMode="KeepScrollOffset" VerticalScrollBarVisibility="Always" ItemsLayout="VerticalGrid, 4">
-                <CollectionView.ItemTemplate>
-                    <DataTemplate>
-                        <Grid Padding="10" ColumnSpacing="10" RowSpacing="20">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="25*"/>
-                            </Grid.ColumnDefinitions>
-                            <Image
-                                Source="{Binding Image}"
-                                HeightRequest="300"
-                                WidthRequest="300" />
-                            
-                            <Label 
-                                VerticalOptions="End"
-                                Padding="7"
-                                HorizontalTextAlignment="Center"
-                                HorizontalOptions="Center"
-                                Text="{Binding Type}"
-                                FontAttributes="Italic"
-                                BackgroundColor="#72a3b3"/>
-                            <Label 
-                                VerticalOptions="End"
-                                Margin="25"
-                                HorizontalOptions="Center"
-                                HorizontalTextAlignment="Center"
-                                Padding="5"
-                                Text="{Binding Nom}"
-                                BackgroundColor="#72a3b3"
-                                FontAttributes="Bold" />
-                           
-                        </Grid>
-                    </DataTemplate>
-                </CollectionView.ItemTemplate>
-            </CollectionView>
+                                    <Label 
+                                    VerticalOptions="End"
+                                    Padding="7"
+                                    HorizontalTextAlignment="Center"
+                                    HorizontalOptions="Center"
+                                    Text="{Binding Type}"
+                                    FontAttributes="Italic"
+                                    BackgroundColor="#72a3b3"/>
+                                    <Label 
+                                    VerticalOptions="End"
+                                    Margin="25"
+                                    HorizontalOptions="Center"
+                                    HorizontalTextAlignment="Center"
+                                    Padding="5"
+                                    Text="{Binding Nom}"
+                                    BackgroundColor="#72a3b3"
+                                    FontAttributes="Bold" />
+
+                                </Grid>
+                            </DataTemplate>
+                        </CollectionView.ItemTemplate>
+                    </CollectionView>
+                </ScrollView>
+            </Frame>
             
         </VerticalStackLayout>
     </Grid>
diff --git a/Sources/Ohara/PageInfoEquipage.xaml b/Sources/Ohara/PageInfoEquipage.xaml
new file mode 100644
index 0000000..3d2e572
--- /dev/null
+++ b/Sources/Ohara/PageInfoEquipage.xaml
@@ -0,0 +1,128 @@
+<?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.PageInfoEquipage"
+             Title="PageInfoEquipage"
+             BackgroundColor="#e2edf1">
+    <Grid>
+
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2*" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="300" />
+            <ColumnDefinition Width="90*" />
+        </Grid.ColumnDefinitions>
+        <VerticalStackLayout BackgroundColor="#72a3b3" Grid.Row="0" Grid.Column="0" Spacing="10">
+
+            <Image Source="ohara2.png" HeightRequest="300" HorizontalOptions="Center" >
+                <Image.Clip>
+                    <EllipseGeometry Center="150,90"  RadiusX="80"  RadiusY="80"/>
+                </Image.Clip>
+            </Image>
+
+
+            <Button Style="{StaticResource buttonMenu}" Text="Accueil"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Carte"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Personnages"/>
+            <Button Style="{StaticResource buttonMenu2}" Text="Fruits du démon"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Bateaux"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Îles"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Bestiaire"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Équipages"/>
+        </VerticalStackLayout>
+        <ScrollView  Grid.Row="0" Grid.Column="1" Orientation="Vertical" VerticalScrollBarVisibility="Always">
+            <VerticalStackLayout  Spacing="40">
+                <CollectionView x:Name="listeEquip">
+                        <CollectionView.ItemTemplate>
+                            <DataTemplate>
+
+                                <VerticalStackLayout Spacing="10" Padding="20">
+
+                                    <Grid Padding="10" ColumnSpacing="20">
+
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="45*"/>
+                                            <ColumnDefinition Width="45*"/>
+                                        </Grid.ColumnDefinitions>
+                                        <VerticalStackLayout Grid.Column="0" Spacing="4">
+                                            <Frame BorderColor="#72a3b3">
+                                                <Label Text="Sommaire" TextColor="#72a3b3"/>
+                                            </Frame>
+                                            <Frame BorderColor="#72a3b3">
+                                                <Label Text="1 - Description" TextColor="#72a3b3"/>
+                                            </Frame>
+                                            <Frame BorderColor="#72a3b3">
+                                                <Label Text="2 - Membre(s)" TextColor="#72a3b3"/>
+                                            </Frame>
+                                            <Frame BorderColor="#72a3b3">
+                                                <Label Text="3 - Allié(s)" TextColor="#72a3b3"/>
+                                            </Frame>
+                                        </VerticalStackLayout>
+                                        <VerticalStackLayout Grid.Column="1" Spacing="4">
+                                            <Frame BorderColor="#72a3b3">
+                                                <Label 
+                                            VerticalOptions="End"
+                                
+                                            HorizontalOptions="Center"
+                                            HorizontalTextAlignment="Center"
+                                            FontSize="20"
+                                            Text="{Binding Nom}"
+                                            TextColor="#72a3b3"
+                                            FontAttributes="Bold" />
+                                            </Frame>
+                                            <Frame BorderColor="#72a3b3">
+                                                <Image
+                                        Source="{Binding Image}"
+                                        HeightRequest="270"
+                                        WidthRequest="270" 
+                                        Aspect="AspectFit"
+                                    
+                                        />
+                                            </Frame>
+                                            <Frame BorderColor="#72a3b3">
+                                                <StackLayout HorizontalOptions="Center" Orientation="Horizontal" Spacing="5">
+                                                    <Label Text="Nom Romanisé :" TextColor="#72a3b3"/>
+                                                    <Label Text="{Binding NomRomanise}" TextColor="#72a3b3"/>
+                                                </StackLayout>
+                                            </Frame>
+                                            <Frame BorderColor="#72a3b3">
+                                                <StackLayout HorizontalOptions="Center" Orientation="Horizontal" Spacing="5">
+                                                    <Label Text="Region :" TextColor="#72a3b3"/>
+                                                    <Label Text="{Binding Region}" TextColor="#72a3b3"/>
+                                                </StackLayout>
+                                            </Frame>
+                                            <Frame BorderColor="#72a3b3">
+                                                <StackLayout HorizontalOptions="Center" Orientation="Horizontal" Spacing="5">
+                                                    <Label Text="Statut :" TextColor="#72a3b3"/>
+                                                    <Label Text="{Binding Statut}" TextColor="#72a3b3"/>
+                                                </StackLayout>
+                                            </Frame>
+                                        </VerticalStackLayout>
+
+
+
+                                    </Grid>
+                                    <Label Text="Description :"  TextColor="#72a3b3" FontSize="20" FontAttributes="Bold"/>
+                                    <Line X1="0" Y1="0" X2="3000" Y2="0"  Stroke="#72a3b3" />
+                                    <Label Text="{Binding Description}" TextColor="#72a3b3" />
+                                    <Label Text="Membre(s) :"  TextColor="#72a3b3" FontSize="20" FontAttributes="Bold"/>
+                                    <Line X1="0" Y1="0" X2="3000" Y2="0"  Stroke="#72a3b3" />
+                                    <Label Text="{Binding Membre}" TextColor="#72a3b3" />
+                                    <Label Text="Allié(s) :"  TextColor="#72a3b3" FontSize="20" FontAttributes="Bold"/>
+                                    <Line X1="0" Y1="0" X2="3000" Y2="0"  Stroke="#72a3b3" />
+                                    <Label Text="{Binding Allie}" TextColor="#72a3b3" />
+                                </VerticalStackLayout>
+
+
+
+
+                            </DataTemplate>
+                        </CollectionView.ItemTemplate>
+                    </CollectionView>
+                
+
+            </VerticalStackLayout>
+        </ScrollView>
+    </Grid>
+</ContentPage>
\ No newline at end of file
diff --git a/Sources/Ohara/PageInfoEquipage.xaml.cs b/Sources/Ohara/PageInfoEquipage.xaml.cs
new file mode 100644
index 0000000..9e7bf07
--- /dev/null
+++ b/Sources/Ohara/PageInfoEquipage.xaml.cs
@@ -0,0 +1,18 @@
+using Model.Stub;
+using Model;
+
+namespace Ohara;
+
+public partial class PageInfoEquipage : ContentPage
+{
+	public PageInfoEquipage()
+	{
+		InitializeComponent();
+       
+
+        List<Equipage> Lequipage = StubEquipage.RecupererEquipage().ToList();
+
+
+        listeEquip.ItemsSource = Lequipage;
+    }
+}
\ No newline at end of file