Merge branch 'master' of gitlab.iut-clermont.uca.fr:cldupland/thegameextreme

TheGameExtreme/model/manager/GameManager.cs

@@ -126,6 +126,10 @@ namespace TheGameExtreme.model.manager
 
         public void joue(int valueCard, int orderedStackSelected)
         {
+            if (EndMessage != null)
+            {
+                throw new Exception("Le jeu est fini! Veuillez lancer une nouvelle partie!");
+            }
             foreach(Card card in CurrentHand)
             {
                 if (valueCard == card.Value)

TheGameExtreme/view/MainPage.xaml

@@ -16,7 +16,7 @@
                 Margin="0,0,0,40">
                 <StackLayout
                     Orientation="Vertical">
-                    <Label HorizontalTextAlignment="Center" x:Name="pile0" />
+                    <Label HorizontalTextAlignment="Center" x:Name="pile0" Text="1" />
                     <StackLayout
                         Orientation="Horizontal">
                         <CheckBox x:Name="checkbox0" CheckedChanged="radioButton" />
@@ -25,7 +25,7 @@
                 </StackLayout>
                 <StackLayout
                     Orientation="Vertical">
-                    <Label HorizontalTextAlignment="Center" x:Name="pile1" />
+                    <Label HorizontalTextAlignment="Center" x:Name="pile1" Text="1" />
                     <StackLayout
                         Orientation="Horizontal">
                         <CheckBox x:Name="checkbox1" CheckedChanged="radioButton" />
@@ -34,7 +34,7 @@
                 </StackLayout>
                 <StackLayout
                     Orientation="Vertical">
-                    <Label HorizontalTextAlignment="Center" x:Name="pile2" />
+                    <Label HorizontalTextAlignment="Center" x:Name="pile2" Text="100" />
                     <StackLayout
                         Orientation="Horizontal">
                         <CheckBox x:Name="checkbox2" CheckedChanged="radioButton" />
@@ -43,7 +43,7 @@
                 </StackLayout>
                 <StackLayout
                     Orientation="Vertical">
-                    <Label HorizontalTextAlignment="Center" x:Name="pile3" />
+                    <Label HorizontalTextAlignment="Center" x:Name="pile3" Text="100" />
                     <StackLayout
                         Orientation="Horizontal">
                         <CheckBox x:Name="checkbox3" CheckedChanged="radioButton" />

TheGameExtreme/view/MainPage.xaml.cs

@@ -150,6 +150,13 @@ namespace TheGameExtreme
             Alert.SetBinding(Label.TextProperty, new Binding("Alert", source: viewmodel));
 
             inflateHand();
+
+            pile0.Text = "1";
+            pile1.Text = "1";
+            pile2.Text = "100";
+            pile3.Text = "100";
+
+            botPanel.Children.Remove(button);
         }
 
         private void endTurn(object sender, EventArgs args)

TheGameExtreme/viewmodel/Main.cs

@@ -103,7 +103,9 @@ namespace TheGameExtreme.viewmodel
         {
             try
             {
-                return gameManager.endTurn();
+                bool isEnd = gameManager.endTurn();
+                Alert = gameManager.EndMessage;
+                return isEnd;
             }
             catch(Exception e)
             {