Merge branch 'devGuillaume' into devYoan

Sources/Ohara/MainPage.xaml

@@ -17,13 +17,14 @@
         </Grid.ColumnDefinitions>
         <VerticalStackLayout BackgroundColor="#72a3b3" Grid.Row="0" Grid.Column="0" Spacing="10">
 
-            <Image Source="ohara2.png" HeightRequest="300" HorizontalOptions="Center">
+            <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="Acceuil"/>
+
+            <Button Style="{StaticResource buttonMenu2}" Text="Acceuil"/>
             <Button Style="{StaticResource buttonMenu}" Text="Carte"/>
             <Button Style="{StaticResource buttonMenu}" Text="Personnages"/>
             <Button Style="{StaticResource buttonMenu}" Text="Fruits du démon"/>
@@ -44,9 +45,13 @@
 
                
             </Frame>
-            <Frame CornerRadius="20" BorderColor="#72a3b3" BackgroundColor="#72a3b3" Padding="20" WidthRequest="600" HeightRequest="500" >
+            <Frame CornerRadius="20" BorderColor="#72a3b3" BackgroundColor="#72a3b3" Padding="20" WidthRequest="1000" HeightRequest="500" >
                 <Label Text="Présentation :" FontAttributes="Bold" FontSize="30" HorizontalOptions="Center" TextColor="White"/>
             </Frame>
+
+            <Frame CornerRadius="20" BorderColor="#72a3b3" BackgroundColor="#72a3b3" Padding="20" WidthRequest="1200" HeightRequest="500" >
+                <Label Text="Nouveautés : ..." FontAttributes="Bold" FontSize="30" HorizontalOptions="Start" TextColor="White"/>
+            </Frame>
         </VerticalStackLayout>
 
         

Sources/Ohara/NewPage1.xaml

@@ -2,11 +2,53 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Ohara.NewPage1"
-             Title="NewPage1">
+             BackgroundColor="#e2edf1">
-    <VerticalStackLayout>
+
-        <Label 
+    <Grid>
-            Text="Welcome to .NET MAUI!"
+
-            VerticalOptions="Center" 
+        <Grid.RowDefinitions>
-            HorizontalOptions="Center" />
+            <RowDefinition Height="2*" />
-    </VerticalStackLayout>
+        </Grid.RowDefinitions>
-</ContentPage>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="300" />
+            <ColumnDefinition Width="*" />
+        </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="Acceuil"/>
+            <Button Style="{StaticResource buttonMenu2}" Text="Carte"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Personnages"/>
+            <Button Style="{StaticResource buttonMenu}" 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>
+        <VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="40">
+
+            <Image Source="carte.png" HorizontalOptions="Center" />
+
+        </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>
+
+
+</ContentPage>

Sources/Ohara/NewPage2.xaml

@@ -0,0 +1,54 @@
+<?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.NewPage2"
+             BackgroundColor="#e2edf1">
+
+    <Grid>
+
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2*" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="300" />
+            <ColumnDefinition Width="*" />
+        </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="Acceuil"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Carte"/>
+            <Button Style="{StaticResource buttonMenu2}" Text="Personnages"/>
+            <Button Style="{StaticResource buttonMenu}" 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>
+        <VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="40">
+            <ScrollView Orientation="Horizontal">
+                <Image Source="luffy.png" HeightRequest="800" HorizontalOptions="Start" Margin="30,30,0,0"/>
+            </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>
+
+
+</ContentPage>

Sources/Ohara/NewPage2.xaml.cs

@@ -0,0 +1,9 @@
+namespace Ohara;
+
+public partial class NewPage2 : ContentPage
+{
+	public NewPage2()
+	{
+		InitializeComponent();
+	}
+}

Sources/Ohara/Ohara.csproj

@@ -56,6 +56,9 @@
 	  <MauiXaml Update="NewPage1.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="NewPage2.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	</ItemGroup>
 
 </Project>

Sources/Ohara/Resources/Styles/Styles.xaml

@@ -411,4 +411,22 @@
         
         <Setter Property="WidthRequest" Value="250"/>
     </Style>
+
+    <Style TargetType="Button" x:Key="buttonMenu2">
+        <Setter Property="Background">
+            <Setter.Value>
+                <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                    <GradientStop Color="#cdffd8" Offset="0.1" />
+                    <GradientStop Color="#94b9ff" Offset="1.0" />
+                </LinearGradientBrush>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="FontFamily" Value="OpenSans"/>
+        <Setter Property="FontAttributes" Value="Bold" />
+        <Setter Property="FontSize" Value="20"/>
+        <Setter Property="CornerRadius" Value="0"/>
+
+        <Setter Property="WidthRequest" Value="275" />
+        
+    </Style>
 </ResourceDictionary>