diff --git a/TheGameExtreme.Android/Resources/Resource.designer.cs b/TheGameExtreme.Android/Resources/Resource.designer.cs
index 884c56f..455e66d 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é.
//
//------------------------------------------------------------------------------
diff --git a/TheGameExtreme/AppRessource.Designer.cs b/TheGameExtreme/AppRessource.Designer.cs
index 9e97191..919096b 100644
--- a/TheGameExtreme/AppRessource.Designer.cs
+++ b/TheGameExtreme/AppRessource.Designer.cs
@@ -132,6 +132,15 @@ namespace TheGameExtreme {
}
}
+ ///
+ /// Recherche une chaîne localisée semblable à Veuillez saisir votre pseudo.
+ ///
+ internal static string StrEnterPseudo {
+ get {
+ return ResourceManager.GetString("StrEnterPseudo", resourceCulture);
+ }
+ }
+
///
/// Recherche une chaîne localisée semblable à Le jeu est terminé! Désolé, vous avez perdu... Essayez encore!.
///
diff --git a/TheGameExtreme/AppRessource.resx b/TheGameExtreme/AppRessource.resx
index 4eb7186..e9103c3 100644
--- a/TheGameExtreme/AppRessource.resx
+++ b/TheGameExtreme/AppRessource.resx
@@ -186,4 +186,7 @@
Veuillez choisir un nombre de joueur et leur(s) nom(s)
+
+ Veuillez saisir votre pseudo
+
\ No newline at end of file
diff --git a/TheGameExtreme/AppRessources-br.Designer.cs b/TheGameExtreme/AppRessources-br.Designer.cs
index ba23b76..3f2f1b9 100644
--- a/TheGameExtreme/AppRessources-br.Designer.cs
+++ b/TheGameExtreme/AppRessources-br.Designer.cs
@@ -1,44 +1,57 @@
//------------------------------------------------------------------------------
//
-// 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é.
//
//------------------------------------------------------------------------------
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()]
+ ///
+ /// 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 System.Resources.ResourceManager resourceMan;
+ private static global::System.Resources.ResourceManager resourceMan;
- private static System.Globalization.CultureInfo resourceCulture;
+ private static global::System.Globalization.CultureInfo resourceCulture;
- [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal AppRessources_br() {
}
- [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static System.Resources.ResourceManager ResourceManager {
+ ///
+ /// 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.Equals(null, resourceMan)) {
- System.Resources.ResourceManager temp = new System.Resources.ResourceManager("TheGameExtreme.AppRessources-br", typeof(AppRessources_br).Assembly);
+ 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;
}
}
- [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static System.Globalization.CultureInfo Culture {
+ ///
+ /// 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;
}
@@ -47,84 +60,147 @@ namespace TheGameExtreme {
}
}
+ ///
+ /// 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/AppRessources-br.resx b/TheGameExtreme/AppRessources-br.resx
index 8f9ac32..77e02ce 100644
--- a/TheGameExtreme/AppRessources-br.resx
+++ b/TheGameExtreme/AppRessources-br.resx
@@ -155,6 +155,25 @@
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/TheGameExtreme.csproj b/TheGameExtreme/TheGameExtreme.csproj
index 48cc94d..65a2bc3 100644
--- a/TheGameExtreme/TheGameExtreme.csproj
+++ b/TheGameExtreme/TheGameExtreme.csproj
@@ -64,6 +64,8 @@
AppRessources-br.resx
+ True
+ True
\ No newline at end of file
diff --git a/TheGameExtreme/view/GamePreparationPage.xaml b/TheGameExtreme/view/GamePreparationPage.xaml
index 046d90a..b8e88dd 100644
--- a/TheGameExtreme/view/GamePreparationPage.xaml
+++ b/TheGameExtreme/view/GamePreparationPage.xaml
@@ -40,6 +40,7 @@
HorizontalTextAlignment="Center"
VerticalTextAlignment="Center"
x:Name="Instruction"
+ FontSize="24"
TextColor="{DynamicResource WhiteColor}"/>
@@ -47,11 +48,22 @@
Grid.Row="2"
Grid.Column="0"
Margin="50,0,50,0">
-
+
+
+
-
+
+
+
@@ -74,7 +95,11 @@
Grid.ColumnSpan="2">
+ Clicked="Play"
+ HorizontalOptions="Center"
+ WidthRequest="220"
+ BackgroundColor="{DynamicResource SkyBlueColor}"
+ CornerRadius="10"/>
diff --git a/TheGameExtreme/view/GamePreparationPage.xaml.cs b/TheGameExtreme/view/GamePreparationPage.xaml.cs
index f2c4ed1..fdb13bb 100644
--- a/TheGameExtreme/view/GamePreparationPage.xaml.cs
+++ b/TheGameExtreme/view/GamePreparationPage.xaml.cs
@@ -45,7 +45,7 @@ namespace TheGameExtreme.view
playersNames.Add(((Entry)NameList.Children[i]).Text);
if (string.IsNullOrWhiteSpace(playersNames[playersNames.Count - 1]))
{
- await DisplayAlert("Erreur Pseudo", "Veuillez remplir tous les pseudos", "OK");
+ await DisplayAlert("Erreur pseudo", AppRessource.StrEnterPseudo, "OK");
return;
}
}
@@ -59,12 +59,24 @@ namespace TheGameExtreme.view
{
if (NameList.Children.Count < (int)PlayerSelecter.SelectedItem)
{
+
Entry e = new Entry
{
- Placeholder = "Enter your pseudo",
- BackgroundColor = (Color)Application.Current.Resources["SkyBlueColor"]
+ Placeholder = "Pseudo",
+ BackgroundColor = (Color)Application.Current.Resources["SkyBlueColor"]
};
- NameList.Children.Add(e);
+ 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);
}
else
{
diff --git a/TheGameExtreme/view/Settings.xaml b/TheGameExtreme/view/Settings.xaml
index dfd29e8..17f624d 100644
--- a/TheGameExtreme/view/Settings.xaml
+++ b/TheGameExtreme/view/Settings.xaml
@@ -74,7 +74,7 @@
+ CheckedChanged ="CBFr_CheckedChanged"/>
@@ -85,13 +85,14 @@
+ ThumbColor="WhiteSmoke"
+ Margin="30,0,0,50"/>
@@ -100,12 +101,13 @@
Orientation="Horizontal">
diff --git a/TheGameExtreme/view/Settings.xaml.cs b/TheGameExtreme/view/Settings.xaml.cs
index 588cd3e..da2cc4e 100644
--- a/TheGameExtreme/view/Settings.xaml.cs
+++ b/TheGameExtreme/view/Settings.xaml.cs
@@ -22,25 +22,41 @@ namespace TheGameExtreme.view
swTheme.IsToggled = true;
}
+
+
+
}
private void CBBr_CheckedChanged(object sender, CheckedChangedEventArgs e)
{
- if(CBBr.IsChecked == true)
+ if (CBBr.IsChecked == true)
{
- CBFr.IsChecked = !CBBr.IsChecked;
+ CBFr.IsChecked = false;
+
}
-
+ else if(CBBr.IsChecked == false)
+ {
+ CBFr.IsChecked = true;
+
+ }
+
+
+
}
private void CBFr_CheckedChanged(object sender, CheckedChangedEventArgs e)
{
- if(CBFr.IsChecked == true)
+ if (CBFr.IsChecked == true)
+ {
+ CBBr.IsChecked = false;
+
+ }
+ else if (CBFr.IsChecked == false)
{
- CBBr.IsChecked = !CBBr.IsChecked;
- }
+ CBBr.IsChecked = true;
+ }
}
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