From d3ffac10fee6c405eb6c4c1126ada3ef3fc2643d Mon Sep 17 00:00:00 2001
From: Baptiste ARNAUD <baarnaud2@iut.local>
Date: Mon, 9 Dec 2019 10:50:58 +0100
Subject: [PATCH] Reglage bouton theme

---
 TheGameExtreme.Android/MainActivity.cs |  2 +-
 TheGameExtreme/view/HomePage.xaml      | 16 +++++++++-----
 TheGameExtreme/view/HomePage.xaml.cs   | 30 ++++----------------------
 3 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/TheGameExtreme.Android/MainActivity.cs b/TheGameExtreme.Android/MainActivity.cs
index 401b89f..1fc2dfb 100644
--- a/TheGameExtreme.Android/MainActivity.cs
+++ b/TheGameExtreme.Android/MainActivity.cs
@@ -19,7 +19,7 @@ namespace TheGameExtreme.Droid
             TabLayoutResource = Resource.Layout.Tabbar;
             ToolbarResource = Resource.Layout.Toolbar;
 
-             int uiOptions = (int)Window.DecorView.SystemUiVisibility;
+            int uiOptions = (int)Window.DecorView.SystemUiVisibility;
             uiOptions |= (int)SystemUiFlags.LowProfile;
             uiOptions |= (int)SystemUiFlags.Fullscreen;
             uiOptions |= (int)SystemUiFlags.HideNavigation;
diff --git a/TheGameExtreme/view/HomePage.xaml b/TheGameExtreme/view/HomePage.xaml
index 1b18e63..f7d0912 100644
--- a/TheGameExtreme/view/HomePage.xaml
+++ b/TheGameExtreme/view/HomePage.xaml
@@ -22,6 +22,7 @@
                 <RowDefinition Height="27*"/>
                 <RowDefinition Height="27*"/>
                 <RowDefinition Height="27*"/>
+                <RowDefinition Height="27*"/>
             </Grid.RowDefinitions>
 
             <Label
@@ -38,7 +39,7 @@
             <Button
                 Text="{x:Static resources:AppResources.StrLocalGame}"
                 FontSize="18"
-                Grid.Row="1"
+                Grid.Row="2"
                 Grid.Column="1" 
                 HorizontalOptions="Center" 
                 WidthRequest="230" 
@@ -52,7 +53,7 @@
             <Button
                 Text="{x:Static resources:AppResources.StrMultiplayer}"
                 FontSize="18"
-                Grid.Row="2"
+                Grid.Row="3"
                 Grid.Column="1" 
                 HorizontalOptions="Center" 
                 VerticalOptions="Center"
@@ -64,7 +65,7 @@
 
             <Button Text="{x:Static resources:AppResources.StrTitleRules}"
                     FontSize="18"
-                    Grid.Row="3"
+                    Grid.Row="4"
                     Grid.Column="1"
                     HorizontalOptions="Center"
                     VerticalOptions="Center"
@@ -74,14 +75,19 @@
                     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="5*"/>
+                    <RowDefinition Height="6*"/>
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="2*" />
-                    <ColumnDefinition Width="5*" />
+                    <ColumnDefinition Width="6*" />
                 </Grid.ColumnDefinitions>
             
                 <ImageButton
diff --git a/TheGameExtreme/view/HomePage.xaml.cs b/TheGameExtreme/view/HomePage.xaml.cs
index 3c7257c..e5c6b77 100644
--- a/TheGameExtreme/view/HomePage.xaml.cs
+++ b/TheGameExtreme/view/HomePage.xaml.cs
@@ -1,13 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Xml.Serialization;
 using Xamarin.Forms;
-using System.Diagnostics;
 using TheGameExtreme.IO;
-using Rg.Plugins.Popup.Pages;
-using Rg.Plugins.Popup.Extensions;
-using TheGameExtreme.Resx;
 
 namespace TheGameExtreme.view
 {
@@ -17,8 +10,7 @@ namespace TheGameExtreme.view
         public HomePage()
         {
             InitializeComponent();
-            NavigationPage.SetHasNavigationBar(this, false);
-            SetTheme();
+            NavigationPage.SetHasNavigationBar(this, false);            
             LoadParameterOptionOnHomepage();
 
         }        
@@ -82,30 +74,16 @@ namespace TheGameExtreme.view
                 {
                     BackgroundColor = Color.Transparent,
                     BorderColor = (Color)Application.Current.Resources["SkyBlueColor"]
-
-
                 };
                 imageButton.Source = "SoleilThemes.png";
-                
             }
             ButtonGrid.Children.Add(imageButton, 1, 1);
             imageButton.Clicked += Theme_Clicked;
+            imageButton.HorizontalOptions = LayoutOptions.Center;
+            imageButton.VerticalOptions = LayoutOptions.End;
             IOOptions.SaveOptionParameter(b);
             
             
-        }
-
-        private void SetTheme()
-        {
-            if (homepageT.BackgroundColor == Color.Black)
-            {
-                imageButton.Source = "SoleilThemes.png";
-            }
-            if(homepageT.BackgroundColor == Color.White)
-            {
-                imageButton.Source = "LuneSombreTheme";                
-            }
-            
-        }
+        }       
     }
 }