From a80e43f9f936b5efe6221c910e45e86ff9b6d5eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoan=20BRUGI=C3=88RE?= Date: Wed, 24 May 2023 11:55:58 +0200 Subject: [PATCH] Quelques modification de styles --- Sources/Model/ObjetOhara.cs | 2 +- Sources/Ohara/AppShell.xaml | 28 +++-- Sources/Ohara/MainPage.xaml | 40 +++---- Sources/Ohara/PageBestiaire.xaml | 50 ++++++--- Sources/Ohara/PageEquipage.xaml | 83 ++++++++------ Sources/Ohara/PageFDD.xaml | 121 ++++++++++----------- Sources/Ohara/PageFavoris.xaml | 28 ++--- Sources/Ohara/Resources/Styles/Styles.xaml | 16 +++ 8 files changed, 195 insertions(+), 173 deletions(-) diff --git a/Sources/Model/ObjetOhara.cs b/Sources/Model/ObjetOhara.cs index 31a4d3e..62b2dbf 100644 --- a/Sources/Model/ObjetOhara.cs +++ b/Sources/Model/ObjetOhara.cs @@ -14,7 +14,7 @@ namespace Model public string Nom { get; set; } [DataMember (Name ="image")] public string? Image { get; set;} - + [DataMember(Name = "estfavori")] public bool EstFavori { get; set; } public ObjetOhara(string nom,string image = "baseimage.png", bool estFavori = false) diff --git a/Sources/Ohara/AppShell.xaml b/Sources/Ohara/AppShell.xaml index 04d8f36..36a8ef4 100644 --- a/Sources/Ohara/AppShell.xaml +++ b/Sources/Ohara/AppShell.xaml @@ -5,29 +5,25 @@ xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:local="clr-namespace:Ohara" Shell.FlyoutBehavior="Locked" - Shell.NavBarIsVisible="False" - Shell.Background="#72a3b3" + Shell.NavBarIsVisible="False" + Shell.FlyoutWidth="300" > - - - - - + + + + + - + @@ -37,6 +33,8 @@ - + + diff --git a/Sources/Ohara/MainPage.xaml b/Sources/Ohara/MainPage.xaml index a21a3e5..caceff8 100644 --- a/Sources/Ohara/MainPage.xaml +++ b/Sources/Ohara/MainPage.xaml @@ -3,25 +3,25 @@ xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" x:Class="Ohara.MainPage" BackgroundColor="#e2edf1"> + + + + + + diff --git a/Sources/Ohara/PageBestiaire.xaml b/Sources/Ohara/PageBestiaire.xaml index b987382..5fb9aae 100644 --- a/Sources/Ohara/PageBestiaire.xaml +++ b/Sources/Ohara/PageBestiaire.xaml @@ -6,27 +6,41 @@ BackgroundColor="#e2edf1"> - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/Sources/Ohara/PageEquipage.xaml b/Sources/Ohara/PageEquipage.xaml index 03c8d63..ff56f12 100644 --- a/Sources/Ohara/PageEquipage.xaml +++ b/Sources/Ohara/PageEquipage.xaml @@ -5,8 +5,13 @@ Title="PageEquipage" BackgroundColor="#e2edf1"> - - + + + + + + + @@ -17,44 +22,52 @@ - - - - - - - - - - - - - - - - - + FontSize="19" + TextColor="White" + FontAttributes="Bold" /> + + + + + + + \ No newline at end of file diff --git a/Sources/Ohara/PageFDD.xaml b/Sources/Ohara/PageFDD.xaml index 6ed942d..318705f 100644 --- a/Sources/Ohara/PageFDD.xaml +++ b/Sources/Ohara/PageFDD.xaml @@ -6,84 +6,73 @@ BackgroundColor="#e2edf1"> - - - - - - - - - - - - - - - + + - - - \ No newline at end of file diff --git a/Sources/Ohara/PageFavoris.xaml b/Sources/Ohara/PageFavoris.xaml index d84c21f..1234d22 100644 --- a/Sources/Ohara/PageFavoris.xaml +++ b/Sources/Ohara/PageFavoris.xaml @@ -5,37 +5,29 @@ Title="PageFavoris" BackgroundColor="#e2edf1"> - - - + + + - - - - - - - - - - - - + + + + + - + + +