diff --git a/TheGameExtreme.Android/Properties/AndroidManifest.xml b/TheGameExtreme.Android/Properties/AndroidManifest.xml index 3b6c783..0b2c113 100644 --- a/TheGameExtreme.Android/Properties/AndroidManifest.xml +++ b/TheGameExtreme.Android/Properties/AndroidManifest.xml @@ -1,7 +1,7 @@  - + diff --git a/TheGameExtreme.Android/Resources/Resource.designer.cs b/TheGameExtreme.Android/Resources/Resource.designer.cs index 8dd2c6c..625a514 100644 --- a/TheGameExtreme.Android/Resources/Resource.designer.cs +++ b/TheGameExtreme.Android/Resources/Resource.designer.cs @@ -1,11 +1,11 @@ #pragma warning disable 1591 //------------------------------------------------------------------------------ // -// Ce code a été généré par un outil. -// Version du runtime :4.0.30319.42000 +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // -// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si -// le code est régénéré. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ diff --git a/TheGameExtreme.Android/Resources/drawable/IconPique.ico b/TheGameExtreme.Android/Resources/drawable/IconPique.ico new file mode 100644 index 0000000..817055d Binary files /dev/null and b/TheGameExtreme.Android/Resources/drawable/IconPique.ico differ diff --git a/TheGameExtreme.Android/Resources/drawable/IconPique.jpg b/TheGameExtreme.Android/Resources/drawable/IconPique.jpg deleted file mode 100644 index e7d9e87..0000000 Binary files a/TheGameExtreme.Android/Resources/drawable/IconPique.jpg and /dev/null differ diff --git a/TheGameExtreme.Android/TheGameExtreme.Android.csproj b/TheGameExtreme.Android/TheGameExtreme.Android.csproj index 2f10e31..777f38b 100644 --- a/TheGameExtreme.Android/TheGameExtreme.Android.csproj +++ b/TheGameExtreme.Android/TheGameExtreme.Android.csproj @@ -73,6 +73,10 @@ + + + + diff --git a/TheGameExtreme.iOS/Resources/AndroidManifest.xml b/TheGameExtreme.iOS/Resources/AndroidManifest.xml new file mode 100644 index 0000000..a2e8d0c --- /dev/null +++ b/TheGameExtreme.iOS/Resources/AndroidManifest.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/TheGameExtreme.iOS/Apple.ico b/TheGameExtreme.iOS/Resources/Apple.ico similarity index 100% rename from TheGameExtreme.iOS/Apple.ico rename to TheGameExtreme.iOS/Resources/Apple.ico diff --git a/TheGameExtreme.iOS/Resources/IconPique.ico b/TheGameExtreme.iOS/Resources/IconPique.ico new file mode 100644 index 0000000..817055d Binary files /dev/null and b/TheGameExtreme.iOS/Resources/IconPique.ico differ diff --git a/TheGameExtreme.iOS/TheGameExtreme.iOS.csproj b/TheGameExtreme.iOS/TheGameExtreme.iOS.csproj index e641617..162238e 100644 --- a/TheGameExtreme.iOS/TheGameExtreme.iOS.csproj +++ b/TheGameExtreme.iOS/TheGameExtreme.iOS.csproj @@ -14,6 +14,7 @@ TheGameExtreme.iOS true NSUrlSessionHandler + Resources\IconPique.jpg true @@ -77,6 +78,7 @@ TheGameExtreme.iOS.Resources.Apple.png + diff --git a/TheGameExtreme/AppRessource.resx b/TheGameExtreme/AppRessource.resx index 60d7f39..11bc7f5 100644 --- a/TheGameExtreme/AppRessource.resx +++ b/TheGameExtreme/AppRessource.resx @@ -159,7 +159,7 @@ - L'objectif est de battre la machine seul et/ou en coopération. - - Afin d'atteindre l'objectif, les joueurs disposent de 4 piles (par defaut): deux ascendantes(↑) et deux descendantes(↓). + - Afin d'atteindre l'objectif, les joueurs disposent de 4 piles (par defaut): deux ascendantes(Verte) et deux descendantes(Rouge). Sur les piles ascendantes, le joueur doit bien entendu poser des cartes plus grandes et inversement sur les piles descendantes. - Le but est de poser les 98 cartes du jeu sur les différentes piles à votre disposition. diff --git a/TheGameExtreme/TheGameExtreme.csproj b/TheGameExtreme/TheGameExtreme.csproj index adc2aea..4202f77 100644 --- a/TheGameExtreme/TheGameExtreme.csproj +++ b/TheGameExtreme/TheGameExtreme.csproj @@ -6,10 +6,10 @@ - - + + - + diff --git a/TheGameExtreme/view/GamePreparationPage.xaml.cs b/TheGameExtreme/view/GamePreparationPage.xaml.cs index 0dfa340..579af70 100644 --- a/TheGameExtreme/view/GamePreparationPage.xaml.cs +++ b/TheGameExtreme/view/GamePreparationPage.xaml.cs @@ -8,7 +8,7 @@ namespace TheGameExtreme.view public partial class GamePreparationPage : ContentPage { public List listNbPlayer = new List { 1, 2, 3, 4, 5 }; - public List listGameMode = new List { "entières", "relatives", "décimales", "dizaine", "centaine", "millième", "fractionnées" }; + public List listGameMode = new List { "entières", "relatives", "décimales", "dizaines", "centaines", "millièmes" }; // , "fractionnées" public List listNbStack = new List { 4, 6, 8 }; diff --git a/TheGameExtreme/view/TouchManipulationBitmap.cs b/TheGameExtreme/view/TouchManipulationBitmap.cs index 272c22d..a4673db 100644 --- a/TheGameExtreme/view/TouchManipulationBitmap.cs +++ b/TheGameExtreme/view/TouchManipulationBitmap.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using SkiaSharp; using TouchTracking; @@ -15,7 +16,11 @@ namespace TheGameExtreme.view { this.textPaint = textPaint; Value = value.ToString(); - if (value > -10 && value < 10) + if (value < 0 && value > -10) + { + Value = "-0" + Math.Abs(value).ToString(); + } + else if (value >= 0 && value < 10 && !(value > 0 && value < 1)) { Value = "0" + value.ToString(); }