diff --git a/ConsoleApp/ConsoleApp.csproj b/ConsoleApp/ConsoleApp.csproj index e83c6af..fc237a2 100644 --- a/ConsoleApp/ConsoleApp.csproj +++ b/ConsoleApp/ConsoleApp.csproj @@ -8,7 +8,7 @@ - + diff --git a/ConsoleApp/Program.cs b/ConsoleApp/Program.cs index e69de29..b436bdb 100644 --- a/ConsoleApp/Program.cs +++ b/ConsoleApp/Program.cs @@ -0,0 +1,7 @@ +using CoreLibrary; + + +JetonIndicateur ji1 = new JetonIndicateur(Couleur.Noir); +Console.WriteLine(ji1.Couleur); +Jeton j1 = new JetonIndicateur(Couleur.Blanc); +Console.WriteLine(j1.Couleur); \ No newline at end of file diff --git a/CoreLibrary/Jeton.cs b/CoreLibrary/Jeton.cs index 92834d6..deaaf95 100644 --- a/CoreLibrary/Jeton.cs +++ b/CoreLibrary/Jeton.cs @@ -1,6 +1,4 @@ -using System; - -namespace BibliothequeClasses +namespace CoreLibrary { /// /// Représente un jeton de jeu qui permet de récupérer et de modifier sa couleur. @@ -11,7 +9,7 @@ namespace BibliothequeClasses /// Initialise une nouvelle instance de la classe Jeton avec la couleur spécifiée. /// /// La couleur du jeton. - protected Jeton(Couleur couleur) + protected Jeton(Couleur couleur) { this.Couleur = couleur; } diff --git a/CoreLibrary/JetonIndicateur.cs b/CoreLibrary/JetonIndicateur.cs index 5a16657..846fb07 100644 --- a/CoreLibrary/JetonIndicateur.cs +++ b/CoreLibrary/JetonIndicateur.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BibliothequeClasses +namespace CoreLibrary { /// /// Représente un jeton indicateur, une classe dérivée de la classe Jeton. @@ -16,13 +10,15 @@ namespace BibliothequeClasses /// /// La couleur du jeton. /// Levée si la couleur spécifiée n'est pas Noir ou Blanc. - public JetonIndicateur(Couleur couleur) + public JetonIndicateur(Couleur couleur) : base(couleur) { if (couleur < Couleur.Noir) { throw new ArgumentException("La couleur doit être Noir ou Blanc"); } + + } } } diff --git a/CoreLibrary/JetonJoueur.cs b/CoreLibrary/JetonJoueur.cs index 73a73a8..e862382 100644 --- a/CoreLibrary/JetonJoueur.cs +++ b/CoreLibrary/JetonJoueur.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BibliothequeClasses +namespace CoreLibrary { /// /// Représente un jeton joueur, une classe dérivée de la classe Jeton. @@ -15,10 +9,10 @@ namespace BibliothequeClasses /// Initialise une nouvelle instance de la classe JetonJoueur avec la couleur spécifiée. /// /// La couleur du jeton. - public JetonJoueur(Couleur couleur) + public JetonJoueur(Couleur couleur) : base(couleur) { - + } } } diff --git a/CoreLibrary/Plateau.cs b/CoreLibrary/Plateau.cs index 197f4f1..b5afda4 100644 --- a/CoreLibrary/Plateau.cs +++ b/CoreLibrary/Plateau.cs @@ -1,9 +1,4 @@ -using System; -using System.ComponentModel.DataAnnotations; -using System.Reflection; -using System.Collections.Generic; - -namespace BibliothequeClasses +namespace CoreLibrary { /// @@ -30,8 +25,8 @@ namespace BibliothequeClasses throw new Exception("Le plateau est plein, impossible d'ajouter une combinaison supplémentaire."); } - lesCombinaisonsJoueur[index] = combinaisonJoueur; - index++; + lesCombinaisonsJoueur[index] = combinaisonJoueur; + index++; return combinaisonSecrete.EstEgal(combinaisonJoueur); } diff --git a/MauiSpark/App.xaml b/MauiSpark/App.xaml index 1fcc0bc..167daca 100644 --- a/MauiSpark/App.xaml +++ b/MauiSpark/App.xaml @@ -1,7 +1,7 @@  diff --git a/MauiSpark/AppShell.xaml b/MauiSpark/AppShell.xaml index 2833853..7242e6c 100644 --- a/MauiSpark/AppShell.xaml +++ b/MauiSpark/AppShell.xaml @@ -1,43 +1,40 @@ + Title="Mastermind"> + + + + ContentTemplate="{DataTemplate pages:TableauScore}" /> + - - + ContentTemplate="{DataTemplate pages:Regle}" /> + + ContentTemplate="{DataTemplate pages:Victoire}" /> + Title="Defaite" + ContentTemplate="{DataTemplate pages:Defaite}" /> - + diff --git a/MauiSpark/MauiSpark.csproj b/MauiSpark/MauiSpark.csproj index 2e30ff5..4322eef 100644 --- a/MauiSpark/MauiSpark.csproj +++ b/MauiSpark/MauiSpark.csproj @@ -24,7 +24,7 @@ MauiSpark - com.companyname.MauiSpark + fr.mastermind.mauispark 1.0 @@ -47,6 +47,7 @@ + @@ -62,52 +63,31 @@ - - %(Filename) - - - TableauScore.xaml - - + MSBuild:Compile - + MSBuild:Compile - + MSBuild:Compile - + MSBuild:Compile - + MSBuild:Compile MSBuild:Compile - - - - - Connexion.xaml - - - ConnexionPage.xaml - - - - - + MSBuild:Compile - + MSBuild:Compile - - - - + MSBuild:Compile diff --git a/MauiSpark/Pages/Accueil.xaml b/MauiSpark/Pages/Accueil.xaml index 26f29bb..310a4ef 100644 --- a/MauiSpark/Pages/Accueil.xaml +++ b/MauiSpark/Pages/Accueil.xaml @@ -1,6 +1,6 @@ diff --git a/MauiSpark/Pages/Defaite.xaml.cs b/MauiSpark/Pages/Defaite.xaml.cs index 6c9bb3b..f7bea5f 100644 --- a/MauiSpark/Pages/Defaite.xaml.cs +++ b/MauiSpark/Pages/Defaite.xaml.cs @@ -1,4 +1,4 @@ -namespace mastermind.Pages; +namespace MauiSpark.Pages; public partial class Defaite : ContentPage { diff --git a/MauiSpark/Pages/Egalite.xaml b/MauiSpark/Pages/Egalite.xaml new file mode 100644 index 0000000..71a7c39 --- /dev/null +++ b/MauiSpark/Pages/Egalite.xaml @@ -0,0 +1,42 @@ +<<<<<<<< HEAD:MauiSpark/Pages/Egaliter.xaml + + + + + + + + + +======== + + + + + + + + + +>>>>>>>> master:MauiSpark/Pages/Egalite.xaml + \ No newline at end of file diff --git a/MauiSpark/Pages/Egalite.xaml.cs b/MauiSpark/Pages/Egalite.xaml.cs new file mode 100644 index 0000000..010abb3 --- /dev/null +++ b/MauiSpark/Pages/Egalite.xaml.cs @@ -0,0 +1,9 @@ +namespace MauiSpark.Pages; + +public partial class Egalite : ContentPage +{ + public Egalite() + { + InitializeComponent(); + } +} \ No newline at end of file diff --git a/MauiSpark/Pages/Egaliter.xaml b/MauiSpark/Pages/Egaliter.xaml deleted file mode 100644 index 8a91e37..0000000 --- a/MauiSpark/Pages/Egaliter.xaml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/MauiSpark/Pages/Egaliter.xaml.cs b/MauiSpark/Pages/Egaliter.xaml.cs deleted file mode 100644 index 372d0b1..0000000 --- a/MauiSpark/Pages/Egaliter.xaml.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace mastermind.Pages; - -public partial class Egaliter : ContentPage -{ - public Egaliter() - { - InitializeComponent(); - } -} \ No newline at end of file diff --git a/MauiSpark/Pages/Regle.xaml b/MauiSpark/Pages/Regle.xaml index a89b450..79666bd 100644 --- a/MauiSpark/Pages/Regle.xaml +++ b/MauiSpark/Pages/Regle.xaml @@ -1,8 +1,8 @@ diff --git a/MauiSpark/Pages/Regle.xaml.cs b/MauiSpark/Pages/Regle.xaml.cs index 5cfc5e5..07db133 100644 --- a/MauiSpark/Pages/Regle.xaml.cs +++ b/MauiSpark/Pages/Regle.xaml.cs @@ -1,4 +1,4 @@ -namespace mastermind.Pages; +namespace MauiSpark.Pages; public partial class Regle : ContentPage { diff --git a/MauiSpark/Pages/TableauScore.xaml b/MauiSpark/Pages/TableauScore.xaml index a6e5a32..f637c5c 100644 --- a/MauiSpark/Pages/TableauScore.xaml +++ b/MauiSpark/Pages/TableauScore.xaml @@ -1,9 +1,9 @@ diff --git a/MauiSpark/Pages/TableauScore.xaml.cs b/MauiSpark/Pages/TableauScore.xaml.cs new file mode 100644 index 0000000..cdd494e --- /dev/null +++ b/MauiSpark/Pages/TableauScore.xaml.cs @@ -0,0 +1,20 @@ +<<<<<<<< HEAD:MauiSpark/Pages/tableauScore.xaml.cs +namespace mastermind.Pages; + +public partial class TableauScore : ContentPage +{ + public TableauScore() + { + InitializeComponent(); + } +======== +namespace MauiSpark.Pages; + +public partial class TableauScore : ContentPage +{ + public TableauScore() + { + InitializeComponent(); + } +>>>>>>>> master:MauiSpark/Pages/TableauScore.xaml.cs +} \ No newline at end of file diff --git a/MauiSpark/Pages/Victoire.xaml b/MauiSpark/Pages/Victoire.xaml index cd250c7..f8425d8 100644 --- a/MauiSpark/Pages/Victoire.xaml +++ b/MauiSpark/Pages/Victoire.xaml @@ -1,8 +1,8 @@ diff --git a/MauiSpark/Pages/Victoire.xaml.cs b/MauiSpark/Pages/Victoire.xaml.cs index ee38509..c36b984 100644 --- a/MauiSpark/Pages/Victoire.xaml.cs +++ b/MauiSpark/Pages/Victoire.xaml.cs @@ -1,4 +1,4 @@ -namespace mastermind.Pages; +namespace MauiSpark.Pages; public partial class Victoire : ContentPage { diff --git a/MauiSpark/Pages/tableauScore.xaml.cs b/MauiSpark/Pages/tableauScore.xaml.cs deleted file mode 100644 index 9630843..0000000 --- a/MauiSpark/Pages/tableauScore.xaml.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace mastermind.Pages; - -public partial class TableauScore : ContentPage -{ - public TableauScore() - { - InitializeComponent(); - } -} \ No newline at end of file diff --git a/MauiSpark/Platforms/Android/MainActivity.cs b/MauiSpark/Platforms/Android/MainActivity.cs index f9c78f3..96e7ee8 100644 --- a/MauiSpark/Platforms/Android/MainActivity.cs +++ b/MauiSpark/Platforms/Android/MainActivity.cs @@ -2,7 +2,7 @@ using Android.Content.PM; using Android.OS; -namespace mastermind +namespace MauiSpark { [Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)] public class MainActivity : MauiAppCompatActivity diff --git a/MauiSpark/Platforms/Android/MainApplication.cs b/MauiSpark/Platforms/Android/MainApplication.cs index 69d26e3..370f156 100644 --- a/MauiSpark/Platforms/Android/MainApplication.cs +++ b/MauiSpark/Platforms/Android/MainApplication.cs @@ -1,7 +1,7 @@ using Android.App; using Android.Runtime; -namespace mastermind +namespace MauiSpark { [Application] public class MainApplication : MauiApplication diff --git a/MauiSpark/Platforms/MacCatalyst/AppDelegate.cs b/MauiSpark/Platforms/MacCatalyst/AppDelegate.cs index b69a836..6c3bf9e 100644 --- a/MauiSpark/Platforms/MacCatalyst/AppDelegate.cs +++ b/MauiSpark/Platforms/MacCatalyst/AppDelegate.cs @@ -1,6 +1,6 @@ using Foundation; -namespace mastermind +namespace MauiSpark { [Register("AppDelegate")] public class AppDelegate : MauiUIApplicationDelegate diff --git a/MauiSpark/Platforms/MacCatalyst/Program.cs b/MauiSpark/Platforms/MacCatalyst/Program.cs index a7baf31..a044203 100644 --- a/MauiSpark/Platforms/MacCatalyst/Program.cs +++ b/MauiSpark/Platforms/MacCatalyst/Program.cs @@ -1,4 +1,5 @@ -using ObjCRuntime; +<<<<<<<< HEAD:MauiSpark/Platforms/iOS/Program.cs +using ObjCRuntime; using UIKit; namespace mastermind @@ -14,3 +15,21 @@ namespace mastermind } } } +======== +using ObjCRuntime; +using UIKit; + +namespace MauiSpark +{ + public class Program + { + // This is the main entry point of the application. + static void Main(string[] args) + { + // if you want to use a different Application Delegate class from "AppDelegate" + // you can specify it here. + UIApplication.Main(args, null, typeof(AppDelegate)); + } + } +} +>>>>>>>> master:MauiSpark/Platforms/MacCatalyst/Program.cs diff --git a/MauiSpark/Platforms/Tizen/Main.cs b/MauiSpark/Platforms/Tizen/Main.cs index abd8b68..a47137f 100644 --- a/MauiSpark/Platforms/Tizen/Main.cs +++ b/MauiSpark/Platforms/Tizen/Main.cs @@ -2,7 +2,7 @@ using Microsoft.Maui; using Microsoft.Maui.Hosting; using System; -namespace mastermind +namespace MauiSpark { internal class Program : MauiApplication { diff --git a/MauiSpark/Platforms/Tizen/tizen-manifest.xml b/MauiSpark/Platforms/Tizen/tizen-manifest.xml index 0eb8ad2..f2f8ec4 100644 --- a/MauiSpark/Platforms/Tizen/tizen-manifest.xml +++ b/MauiSpark/Platforms/Tizen/tizen-manifest.xml @@ -1,7 +1,7 @@  - + - + maui-appicon-placeholder diff --git a/MauiSpark/Platforms/Windows/App.xaml b/MauiSpark/Platforms/Windows/App.xaml index 78b2c77..8cbc430 100644 --- a/MauiSpark/Platforms/Windows/App.xaml +++ b/MauiSpark/Platforms/Windows/App.xaml @@ -1,8 +1,8 @@  + xmlns:local="using:MauiSpark.WinUI"> diff --git a/MauiSpark/Platforms/Windows/App.xaml.cs b/MauiSpark/Platforms/Windows/App.xaml.cs index d51d626..15496b2 100644 --- a/MauiSpark/Platforms/Windows/App.xaml.cs +++ b/MauiSpark/Platforms/Windows/App.xaml.cs @@ -3,7 +3,7 @@ // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. -namespace mastermind.WinUI +namespace MauiSpark.WinUI { /// /// Provides application-specific behavior to supplement the default Application class. diff --git a/MauiSpark/Platforms/Windows/Package.appxmanifest b/MauiSpark/Platforms/Windows/Package.appxmanifest index 3065afb..fe332f8 100644 --- a/MauiSpark/Platforms/Windows/Package.appxmanifest +++ b/MauiSpark/Platforms/Windows/Package.appxmanifest @@ -8,7 +8,7 @@ - + $placeholder$ diff --git a/MauiSpark/Platforms/Windows/app.manifest b/MauiSpark/Platforms/Windows/app.manifest index 4b103f3..f1d5857 100644 --- a/MauiSpark/Platforms/Windows/app.manifest +++ b/MauiSpark/Platforms/Windows/app.manifest @@ -1,6 +1,6 @@ - + diff --git a/MauiSpark/Platforms/iOS/AppDelegate.cs b/MauiSpark/Platforms/iOS/AppDelegate.cs index b69a836..6c3bf9e 100644 --- a/MauiSpark/Platforms/iOS/AppDelegate.cs +++ b/MauiSpark/Platforms/iOS/AppDelegate.cs @@ -1,6 +1,6 @@ using Foundation; -namespace mastermind +namespace MauiSpark { [Register("AppDelegate")] public class AppDelegate : MauiUIApplicationDelegate diff --git a/MauiSpark/Platforms/iOS/Program.cs b/MauiSpark/Platforms/iOS/Program.cs index a7baf31..d3de15d 100644 --- a/MauiSpark/Platforms/iOS/Program.cs +++ b/MauiSpark/Platforms/iOS/Program.cs @@ -1,4 +1,5 @@ -using ObjCRuntime; +<<<<<<<< HEAD:MauiSpark/Platforms/MacCatalyst/Program.cs +using ObjCRuntime; using UIKit; namespace mastermind @@ -14,3 +15,21 @@ namespace mastermind } } } +======== +using ObjCRuntime; +using UIKit; + +namespace MauiSpark +{ + public class Program + { + // This is the main entry point of the application. + static void Main(string[] args) + { + // if you want to use a different Application Delegate class from "AppDelegate" + // you can specify it here. + UIApplication.Main(args, null, typeof(AppDelegate)); + } + } +} +>>>>>>>> master:MauiSpark/Platforms/iOS/Program.cs diff --git a/MauiSpark/Resources/Fonts/OpenSans-Regular.ttf b/MauiSpark/Resources/Fonts/OpenSans-Regular.ttf index 9ab655d..2d1edf0 100644 Binary files a/MauiSpark/Resources/Fonts/OpenSans-Regular.ttf and b/MauiSpark/Resources/Fonts/OpenSans-Regular.ttf differ diff --git a/MauiSpark/Resources/Fonts/OpenSans-Semibold.ttf b/MauiSpark/Resources/Fonts/OpenSans-Semibold.ttf index 2b7468e..fe13d06 100644 Binary files a/MauiSpark/Resources/Fonts/OpenSans-Semibold.ttf and b/MauiSpark/Resources/Fonts/OpenSans-Semibold.ttf differ diff --git a/MauiSpark/Views/CTableauScore.xaml b/MauiSpark/Views/CTableauScore.xaml index a7cc50b..5ef6dcd 100644 --- a/MauiSpark/Views/CTableauScore.xaml +++ b/MauiSpark/Views/CTableauScore.xaml @@ -1,7 +1,7 @@ + x:Class="MauiSpark.Views.CTableauScore"> diff --git a/MauiSpark/Views/CTableauScore.xaml.cs b/MauiSpark/Views/CTableauScore.xaml.cs index 64059f9..28a60c1 100644 --- a/MauiSpark/Views/CTableauScore.xaml.cs +++ b/MauiSpark/Views/CTableauScore.xaml.cs @@ -1,4 +1,4 @@ -namespace mastermind.Views; +namespace MauiSpark.Views; public partial class CTableauScore : ContentView { diff --git a/MauiSpark/Views/UsernameEntryView.xaml b/MauiSpark/Views/UsernameEntryView.xaml index 84623e8..7c7e294 100644 --- a/MauiSpark/Views/UsernameEntryView.xaml +++ b/MauiSpark/Views/UsernameEntryView.xaml @@ -1,7 +1,7 @@ + x:Class="MauiSpark.Views.UsernameEntryView">