pascal.lafourcade
/
orderstacks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mergePull

Browse Source
master
Baptiste ARNAUD 5 years ago
parent dca5a4b1e2 9662b4cd1b
commit 952c6827ab
20 changed files with 111 additions and 431 deletions
Show Stats Download Patch File Download Diff File

2
TheGameExtreme.Android/Properties/AndroidManifest.xml
Unescape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="15" android:versionName="5.1" package="com.uca.thegameextreme" android:installLocation="auto">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="17" android:versionName="5.3" package="com.uca.thegameextreme" android:installLocation="auto">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
<application android:icon="@drawable/TrierImageB" android:label="OrderStacks"></application>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

8
TheGameExtreme.Android/Resources/Resource.designer.cs generated
Unescape View File

@ -1,11 +1,11 @@
#pragma warning disable 1591
//------------------------------------------------------------------------------
// <auto-generated>
// 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.
// </auto-generated>
//------------------------------------------------------------------------------

74
TheGameExtreme/Resx/AppResources.Designer.cs generated
Unescape View File

@ -161,18 +161,12 @@ namespace TheGameExtreme.Resx {
}
}
/// <summary>
/// Recherche une chaîne localisée semblable à Suivant.
/// </summary>
public static string StrNext {
get {
return ResourceManager.GetString("StrNext", resourceCulture);
}
}
/// <summary>
/// Recherche une chaîne localisée semblable à Veuillez choisir un nombre de joueur ainsi que leur(s) nom(s).
/// </summary>
public static string StrPlayerSelections {
get {
return ResourceManager.GetString("StrPlayerSelections", resourceCulture);
@ -191,128 +185,84 @@ namespace TheGameExtreme.Resx {
}
}
/// <summary>
/// Recherche une chaîne localisée semblable à - L&apos;objectif est de battre la machine seul et/ou en coopération..
/// </summary>
public static string StrTiret1 {
get {
return ResourceManager.GetString("StrTiret1", resourceCulture);
}
}
/// <summary>
/// Recherche une chaîne localisée semblable à - Une fois votre tour terminé, vous appuyez sur le boutton &quot;Fin de tour&quot; afin de passer au joueur suivant..
/// </summary>
public static string StrTiret10 {
get {
return ResourceManager.GetString("StrTiret10", resourceCulture);
}
}
/// <summary>
/// Recherche une chaîne localisée semblable à - La partie est finie quand toutes les cartes sont jouées ou quand le joueur dont c&apos;est le tour ne peut plus jouer..
/// </summary>
public static string StrTiret11 {
get {
return ResourceManager.GetString("StrTiret11", resourceCulture);
}
}
/// <summary>
/// Recherche une chaîne localisée semblable à - Afin de préparer la partie, vous disposez d&apos;un écran permettant de choisir le nombre de joueur et leur pseudo, le type de jeu auquels vous souhaitez jouer et enfin le nombre de piles pour jouer..
/// </summary>
public static string StrTiret12 {
get {
return ResourceManager.GetString("StrTiret12", resourceCulture);
}
}
/// <summary>
/// Recherche une chaîne localisée semblable à - Le type de jeu permet de définir les valeurs présentent sur les cartes. Vous pouvez jouer avec des valeurs entières, relatives, décimales (1 chiffre), décimales (2 chiffres), décimales (3 chiffres) et avec des fractions décimales.
/// </summary>
public static string StrTiret13 {
get {
return ResourceManager.GetString("StrTiret13", resourceCulture);
}
}
/// <summary>
/// Recherche une chaîne localisée semblable à - Afin d&apos;atteindre l&apos;objectif, les joueurs disposent de 4 piles (par défaut): deux piles ascendantes vertes et deux piles descendantes rouges..
/// </summary>
public static string StrTiret2 {
get {
return ResourceManager.GetString("StrTiret2", resourceCulture);
}
}
/// <summary>
/// Recherche une chaîne localisée semblable à - Sur les piles ascendantes, le joueur doit poser des cartes plus grandes et inversement sur les piles descendantes..
/// </summary>
public static string StrTiret3 {
get {
return ResourceManager.GetString("StrTiret3", resourceCulture);
}
}
/// <summary>
/// Recherche une chaîne localisée semblable à - Le but est de poser les 98 cartes du jeu sur les différentes piles à votre disposition..
/// </summary>
public static string StrTiret4 {
get {
return ResourceManager.GetString("StrTiret4", resourceCulture);
}
}
/// <summary>
/// Recherche une chaîne localisée semblable à - Pour jouer, il suffit de faire glisser une carte sur la pile que vous avez décidé..
/// </summary>
public static string StrTiret5 {
get {
return ResourceManager.GetString("StrTiret5", resourceCulture);
}
}
/// <summary>
/// Recherche une chaîne localisée semblable à - Cette carte doit être plus grande que celle déjà présente s&apos;il s&apos;agit d&apos;une pile ascendante et plus petite si c&apos;est l&apos;inverse..
/// </summary>
public static string StrTiret6 {
get {
return ResourceManager.GetString("StrTiret6", resourceCulture);
}
}
/// <summary>
/// Recherche une chaîne localisée semblable à - Il est possible de poser une carte plus petite sur une pile ascendante à condition que ce soit d&apos;&apos;une dizaine inférieur. De la même manière, si la carte est plus grande d&apos;une dizaine, il est possible de la poser sur une pile descendante..
/// </summary>
public static string StrTiret7 {
get {
return ResourceManager.GetString("StrTiret7", resourceCulture);
}
}
/// <summary>
/// Recherche une chaîne localisée semblable à - Ex : Sur une pile descendante, nous avons 22 =&gt; Nous pouvons alors poser 32.
/// Sur une pile ascendante, nous avons 16 =&gt; Nous pouvons poser 6..
/// </summary>
public static string StrTiret8 {
get {
return ResourceManager.GetString("StrTiret8", resourceCulture);
}
}
/// <summary>
/// Recherche une chaîne localisée semblable à - Chaque joueur doit jouer au minimum deux cartes par tour.
/// Il n&apos;y a donc aucune limite maximale de carte à jouer par tour. Cependant, il est conseillé dans la plupart des cas de ne pas jouer toutes les cartes en sa possessions..
/// </summary>
public static string StrTiret9 {
get {
return ResourceManager.GetString("StrTiret9", resourceCulture);
}
}
/// <summary>
/// Recherche une chaîne localisée semblable à OrderStacks.
/// </summary>
public static string StrTitle {
get {
return ResourceManager.GetString("StrTitle", resourceCulture);
@ -349,9 +299,9 @@ namespace TheGameExtreme.Resx {
}
}
public static string TypeValuehundredth {
public static string TypeValueHundredthFract {
get {
return ResourceManager.GetString("TypeValuehundredth", resourceCulture);
return ResourceManager.GetString("TypeValueHundredthFract", resourceCulture);
}
}
@ -361,15 +311,15 @@ namespace TheGameExtreme.Resx {
}
}
public static string TypeValueTens {
public static string TypeValueTenthFract {
get {
return ResourceManager.GetString("TypeValueTens", resourceCulture);
return ResourceManager.GetString("TypeValueTenthFract", resourceCulture);
}
}
public static string TypeValuethousandth {
public static string TypeValueThousandthFract {
get {
return ResourceManager.GetString("TypeValuethousandth", resourceCulture);
return ResourceManager.GetString("TypeValueThousandthFract", resourceCulture);
}
}
@ -379,6 +329,18 @@ namespace TheGameExtreme.Resx {
}
}
public static string TypeValueTenth {
get {
return ResourceManager.GetString("TypeValueTenth", resourceCulture);
}
}
public static string TypeValueHundredth {
get {
return ResourceManager.GetString("TypeValueHundredth", resourceCulture);
}
}
public static string WhiteTheme {
get {
return ResourceManager.GetString("WhiteTheme", resourceCulture);

18
TheGameExtreme/Resx/AppResources.resx
Unescape View File

@ -253,21 +253,27 @@ Une possibilité de changer le thème de l'application grâce aux images du sole
<data name="TypeValuefractionated" xml:space="preserve">
<value>Fractionnées</value>
</data>
<data name="TypeValuehundredth" xml:space="preserve">
<value>Décimales (2 chiffres)</value>
<data name="TypeValueHundredthFract" xml:space="preserve">
<value>2 Décimales (Fraction)</value>
</data>
<data name="TypeValueRelative" xml:space="preserve">
<value>Relatives</value>
</data>
<data name="TypeValueTens" xml:space="preserve">
<value>Décimales (1 chiffre)</value>
<data name="TypeValueTenthFract" xml:space="preserve">
<value>1 Décimales (Fraction)</value>
</data>
<data name="TypeValuethousandth" xml:space="preserve">
<value>Décimales (3 chiffres)</value>
<data name="TypeValueThousandthFract" xml:space="preserve">
<value>3 Décimales (Fraction)</value>
</data>
<data name="TypeValueWhole" xml:space="preserve">
<value>Entière</value>
</data>
<data name="TypeValueTenth" xml:space="preserve">
<value>1 Décimales</value>
</data>
<data name="TypeValueHundredth" xml:space="preserve">
<value>2 Décimales</value>
</data>
<data name="WhiteTheme" xml:space="preserve">
<value>Thème clair :</value>
</data>

10
TheGameExtreme/model/Parametreur.cs
Unescape View File

@ -29,5 +29,15 @@ namespace TheGameExtreme.model
players.Add(player);
}
}
public string getScore()
{
int score = GameMode.getScore();
players.ForEach(player =>
{
score += player.getCardList().Count;
});
return score.ToString();
}
}
}

8
TheGameExtreme/model/deck/ClassicDeck.cs
Unescape View File

@ -13,14 +13,6 @@ namespace TheGameExtreme.model.deck
while (deck.Count < nbCard && deck.Count < (borneMax - borneMin))
{
int value = random.Next(borneMin, borneMax);
//foreach (Card card in deck)
//{
// if (card.Value.CompareTo(value) == 0)
// {
// Debug.WriteLine("Regarde!");
// break;
// }
//}
InsertionDichotomique(deck, 0, deck.Count-1, new ClassicCard(value));
}
}

18
TheGameExtreme/model/deck/Decimal1.cs
Unescape View File

@ -0,0 +1,18 @@
using System;
using TheGameExtreme.model.card.cardType;
namespace TheGameExtreme.model.deck
{
public class Decimal1Deck : Deck
{
public Decimal1Deck(int nbCard, int borneMin, int borneMax) : base(nbCard)
{
Random random = new Random();
while (deck.Count < nbCard && deck.Count < (borneMax - borneMin))
{
decimal value = random.Next(borneMin, borneMax) * 0.1m;
InsertionDichotomique(deck, 0, deck.Count - 1, new ClassicCard(value));
}
}
}
}

18
TheGameExtreme/model/deck/Decimal2.cs
Unescape View File

@ -0,0 +1,18 @@
using System;
using TheGameExtreme.model.card.cardType;
namespace TheGameExtreme.model.deck
{
public class Decimal2Deck : Deck
{
public Decimal2Deck(int nbCard, int borneMin, int borneMax) : base(nbCard)
{
Random random = new Random();
while (deck.Count < nbCard && deck.Count < (borneMax - borneMin))
{
decimal value = random.Next(borneMin, borneMax) * 0.01m;
InsertionDichotomique(deck, 0, deck.Count - 1, new ClassicCard(value));
}
}
}
}

4
TheGameExtreme/model/gameActions/abstractRules/GameMode.cs
Unescape View File

@ -112,9 +112,9 @@ namespace TheGameExtreme.model.gameActions.abstractRules
public abstract void TestEndGame(List<Card> currentHand);
public string getScore()
public int getScore()
{
return deck.size().ToString();
return deck.size();
}
}
}

1
TheGameExtreme/model/gameActions/classic/GameModeClassic.cs
Unescape View File

@ -4,6 +4,7 @@ using TheGameExtreme.model.card;
using TheGameExtreme.model.deck;
using TheGameExtreme.model.gameActions.abstractRules;
using TheGameExtreme.model.piles;
using TheGameExtreme.Resx;
namespace TheGameExtreme.model.gameActions.classic
{

3
TheGameExtreme/model/manager/GameManager.cs
Unescape View File

@ -104,7 +104,7 @@ namespace TheGameExtreme.model.manager
{
if(parametreur.GameMode.endTurn(currentHand, CurrentCardPlayed, parametreur.players[currentIndexPlayer]))
{
EndMessage = parametreur.GameMode.Message + "Il vous restait " + parametreur.GameMode.getScore() + " cartes à jouer!";
EndMessage = parametreur.GameMode.Message + "Il vous restait " + parametreur.getScore() + " cartes à jouer!";
return true;
}
else
@ -112,6 +112,7 @@ namespace TheGameExtreme.model.manager
EndMessage = parametreur.GameMode.Message;
if (win)
{
EndMessage = AppResources.StrWin;
OnEndGame(this, new EventArgs());
return true;
}

4
TheGameExtreme/view/GamePreparationPage.xaml.cs
Unescape View File

@ -9,7 +9,7 @@ namespace TheGameExtreme.view
public partial class GamePreparationPage : ContentPage
{
public List<int> listNbPlayer = new List<int> { 1, 2, 3, 4, 5 };
public List<string> listGameMode = new List<string> { AppResources.TypeValueWhole, AppResources.TypeValueRelative, AppResources.TypeValueTens, AppResources.TypeValuehundredth, AppResources.TypeValuethousandth, AppResources.TypeValuefractionated };
public List<string> listGameMode = new List<string> { AppResources.TypeValueWhole, AppResources.TypeValueRelative, AppResources.TypeValueTenthFract, AppResources.TypeValueHundredthFract, AppResources.TypeValueThousandthFract, AppResources.TypeValuefractionated, AppResources.TypeValueTenth, AppResources.TypeValueHundredth };
public List<int> listNbStack = new List<int> { 4, 6, 8 };
public List<int> listNbCard = new List<int> { 100, 80, 60, 40 };
@ -104,7 +104,7 @@ namespace TheGameExtreme.view
{
Placeholder = "Pseudo",
BackgroundColor = (Color)Application.Current.Resources["Gold"],
WidthRequest = 200,
WidthRequest = 150,
MinimumWidthRequest = 50,
HorizontalOptions = LayoutOptions.Center,
MaxLength = 18,

160
TheGameExtreme/view/GamePreparationPage.xaml.cs.orig
Unescape View File

@ -1,160 +0,0 @@
using System;
using System.Collections.Generic;
using TheGameExtreme.IO;
using TheGameExtreme.Resx;
using Xamarin.Forms;
namespace TheGameExtreme.view
{
public partial class GamePreparationPage : ContentPage
{
public List<int> listNbPlayer = new List<int> { 1, 2, 3, 4, 5 };
public List<string> listGameMode = new List<string> { AppResources.TypeValueWhole, AppResources.TypeValueRelative, AppResources.TypeValueTens, AppResources.TypeValuehundredth, AppResources.TypeValuethousandth, AppResources.TypeValuefractionated };
public List<int> listNbStack = new List<int> { 4, 6, 8 };
public List<int> listNbCard = new List<int> { 100, 80, 60, 40 };
public GamePreparationPage()
{
InitializeComponent();
NavigationPage.SetHasNavigationBar(this, false);
LoadParameterName();
PlayerSelecter.ItemsSource = listNbPlayer;
LoadParameterNbPlayerGamePreparation();
SelectMode.ItemsSource = listGameMode;
LoadParameterGameModeValueGamePreparation();
SelectNbStack.ItemsSource = listNbStack;
LoadParameterNbStacksGamePreparation();
SelectNbCard.ItemsSource = listNbCard;
LoadParameterNbCardsGamePreparation();
}
private async void Back(object sender, EventArgs e)
{
IOGamePreparation.SaveParamaterGamePreparationNbPlayers(PlayerSelecter.SelectedIndex);
IOGamePreparation.SaveParameterGamePreparationGameModeValue(SelectMode.SelectedIndex);
IOGamePreparation.SaveParameterGamePreparationNbStacks(SelectNbStack.SelectedIndex);
IOGamePreparation.SaveParameterGamePreparationNbCards(SelectNbCard.SelectedIndex);
<<<<<<< HEAD
IOGamePreparation.SaveParameterGamePreparationName(FirstEntry.Text);
await Navigation.PopToRootAsync();
=======
if ((int)PlayerSelecter.SelectedItem == 1)
{
IOGamePreparation.SaveParameterGamePreparationName(FirstEntry.Text);
}
await Navigation.PopAsync();
>>>>>>> 6006856012a9420076ac40947eee0560f1e65e3e
}
protected override bool OnBackButtonPressed()
{
IOGamePreparation.SaveParamaterGamePreparationNbPlayers(PlayerSelecter.SelectedIndex);
IOGamePreparation.SaveParameterGamePreparationGameModeValue(SelectMode.SelectedIndex);
IOGamePreparation.SaveParameterGamePreparationNbStacks(SelectNbStack.SelectedIndex);
IOGamePreparation.SaveParameterGamePreparationNbCards(SelectNbCard.SelectedIndex);
if ((int)PlayerSelecter.SelectedItem == 1)
{
IOGamePreparation.SaveParameterGamePreparationName(FirstEntry.Text);
}
return base.OnBackButtonPressed();
}
private async void Play(object sender, EventArgs args)
{
List<string> playersNames = new List<string>();
for (int i = 1; i < NameList.Children.Count; i++)
{
playersNames.Add(((Entry)NameList.Children[i]).Text);
if (string.IsNullOrWhiteSpace(playersNames[playersNames.Count - 1]))
{
await DisplayAlert(AppResources.WrongPseudo, AppResources.StrEnterPseudo, AppResources.StrCloseWind);
return;
}
}
IOGamePreparation.SaveParamaterGamePreparationNbPlayers(PlayerSelecter.SelectedIndex);
IOGamePreparation.SaveParameterGamePreparationGameModeValue(SelectMode.SelectedIndex);
IOGamePreparation.SaveParameterGamePreparationNbStacks(SelectNbStack.SelectedIndex);
IOGamePreparation.SaveParameterGamePreparationNbCards(SelectNbCard.SelectedIndex);
IOGamePreparation.SaveParameterGamePreparationName(FirstEntry.Text);
await Navigation.PushAsync(new MainPage(playersNames, (int)SelectNbStack.SelectedItem, (int)SelectMode.SelectedIndex, (int)SelectNbCard.SelectedItem));
}
private void ChangedPseudo(object sender, EventArgs args)
{
if ((int)PlayerSelecter.SelectedItem == 1)
{
LoadParameterName();
}
else
{
FirstEntry.Text = "";
}
while (NameList.Children.Count - 1 != (int)PlayerSelecter.SelectedItem)
{
if (NameList.Children.Count - 1 < (int)PlayerSelecter.SelectedItem)
{
Entry e = new Entry
{
Placeholder = "Pseudo",
BackgroundColor = (Color)Application.Current.Resources["Gold"],
WidthRequest = 200,
MinimumWidthRequest = 50,
HorizontalOptions = LayoutOptions.Center,
MaxLength = 18,
IsTextPredictionEnabled = false
};
NameList.Children.Add(e);
}
else
{
NameList.Children.RemoveAt(NameList.Children.Count - 1);
}
}
}
public void LoadParameterNbPlayerGamePreparation()
{
int nbJoueurs = IOGamePreparation.LoadParameterGamePreparationNbPlayers();
PlayerSelecter.SelectedIndex = nbJoueurs;
}
public void LoadParameterGameModeValueGamePreparation()
{
int gameModeValue = IOGamePreparation.LoadParameterGamePreparationGameModeValue();
SelectMode.SelectedIndex = gameModeValue;
}
public void LoadParameterNbStacksGamePreparation()
{
int nbStackSer = IOGamePreparation.LoadParamaterGamePreparationNbStacks();
SelectNbStack.SelectedIndex = nbStackSer;
}
public void LoadParameterNbCardsGamePreparation()
{
int nbCards = IOGamePreparation.LoadParameterGamePreparationNbCards();
SelectNbCard.SelectedIndex = nbCards;
}
public void LoadParameterName()
{
string pseudo = IOGamePreparation.LoadNameFromGamePrepararion();
FirstEntry.Text = pseudo;
}
}
}

156
TheGameExtreme/view/HomePage.xaml.orig
Unescape View File

@ -1,156 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ContentPage
Title="THEGAME"
BackgroundColor="{DynamicResource BlackColor}"
xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:resources="clr-namespace:TheGameExtreme.Resx"
x:Class="TheGameExtreme.view.HomePage"
x:Name="homepageT">
<Grid x:Name="MainGrid">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="15*"/>
<ColumnDefinition Width="70*"/>
<ColumnDefinition Width="15*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="19*"/>
<RowDefinition Height="27*"/>
<RowDefinition Height="27*"/>
<RowDefinition Height="27*"/>
<RowDefinition Height="27*"/>
</Grid.RowDefinitions>
<ImageButton
Source="PointI.png"
Grid.Column="0"
Grid.Row="0"
Clicked="ImageButton_Clicked"
BackgroundColor="Transparent"
WidthRequest="40"
HeightRequest="40"
VerticalOptions="Center"
HorizontalOptions="Center"/>
<Label
Text="{x:Static resources:AppResources.StrTitle}"
TextColor="{DynamicResource WhiteColor}"
Grid.Row="0"
Grid.Column="1"
HorizontalTextAlignment="Center"
FontSize="45"
VerticalTextAlignment="Center"
FontFamily=""/>
<Button
Text="{x:Static resources:AppResources.StrLocalGame}"
FontSize="18"
Grid.Row="2"
Grid.Column="1"
HorizontalOptions="Center"
WidthRequest="230"
HeightRequest="57"
VerticalOptions="Center"
Clicked="OpenGame"
CornerRadius="10"
BackgroundColor="{DynamicResource SkyBlueColor}"/>
<Button
Text="{x:Static resources:AppResources.StrMultiplayer}"
FontSize="18"
Grid.Row="3"
Grid.Column="1"
HorizontalOptions="Center"
VerticalOptions="Center"
HeightRequest="57"
WidthRequest="230"
Clicked="OpenMultiPlayerMode"
CornerRadius="10"
BackgroundColor="{DynamicResource SkyBlueColor}"/>
<Button Text="{x:Static resources:AppResources.StrTitleRules}"
FontSize="18"
Grid.Row="4"
Grid.Column="1"
HorizontalOptions="Center"
VerticalOptions="Center"
HeightRequest="57"
WidthRequest="230"
Clicked="Rules_Clicked"
CornerRadius="10"
BackgroundColor="{DynamicResource SkyBlueColor}"/>
<Image
Source="TrierImageB.png"
Grid.Column="1"
Grid.Row="1"/>
<<<<<<< HEAD
<Button Text="{x:Static resources:AppResources.StrTitleRules}"
FontSize="18"
Grid.Row="4"
Grid.Column="1"
HorizontalOptions="Center"
VerticalOptions="Center"
HeightRequest="57"
WidthRequest="230"
Clicked="Rules_Clicked"
CornerRadius="10"
BackgroundColor="{DynamicResource SkyBlueColor}"/>
<Image Source="TrierImageB.png"
Grid.Column="1"
Grid.Row="1"/>
<Grid Grid.Row="0" Grid.Column="2" x:Name="ButtonGrid">
<Grid.RowDefinitions>
<RowDefinition Height="2*"/>
<RowDefinition Height="6*"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*" />
<ColumnDefinition Width="6*" />
</Grid.ColumnDefinitions>
<ImageButton
x:Name="imageButton"
Grid.Column="1"
Grid.Row="1"
VerticalOptions="End"
HorizontalOptions="Center"
Clicked="Theme_Clicked"
BackgroundColor="Black"/>
</Grid>
=======
<Grid Grid.Row="0" Grid.Column="2" x:Name="ButtonGrid">
<Grid.RowDefinitions>
<RowDefinition Height="2*"/>
<RowDefinition Height="6*"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*" />
<ColumnDefinition Width="6*" />
</Grid.ColumnDefinitions>
>>>>>>> 6006856012a9420076ac40947eee0560f1e65e3e
<ImageButton
x:Name="imageButton"
Grid.Column="1"
Grid.Row="1"
VerticalOptions="Center"
HorizontalOptions="Center"
Clicked="Theme_Clicked"
BorderColor="{DynamicResource SkyBlueColor}"
BackgroundColor="Transparent"/>
</Grid>
</Grid>
</ContentPage>

1
TheGameExtreme/view/MainPage.xaml
Unescape View File

@ -67,7 +67,6 @@
HorizontalOptions="End"
VerticalOptions="Center"
BackgroundColor="{DynamicResource Gold}"
HeightRequest="35"
Padding="10"
CornerRadius="10"
Clicked="EndTurn"/>

24
TheGameExtreme/view/MainPage.xaml.cs
Unescape View File

@ -326,11 +326,15 @@ namespace TheGameExtreme.view
private void OnEndGame(object sender, EventArgs args)
{
gameOption.Children.Clear();
Button retryButton = new Button();
retryButton.Text = AppResources.StrRetry;
retryButton.CornerRadius = 10;
Button retryButton = new Button()
{
Text = AppResources.StrRetry,
CornerRadius = 10,
BackgroundColor = (Color)Application.Current.Resources["Gold"],
VerticalOptions = LayoutOptions.Center,
HorizontalOptions = LayoutOptions.End
};
retryButton.Clicked += Retry;
retryButton.BackgroundColor = (Color)Application.Current.Resources["Gold"];
gameOption.Children.Add(retryButton);
}
@ -375,10 +379,16 @@ namespace TheGameExtreme.view
progressBar.Progress = 1f;
gameOption.Children.Clear();
Button button = new Button();
button.Text = AppResources.StrEndTurn;
Button button = new Button()
{
Padding = 10,
Text = AppResources.StrEndTurn,
BackgroundColor = (Color)Application.Current.Resources["Gold"],
CornerRadius = 10,
VerticalOptions = LayoutOptions.Center,
HorizontalOptions = LayoutOptions.End
};
button.Clicked += EndTurn;
button.BackgroundColor = (Color)Application.Current.Resources["Gold"];
gameOption.Children.Add(button);
}

27
TheGameExtreme/view/MultiPlayerMode.xaml.cs.orig
Unescape View File

@ -1,27 +0,0 @@
<<<<<<< HEAD
//using Microsoft.AspNetCore.SignalR.Client;
=======
using Plugin.BLE;
using Plugin.BLE.Abstractions.Contracts;
>>>>>>> 6006856012a9420076ac40947eee0560f1e65e3e
using System;
using System.Threading.Tasks;
using Xamarin.Forms;
namespace TheGameExtreme.view
{
public partial class MultiPlayerMode : ContentPage
{
public MultiPlayerMode()
{
InitializeComponent();
NavigationPage.SetHasNavigationBar(this, false);
}
private void Button_ClickedCo(object sender, EventArgs args)
{
//await Navigation.PushAsync(new Testconnectivité());
}
}
}

6
TheGameExtreme/viewmodel/Main.cs
Unescape View File

@ -78,6 +78,12 @@ namespace TheGameExtreme.viewmodel
case 5:
gameMode = new GameModeFraction(new FractionPiles(nbPile), new FractionDeck(nbCard, 0m, 51m));
break;
case 6:
gameMode = new GameModeDecimal(new Piles0To10(nbPile), new Decimal1Deck(nbCard, 0, 100));
break;
case 7:
gameMode = new GameModeDecimal(new Piles0To10(nbPile), new Decimal2Deck(nbCard, 0, 1000));
break;
default:
gameMode = new GameModeClassic(new ClassicPiles(nbPile), new ClassicDeck(nbCard, 1, 99));
break;

BIN
com.uca.thegameextreme-Signed.apk
View File

Binary file not shown.

BIN
com.uca.thegameextreme.apk
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save