Branch-test-graphisme

TheGameExtreme.Android/Resources/Resource.designer.cs

@@ -1,11 +1,11 @@
 #pragma warning disable 1591
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
+//     Ce code a été généré par un outil.
-//     Runtime Version:4.0.30319.42000
+//     Version du runtime :4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
+//     Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
-//     the code is regenerated.
+//     le code est régénéré.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -5740,64 +5740,67 @@ namespace TheGameExtreme.Droid
 			public const int Engrenage = 2131165283;
 			
 			// aapt resource value: 0x7F070064
-			public const int ic_mtrl_chip_checked_black = 2131165284;
+			public const int EngrenageV1 = 2131165284;
 			
 			// aapt resource value: 0x7F070065
-			public const int ic_mtrl_chip_checked_circle = 2131165285;
+			public const int ic_mtrl_chip_checked_black = 2131165285;
 			
 			// aapt resource value: 0x7F070066
-			public const int ic_mtrl_chip_close_circle = 2131165286;
+			public const int ic_mtrl_chip_checked_circle = 2131165286;
 			
 			// aapt resource value: 0x7F070067
-			public const int mtrl_snackbar_background = 2131165287;
+			public const int ic_mtrl_chip_close_circle = 2131165287;
 			
 			// aapt resource value: 0x7F070068
-			public const int mtrl_tabs_default_indicator = 2131165288;
+			public const int mtrl_snackbar_background = 2131165288;
 			
 			// aapt resource value: 0x7F070069
-			public const int navigation_empty_icon = 2131165289;
+			public const int mtrl_tabs_default_indicator = 2131165289;
 			
 			// aapt resource value: 0x7F07006A
-			public const int notification_action_background = 2131165290;
+			public const int navigation_empty_icon = 2131165290;
 			
 			// aapt resource value: 0x7F07006B
-			public const int notification_bg = 2131165291;
+			public const int notification_action_background = 2131165291;
 			
 			// aapt resource value: 0x7F07006C
-			public const int notification_bg_low = 2131165292;
+			public const int notification_bg = 2131165292;
 			
 			// aapt resource value: 0x7F07006D
-			public const int notification_bg_low_normal = 2131165293;
+			public const int notification_bg_low = 2131165293;
 			
 			// aapt resource value: 0x7F07006E
-			public const int notification_bg_low_pressed = 2131165294;
+			public const int notification_bg_low_normal = 2131165294;
 			
 			// aapt resource value: 0x7F07006F
-			public const int notification_bg_normal = 2131165295;
+			public const int notification_bg_low_pressed = 2131165295;
 			
 			// aapt resource value: 0x7F070070
-			public const int notification_bg_normal_pressed = 2131165296;
+			public const int notification_bg_normal = 2131165296;
 			
 			// aapt resource value: 0x7F070071
-			public const int notification_icon_background = 2131165297;
+			public const int notification_bg_normal_pressed = 2131165297;
 			
 			// aapt resource value: 0x7F070072
-			public const int notification_template_icon_bg = 2131165298;
+			public const int notification_icon_background = 2131165298;
 			
 			// aapt resource value: 0x7F070073
-			public const int notification_template_icon_low_bg = 2131165299;
+			public const int notification_template_icon_bg = 2131165299;
 			
 			// aapt resource value: 0x7F070074
-			public const int notification_tile_bg = 2131165300;
+			public const int notification_template_icon_low_bg = 2131165300;
 			
 			// aapt resource value: 0x7F070075
-			public const int notify_panel_notification_icon_bg = 2131165301;
+			public const int notification_tile_bg = 2131165301;
 			
 			// aapt resource value: 0x7F070076
-			public const int tooltip_frame_dark = 2131165302;
+			public const int notify_panel_notification_icon_bg = 2131165302;
 			
 			// aapt resource value: 0x7F070077
-			public const int tooltip_frame_light = 2131165303;
+			public const int tooltip_frame_dark = 2131165303;
+			
+			// aapt resource value: 0x7F070078
+			public const int tooltip_frame_light = 2131165304;
 			
 			static Drawable()
 			{

TheGameExtreme.Android/TheGameExtreme.Android.csproj

@@ -107,5 +107,8 @@
   <ItemGroup>
     <Folder Include="Assets\fonts\" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\EngrenageV1.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>

TheGameExtreme.iOS/AppDelegate.cs

@@ -23,6 +23,7 @@ namespace TheGameExtreme.iOS
         public override bool FinishedLaunching(UIApplication app, NSDictionary options)
         {
             global::Xamarin.Forms.Forms.Init();
+            global::Xamarin.Forms.FormsMaterial.Init();
             LoadApplication(new App());
 
             return base.FinishedLaunching(app, options);

TheGameExtreme/TheGameExtreme.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.3.0.908675" />
+    <PackageReference Include="Xamarin.Forms" Version="4.3.0.947036" />
     <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
   </ItemGroup>
   <ItemGroup>

TheGameExtreme/view/HomePage.xaml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ContentPage
+<ContentPage Visual="Material"
-    BackgroundColor="#4d4c4b"
+    BackgroundColor="#4d4c4a" Opacity=""
     xmlns="http://xamarin.com/schemas/2014/forms"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     x:Class="TheGameExtreme.view.HomePage">
     <StackLayout BackgroundColor="Transparent">
         <Grid>
+            
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="*"/>
@@ -18,40 +19,47 @@
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>            
             
-            <Label Text="THE GAME" TextColor="DarkBlue"
+            
+            
+            <Label Text="THE GAME" TextColor="Black"
                    Grid.Row="0" Grid.Column="1" 
                    HorizontalTextAlignment="Center"  
                    FontSize="28"                   
                    VerticalTextAlignment="Center"/>
 
-            <ImageButton Source="Engrenage.jpeg"
+            <ImageButton Source="EngrenageV1.jpeg"
                     Grid.Row="0" Grid.Column="2" 
                     VerticalOptions="CenterAndExpand" 
                     HorizontalOptions="End" 
                     HeightRequest="60" 
                     WidthRequest="68"                         
-                         
+                    Clicked="OpenSetting"
-                         Clicked="OpenSetting"/>
+                    />
             
             <Button Text="Solo" Grid.Row="1" Grid.Column="1" 
                     HorizontalOptions="Center" 
                     WidthRequest="150" 
-                    HeightRequest="60" 
+                    HeightRequest="50" 
                     VerticalOptions="Center"
-                    Clicked="OpenGame"/>
+                    Clicked="OpenGame"
+                    CornerRadius="20"
+                    Margin="15"/>
+            
             
             <Button Text="Multijoueur" Grid.Row="2" Grid.Column="1" 
                     HorizontalOptions="Center" 
                     VerticalOptions="Center"
-                    HeightRequest="60" 
+                    HeightRequest="50" 
                     WidthRequest="180"
-                    Clicked="OpenMultiPlayerMode"/>
+                    Clicked="OpenMultiPlayerMode"
+                    CornerRadius="20"/>
             
             <Button Text="Connexion en ligne" Grid.Row="3" Grid.Column="1"
                     HorizontalOptions="Center" 
                     VerticalOptions="Center" 
                     WidthRequest="230"
-                    HeightRequest="60"/>
+                    HeightRequest="50"
+                    CornerRadius="20"/>
         </Grid>  
     </StackLayout>
 </ContentPage>