Merge master sur multiplayer_view

TheGameExtreme.Android/MainActivity.cs

@@ -9,7 +9,7 @@ using Android.OS;
 
 namespace TheGameExtreme.Droid
 {
-    [Activity(Label = "TheGameExtreme", Icon = "@mipmap/icon", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation, ScreenOrientation = ScreenOrientation.Landscape)]
+    [Activity(Label = "TheGameExtreme", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation, ScreenOrientation = ScreenOrientation.Landscape)]
     public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity
     {
         protected override void OnCreate(Bundle savedInstanceState)
@@ -22,6 +22,7 @@ namespace TheGameExtreme.Droid
             Xamarin.Essentials.Platform.Init(this, savedInstanceState);
             global::Xamarin.Forms.Forms.Init(this, savedInstanceState);
             LoadApplication(new App());
+            Window.SetStatusBarColor(Android.Graphics.Color.Argb(255, 0, 0, 0));
         }
         public override void OnRequestPermissionsResult(int requestCode, string[] permissions, [GeneratedEnum] Android.Content.PM.Permission[] grantResults)
         {

TheGameExtreme.Android/Properties/AndroidManifest.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.uca.thegameextreme">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          android:versionCode="1" android:versionName="1.0"
+          package="com.uca.thegameextreme"
+          android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
-	<application android:label="TheGameExtreme.Android"></application>
+	<application android:label="TheGameExtreme.Android"
+               android:icon="@drawable/Apple"></application>
+  
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 </manifest>

TheGameExtreme.Android/Resources/Resource.designer.cs

@@ -1,11 +1,11 @@
 #pragma warning disable 1591
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
+//     Ce code a été généré par un outil.
-//     Runtime Version:4.0.30319.42000
+//     Version du runtime :4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
+//     Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
-//     the code is regenerated.
+//     le code est régénéré.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -5713,91 +5713,106 @@ namespace TheGameExtreme.Droid
 			public const int Apple = 2131165274;
 			
 			// aapt resource value: 0x7F07005B
-			public const int avd_hide_password = 2131165275;
+			public const int ArrowSettingsBack = 2131165275;
 			
 			// aapt resource value: 0x7F07005C
-			public const int avd_show_password = 2131165276;
+			public const int avd_hide_password = 2131165276;
 			
 			// aapt resource value: 0x7F07005D
-			public const int design_bottom_navigation_item_background = 2131165277;
+			public const int avd_show_password = 2131165277;
 			
 			// aapt resource value: 0x7F07005E
-			public const int design_fab_background = 2131165278;
+			public const int design_bottom_navigation_item_background = 2131165278;
 			
 			// aapt resource value: 0x7F07005F
-			public const int design_ic_visibility = 2131165279;
+			public const int design_fab_background = 2131165279;
 			
 			// aapt resource value: 0x7F070060
-			public const int design_ic_visibility_off = 2131165280;
+			public const int design_ic_visibility = 2131165280;
 			
 			// aapt resource value: 0x7F070061
-			public const int design_password_eye = 2131165281;
+			public const int design_ic_visibility_off = 2131165281;
 			
 			// aapt resource value: 0x7F070062
-			public const int design_snackbar_background = 2131165282;
+			public const int design_password_eye = 2131165282;
 			
 			// aapt resource value: 0x7F070063
-			public const int Engrenage = 2131165283;
+			public const int design_snackbar_background = 2131165283;
 			
 			// aapt resource value: 0x7F070064
-			public const int ic_mtrl_chip_checked_black = 2131165284;
+			public const int Engrenage = 2131165284;
 			
 			// aapt resource value: 0x7F070065
-			public const int ic_mtrl_chip_checked_circle = 2131165285;
+			public const int EngrenageV1 = 2131165285;
 			
 			// aapt resource value: 0x7F070066
-			public const int ic_mtrl_chip_close_circle = 2131165286;
+			public const int ic_mtrl_chip_checked_black = 2131165286;
 			
 			// aapt resource value: 0x7F070067
-			public const int mtrl_snackbar_background = 2131165287;
+			public const int ic_mtrl_chip_checked_circle = 2131165287;
 			
 			// aapt resource value: 0x7F070068
-			public const int mtrl_tabs_default_indicator = 2131165288;
+			public const int ic_mtrl_chip_close_circle = 2131165288;
 			
 			// aapt resource value: 0x7F070069
-			public const int navigation_empty_icon = 2131165289;
+			public const int imagesRules = 2131165289;
 			
 			// aapt resource value: 0x7F07006A
-			public const int notification_action_background = 2131165290;
+			public const int mtrl_snackbar_background = 2131165290;
 			
 			// aapt resource value: 0x7F07006B
-			public const int notification_bg = 2131165291;
+			public const int mtrl_tabs_default_indicator = 2131165291;
 			
 			// aapt resource value: 0x7F07006C
-			public const int notification_bg_low = 2131165292;
+			public const int navigation_empty_icon = 2131165292;
 			
 			// aapt resource value: 0x7F07006D
-			public const int notification_bg_low_normal = 2131165293;
+			public const int notification_action_background = 2131165293;
 			
 			// aapt resource value: 0x7F07006E
-			public const int notification_bg_low_pressed = 2131165294;
+			public const int notification_bg = 2131165294;
 			
 			// aapt resource value: 0x7F07006F
-			public const int notification_bg_normal = 2131165295;
+			public const int notification_bg_low = 2131165295;
 			
 			// aapt resource value: 0x7F070070
-			public const int notification_bg_normal_pressed = 2131165296;
+			public const int notification_bg_low_normal = 2131165296;
 			
 			// aapt resource value: 0x7F070071
-			public const int notification_icon_background = 2131165297;
+			public const int notification_bg_low_pressed = 2131165297;
 			
 			// aapt resource value: 0x7F070072
-			public const int notification_template_icon_bg = 2131165298;
+			public const int notification_bg_normal = 2131165298;
 			
 			// aapt resource value: 0x7F070073
-			public const int notification_template_icon_low_bg = 2131165299;
+			public const int notification_bg_normal_pressed = 2131165299;
 			
 			// aapt resource value: 0x7F070074
-			public const int notification_tile_bg = 2131165300;
+			public const int notification_icon_background = 2131165300;
 			
 			// aapt resource value: 0x7F070075
-			public const int notify_panel_notification_icon_bg = 2131165301;
+			public const int notification_template_icon_bg = 2131165301;
 			
 			// aapt resource value: 0x7F070076
-			public const int tooltip_frame_dark = 2131165302;
+			public const int notification_template_icon_low_bg = 2131165302;
 			
 			// aapt resource value: 0x7F070077
-			public const int tooltip_frame_light = 2131165303;
+			public const int notification_tile_bg = 2131165303;
+			
+			// aapt resource value: 0x7F070078
+			public const int notify_panel_notification_icon_bg = 2131165304;
+			
+			// aapt resource value: 0x7F070079
+			public const int rules = 2131165305;
+			
+			// aapt resource value: 0x7F07007A
+			public const int rulesImg = 2131165306;
+			
+			// aapt resource value: 0x7F07007B
+			public const int tooltip_frame_dark = 2131165307;
+			
+			// aapt resource value: 0x7F07007C
+			public const int tooltip_frame_light = 2131165308;
 			
 			static Drawable()
 			{

TheGameExtreme.Android/TheGameExtreme.Android.csproj

@@ -107,5 +107,20 @@
   <ItemGroup>
     <Folder Include="Assets\fonts\" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\EngrenageV1.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\rulesImg.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\rules.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\imagesRules.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\ArrowSettingsBack.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>

TheGameExtreme.iOS/TheGameExtreme.iOS.csproj

@@ -59,6 +59,12 @@
     <CodesignKey>iPhone Developer</CodesignKey>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
+    <AppExtensionDebugBundleId />
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>Apple.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="Main.cs" />
     <Compile Include="AppDelegate.cs" />
@@ -140,4 +146,15 @@
   <ItemGroup>
     <BundleResource Include="Resources\FontStyle\SIL Open Font License.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="Resources\rulesImg.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="Resources\rules.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Apple.ico" />
+    <BundleResource Include="Resources\Arrow-left.png" />
+    <BundleResource Include="Resources\ArrowSettingsBack.png" />
+  </ItemGroup>
 </Project>

TheGameExtreme/AppRessource.Designer.cs

@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.42000
@@ -113,6 +113,28 @@ namespace TheGameExtreme {
             }
         }
         
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à -L&apos;objectif est de battre le jeu !
+        ///
+        ///-99 cartes numérotés de 2 à 99.
+        ///
+        ///-4 piles sont à votre disposition, deux ascendantes et deux descendantes.
+        ///
+        ///-L&apos;objectif est de pourvoir poser toute les cartes de la pioches sur les différentes piles à votre disposition.
+        ///
+        ///-Si vous arrivé a vider toute la pioche et de poser tout les cartes sur les piles, vous gagné, sinon vous perdez.
+        ///
+        ///-Quelques suprise pourrait aussi vous surprendre..
+        /// </summary>
+        internal static string StrRules {
+            get {
+                return ResourceManager.GetString("StrRules", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Désolé, vous n&apos;avez pas recouvert la tête de mort... Réessayez ;).
+        /// </summary>
         internal static string StrSkullEffect {
             get {
                 return ResourceManager.GetString("StrSkullEffect", resourceCulture);

TheGameExtreme/AppRessource.Designer.cs.orig

@@ -0,0 +1,165 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace TheGameExtreme {
+    using System;
+    using System.Reflection;
+    
+    
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class AppRessource {
+        
+        private static System.Resources.ResourceManager resourceMan;
+        
+        private static System.Globalization.CultureInfo resourceCulture;
+        
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal AppRessource() {
+        }
+        
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.Equals(null, resourceMan)) {
+                    System.Resources.ResourceManager temp = new System.Resources.ResourceManager("TheGameExtreme.AppRessource", typeof(AppRessource).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        internal static string StrAcendingStack {
+            get {
+                return ResourceManager.GetString("StrAcendingStack", resourceCulture);
+            }
+        }
+        
+        internal static string StrCantGetStack {
+            get {
+                return ResourceManager.GetString("StrCantGetStack", resourceCulture);
+            }
+        }
+        
+        internal static string StrCardPlayedLessThanTwo {
+            get {
+                return ResourceManager.GetString("StrCardPlayedLessThanTwo", resourceCulture);
+            }
+        }
+        
+        internal static string StrChooseCardToPlay {
+            get {
+                return ResourceManager.GetString("StrChooseCardToPlay", resourceCulture);
+            }
+        }
+        
+        internal static string StrChooseStack {
+            get {
+                return ResourceManager.GetString("StrChooseStack", resourceCulture);
+            }
+        }
+        
+        internal static string StrDownStack {
+            get {
+                return ResourceManager.GetString("StrDownStack", resourceCulture);
+            }
+        }
+        
+        internal static string StrEndOfGame {
+            get {
+                return ResourceManager.GetString("StrEndOfGame", resourceCulture);
+            }
+        }
+        
+        internal static string StrEndTurn {
+            get {
+                return ResourceManager.GetString("StrEndTurn", resourceCulture);
+            }
+        }
+        
+        internal static string StrLose {
+            get {
+                return ResourceManager.GetString("StrLose", resourceCulture);
+            }
+        }
+        
+        internal static string StrLose3CardEffect {
+            get {
+                return ResourceManager.GetString("StrLose3CardEffect", resourceCulture);
+            }
+        }
+        
+        internal static string StrNoMoreCardOnHand {
+            get {
+                return ResourceManager.GetString("StrNoMoreCardOnHand", resourceCulture);
+            }
+        }
+        
+<<<<<<< HEAD
+=======
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à -L&apos;objectif est de battre le jeu !
+        ///
+        ///-99 cartes numérotés de 2 à 99.
+        ///
+        ///-4 piles sont à votre disposition, deux ascendantes et deux descendantes.
+        ///
+        ///-L&apos;objectif est de pourvoir poser toute les cartes de la pioches sur les différentes piles à votre disposition.
+        ///
+        ///-Si vous arrivé a vider toute la pioche et de poser tout les cartes sur les piles, vous gagné, sinon vous perdez.
+        ///
+        ///-Quelques suprise pourrait aussi vous surprendre..
+        /// </summary>
+        internal static string StrRules {
+            get {
+                return ResourceManager.GetString("StrRules", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Désolé, vous n&apos;avez pas recouvert la tête de mort... Réessayez ;).
+        /// </summary>
+>>>>>>> master
+        internal static string StrSkullEffect {
+            get {
+                return ResourceManager.GetString("StrSkullEffect", resourceCulture);
+            }
+        }
+        
+        internal static string StrWin {
+            get {
+                return ResourceManager.GetString("StrWin", resourceCulture);
+            }
+        }
+        
+        internal static string StrWrongStack {
+            get {
+                return ResourceManager.GetString("StrWrongStack", resourceCulture);
+            }
+        }
+        
+        internal static string StrPlayerSelection {
+            get {
+                return ResourceManager.GetString("StrPlayerSelection", resourceCulture);
+            }
+        }
+    }
+}

TheGameExtreme/AppRessource.resx

@@ -155,6 +155,19 @@
   <data name="StrNoMoreCardOnHand" xml:space="preserve">
     <value>Le joueur n'a plus de carte dans sa main</value>
   </data>
+  <data name="StrRules" xml:space="preserve">
+    <value>-L'objectif est de battre le jeu !
+
+-99 cartes numérotés de 2 à 99.
+
+-4 piles sont à votre disposition, deux ascendantes et deux descendantes.
+
+-L'objectif est de pourvoir poser toute les cartes de la pioches sur les différentes piles à votre disposition.
+
+-Si vous arrivé a vider toute la pioche et de poser tout les cartes sur les piles, vous gagné, sinon vous perdez.
+
+-Quelques suprise pourrait aussi vous surprendre.</value>
+  </data>
   <data name="StrSkullEffect" xml:space="preserve">
     <value>Désolé, vous n'avez pas recouvert la tête de mort... Réessayez ;)</value>
   </data>

TheGameExtreme/Rules.xaml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ContentView xmlns="http://xamarin.com/schemas/2014/forms" 
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:d="http://xamarin.com/schemas/2014/forms/design"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d"
-             x:Class="TheGameExtreme.Rules">
-  <ContentView.Content>
-      <StackLayout>
-          <Label Text="Hello Xamarin.Forms!" />
-      </StackLayout>
-  </ContentView.Content>
-</ContentView>

TheGameExtreme/Rules.xaml.cs

@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using Xamarin.Forms;
-using Xamarin.Forms.Xaml;
-
-namespace TheGameExtreme
-{
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class Rules : ContentView
-    {
-        public Rules()
-        {
-            InitializeComponent();
-        }
-    }
-}

TheGameExtreme/TheGameExtreme.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.3.0.991211" />
+    <PackageReference Include="Xamarin.Forms" Version="4.3.0.947036" />
     <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
   </ItemGroup>
   <ItemGroup>
@@ -36,17 +36,20 @@
     <EmbeddedResource Include="view\Image\thegame.jpg" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Update="Rules.xaml">
+    <EmbeddedResource Update="AppRessource.resx">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Condition=" '$(EnableDefaultEmbeddedResourceItems)' == 'true' " Update="AppRessource.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>AppRessource.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <EmbeddedResource Condition=" '$(EnableDefaultEmbeddedResourceItems)' == 'true' " Update="AppRessources-br.resx">
+    <EmbeddedResource Update="AppRessources-br.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>AppRessources-br.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <EmbeddedResource Update="DictionnaireBGCBLACK.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Update="DictionnaireBGCWhite.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="AppRessource.Designer.cs">

TheGameExtreme/TheGameExtreme.csproj.orig

@@ -0,0 +1,74 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
+    <SynchReleaseVersion>false</SynchReleaseVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+<<<<<<< HEAD
+    <PackageReference Include="Xamarin.Forms" Version="4.3.0.991211" />
+=======
+    <PackageReference Include="Xamarin.Forms" Version="4.3.0.947036" />
+>>>>>>> master
+    <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="model\event\" />
+    <Folder Include="viewmodel\" />
+    <Folder Include="model\card\" />
+    <Folder Include="model\deck\" />
+    <Folder Include="model\Card\rapidCard\" />
+    <Folder Include="model\gameActions\" />
+    <Folder Include="model\gameActions\extreme\" />
+    <Folder Include="model\gameActions\classic\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Remove="model\effect\StopColm.cs" />
+    <Compile Remove="model\effect\StopCom.cs" />
+    <Compile Remove="model\manager.cs" />
+    <Compile Remove="model\manager\GameManagerSolo.cs" />
+    <Compile Remove="view\AppRessources-br.Designer.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Remove="AppRessources.config" />
+    <None Remove="view\Image\thegame.jpg" />
+    <None Remove="view\MultiPlayerMode.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="view\Image\thegame.jpg" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Rules.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Condition=" '$(EnableDefaultEmbeddedResourceItems)' == 'true' " Update="AppRessource.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>AppRessource.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Condition=" '$(EnableDefaultEmbeddedResourceItems)' == 'true' " Update="AppRessources-br.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>AppRessources-br.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+<<<<<<< HEAD
+=======
+    <EmbeddedResource Update="DictionnaireBGCBLACK.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Update="DictionnaireBGCWhite.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+>>>>>>> master
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="AppRessource.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>AppRessource.resx</DependentUpon>
+    </Compile>
+    <Compile Update="AppRessources-br.Designer.cs">
+      <DependentUpon>AppRessources-br.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+</Project>

TheGameExtreme/view/App.xaml

@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Application xmlns="http://xamarin.com/schemas/2014/forms" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:d="http://xamarin.com/schemas/2014/forms/design" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" x:Class="TheGameExtreme.App">
     <Application.Resources>        
+            <ResourceDictionary>
+
+            <Color x:Key="BlackColor">black</Color>
+            <Color x:Key="WhiteColor">white</Color>
+            <Color x:Key="SkyBlueColor">SkyBlue</Color>
+            
+
+        </ResourceDictionary>        
     </Application.Resources>
 </Application>

TheGameExtreme/view/App.xaml.cs

@@ -12,6 +12,7 @@ namespace TheGameExtreme
             InitializeComponent();
 
             MainPage = new NavigationPage(new HomePage());
+
         }
 
         protected override void OnStart()

TheGameExtreme/view/HomePage.xaml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ContentPage
+<ContentPage Title="THEGAME" BackgroundColor="{DynamicResource BlackColor}"        
-    BackgroundColor="#4d4c4b"
     xmlns="http://xamarin.com/schemas/2014/forms"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     x:Class="TheGameExtreme.view.HomePage">
     <StackLayout BackgroundColor="Transparent">
         <Grid>
+            
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="*"/>
@@ -18,40 +18,61 @@
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
 
-            <Label Text="THE GAME" TextColor="DarkBlue"
+            <Label Text="THE GAME"  TextColor="{DynamicResource WhiteColor}"
                    Grid.Row="0" Grid.Column="1" 
                    HorizontalTextAlignment="Center"  
-                   FontSize="28"                   
+                   FontSize="35"                   
-                   VerticalTextAlignment="Center"/>
+                   VerticalTextAlignment="Center"
+                   FontFamily=""/>
 
-            <ImageButton Source="Engrenage.jpeg"
+            <ImageButton Source="EngrenageV1.jpeg"
                     Grid.Row="0" Grid.Column="2" 
                     VerticalOptions="CenterAndExpand" 
                     HorizontalOptions="End" 
                     HeightRequest="60" 
                     WidthRequest="68"                         
+                    Clicked="OpenSetting"
+                         BackgroundColor="Transparent"/>
             
-                         Clicked="OpenSetting"/>
+            <Button Text="Solo" FontSize="18" Grid.Row="1" Grid.Column="1" 
-            
-            <Button Text="Solo" Grid.Row="1" Grid.Column="1" 
                     HorizontalOptions="Center" 
-                    WidthRequest="150" 
+                    WidthRequest="230" 
-                    HeightRequest="60" 
+                    HeightRequest="57" 
                     VerticalOptions="Center"
-                    Clicked="OpenGame"/>
+                    Clicked="OpenGame"
+                    CornerRadius="10"
+                    Margin="15"
+                    BackgroundColor="{DynamicResource SkyBlueColor}"/>
+
 
-            <Button Text="Multijoueur" Grid.Row="2" Grid.Column="1" 
+            <Button Text="Multijoueur" FontSize="18" Grid.Row="2" Grid.Column="1" 
                     HorizontalOptions="Center" 
                     VerticalOptions="Center"
-                    HeightRequest="60" 
+                    HeightRequest="57" 
-                    WidthRequest="180"
+                    WidthRequest="230"
-                    Clicked="OpenMultiPlayerMode"/>
+                    Clicked="OpenMultiPlayerMode"
+                    CornerRadius="10"
+                    Margin="15"
+                    BackgroundColor="{DynamicResource SkyBlueColor}"/>
 
-            <Button Text="Connexion en ligne" Grid.Row="3" Grid.Column="1"
+            <Button Text="Connexion en ligne" FontSize="16" Grid.Row="3" Grid.Column="1"
                     HorizontalOptions="Center" 
                     VerticalOptions="Center"                    
                     WidthRequest="230"
-                    HeightRequest="60"/>
+                    HeightRequest="57"
+                    CornerRadius="10"
+                    Margin="15"
+                    BackgroundColor="{DynamicResource SkyBlueColor}"/>
+
+            <ImageButton Source="imagesRules.png" Grid.Column="0"
+                         Grid.Row="0"
+                         HeightRequest="60"
+                         WidthRequest="45"
+                         VerticalOptions="CenterAndExpand"
+                         HorizontalOptions="Start"
+                         Margin="20"
+                         Clicked="Rules_Clicked"/>
+
         </Grid>  
     </StackLayout>
 </ContentPage>

TheGameExtreme/view/HomePage.xaml.cs

@@ -7,11 +7,12 @@ namespace TheGameExtreme.view
 {
     public partial class HomePage : ContentPage
     {
+        
         public HomePage()
         {
             InitializeComponent();
+            NavigationPage.SetHasNavigationBar(this, false);
         }        
-
         private async void OpenGame(object sender, EventArgs args)
         {
             await Navigation.PushAsync(new GamePreparationPage());
@@ -26,5 +27,12 @@ namespace TheGameExtreme.view
         {            
             await Navigation.PushAsync(new Settings());            
         }
+
+        private async void Rules_Clicked(object sender, EventArgs e)
+        {
+            await DisplayAlert("Règles", AppRessource.StrRules, "let's go");
+        }
+        
+        
     }
 }

TheGameExtreme/view/MainPage.xaml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<ContentPage
+<ContentPage BackgroundColor="{DynamicResource BlackColor}"
     xmlns="http://xamarin.com/schemas/2014/forms"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:d="http://xamarin.com/schemas/2014/forms/design"

TheGameExtreme/view/MultiPlayerMode.xaml

@@ -1,15 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<ContentPage
+<ContentPage BackgroundColor="{DynamicResource BlackColor}"
     xmlns="http://xamarin.com/schemas/2014/forms"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     x:Class="TheGameExtreme.view.MultiPlayerMode">
 
-    <StackLayout>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="*"/>
+        </Grid.ColumnDefinitions>
 
-        <Button Text="Connexion Bluetooth" Margin="60"/>
+        <ImageButton Source="ArrowSettingsBack.png"
-        <Button Text="Connexion Wifi" />
+                     Margin="15,15,0,0"
+                     Clicked="BackMulti_Clicked"
+                     BackgroundColor="Transparent"                    
+                     VerticalOptions="StartAndExpand" 
+                     HorizontalOptions="Start" 
+                     HeightRequest="50" 
+                     WidthRequest="58"
+                     Grid.Column="0" Grid.Row="0"/>
 
-    </StackLayout>
+        <Label Text="Multijoueur" TextColor="{DynamicResource WhiteColor}"
+               FontSize="28"
+               VerticalTextAlignment="Center"
+               HorizontalTextAlignment="Center"              
+               Grid.Column="1" Grid.Row="0"/>
+
+        <Button Text="Connexion Bluetooth"
+                Grid.Row="1"
+                Grid.Column="1"
+                WidthRequest="230" 
+                HeightRequest="57"
+                VerticalOptions="Center"
+                HorizontalOptions="Center"
+                CornerRadius="10"
+                BackgroundColor="{DynamicResource SkyBlueColor}"/>
+        
+        <Button Text="Connexion Wifi"
+                Grid.Row="2"
+                Grid.Column="1"
+                WidthRequest="230" 
+                HeightRequest="57"
+                VerticalOptions="Center"
+                HorizontalOptions="Center"
+                CornerRadius="10"
+                BackgroundColor="{DynamicResource SkyBlueColor}"/>
+
+    </Grid>
 
 </ContentPage>

TheGameExtreme/view/MultiPlayerMode.xaml.cs

@@ -10,6 +10,12 @@ namespace TheGameExtreme.view
         public MultiPlayerMode()
         {
             InitializeComponent();
+            NavigationPage.SetHasNavigationBar(this, false);
+        }       
+
+        private async void BackMulti_Clicked(object sender, EventArgs e)
+        {
+            await Navigation.PushAsync(new HomePage());
         }
     }
 }

TheGameExtreme/view/Settings.xaml

@@ -1,17 +1,89 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<ContentPage
+<ContentPage BackgroundColor="{DynamicResource BlackColor}" x:Name="pageContentSetting"
+             
     xmlns="http://xamarin.com/schemas/2014/forms"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     x:Class="TheGameExtreme.view.Settings">
 
-    <StackLayout>
+    <Grid>
-        <Label Text="langage" Margin="50" />
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="*"/>
+        </Grid.ColumnDefinitions>
+
+        <ImageButton Source="ArrowSettingsBack.png"
+                    Grid.Row="0" Grid.Column="0" 
+                    VerticalOptions="Start" 
+                    HorizontalOptions="StartAndExpand" 
+                    HeightRequest="40" 
+                    WidthRequest="50"                    
+                    Clicked="SettingToHomePage"
+                     BackgroundColor="Transparent"
+                     Margin="10,10,0,0"/>
+
+        <Label HorizontalTextAlignment="Start"
+               Text ="Langage" Grid.Column="0"
+               Grid.Row="0" FontSize="25"               
+               TextColor="{DynamicResource WhiteColor}"
+               Margin="40,58,0,0"/>
+        
+        <Label Text="English"
+               Grid.Column="1" Grid.Row="0" 
+               FontSize="25"
+               
+               TextColor="{DynamicResource WhiteColor}"
+               Margin="80,58,0,0"/>
+        
+        <CheckBox IsChecked="False"
+                  Grid.Column="1" Grid.Row="0"
+                  x:Name="CBBr"
+                  CheckedChanged="CBBr_CheckedChanged"
+                  Color="SkyBlue"
+                  Margin="40,63,0,0"/>
+        
+        <Label Text="Français"
+               Grid.Column="2" Grid.Row="0"
+               FontSize="25"               
+               TextColor="{DynamicResource WhiteColor}"
+               Margin="80,58,0,0"/>
+        
+        <CheckBox IsChecked="True"
+                  Grid.Column="2" Grid.Row="0"
+                  x:Name="CBFr"
+                  CheckedChanged="CBFr_CheckedChanged"
+                  Color="SkyBlue"
+                  Margin="40,63,0,0"/>
+
+
+        <Label HorizontalTextAlignment="Start"
+               Text="Mode Extreme" Grid.Column="0"
+               Grid.Row="2"  FontSize="25"               
+               TextColor="{DynamicResource WhiteColor}"
+               Margin="40,25,0,0"/>
+        
+        <Switch 
+                Grid.Column="1" Grid.Row="2"
+                OnColor="SkyBlue"
+                ThumbColor="WhiteSmoke"/>
+
+        <Label Text="Thème Clair"
+               Grid.Column="0" Grid.Row="3"
+               FontSize="25"
+               TextColor="{DynamicResource WhiteColor}"               
+               Margin="40,25,0,0"/>
 
-        <Label Text="Sound"/>            
+        <Switch  
-        <Switch IsToggled="true"/>
+                Grid.Column="1" Grid.Row="3" 
-        <Label Text="Mode Extreme"/>
+                Toggled="Switch_Toggled_Theme" x:Name="swTheme"
-        <Switch IsToggled="true"/>
+                OnColor="SkyBlue" ThumbColor="WhiteSmoke"/>
-    </StackLayout>
+    </Grid>
     
 </ContentPage>

TheGameExtreme/view/Settings.xaml.cs

@@ -6,10 +6,64 @@ using Xamarin.Forms;
 namespace TheGameExtreme.view
 {
     public partial class Settings : ContentPage
+        
     {
+          
         public Settings()
         {
             InitializeComponent();
+            NavigationPage.SetHasNavigationBar(this, false);
+            if(pageContentSetting.BackgroundColor == Color.Black)
+            {
+                swTheme.IsToggled = false;
+            }
+            else
+            {
+                swTheme.IsToggled = true;
+            }
+
+
+        }
+
+        private void CBBr_CheckedChanged(object sender, CheckedChangedEventArgs e)
+        {
+            if(CBBr.IsChecked == true)
+            {
+                CBFr.IsChecked = !CBBr.IsChecked;
+            }
+            
+            
+        }
+
+        private void CBFr_CheckedChanged(object sender, CheckedChangedEventArgs e)
+        {
+            if(CBFr.IsChecked == true)
+            {
+                CBBr.IsChecked = !CBBr.IsChecked;
+            }           
+        }     
+
+        private void Switch_Toggled_Theme(object sender, ToggledEventArgs e)//Change le background color de settings en noir et swap la couleur des labels en blanc
+        {
+            
+            if (swTheme.IsToggled == false)
+            {
+                Application.Current.Resources["BlackColor"] = Color.Black;
+                Application.Current.Resources["WhiteColor"] = Color.White;
+                Application.Current.Resources["SkyBlueColor"] = Color.SkyBlue;
+                
+            }
+            else
+            {
+                Application.Current.Resources["BlackColor"] = Color.White;
+                Application.Current.Resources["WhiteColor"] = Color.Black;
+                Application.Current.Resources["BlueSkyColor"] = Color.SkyBlue;
+            }
+        }       
+
+        private async void SettingToHomePage(object sender, EventArgs e)
+        {            
+            await Navigation.PushAsync(new HomePage());            
         }
     }
 }