celeste.barbosa
/
mastermind
2
3
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

merge de master dans joueur

Browse Source
master
Camille TURPIN-ETIENNE 1 year ago
parent 0d430ec548 a4804abc5a
commit 21fad430ac
46 changed files with 233 additions and 195 deletions
Show Stats Download Patch File Download Diff File

2
ConsoleApp/ConsoleApp.csproj
Unescape View File

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\BibliothequeClasses\BibliothequeClasses.csproj" />
<ProjectReference Include="..\CoreLibrary\CoreLibrary.csproj" />
</ItemGroup>
</Project>

7
ConsoleApp/Program.cs
Unescape View File

@ -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);

4
CoreLibrary/Jeton.cs
Unescape View File

@ -1,6 +1,4 @@
using System;
namespace BibliothequeClasses
namespace CoreLibrary
{
/// <summary>
/// Représente un jeton de jeu qui permet de récupérer et de modifier sa couleur.

10
CoreLibrary/JetonIndicateur.cs
Unescape View File

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BibliothequeClasses
namespace CoreLibrary
{
/// <summary>
/// Représente un jeton indicateur, une classe dérivée de la classe Jeton.
@ -23,6 +17,8 @@ namespace BibliothequeClasses
{
throw new ArgumentException("La couleur doit être Noir ou Blanc");
}
}
}
}

8
CoreLibrary/JetonJoueur.cs
Unescape View File

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BibliothequeClasses
namespace CoreLibrary
{
/// <summary>
/// Représente un jeton joueur, une classe dérivée de la classe Jeton.

11
CoreLibrary/Plateau.cs
Unescape View File

@ -1,9 +1,4 @@
using System;
using System.ComponentModel.DataAnnotations;
using System.Reflection;
using System.Collections.Generic;
namespace BibliothequeClasses
namespace CoreLibrary
{
/// <summary>
@ -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);
}

2
MauiSpark/App.xaml
Unescape View File

@ -1,7 +1,7 @@
<?xml version = "1.0" encoding = "UTF-8" ?>
<Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:mastermind"
xmlns:local="clr-namespace:MauiSpark"
x:Class="MauiSpark.App">
<Application.Resources>
<ResourceDictionary>

39
MauiSpark/AppShell.xaml
Unescape View File

@ -1,43 +1,40 @@
<?xml version="1.0" encoding="UTF-8" ?>
<Shell
x:Class="mastermind.AppShell"
x:Class="MauiSpark.AppShell"
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:MauiSpark"
xmlns:pages="clr-namespace:MauiSpark.Pages"
Shell.NavBarIsVisible="False"
Shell.FlyoutBehavior="Flyout"
Title="mastermind">
Title="Mastermind">
<ShellContent
Title="Accueil"
ContentTemplate="{DataTemplate pages:Accueil}" />
<ShellContent
Title="Connexion"
ContentTemplate="{DataTemplate pages:ConnexionPage}" />
<ShellContent
Title="TableauScore"
ContentTemplate="{DataTemplate pages:TableauScore}"
Route="Pages.TableauScore" />
ContentTemplate="{DataTemplate pages:TableauScore}" />
<ShellContent
Title="Regle"
ContentTemplate="{DataTemplate pages:Regle}"
Route="Pages.Regle" />
<ShellContent
Title="Defaite"
ContentTemplate="{DataTemplate pages:Defaite}"
Route="Pages.Defaite" />
<ShellContent
Title="Egaliter"
ContentTemplate="{DataTemplate pages:Egaliter}"
Route="Pages.Egaliter" />
ContentTemplate="{DataTemplate pages:Regle}" />
<ShellContent
Title="Victoire"
ContentTemplate="{DataTemplate pages:Victoire}"
Route="Pages.Victoire" />
ContentTemplate="{DataTemplate pages:Victoire}" />
<ShellContent
Title="Accueil"
ContentTemplate="{DataTemplate pages:Accueil}"
Route="pages:Accueil" />
Title="Defaite"
ContentTemplate="{DataTemplate pages:Defaite}" />
<ShellContent
Title="Connexion"
ContentTemplate="{DataTemplate pages:ConnexionPage}" />
Title="Egalite"
ContentTemplate="{DataTemplate pages:Egalite}" />
</Shell>

40
MauiSpark/MauiSpark.csproj
Unescape View File

@ -24,7 +24,7 @@
<ApplicationTitle>MauiSpark</ApplicationTitle>
<!-- App Identifier -->
<ApplicationId>com.companyname.MauiSpark</ApplicationId>
<ApplicationId>fr.mastermind.mauispark</ApplicationId>
<!-- Versions -->
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
@ -47,6 +47,7 @@
<!-- Images -->
<MauiImage Include="Resources\Images\*" />
<MauiImage Update="Resources\Images\dotnet_bot.png" Resize="True" BaseSize="300,185" />
<!-- Custom Fonts -->
<MauiFont Include="Resources\Fonts\*" />
@ -62,52 +63,31 @@
</ItemGroup>
<ItemGroup>
<Compile Update="Pages\tableauScore - Copier.xaml.cs">
<DependentUpon>%(Filename)</DependentUpon>
</Compile>
<Compile Update="Pages\tableauScore.xaml.cs">
<DependentUpon>TableauScore.xaml</DependentUpon>
</Compile>
<MauiXaml Update="Pages\Egaliter.xaml">
<MauiXaml Update="Pages\Accueil.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Pages\Regle.xaml">
<MauiXaml Update="Pages\ConnexionPage.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Pages\Victoire.xaml">
<MauiXaml Update="Pages\Defaite.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Views\CTableauScore.xaml">
<MauiXaml Update="Pages\Egaliter.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Pages\NewContent1.xaml">
<MauiXaml Update="Pages\Regle.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Pages\TableauScore.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
</ItemGroup>
<ItemGroup>
<Compile Update="Connexion.xaml.cs">
<DependentUpon>Connexion.xaml</DependentUpon>
</Compile>
<Compile Update="Pages\connexionPage.xaml.cs">
<DependentUpon>ConnexionPage.xaml</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<MauiXaml Update="Pages\ConnexionPage.xaml">
<MauiXaml Update="Pages\Victoire.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Views\UsernameEntry.xaml">
<MauiXaml Update="Views\CTableauScore.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
</ItemGroup>
<ItemGroup>
<MauiXaml Update="Pages\Accueil.xaml">
<MauiXaml Update="Views\UsernameEntryView.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
</ItemGroup>

2
MauiSpark/Pages/Accueil.xaml
Unescape View File

@ -1,6 +1,6 @@
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="mastermind.Pages.Accueil"
x:Class="MauiSpark.Pages.Accueil"
Title="Accueil">
<Grid

2
MauiSpark/Pages/Accueil.xaml.cs
Unescape View File

@ -1,4 +1,4 @@
namespace mastermind.Pages;
namespace MauiSpark.Pages;
public partial class Accueil : ContentPage
{

4
MauiSpark/Pages/ConnexionPage.xaml
Unescape View File

@ -1,8 +1,8 @@
<?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"
xmlns:Views="clr-namespace:mastermind.Views"
x:Class="mastermind.Pages.ConnexionPage"
xmlns:Views="clr-namespace:MauiSpark.Views"
x:Class="MauiSpark.Pages.ConnexionPage"
Title="Connexion">
<Grid
ColumnDefinitions="*"

2
MauiSpark/Pages/ConnexionPage.xaml.cs
Unescape View File

@ -1,4 +1,4 @@
namespace mastermind.Pages;
namespace MauiSpark.Pages;
public partial class ConnexionPage : ContentPage
{

4
MauiSpark/Pages/Defaite.xaml
Unescape View File

@ -1,8 +1,8 @@
<?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="mastermind.Pages.Defaite"
xmlns:pages="clr-namespace:mastermind.Pages"
x:Class="MauiSpark.Pages.Defaite"
xmlns:pages="clr-namespace:MauiSpark.Pages"
Title="Defaite">
<VerticalStackLayout >
<FlexLayout Direction="Row" JustifyContent="SpaceAround" AlignContent="Center" VerticalOptions="Center" Margin="10">

2
MauiSpark/Pages/Defaite.xaml.cs
Unescape View File

@ -1,4 +1,4 @@
namespace mastermind.Pages;
namespace MauiSpark.Pages;
public partial class Defaite : ContentPage
{

42
MauiSpark/Pages/Egalite.xaml
Unescape View File

@ -0,0 +1,42 @@
<<<<<<<< HEAD:MauiSpark/Pages/Egaliter.xaml
<?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="mastermind.Pages.Egaliter"
xmlns:pages="clr-namespace:mastermind.Pages"
Title="Egaliter">
<VerticalStackLayout>
<FlexLayout Direction="Row" JustifyContent="SpaceAround" AlignContent="Center" VerticalOptions="Center" Margin="10">
<Image Source="egaliter.jpg" MaximumHeightRequest="100" MaximumWidthRequest="100" />
<Frame HorizontalOptions="Center" VerticalOptions="Center" Style="{StaticResource FrameTitrePage}">
<Label Text="Egaliter" Style="{StaticResource TexteTitre}"/>
</Frame>
<Image Source="egaliter.jpg" MaximumHeightRequest="100" MaximumWidthRequest="100"/>
</FlexLayout>
<Frame Margin="20">
<Label HorizontalOptions="Center" Text="Les deux joueur ont trouvé en même temps" Style="{StaticResource TexteFrame}"/>
</Frame>
<Button Text="Menu" VerticalOptions="End" HorizontalOptions="Center"></Button>
</VerticalStackLayout>
========
<?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="MauiSpark.Pages.Egalite"
xmlns:pages="clr-namespace:MauiSpark.Pages"
Title="Egalite">
<VerticalStackLayout>
<FlexLayout Direction="Row" JustifyContent="SpaceAround" AlignContent="Center" VerticalOptions="Center" Margin="10">
<Image Source="egaliter.jpg" MaximumHeightRequest="100" MaximumWidthRequest="100" />
<Frame HorizontalOptions="Center" VerticalOptions="Center" Style="{StaticResource FrameTitrePage}">
<Label Text="Egaliter" Style="{StaticResource TexteTitre}"/>
</Frame>
<Image Source="egaliter.jpg" MaximumHeightRequest="100" MaximumWidthRequest="100"/>
</FlexLayout>
<Frame Margin="20">
<Label HorizontalOptions="Center" Text="Les deux joueur ont trouvé en même temps" Style="{StaticResource TexteFrame}"/>
</Frame>
<Button Text="Menu" VerticalOptions="End" HorizontalOptions="Center"></Button>
</VerticalStackLayout>
>>>>>>>> master:MauiSpark/Pages/Egalite.xaml
</ContentPage>

9
MauiSpark/Pages/Egalite.xaml.cs
Unescape View File

@ -0,0 +1,9 @@
namespace MauiSpark.Pages;
public partial class Egalite : ContentPage
{
public Egalite()
{
InitializeComponent();
}
}

20
MauiSpark/Pages/Egaliter.xaml
Unescape View File

@ -1,20 +0,0 @@
<?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="mastermind.Pages.Egaliter"
xmlns:pages="clr-namespace:mastermind.Pages"
Title="Egaliter">
<VerticalStackLayout>
<FlexLayout Direction="Row" JustifyContent="SpaceAround" AlignContent="Center" VerticalOptions="Center" Margin="10">
<Image Source="egaliter.jpg" MaximumHeightRequest="100" MaximumWidthRequest="100" />
<Frame HorizontalOptions="Center" VerticalOptions="Center" Style="{StaticResource FrameTitrePage}">
<Label Text="Egaliter" Style="{StaticResource TexteTitre}"/>
</Frame>
<Image Source="egaliter.jpg" MaximumHeightRequest="100" MaximumWidthRequest="100"/>
</FlexLayout>
<Frame Margin="20">
<Label HorizontalOptions="Center" Text="Les deux joueur ont trouvé en même temps" Style="{StaticResource TexteFrame}"/>
</Frame>
<Button Text="Menu" VerticalOptions="End" HorizontalOptions="Center"></Button>
</VerticalStackLayout>
</ContentPage>

9
MauiSpark/Pages/Egaliter.xaml.cs
Unescape View File

@ -1,9 +0,0 @@
namespace mastermind.Pages;
public partial class Egaliter : ContentPage
{
public Egaliter()
{
InitializeComponent();
}
}

4
MauiSpark/Pages/Regle.xaml
Unescape View File

@ -1,8 +1,8 @@
<?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="mastermind.Pages.Regle"
xmlns:pages="clr-namespace:mastermind.Pages"
x:Class="MauiSpark.Pages.Regle"
xmlns:pages="clr-namespace:MauiSpark.Pages"
Title="Regle">
<ScrollView>
<VerticalStackLayout>

2
MauiSpark/Pages/Regle.xaml.cs
Unescape View File

@ -1,4 +1,4 @@
namespace mastermind.Pages;
namespace MauiSpark.Pages;
public partial class Regle : ContentPage
{

6
MauiSpark/Pages/TableauScore.xaml
Unescape View File

@ -1,9 +1,9 @@
<?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"
xmlns:pages="clr-namespace:mastermind.Pages"
xmlns:views="clr-namespace:mastermind.Views"
x:Class="mastermind.Pages.TableauScore"
xmlns:pages="clr-namespace:MauiSpark.Pages"
xmlns:views="clr-namespace:MauiSpark.Views"
x:Class="MauiSpark.Pages.TableauScore"
Title="TableauScore">
<ScrollView>
<VerticalStackLayout>

20
MauiSpark/Pages/TableauScore.xaml.cs
Unescape View File

@ -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
}

4
MauiSpark/Pages/Victoire.xaml
Unescape View File

@ -1,8 +1,8 @@
<?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="mastermind.Pages.Victoire"
xmlns:pages="clr-namespace:mastermind.Pages"
x:Class="MauiSpark.Pages.Victoire"
xmlns:pages="clr-namespace:MauiSpark.Pages"
Title="Victoire">
<VerticalStackLayout>
<FlexLayout Direction="Row" JustifyContent="SpaceAround" AlignContent="Center" VerticalOptions="Center" Margin="10">

2
MauiSpark/Pages/Victoire.xaml.cs
Unescape View File

@ -1,4 +1,4 @@
namespace mastermind.Pages;
namespace MauiSpark.Pages;
public partial class Victoire : ContentPage
{

9
MauiSpark/Pages/tableauScore.xaml.cs
Unescape View File

@ -1,9 +0,0 @@
namespace mastermind.Pages;
public partial class TableauScore : ContentPage
{
public TableauScore()
{
InitializeComponent();
}
}

2
MauiSpark/Platforms/Android/MainActivity.cs
Unescape View File

@ -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

2
MauiSpark/Platforms/Android/MainApplication.cs
Unescape View File

@ -1,7 +1,7 @@
using Android.App;
using Android.Runtime;
namespace mastermind
namespace MauiSpark
{
[Application]
public class MainApplication : MauiApplication

2
MauiSpark/Platforms/MacCatalyst/AppDelegate.cs
Unescape View File

@ -1,6 +1,6 @@
using Foundation;
namespace mastermind
namespace MauiSpark
{
[Register("AppDelegate")]
public class AppDelegate : MauiUIApplicationDelegate

21
MauiSpark/Platforms/MacCatalyst/Program.cs
Unescape View File

@ -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

2
MauiSpark/Platforms/Tizen/Main.cs
Unescape View File

@ -2,7 +2,7 @@ using Microsoft.Maui;
using Microsoft.Maui.Hosting;
using System;
namespace mastermind
namespace MauiSpark
{
internal class Program : MauiApplication
{

4
MauiSpark/Platforms/Tizen/tizen-manifest.xml
Unescape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="maui-application-id-placeholder" version="0.0.0" api-version="7" xmlns="http://tizen.org/ns/packages">
<manifest package="maui-application-id-placeholder" version="0.0.0" api-version="8" xmlns="http://tizen.org/ns/packages">
<profile name="common" />
<ui-application appid="maui-application-id-placeholder" exec="mastermind.dll" multiple="false" nodisplay="false" taskmanage="true" type="dotnet" launch_mode="single">
<ui-application appid="maui-application-id-placeholder" exec="MauiSpark.dll" multiple="false" nodisplay="false" taskmanage="true" type="dotnet" launch_mode="single">
<label>maui-application-title-placeholder</label>
<icon>maui-appicon-placeholder</icon>
<metadata key="http://tizen.org/metadata/prefer_dotnet_aot" value="true" />

4
MauiSpark/Platforms/Windows/App.xaml
Unescape View File

@ -1,8 +1,8 @@
<maui:MauiWinUIApplication
x:Class="mastermind.WinUI.App"
x:Class="MauiSpark.WinUI.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:maui="using:Microsoft.Maui"
xmlns:local="using:mastermind.WinUI">
xmlns:local="using:MauiSpark.WinUI">
</maui:MauiWinUIApplication>

2
MauiSpark/Platforms/Windows/App.xaml.cs
Unescape View File

@ -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
{
/// <summary>
/// Provides application-specific behavior to supplement the default Application class.

2
MauiSpark/Platforms/Windows/Package.appxmanifest
Unescape View File

@ -8,7 +8,7 @@
<Identity Name="maui-package-name-placeholder" Publisher="CN=User Name" Version="0.0.0.0" />
<mp:PhoneIdentity PhoneProductId="8382CC0C-B479-4409-8C7A-400B666C63FE" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
<mp:PhoneIdentity PhoneProductId="97E124E7-B6AB-477E-A170-E8D28350B439" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
<Properties>
<DisplayName>$placeholder$</DisplayName>

2
MauiSpark/Platforms/Windows/app.manifest
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
<assemblyIdentity version="1.0.0.0" name="mastermind.WinUI.app"/>
<assemblyIdentity version="1.0.0.0" name="MauiSpark.WinUI.app"/>
<application xmlns="urn:schemas-microsoft-com:asm.v3">
<windowsSettings>

2
MauiSpark/Platforms/iOS/AppDelegate.cs
Unescape View File

@ -1,6 +1,6 @@
using Foundation;
namespace mastermind
namespace MauiSpark
{
[Register("AppDelegate")]
public class AppDelegate : MauiUIApplicationDelegate

21
MauiSpark/Platforms/iOS/Program.cs
Unescape View File

@ -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

BIN
MauiSpark/Resources/Fonts/OpenSans-Regular.ttf
View File

Binary file not shown.

BIN
MauiSpark/Resources/Fonts/OpenSans-Semibold.ttf
View File

Binary file not shown.

2
MauiSpark/Views/CTableauScore.xaml
Unescape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="mastermind.Views.CTableauScore">
x:Class="MauiSpark.Views.CTableauScore">
<Frame CornerRadius="5" Padding="0" VerticalOptions="Start" Margin="20,0,20,10" >
<Grid ColumnDefinitions="auto,*,auto,auto" ColumnSpacing="10">

2
MauiSpark/Views/CTableauScore.xaml.cs
Unescape View File

@ -1,4 +1,4 @@
namespace mastermind.Views;
namespace MauiSpark.Views;
public partial class CTableauScore : ContentView
{

2
MauiSpark/Views/UsernameEntryView.xaml
Unescape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="mastermind.Views.UsernameEntryView">
x:Class="MauiSpark.Views.UsernameEntryView">
<Grid
Margin="0, 50"

2
MauiSpark/Views/UsernameEntryView.xaml.cs
Unescape View File

@ -1,4 +1,4 @@
namespace mastermind.Views;
namespace MauiSpark.Views;
public partial class UsernameEntryView : ContentView
{

39
MauiSpark/mastermind.sln
Unescape View File

@ -1,39 +0,0 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.8.34330.188
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mastermind", "mastermind.csproj", "{5552F0D6-EBF5-44B4-81FE-8A7423BB9115}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BibliothequeClasses", "..\BibliothequeClasses\BibliothequeClasses.csproj", "{A728841C-3ADF-478B-B0C7-1DCA344348D6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Console", "..\Console\Console.csproj", "{96316DF7-6526-4D0D-AF41-660832F5CA31}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5552F0D6-EBF5-44B4-81FE-8A7423BB9115}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5552F0D6-EBF5-44B4-81FE-8A7423BB9115}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5552F0D6-EBF5-44B4-81FE-8A7423BB9115}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{5552F0D6-EBF5-44B4-81FE-8A7423BB9115}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5552F0D6-EBF5-44B4-81FE-8A7423BB9115}.Release|Any CPU.Build.0 = Release|Any CPU
{5552F0D6-EBF5-44B4-81FE-8A7423BB9115}.Release|Any CPU.Deploy.0 = Release|Any CPU
{A728841C-3ADF-478B-B0C7-1DCA344348D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A728841C-3ADF-478B-B0C7-1DCA344348D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A728841C-3ADF-478B-B0C7-1DCA344348D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A728841C-3ADF-478B-B0C7-1DCA344348D6}.Release|Any CPU.Build.0 = Release|Any CPU
{96316DF7-6526-4D0D-AF41-660832F5CA31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{96316DF7-6526-4D0D-AF41-660832F5CA31}.Debug|Any CPU.Build.0 = Debug|Any CPU
{96316DF7-6526-4D0D-AF41-660832F5CA31}.Release|Any CPU.ActiveCfg = Release|Any CPU
{96316DF7-6526-4D0D-AF41-660832F5CA31}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B3BD74E0-E5DA-4859-B2B7-E3759C2089EE}
EndGlobalSection
EndGlobal

39
mastermind.sln
Unescape View File

@ -0,0 +1,39 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.8.34330.188
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreLibrary", "CoreLibrary\CoreLibrary.csproj", "{341FB405-085D-4C34-B395-64EF0F9B93E0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp", "ConsoleApp\ConsoleApp.csproj", "{97507EBF-3973-4D1C-BE56-2F125B25E74F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiSpark", "MauiSpark\MauiSpark.csproj", "{BD22A919-E40E-4791-A6B0-2B8D37BBE834}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{341FB405-085D-4C34-B395-64EF0F9B93E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{341FB405-085D-4C34-B395-64EF0F9B93E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{341FB405-085D-4C34-B395-64EF0F9B93E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{341FB405-085D-4C34-B395-64EF0F9B93E0}.Release|Any CPU.Build.0 = Release|Any CPU
{97507EBF-3973-4D1C-BE56-2F125B25E74F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{97507EBF-3973-4D1C-BE56-2F125B25E74F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{97507EBF-3973-4D1C-BE56-2F125B25E74F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{97507EBF-3973-4D1C-BE56-2F125B25E74F}.Release|Any CPU.Build.0 = Release|Any CPU
{BD22A919-E40E-4791-A6B0-2B8D37BBE834}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BD22A919-E40E-4791-A6B0-2B8D37BBE834}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BD22A919-E40E-4791-A6B0-2B8D37BBE834}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{BD22A919-E40E-4791-A6B0-2B8D37BBE834}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BD22A919-E40E-4791-A6B0-2B8D37BBE834}.Release|Any CPU.Build.0 = Release|Any CPU
{BD22A919-E40E-4791-A6B0-2B8D37BBE834}.Release|Any CPU.Deploy.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B3BD74E0-E5DA-4859-B2B7-E3759C2089EE}
EndGlobalSection
EndGlobal
Write Preview
Loading…
Cancel
Save