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

TheGameExtreme.Android/Resources/Resource.designer.cs

@@ -1,11 +1,11 @@
 #pragma warning disable 1591
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     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é.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -5821,7 +5821,10 @@ namespace TheGameExtreme.Droid
 			public const int tooltip_frame_light = 2131165310;
 			
 			// aapt resource value: 0x7F07007F
-			public const int UsersExiticon = 2131165311;
+			public const int TrierImage = 2131165311;
+			
+			// aapt resource value: 0x7F070080
+			public const int UsersExiticon = 2131165312;
 			
 			static Drawable()
 			{

TheGameExtreme.Android/TheGameExtreme.Android.csproj

@@ -31,6 +31,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AndroidLinkMode>None</AndroidLinkMode>
+    <MandroidI18n />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -138,5 +139,8 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\HomeIcon.png" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\TrierImage.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>

TheGameExtreme.iOS/TheGameExtreme.iOS.csproj

@@ -166,5 +166,7 @@
     <BundleResource Include="Resources\ArrowSettingsBack.png" />
     <BundleResource Include="Resources\UsersExiticon.png" />
     <BundleResource Include="Resources\HomeIcon.png" />
+    <BundleResource Include="Resources\TrierImage.ico" />
+    <Content Include="TrierImage.ico" />
   </ItemGroup>
 </Project>

TheGameExtreme/view/HomePage.xaml

@@ -55,14 +55,14 @@
                     Margin="15"
                     BackgroundColor="{DynamicResource SkyBlueColor}"/>
 
-            <Button Text="Connexion en ligne" FontSize="16" Grid.Row="3" Grid.Column="1"
+            <!--<Button Text="Connexion en ligne" FontSize="16" Grid.Row="3" Grid.Column="1"
                     HorizontalOptions="Center" 
                     VerticalOptions="Center"                    
                     WidthRequest="230"
                     HeightRequest="57"
                     CornerRadius="10"
                     Margin="15"
-                    BackgroundColor="{DynamicResource SkyBlueColor}"/>
+                    BackgroundColor="{DynamicResource SkyBlueColor}"/>-->
 
             <ImageButton Source="imagesRules.png" Grid.Column="0"
                          Grid.Row="0"

TheGameExtreme/view/HomePage.xaml.cs

@@ -26,7 +26,8 @@ namespace TheGameExtreme.view
 
         private async void OpenMultiPlayerMode(object sender, EventArgs args)
         {
-            await Navigation.PushAsync(new MultiPlayerMode());
+            await DisplayAlert("Mode en cours de développement", "Ce mode n'est pas encore implémenté !", "Fermer");
+            //await Navigation.PushAsync(new MultiPlayerMode());
         }
 
         private async void OpenSetting(object sender, EventArgs args)

TheGameExtreme/view/Settings.xaml

@@ -43,7 +43,7 @@
                 TextColor="{DynamicResource WhiteColor}"
                 VerticalTextAlignment="Center"/>
 
-            <StackLayout
+            <!--<StackLayout
                 Grid.Column="1"
                 Orientation="Horizontal">
 
@@ -60,26 +60,26 @@
                     Color="{DynamicResource SkyBlueColor}"
                     />
 
-            </StackLayout>
+            </StackLayout>-->
             
             <StackLayout
-                Grid.Column="2"
+                Grid.Column="1"
                 Orientation="Horizontal">
                 <Label
                     Text="Français"
                     FontSize="25"               
                     TextColor="{DynamicResource WhiteColor}"
                     VerticalTextAlignment="Center"/>
-        
+
                 <CheckBox
                     IsChecked="True"
-                    x:Name="CBFr"
-                    CheckedChanged ="CBFr_CheckedChanged"/>
+                    x:Name="CBFr"/>
+                <!--CheckedChanged ="CBFr_CheckedChanged"/>-->
             </StackLayout>
             
         </Grid>
 
-        <StackLayout
+        <!--<StackLayout
             Grid.Row="2"
             Orientation="Horizontal">
 
@@ -92,9 +92,9 @@
             <Switch
                 OnColor="{DynamicResource SkyBlueColor}"
                 ThumbColor="WhiteSmoke"
-                Margin="30,0,0,50"/>
+                Margin="30,0,0,50"/
 
-        </StackLayout>
+        </StackLayout>-->
         
         <StackLayout
             Grid.Row="3"

TheGameExtreme/view/Settings.xaml.cs

@@ -35,7 +35,7 @@ namespace TheGameExtreme.view
 
         }
 
-        private void CBBr_CheckedChanged(object sender, CheckedChangedEventArgs e)
+        /*private void CBBr_CheckedChanged(object sender, CheckedChangedEventArgs e)
         {
             if (CBBr.IsChecked == true)
             {
@@ -61,7 +61,7 @@ namespace TheGameExtreme.view
             {
                 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
         {