diff --git a/TheGameExtreme.Android/MainActivity.cs b/TheGameExtreme.Android/MainActivity.cs index 05749b2..5eafc09 100644 --- a/TheGameExtreme.Android/MainActivity.cs +++ b/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) { diff --git a/TheGameExtreme.Android/Properties/AndroidManifest.xml b/TheGameExtreme.Android/Properties/AndroidManifest.xml index e1c2d4f..67757c5 100644 --- a/TheGameExtreme.Android/Properties/AndroidManifest.xml +++ b/TheGameExtreme.Android/Properties/AndroidManifest.xml @@ -1,6 +1,11 @@  - + - + + \ No newline at end of file diff --git a/TheGameExtreme.Android/Resources/Resource.designer.cs b/TheGameExtreme.Android/Resources/Resource.designer.cs index 021041d..9914a73 100644 --- a/TheGameExtreme.Android/Resources/Resource.designer.cs +++ b/TheGameExtreme.Android/Resources/Resource.designer.cs @@ -1,11 +1,11 @@ #pragma warning disable 1591 //------------------------------------------------------------------------------ // -// 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é. // //------------------------------------------------------------------------------ @@ -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() { diff --git a/TheGameExtreme.Android/Resources/drawable/ArrowSettingsBack.png b/TheGameExtreme.Android/Resources/drawable/ArrowSettingsBack.png new file mode 100644 index 0000000..cdeadec Binary files /dev/null and b/TheGameExtreme.Android/Resources/drawable/ArrowSettingsBack.png differ diff --git a/TheGameExtreme.Android/Resources/drawable/EngrenageV1.png b/TheGameExtreme.Android/Resources/drawable/EngrenageV1.png new file mode 100644 index 0000000..b3df1f3 Binary files /dev/null and b/TheGameExtreme.Android/Resources/drawable/EngrenageV1.png differ diff --git a/TheGameExtreme.Android/Resources/drawable/imagesRules.png b/TheGameExtreme.Android/Resources/drawable/imagesRules.png new file mode 100644 index 0000000..52a4df2 Binary files /dev/null and b/TheGameExtreme.Android/Resources/drawable/imagesRules.png differ diff --git a/TheGameExtreme.Android/Resources/drawable/rules.png b/TheGameExtreme.Android/Resources/drawable/rules.png new file mode 100644 index 0000000..104fe85 Binary files /dev/null and b/TheGameExtreme.Android/Resources/drawable/rules.png differ diff --git a/TheGameExtreme.Android/Resources/drawable/rulesImg.png b/TheGameExtreme.Android/Resources/drawable/rulesImg.png new file mode 100644 index 0000000..65d99c4 Binary files /dev/null and b/TheGameExtreme.Android/Resources/drawable/rulesImg.png differ diff --git a/TheGameExtreme.Android/TheGameExtreme.Android.csproj b/TheGameExtreme.Android/TheGameExtreme.Android.csproj index e7930ca..78e17a7 100644 --- a/TheGameExtreme.Android/TheGameExtreme.Android.csproj +++ b/TheGameExtreme.Android/TheGameExtreme.Android.csproj @@ -107,5 +107,20 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/TheGameExtreme.iOS/AppDelegate.cs b/TheGameExtreme.iOS/AppDelegate.cs index dc02e62..b09f94d 100644 --- a/TheGameExtreme.iOS/AppDelegate.cs +++ b/TheGameExtreme.iOS/AppDelegate.cs @@ -22,7 +22,7 @@ namespace TheGameExtreme.iOS // public override bool FinishedLaunching(UIApplication app, NSDictionary options) { - global::Xamarin.Forms.Forms.Init(); + global::Xamarin.Forms.Forms.Init(); LoadApplication(new App()); return base.FinishedLaunching(app, options); diff --git a/TheGameExtreme.iOS/Apple.ico b/TheGameExtreme.iOS/Apple.ico new file mode 100644 index 0000000..5c179eb Binary files /dev/null and b/TheGameExtreme.iOS/Apple.ico differ diff --git a/TheGameExtreme.iOS/Resources/Arrow-left.png b/TheGameExtreme.iOS/Resources/Arrow-left.png new file mode 100644 index 0000000..b892f54 Binary files /dev/null and b/TheGameExtreme.iOS/Resources/Arrow-left.png differ diff --git a/TheGameExtreme.iOS/Resources/ArrowSettingsBack.png b/TheGameExtreme.iOS/Resources/ArrowSettingsBack.png new file mode 100644 index 0000000..cdeadec Binary files /dev/null and b/TheGameExtreme.iOS/Resources/ArrowSettingsBack.png differ diff --git a/TheGameExtreme.iOS/Resources/EngrenageV1.png b/TheGameExtreme.iOS/Resources/EngrenageV1.png new file mode 100644 index 0000000..b3df1f3 Binary files /dev/null and b/TheGameExtreme.iOS/Resources/EngrenageV1.png differ diff --git a/TheGameExtreme.iOS/Resources/rules.png b/TheGameExtreme.iOS/Resources/rules.png new file mode 100644 index 0000000..104fe85 Binary files /dev/null and b/TheGameExtreme.iOS/Resources/rules.png differ diff --git a/TheGameExtreme.iOS/Resources/rulesImg.png b/TheGameExtreme.iOS/Resources/rulesImg.png new file mode 100644 index 0000000..65d99c4 Binary files /dev/null and b/TheGameExtreme.iOS/Resources/rulesImg.png differ diff --git a/TheGameExtreme.iOS/TheGameExtreme.iOS.csproj b/TheGameExtreme.iOS/TheGameExtreme.iOS.csproj index 80849d0..5204781 100644 --- a/TheGameExtreme.iOS/TheGameExtreme.iOS.csproj +++ b/TheGameExtreme.iOS/TheGameExtreme.iOS.csproj @@ -59,6 +59,12 @@ iPhone Developer Entitlements.plist + + + + + Apple.ico + @@ -140,4 +146,15 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/TheGameExtreme/AppRessource.Designer.cs b/TheGameExtreme/AppRessource.Designer.cs index 3b25acb..655d31a 100644 --- a/TheGameExtreme/AppRessource.Designer.cs +++ b/TheGameExtreme/AppRessource.Designer.cs @@ -159,6 +159,25 @@ namespace TheGameExtreme { } } + /// + /// Recherche une chaîne localisée semblable à -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.. + /// + internal static string StrRules { + get { + return ResourceManager.GetString("StrRules", resourceCulture); + } + } + /// /// Recherche une chaîne localisée semblable à Désolé, vous n'avez pas recouvert la tête de mort... Réessayez ;). /// diff --git a/TheGameExtreme/AppRessource.resx b/TheGameExtreme/AppRessource.resx index ada4757..7e4c8a2 100644 --- a/TheGameExtreme/AppRessource.resx +++ b/TheGameExtreme/AppRessource.resx @@ -155,6 +155,19 @@ Le joueur n'a plus de carte dans sa main + + -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. + Désolé, vous n'avez pas recouvert la tête de mort... Réessayez ;) diff --git a/TheGameExtreme/Rules.xaml b/TheGameExtreme/Rules.xaml deleted file mode 100644 index 1eac67c..0000000 --- a/TheGameExtreme/Rules.xaml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/TheGameExtreme/Rules.xaml.cs b/TheGameExtreme/Rules.xaml.cs deleted file mode 100644 index 72b96f8..0000000 --- a/TheGameExtreme/Rules.xaml.cs +++ /dev/null @@ -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(); - } - } -} \ No newline at end of file diff --git a/TheGameExtreme/TheGameExtreme.csproj b/TheGameExtreme/TheGameExtreme.csproj index ecbb657..72a6f4d 100644 --- a/TheGameExtreme/TheGameExtreme.csproj +++ b/TheGameExtreme/TheGameExtreme.csproj @@ -6,7 +6,7 @@ - + @@ -42,12 +42,11 @@ ResXFileCodeGenerator AppRessources-br.Designer.cs - + MSBuild:UpdateDesignTimeXaml - - PublicResXFileCodeGenerator - AppResources.Designer.cs + + MSBuild:UpdateDesignTimeXaml @@ -61,8 +60,5 @@ True AppRessources-br.resx - - AppResources.resx - \ No newline at end of file diff --git a/TheGameExtreme/view/App.xaml b/TheGameExtreme/view/App.xaml index 7dca57e..2dea446 100644 --- a/TheGameExtreme/view/App.xaml +++ b/TheGameExtreme/view/App.xaml @@ -1,5 +1,13 @@  - + + + + black + white + SkyBlue + + + \ No newline at end of file diff --git a/TheGameExtreme/view/App.xaml.cs b/TheGameExtreme/view/App.xaml.cs index dd32133..9866ca3 100644 --- a/TheGameExtreme/view/App.xaml.cs +++ b/TheGameExtreme/view/App.xaml.cs @@ -12,6 +12,7 @@ namespace TheGameExtreme InitializeComponent(); MainPage = new NavigationPage(new HomePage()); + } protected override void OnStart() diff --git a/TheGameExtreme/view/AppResources.Designer.cs b/TheGameExtreme/view/AppResources.Designer.cs deleted file mode 100644 index 169b709..0000000 --- a/TheGameExtreme/view/AppResources.Designer.cs +++ /dev/null @@ -1,56 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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. -// -//------------------------------------------------------------------------------ - -namespace TheGameExtreme.view { - using System; - using System.Reflection; - - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - public class AppResources { - - private static System.Resources.ResourceManager resourceMan; - - private static System.Globalization.CultureInfo resourceCulture; - - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal AppResources() { - } - - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] - public static System.Resources.ResourceManager ResourceManager { - get { - if (object.Equals(null, resourceMan)) { - System.Resources.ResourceManager temp = new System.Resources.ResourceManager("TheGameExtreme.view.AppResources", typeof(AppResources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] - public static System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - public static string coucou { - get { - return ResourceManager.GetString("coucou", resourceCulture); - } - } - } -} diff --git a/TheGameExtreme/view/AppResources.resx b/TheGameExtreme/view/AppResources.resx deleted file mode 100644 index 67bbe9a..0000000 --- a/TheGameExtreme/view/AppResources.resx +++ /dev/null @@ -1,22 +0,0 @@ - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - coucou - Valeur de test - - - - diff --git a/TheGameExtreme/view/HomePage.xaml b/TheGameExtreme/view/HomePage.xaml index f255c97..61a5e56 100644 --- a/TheGameExtreme/view/HomePage.xaml +++ b/TheGameExtreme/view/HomePage.xaml @@ -1,11 +1,11 @@  - + @@ -18,40 +18,61 @@ -