From a70d3003e715bdb0c64e18065e49518dce5c7a69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yoan=20BRUGI=C3=88RE?= <yobrugiere1>
Date: Wed, 29 Mar 2023 19:29:56 +0200
Subject: [PATCH] =?UTF-8?q?Menu=20de=20navigation=20+=20D=C3=A9but=20page?=
 =?UTF-8?q?=20=20d'acceuil=20(Xaml)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vs/Ohara/v17/.wsuo                        | Bin 0 -> 11264 bytes
 .vs/VSWorkspaceState.json                  |   6 ++
 Sources/Ohara/MainPage.xaml                |  98 ++++++++++++---------
 Sources/Ohara/MainPage.xaml.cs             |  16 +---
 Sources/Ohara/NewPage1.xaml                |  12 +++
 Sources/Ohara/NewPage1.xaml.cs             |   9 ++
 Sources/Ohara/Ohara.csproj                 |   6 ++
 Sources/Ohara/Resources/Styles/Styles.xaml |  11 ++-
 8 files changed, 104 insertions(+), 54 deletions(-)
 create mode 100644 .vs/Ohara/v17/.wsuo
 create mode 100644 .vs/VSWorkspaceState.json
 create mode 100644 Sources/Ohara/NewPage1.xaml
 create mode 100644 Sources/Ohara/NewPage1.xaml.cs

diff --git a/.vs/Ohara/v17/.wsuo b/.vs/Ohara/v17/.wsuo
new file mode 100644
index 0000000000000000000000000000000000000000..c69aebd738fddb901b1b0788a1fd6a542f5d13dc
GIT binary patch
literal 11264
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

literal 0
HcmV?d00001

diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
new file mode 100644
index 0000000..9568b22
--- /dev/null
+++ b/.vs/VSWorkspaceState.json
@@ -0,0 +1,6 @@
+{
+  "ExpandedNodes": [
+    ""
+  ],
+  "PreviewInSolutionExplorer": false
+}
\ No newline at end of file
diff --git a/Sources/Ohara/MainPage.xaml b/Sources/Ohara/MainPage.xaml
index 962d0c2..4dbbc74 100644
--- a/Sources/Ohara/MainPage.xaml
+++ b/Sources/Ohara/MainPage.xaml
@@ -3,46 +3,64 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Ohara.MainPage"
              BackgroundColor="#e2edf1">
-    
-    <ScrollView>
-
-        <Grid
-            Margin="20,35,20,20">
-
-            <Grid.RowDefinitions>
-                <RowDefinition Height="300" />
-                <RowDefinition Height="*" />
-                <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="300" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <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" />
-                        
+
+
+
+    <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 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" Margin="0,20,0,0">
+            <Frame CornerRadius="20"  WidthRequest="600" HeightRequest="75">
+                <Label Text="Bienvenue dans Ohara !" FontAttributes="Bold" FontSize="30" HorizontalOptions="Center" TextColor="White"/>
+                <Frame.Background>
+                    <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                        <GradientStop Color="#cdffd8" Offset="0.1" /> 
                         <GradientStop Color="#94b9ff" Offset="1.0" />
                     </LinearGradientBrush>
-                </Rectangle.Fill>
-            </Rectangle>
-
-            <Frame CornerRadius="20" BorderColor="#72a3b3" BackgroundColor="#72a3b3" Padding="20" WidthRequest="600" Grid.Row="1" Grid.Column="1"/>
-            <Label Text="Présentation :" FontAttributes="Bold" FontSize="30" HorizontalOptions="Center" TextColor="White" Grid.Row="1" Grid.Column="1"/>
-
-
-            <Image
-                Source="ohara2.png"
-                SemanticProperties.Description="Cute dot net bot waving hi to you!"
-                HeightRequest="400"
-              
-                HorizontalOptions="Center"
-                Grid.Row="0"
-                Grid.Column="0"/>
-            
-
-        </Grid>
-    </ScrollView>
-    
+               </Frame.Background>
+
+               
+            </Frame>
+            <Frame CornerRadius="20" BorderColor="#72a3b3" BackgroundColor="#72a3b3" Padding="20" WidthRequest="600" HeightRequest="500" >
+                <Label Text="Présentation :" FontAttributes="Bold" FontSize="30" HorizontalOptions="Center" TextColor="White"/>
+            </Frame>
+        </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>
diff --git a/Sources/Ohara/MainPage.xaml.cs b/Sources/Ohara/MainPage.xaml.cs
index efeefa4..c4e9194 100644
--- a/Sources/Ohara/MainPage.xaml.cs
+++ b/Sources/Ohara/MainPage.xaml.cs
@@ -1,4 +1,6 @@
-namespace Ohara;
+using Microsoft.Maui.Platform;
+
+namespace Ohara;
 
 public partial class MainPage : ContentPage
 {
@@ -8,17 +10,5 @@ public partial class MainPage : ContentPage
 	{
 		InitializeComponent();
 	}
-
-	private void OnCounterClicked(object sender, EventArgs e)
-	{
-		count++;
-
-		if (count == 1)
-			CounterBtn.Text = $"Clicked {count} time";
-		else
-			CounterBtn.Text = $"Clicked {count} times";
-
-		SemanticScreenReader.Announce(CounterBtn.Text);
-	}
 }
 
diff --git a/Sources/Ohara/NewPage1.xaml b/Sources/Ohara/NewPage1.xaml
new file mode 100644
index 0000000..33b9949
--- /dev/null
+++ b/Sources/Ohara/NewPage1.xaml
@@ -0,0 +1,12 @@
+<?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.NewPage1"
+             Title="NewPage1">
+    <VerticalStackLayout>
+        <Label 
+            Text="Welcome to .NET MAUI!"
+            VerticalOptions="Center" 
+            HorizontalOptions="Center" />
+    </VerticalStackLayout>
+</ContentPage>
\ No newline at end of file
diff --git a/Sources/Ohara/NewPage1.xaml.cs b/Sources/Ohara/NewPage1.xaml.cs
new file mode 100644
index 0000000..6ca7ae3
--- /dev/null
+++ b/Sources/Ohara/NewPage1.xaml.cs
@@ -0,0 +1,9 @@
+namespace Ohara;
+
+public partial class NewPage1 : ContentPage
+{
+	public NewPage1()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/Sources/Ohara/Ohara.csproj b/Sources/Ohara/Ohara.csproj
index eeb853a..d6e4fbd 100644
--- a/Sources/Ohara/Ohara.csproj
+++ b/Sources/Ohara/Ohara.csproj
@@ -52,4 +52,10 @@
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <MauiXaml Update="NewPage1.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	</ItemGroup>
+
 </Project>
diff --git a/Sources/Ohara/Resources/Styles/Styles.xaml b/Sources/Ohara/Resources/Styles/Styles.xaml
index 050b36c..d5cf4cb 100644
--- a/Sources/Ohara/Resources/Styles/Styles.xaml
+++ b/Sources/Ohara/Resources/Styles/Styles.xaml
@@ -25,7 +25,7 @@
 
     <Style TargetType="Button">
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Primary}}" />
-        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
+        <Setter Property="BackgroundColor" Value="#bfe5ef"/>
         <Setter Property="FontFamily" Value="OpenSansRegular"/>
         <Setter Property="FontSize" Value="14"/>
         <Setter Property="CornerRadius" Value="8"/>
@@ -402,4 +402,13 @@
         <Setter Property="SelectedTabColor" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray200}}" />
     </Style>
 
+    <Style TargetType="Button" x:Key="buttonMenu">
+        <Setter Property="BackgroundColor" Value="#bfe5ef"/>
+        <Setter Property="FontFamily" Value="OpenSans"/>
+        <Setter Property="FontAttributes" Value="Bold" />
+        <Setter Property="FontSize" Value="20"/>
+        <Setter Property="CornerRadius" Value="0"/>
+        
+        <Setter Property="WidthRequest" Value="250"/>
+    </Style>
 </ResourceDictionary>