ajout des icons, suppressions des images inutilisees, corrections de petites images

11 months ago · e77fe24f39
parent 04b3f49a14
commit e77fe24f39
12 changed files with 3102 additions and 20 deletions
--- a/Sources/Fichiers/parties.json
+++ b/Sources/Fichiers/parties.json
--- a/Sources/MauiSpark/App.xaml.cs
+++ b/Sources/MauiSpark/App.xaml.cs
@ -7,9 +7,14 @@ namespace MauiSpark
        public App()
        {
            InitializeComponent();
+        }

-            MainPage = new NavigationPage(new AccueilPage());
-            MainPage.Title = "Mastermind";
+        protected override Window CreateWindow(IActivationState? activationState)
+        {
+            Window window = new Window(new NavigationPage(new AccueilPage()));
+            window.Title = "Mastermind";
+            
+            return window;
        }
    }
 }
--- a/Sources/MauiSpark/MauiSpark.csproj
+++ b/Sources/MauiSpark/MauiSpark.csproj
@ -40,7 +40,7 @@

 	<ItemGroup>
 		<!-- App Icon -->
-		<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
+		<MauiIcon Include="Resources\AppIcon\appicon.png"/>

 		<!-- Splash Screen -->
 		<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
--- a/Sources/MauiSpark/Pages/PlateauPage.xaml
+++ b/Sources/MauiSpark/Pages/PlateauPage.xaml
@ -85,7 +85,7 @@
                        RowDefinitions="*, auto, *, *" 
                        ColumnDefinitions="*, *, *, *, *, *">

-                        <Label FontSize="Medium" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" HorizontalTextAlignment="Center" VerticalTextAlignment="Center" Text="X">
+                        <Label FontSize="Header" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" HorizontalTextAlignment="Center" VerticalTextAlignment="Center" Text="X">
                            <Label.GestureRecognizers>
                                <TapGestureRecognizer Tapped="SupprimerDernierJeton"/>
                            </Label.GestureRecognizers>
@ -107,7 +107,7 @@
                            </BindableLayout.ItemTemplate>
                        </StackLayout>

-                        <Label FontSize="Medium" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" HorizontalTextAlignment="Center" VerticalTextAlignment="Center" Grid.Column="5" Text="V">
+                        <Label FontSize="Header" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" HorizontalTextAlignment="Center" VerticalTextAlignment="Center" Grid.Column="5" Text="V">
                            <Label.GestureRecognizers>
                                <TapGestureRecognizer Tapped="ValiderCode"/>
                            </Label.GestureRecognizers>
@ -128,7 +128,7 @@
                <Label Grid.Row="2" Text="{Binding Numero}" FontSize="Medium" VerticalOptions="Center" HorizontalOptions="Center"/>
            </Grid>

-            <vues:BoutonReglesVue Grid.Column="1" VerticalOptions="Start" HorizontalOptions="End"/>
+            <vues:BoutonReglesVue Grid.Column="1" VerticalOptions="Start" HorizontalOptions="End" WidthRequest="100" HeightRequest="100"/>
        </Grid>
    </ContentPage.Content>
 </ContentPage>
--- a/Sources/MauiSpark/Pages/VictoirePage.xaml.cs
+++ b/Sources/MauiSpark/Pages/VictoirePage.xaml.cs
@ -67,7 +67,7 @@ public partial class VictoirePage : ContentPage
            BindingContext = new Message()
            {
                Titre = "Egalité",
-                Texte = $"Les joueurs {string.Join(' ', gagnants)} ont gagné",
+                Texte = $"Les joueurs {string.Join(", ", gagnants)} ont gagné",
                Image = "egalite.png"
            };
        else
--- a/Sources/MauiSpark/Platforms/Windows/App.xaml
+++ b/Sources/MauiSpark/Platforms/Windows/App.xaml
@ -5,4 +5,31 @@
    xmlns:maui="using:Microsoft.Maui"
    xmlns:local="using:MauiSpark.WinUI">

+    <maui:MauiWinUIApplication.Resources>
+        <DataTemplate x:Key="MauiAppTitleBarTemplate">
+            <Border
+            Canvas.ZIndex="1" 
+            VerticalAlignment="Stretch"
+            Margin="0,0,0,0">
+                <StackPanel Orientation="Horizontal" Margin="12, 0, 0, 0" x:Name="RootStackPanel">
+                    <Image 
+                        x:Name="AppFontIcon"
+                        HorizontalAlignment="Left" 
+                        VerticalAlignment="Center"
+                        Source="mastermind.png"
+                        Visibility="Visible"
+                        Width="16" 
+                        Height="16"/>
+                    <TextBlock 
+                        x:Name="AppTitle"
+                        VerticalAlignment="Center"
+                        Margin="{Binding WindowTitleMargin}"
+                        Text="{Binding WindowTitle}"
+                        Foreground="{Binding WindowTitleForeground}"
+                        Style="{StaticResource CaptionTextBlockStyle}" />
+                </StackPanel>
+            </Border>
+        </DataTemplate>
+    </maui:MauiWinUIApplication.Resources>
+
 </maui:MauiWinUIApplication>
--- a/Sources/MauiSpark/Resources/AppIcon/appicon.png
+++ b/Sources/MauiSpark/Resources/AppIcon/appicon.png
--- a/Sources/MauiSpark/Resources/AppIcon/appicon.svg
+++ b/Sources/MauiSpark/Resources/AppIcon/appicon.svg
@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="456" height="456" viewBox="0 0 456 456" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <rect x="0" y="0" width="456" height="456" fill="#512BD4" />
-</svg>
--- a/Sources/MauiSpark/Resources/AppIcon/appiconfg.svg
+++ b/Sources/MauiSpark/Resources/AppIcon/appiconfg.svg
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="456" height="456" viewBox="0 0 456 456" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <path d="m 105.50037,281.60863 c -2.70293,0 -5.00091,-0.90042 -6.893127,-2.70209 -1.892214,-1.84778 -2.837901,-4.04181 -2.837901,-6.58209 0,-2.58722 0.945687,-4.80389 2.837901,-6.65167 1.892217,-1.84778 4.190197,-2.77167 6.893127,-2.77167 2.74819,0 5.06798,0.92389 6.96019,2.77167 1.93749,1.84778 2.90581,4.06445 2.90581,6.65167 0,2.54028 -0.96832,4.73431 -2.90581,6.58209 -1.89221,1.80167 -4.212,2.70209 -6.96019,2.70209 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
-    <path d="M 213.56111,280.08446 H 195.99044 L 149.69953,207.0544 c -1.17121,-1.84778 -2.14037,-3.76515 -2.90581,-5.75126 h -0.40578 c 0.36051,2.12528 0.54076,6.67515 0.54076,13.6496 v 65.13172 h -15.54349 v -99.36009 h 18.71925 l 44.7374,71.29798 c 1.89222,2.95695 3.1087,4.98917 3.64945,6.09751 h 0.26996 c -0.45021,-2.6325 -0.67573,-7.09015 -0.67573,-13.37293 v -64.02256 h 15.47557 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
-    <path d="m 289.25134,280.08446 h -54.40052 v -99.36009 h 52.23835 v 13.99669 h -36.15411 v 28.13085 h 33.31621 v 13.9271 h -33.31621 v 29.37835 h 38.31628 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
-    <path d="M 366.56466,194.72106 H 338.7222 v 85.3634 h -16.08423 v -85.3634 h -27.77455 v -13.99669 h 71.70124 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
-</svg>
--- a/Sources/MauiSpark/Resources/Images/fleche_retour.png
+++ b/Sources/MauiSpark/Resources/Images/fleche_retour.png
--- a/Sources/MauiSpark/Resources/Images/pink_cloud.jpg
+++ b/Sources/MauiSpark/Resources/Images/pink_cloud.jpg
--- a/Sources/MauiSpark/Resources/Images/wood.jpg
+++ b/Sources/MauiSpark/Resources/Images/wood.jpg