diff --git a/TheGameExtreme.Android/Resources/Resource.designer.cs b/TheGameExtreme.Android/Resources/Resource.designer.cs index 455e66d..884c56f 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/AppRessources-br.Designer.cs b/TheGameExtreme/AppRessources-br.Designer.cs deleted file mode 100644 index 3f2f1b9..0000000 --- a/TheGameExtreme/AppRessources-br.Designer.cs +++ /dev/null @@ -1,210 +0,0 @@ -//------------------------------------------------------------------------------ -// -// Ce code a été généré par un outil. -// Version du runtime :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é. -// -//------------------------------------------------------------------------------ - -namespace TheGameExtreme { - using System; - - - /// - /// Une classe de ressource fortement typée destinée, entre autres, à la consultation des chaînes localisées. - /// - // Cette classe a été générée automatiquement par la classe StronglyTypedResourceBuilder - // à l'aide d'un outil, tel que ResGen ou Visual Studio. - // Pour ajouter ou supprimer un membre, modifiez votre fichier .ResX, puis réexécutez ResGen - // avec l'option /str ou régénérez votre projet VS. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class AppRessources_br { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal AppRessources_br() { - } - - /// - /// Retourne l'instance ResourceManager mise en cache utilisée par cette classe. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TheGameExtreme.AppRessources-br", typeof(AppRessources_br).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Remplace la propriété CurrentUICulture du thread actuel pour toutes - /// les recherches de ressources à l'aide de cette classe de ressource fortement typée. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Recherche une chaîne localisée semblable à rising stack. - /// - internal static string StrAcendingStack { - get { - return ResourceManager.GetString("StrAcendingStack", resourceCulture); - } - } - - /// - /// Recherche une chaîne localisée semblable à the chosen pile does not exist. - /// - internal static string StrCantGetStack { - get { - return ResourceManager.GetString("StrCantGetStack", resourceCulture); - } - } - - /// - /// Recherche une chaîne localisée semblable à You have not played enough cards!. - /// - internal static string StrCardPlayedLessThanTwo { - get { - return ResourceManager.GetString("StrCardPlayedLessThanTwo", resourceCulture); - } - } - - /// - /// Recherche une chaîne localisée semblable à Please select a card to place on a stack. - /// - internal static string StrChooseCardToPlay { - get { - return ResourceManager.GetString("StrChooseCardToPlay", resourceCulture); - } - } - - /// - /// Recherche une chaîne localisée semblable à Select the stack on which you want to put the card. - /// - internal static string StrChooseStack { - get { - return ResourceManager.GetString("StrChooseStack", resourceCulture); - } - } - - /// - /// Recherche une chaîne localisée semblable à Down stack. - /// - internal static string StrDownStack { - get { - return ResourceManager.GetString("StrDownStack", resourceCulture); - } - } - - /// - /// Recherche une chaîne localisée semblable à End of turn. - /// - internal static string StrEndTurn { - get { - return ResourceManager.GetString("StrEndTurn", resourceCulture); - } - } - - /// - /// Recherche une chaîne localisée semblable à . - /// - internal static string String1 { - get { - return ResourceManager.GetString("String1", resourceCulture); - } - } - - /// - /// Recherche une chaîne localisée semblable à The game is over! Sorry, you lost ... Try again!. - /// - internal static string StrLose { - get { - return ResourceManager.GetString("StrLose", resourceCulture); - } - } - - /// - /// Recherche une chaîne localisée semblable à The game is over! Sorry, you lost ... You had to play three cards because of the effect \ "Three cards played \" off your game does not play as much! Try again!. - /// - internal static string StrLose3CardEffect { - get { - return ResourceManager.GetString("StrLose3CardEffect", resourceCulture); - } - } - - /// - /// Recherche une chaîne localisée semblable à The player has no more cards in his hand. - /// - internal static string StrNoMoreCardOnHand { - get { - return ResourceManager.GetString("StrNoMoreCardOnHand", resourceCulture); - } - } - - /// - /// Recherche une chaîne localisée semblable à -The goal is to beat the game! Alone or with others! - /// - ///-98 cards numbered from 2 to 99. - /// - ///-4 batteries are at your disposal, two ascending and two descending. - /// - ///-The objective is to be able to put all the cards of the picks on the different piles at your disposal. - /// - ///-If you get to empty all the deck and put all the cards on the piles, you win, otherwise you lose. - /// - ///-Every player must play at least two cards per turn. - /// - ///-On an ascending stack, it is possible to roll back 10 (eg 73 is played -> possibil [le reste de la chaîne a été tronqué]";. - /// - internal static string StrRules { - get { - return ResourceManager.GetString("StrRules", resourceCulture); - } - } - - /// - /// Recherche une chaîne localisée semblable à Sorry, you did not cover the skull ... Try again;). - /// - internal static string StrSkullEffect { - get { - return ResourceManager.GetString("StrSkullEffect", resourceCulture); - } - } - - /// - /// Recherche une chaîne localisée semblable à The game is over! Well done you won!. - /// - internal static string StrWin { - get { - return ResourceManager.GetString("StrWin", resourceCulture); - } - } - - /// - /// Recherche une chaîne localisée semblable à The card does not fit in the selected stack!. - /// - internal static string StrWrongStack { - get { - return ResourceManager.GetString("StrWrongStack", resourceCulture); - } - } - } -} diff --git a/TheGameExtreme/TheGameExtreme.csproj b/TheGameExtreme/TheGameExtreme.csproj index 65a2bc3..1cd0c9a 100644 --- a/TheGameExtreme/TheGameExtreme.csproj +++ b/TheGameExtreme/TheGameExtreme.csproj @@ -42,7 +42,6 @@ - ResXFileCodeGenerator AppRessource.Designer.cs diff --git a/TheGameExtreme/AppRessource.Designer.cs b/TheGameExtreme/TheGameExtreme_AppRessource.Designer.cs similarity index 100% rename from TheGameExtreme/AppRessource.Designer.cs rename to TheGameExtreme/TheGameExtreme_AppRessource.Designer.cs diff --git a/TheGameExtreme/view/AppRessources-br.Designer.cs b/TheGameExtreme/TheGameExtreme_AppRessources-br.Designer.cs similarity index 100% rename from TheGameExtreme/view/AppRessources-br.Designer.cs rename to TheGameExtreme/TheGameExtreme_AppRessources-br.Designer.cs diff --git a/TheGameExtreme/AppRessources-br.resx b/TheGameExtreme/TheGameExtreme_AppRessources-br.resx similarity index 90% rename from TheGameExtreme/AppRessources-br.resx rename to TheGameExtreme/TheGameExtreme_AppRessources-br.resx index 77e02ce..8f9ac32 100644 --- a/TheGameExtreme/AppRessources-br.resx +++ b/TheGameExtreme/TheGameExtreme_AppRessources-br.resx @@ -155,25 +155,6 @@ The player has no more cards in his hand - - -The goal is to beat the game! Alone or with others! - --98 cards numbered from 2 to 99. - --4 batteries are at your disposal, two ascending and two descending. - --The objective is to be able to put all the cards of the picks on the different piles at your disposal. - --If you get to empty all the deck and put all the cards on the piles, you win, otherwise you lose. - --Every player must play at least two cards per turn. - --On an ascending stack, it is possible to roll back 10 (eg 73 is played -> possibility to play above 73 or 63). - --On a falling stack, it is possible to roll back 10 (eg 73 is played -> possibility to play below 73 or 83). - --The cohesion and strategy will be two important friends to overcome The Game. - Sorry, you did not cover the skull ... Try again;) diff --git a/TheGameExtreme/view/GamePreparationPage.xaml b/TheGameExtreme/view/GamePreparationPage.xaml index b8e88dd..525849c 100644 --- a/TheGameExtreme/view/GamePreparationPage.xaml +++ b/TheGameExtreme/view/GamePreparationPage.xaml @@ -73,18 +73,21 @@ - + --> + - diff --git a/TheGameExtreme/view/GamePreparationPage.xaml.cs b/TheGameExtreme/view/GamePreparationPage.xaml.cs index fdb13bb..aa06848 100644 --- a/TheGameExtreme/view/GamePreparationPage.xaml.cs +++ b/TheGameExtreme/view/GamePreparationPage.xaml.cs @@ -1,13 +1,12 @@ using System; using System.Collections.Generic; -using System.ComponentModel; + using Xamarin.Forms; namespace TheGameExtreme.view { public partial class GamePreparationPage : ContentPage { - private string instructionText; public string InstructionText { @@ -49,7 +48,7 @@ namespace TheGameExtreme.view return; } } - + await Navigation.PushAsync(new MainPage(playersNames)); } @@ -59,28 +58,28 @@ namespace TheGameExtreme.view { if (NameList.Children.Count < (int)PlayerSelecter.SelectedItem) { - + Entry e = new Entry { Placeholder = "Pseudo", - BackgroundColor = (Color)Application.Current.Resources["SkyBlueColor"] + BackgroundColor = (Color)Application.Current.Resources["SkyBlueColor"] }; - Frame myFrame = new Frame - { - BackgroundColor = (Color)Application.Current.Resources["SkyBlueColor"], - HeightRequest = 45, - VerticalOptions = LayoutOptions.Center, - HorizontalOptions = LayoutOptions.Center, - WidthRequest = 120, - CornerRadius = 10, - Content = e - }; - - NameList.Children.Add(myFrame); + //Frame myFrame = new Frame + //{ + // BackgroundColor = (Color)Application.Current.Resources["SkyBlueColor"], + // HeightRequest = 45, + // VerticalOptions = LayoutOptions.Center, + // HorizontalOptions = LayoutOptions.Center, + // WidthRequest = 120, + // CornerRadius = 10, + // Content = e + //}; + + NameList.Children.Add(e); } else { - NameList.Children.RemoveAt(NameList.Children.Count-1); + NameList.Children.RemoveAt(NameList.Children.Count - 1); } } } diff --git a/TheGameExtreme/view/MainPage.xaml b/TheGameExtreme/view/MainPage.xaml index 90bea66..b403889 100644 --- a/TheGameExtreme/view/MainPage.xaml +++ b/TheGameExtreme/view/MainPage.xaml @@ -1,13 +1,13 @@  - diff --git a/TheGameExtreme/view/MainPage.xaml.cs b/TheGameExtreme/view/MainPage.xaml.cs index f6838ed..eba7899 100644 --- a/TheGameExtreme/view/MainPage.xaml.cs +++ b/TheGameExtreme/view/MainPage.xaml.cs @@ -14,6 +14,7 @@ using TheGameExtreme.model.card; namespace TheGameExtreme.view { + // Learn more about making custom code visible in the Xamarin.Forms previewer // by visiting https://aka.ms/xamarinforms-previewer [DesignTimeVisible(false)] @@ -28,7 +29,6 @@ namespace TheGameExtreme.view private SKCanvas canvas; - public MainPage(List playersNames) { this.playersNames = playersNames;