Revert "Modification des interaction entre page"

This reverts commit f9bd6ba6d7.

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" android:installLocation="auto">
+<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" android:icon="@drawable/Apple"></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.
-//     Runtime Version:4.0.30319.42000
+//     Ce code a été généré par un outil.
+//     Version du runtime :4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
+//     le code est régénéré.
 // </auto-generated>
 //------------------------------------------------------------------------------
 

TheGameExtreme.Android/Resources/layout/Tabbar 3.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.TabLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/sliding_tabs" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/colorPrimary" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:tabIndicatorColor="@android:color/white" app:tabGravity="fill" app:tabMode="fixed" />

TheGameExtreme.Android/Resources/layout/Toolbar 3.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/colorPrimary" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" android:popupTheme="@style/ThemeOverlay.AppCompat.Light" />

TheGameExtreme.Android/Resources/mipmap-anydpi-v26/icon 3.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/launcher_background" />
-    <foreground android:drawable="@mipmap/launcher_foreground" />
-</adaptive-icon>

TheGameExtreme.Android/Resources/mipmap-anydpi-v26/icon_round 3.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/launcher_background" />
-    <foreground android:drawable="@mipmap/launcher_foreground" />
-</adaptive-icon>

TheGameExtreme.Android/Resources/values/Strings 3.xml

@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>

TheGameExtreme.Android/Resources/values/colors 3.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="launcher_background">#FFFFFF</color>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
-</resources>

TheGameExtreme.Android/Resources/values/styles 3.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="MainTheme" parent="MainTheme.Base">
-    </style>
-    <!-- Base theme applied no matter what API -->
-    <style name="MainTheme.Base" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!--If you are using revision 22.1 please use just windowNoTitle. Without android:-->
-        <item name="windowNoTitle">true</item>
-        <!--We will be using the toolbar so no need to show ActionBar-->
-        <item name="windowActionBar">false</item>
-        <!-- Set theme colors from https://aka.ms/material-colors -->
-        <!-- colorPrimary is used for the default action bar background -->
-        <item name="colorPrimary">#2196F3</item>
-        <!-- colorPrimaryDark is used for the status bar -->
-        <item name="colorPrimaryDark">#1976D2</item>
-        <!-- colorAccent is used as the default value for colorControlActivated
-         which is used to tint widgets -->
-        <item name="colorAccent">#FF4081</item>
-        <!-- You can also set colorControlNormal, colorControlActivated
-         colorControlHighlight and colorSwitchThumbNormal. -->
-        <item name="windowActionModeOverlay">true</item>
-        <item name="android:datePickerDialogTheme">@style/AppCompatDialogStyle</item>
-    </style>
-    <style name="AppCompatDialogStyle" parent="Theme.AppCompat.Light.Dialog">
-        <item name="colorAccent">#FF4081</item>
-    </style>
-</resources>

TheGameExtreme.iOS/AppDelegate 2.cs

@@ -1,31 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-using Foundation;
-using UIKit;
-
-namespace TheGameExtreme.iOS
-{
-    // The UIApplicationDelegate for the application. This class is responsible for launching the 
-    // User Interface of the application, as well as listening (and optionally responding) to 
-    // application events from iOS.
-    [Register("AppDelegate")]
-    public partial class AppDelegate : global::Xamarin.Forms.Platform.iOS.FormsApplicationDelegate
-    {
-        //
-        // This method is invoked when the application has loaded and is ready to run. In this 
-        // method you should instantiate the window, load the UI into it and then make the window
-        // visible.
-        //
-        // You have 17 seconds to return from this method, or iOS will terminate your application.
-        //
-        public override bool FinishedLaunching(UIApplication app, NSDictionary options)
-        {
-            global::Xamarin.Forms.Forms.Init();            
-            LoadApplication(new App());
-
-            return base.FinishedLaunching(app, options);
-        }
-    }
-}

TheGameExtreme.iOS/Assets.xcassets/AppIcon.appiconset/Contents 3.json

@@ -1,117 +0,0 @@
-{
-  "images": [
-    {
-      "scale": "2x",
-      "size": "20x20",
-      "idiom": "iphone",
-      "filename": "Icon40.png"
-    },
-    {
-      "scale": "3x",
-      "size": "20x20",
-      "idiom": "iphone",
-      "filename": "Icon60.png"
-    },
-    {
-      "scale": "2x",
-      "size": "29x29",
-      "idiom": "iphone",
-      "filename": "Icon58.png"
-    },
-    {
-      "scale": "3x",
-      "size": "29x29",
-      "idiom": "iphone",
-      "filename": "Icon87.png"
-    },
-    {
-      "scale": "2x",
-      "size": "40x40",
-      "idiom": "iphone",
-      "filename": "Icon80.png"
-    },
-    {
-      "scale": "3x",
-      "size": "40x40",
-      "idiom": "iphone",
-      "filename": "Icon120.png"
-    },
-    {
-      "scale": "2x",
-      "size": "60x60",
-      "idiom": "iphone",
-      "filename": "Icon120.png"
-    },
-    {
-      "scale": "3x",
-      "size": "60x60",
-      "idiom": "iphone",
-      "filename": "Icon180.png"
-    },
-    {
-      "scale": "1x",
-      "size": "20x20",
-      "idiom": "ipad",
-      "filename": "Icon20.png"
-    },
-    {
-      "scale": "2x",
-      "size": "20x20",
-      "idiom": "ipad",
-      "filename": "Icon40.png"
-    },
-    {
-      "scale": "1x",
-      "size": "29x29",
-      "idiom": "ipad",
-      "filename": "Icon29.png"
-    },
-    {
-      "scale": "2x",
-      "size": "29x29",
-      "idiom": "ipad",
-      "filename": "Icon58.png"
-    },
-    {
-      "scale": "1x",
-      "size": "40x40",
-      "idiom": "ipad",
-      "filename": "Icon40.png"
-    },
-    {
-      "scale": "2x",
-      "size": "40x40",
-      "idiom": "ipad",
-      "filename": "Icon80.png"
-    },
-    {
-      "scale": "1x",
-      "size": "76x76",
-      "idiom": "ipad",
-      "filename": "Icon76.png"
-    },
-    {
-      "scale": "2x",
-      "size": "76x76",
-      "idiom": "ipad",
-      "filename": "Icon152.png"
-    },
-    {
-      "scale": "2x",
-      "size": "83.5x83.5",
-      "idiom": "ipad",
-      "filename": "Icon167.png"
-    },
-    {
-      "scale": "1x",
-      "size": "1024x1024",
-      "idiom": "ios-marketing",
-      "filename": "Icon1024.png"
-    }
-  ],
-  "properties": {},
-  "info": {
-    "version": 1,
-    "author": "xcode"
-  }
-}

TheGameExtreme.iOS/Entitlements 2.plist

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-</dict>
-</plist>
-

TheGameExtreme.iOS/Info 2.plist

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>UIDeviceFamily</key>
-	<array>
-		<integer>1</integer>
-		<integer>2</integer>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>MinimumOSVersion</key>
-	<string>8.0</string>
-	<key>CFBundleDisplayName</key>
-	<string>TheGameExtreme</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.uca.TheGameExtreme</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>CFBundleName</key>
-	<string>TheGameExtreme</string>
-	<key>XSAppIconAssets</key>
-	<string>Assets.xcassets/AppIcon.appiconset</string>
-</dict>
-</plist>

TheGameExtreme.iOS/Main 2.cs

@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-using Foundation;
-using UIKit;
-
-namespace TheGameExtreme.iOS
-{
-    public class Application
-    {
-        // 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, "AppDelegate");
-        }
-    }
-}

TheGameExtreme.iOS/TheGameExtreme.iOS.csproj

@@ -154,6 +154,7 @@
   </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,12 +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/view/GamePreparationPage.xaml

@@ -9,8 +9,7 @@
     <Grid
         Margin="0,30,0,0">
         <Grid.RowDefinitions>
-            <RowDefinition Height="10*"/>
-            <RowDefinition Height="25*"/>
+            <RowDefinition Height="35*" />
             <RowDefinition Height="55*"/>
             <RowDefinition Height="10*" />
         </Grid.RowDefinitions>
@@ -21,42 +20,27 @@
 
         <StackLayout
             Grid.Row="0"
-            Grid.Column="0">
-            <ImageButton Source="ArrowSettingsBack.png"
-                    VerticalOptions="Start" 
-                    HorizontalOptions="StartAndExpand" 
-                    HeightRequest="40" 
-                    WidthRequest="50"                    
-                    Clicked="Back"
-                    BackgroundColor="Transparent"
-                    Margin="10,10,0,0"/>
-        </StackLayout>
-
-        <StackLayout
-            Grid.Row="1"
             Grid.Column="0"
             Grid.ColumnSpan="1">
             <Label x:Name="Instruction"/>
         </StackLayout>
 
         <StackLayout
-            Grid.Row="2"
+            Grid.Row="1"
             Grid.Column="0">
 
         </StackLayout>
 
         <StackLayout
-            Grid.Row="2"
+            Grid.Row="1"
             Grid.Column="1">
 
         </StackLayout>
 
         <StackLayout
-            Grid.Row="3"
+            Grid.Row="2"
             Grid.Column="0">
-            <Button
-                Text="Play"
-                Clicked="Play"/>
+
         </StackLayout>
 
     </Grid>

TheGameExtreme/view/GamePreparationPage.xaml.cs

@@ -27,15 +27,5 @@ namespace TheGameExtreme.view
             Instruction.SetBinding(Label.TextProperty, new Binding("InstructionText", source: this));
             InstructionText = AppRessource.StrPlayerSelection;
         }
-
-        private async void Back(object sender, EventArgs e)
-        {
-            await Navigation.PopToRootAsync();
-        }
-
-        private async void Play(object sender, EventArgs args)
-        {
-            await Navigation.PushAsync(new MainPage());
-        }
     }
 }

TheGameExtreme/view/MultiPlayerMode.xaml.cs

@@ -15,7 +15,7 @@ namespace TheGameExtreme.view
 
         private async void BackMulti_Clicked(object sender, EventArgs e)
         {
-            await Navigation.PopToRootAsync();
+            await Navigation.PushAsync(new HomePage());
         }
     }
 }

TheGameExtreme/view/Settings.xaml.cs

@@ -63,7 +63,7 @@ namespace TheGameExtreme.view
 
         private async void SettingToHomePage(object sender, EventArgs e)
         {            
-            await Navigation.PopToRootAsync();            
+            await Navigation.PushAsync(new HomePage());            
         }
     }
 }