diff --git a/TheGameExtreme.Android/MainActivity.cs b/TheGameExtreme.Android/MainActivity.cs
index 05749b2..a97ab60 100644
--- a/TheGameExtreme.Android/MainActivity.cs
+++ b/TheGameExtreme.Android/MainActivity.cs
@@ -22,6 +22,7 @@ namespace TheGameExtreme.Droid
Xamarin.Essentials.Platform.Init(this, savedInstanceState);
global::Xamarin.Forms.Forms.Init(this, savedInstanceState);
LoadApplication(new App());
+ Window.SetStatusBarColor(Android.Graphics.Color.Argb(255, 0, 0, 0));
}
public override void OnRequestPermissionsResult(int requestCode, string[] permissions, [GeneratedEnum] Android.Content.PM.Permission[] grantResults)
{
diff --git a/TheGameExtreme.Android/Properties/AndroidManifest.xml b/TheGameExtreme.Android/Properties/AndroidManifest.xml
index e1c2d4f..78ea3a5 100644
--- a/TheGameExtreme.Android/Properties/AndroidManifest.xml
+++ b/TheGameExtreme.Android/Properties/AndroidManifest.xml
@@ -1,6 +1,7 @@
-
+
+
\ No newline at end of file
diff --git a/TheGameExtreme/TheGameExtreme.csproj b/TheGameExtreme/TheGameExtreme.csproj
index c9b9f51..3d51f6d 100644
--- a/TheGameExtreme/TheGameExtreme.csproj
+++ b/TheGameExtreme/TheGameExtreme.csproj
@@ -38,7 +38,7 @@
ResXFileCodeGenerator
AppRessources-br.Designer.cs
-
+
MSBuild:UpdateDesignTimeXaml
diff --git a/TheGameExtreme/view/App.xaml b/TheGameExtreme/view/App.xaml
index 2327f30..739a401 100644
--- a/TheGameExtreme/view/App.xaml
+++ b/TheGameExtreme/view/App.xaml
@@ -5,12 +5,18 @@
-
+
+
+
+
+
\ No newline at end of file
diff --git a/TheGameExtreme/view/App.xaml.cs b/TheGameExtreme/view/App.xaml.cs
index dd32133..7c12bfe 100644
--- a/TheGameExtreme/view/App.xaml.cs
+++ b/TheGameExtreme/view/App.xaml.cs
@@ -12,6 +12,7 @@ namespace TheGameExtreme
InitializeComponent();
MainPage = new NavigationPage(new HomePage());
+
}
protected override void OnStart()
diff --git a/TheGameExtreme/view/HomePage.xaml b/TheGameExtreme/view/HomePage.xaml
index b398cec..86ba6e0 100644
--- a/TheGameExtreme/view/HomePage.xaml
+++ b/TheGameExtreme/view/HomePage.xaml
@@ -17,16 +17,16 @@
-
-
-
-
+
+
+
+
+ CornerRadius="10"
+ Margin="20"/>
+ CornerRadius="10"
+ Margin="20"
+ />
+ HeightRequest="40"
+ CornerRadius="10"
+ Margin="20"/>
+
+
+
diff --git a/TheGameExtreme/view/HomePage.xaml.cs b/TheGameExtreme/view/HomePage.xaml.cs
index 41d3ed0..802056a 100644
--- a/TheGameExtreme/view/HomePage.xaml.cs
+++ b/TheGameExtreme/view/HomePage.xaml.cs
@@ -10,6 +10,10 @@ namespace TheGameExtreme.view
public HomePage()
{
InitializeComponent();
+ NavigationPage.SetHasNavigationBar(this, false);
+
+
+
}
private async void OpenGame(object sender, EventArgs args)
diff --git a/TheGameExtreme/Rules.xaml b/TheGameExtreme/view/Rules.xaml
similarity index 100%
rename from TheGameExtreme/Rules.xaml
rename to TheGameExtreme/view/Rules.xaml
diff --git a/TheGameExtreme/Rules.xaml.cs b/TheGameExtreme/view/Rules.xaml.cs
similarity index 100%
rename from TheGameExtreme/Rules.xaml.cs
rename to TheGameExtreme/view/Rules.xaml.cs
diff --git a/TheGameExtreme/view/Settings.xaml b/TheGameExtreme/view/Settings.xaml
index 57975c1..635d06f 100644
--- a/TheGameExtreme/view/Settings.xaml
+++ b/TheGameExtreme/view/Settings.xaml
@@ -1,6 +1,6 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
-
-
+
+
+
diff --git a/TheGameExtreme/view/Settings.xaml.cs b/TheGameExtreme/view/Settings.xaml.cs
index 1542fb3..efe4f60 100644
--- a/TheGameExtreme/view/Settings.xaml.cs
+++ b/TheGameExtreme/view/Settings.xaml.cs
@@ -22,6 +22,7 @@ namespace TheGameExtreme.view
}
+
}
private void CBFr_CheckedChanged(object sender, CheckedChangedEventArgs e)
@@ -30,17 +31,33 @@ namespace TheGameExtreme.view
{
CBBr.IsChecked = !CBBr.IsChecked;
}
+
+ }
+
+ private void WhiteTheme()
+ {
+ pageContentSetting.Style = Application.Current.Resources["MyBackGroundColorStyle2"] as Style;
+ lbColor0.Style = Application.Current.Resources["ColorLabelWhite"] as Style;
+ lbColor1.Style = Application.Current.Resources["ColorLabelWhite"] as Style;
+ lbColor2.Style = Application.Current.Resources["ColorLabelWhite"] as Style;
+ lbColor3.Style = Application.Current.Resources["ColorLabelWhite"] as Style;
+ lbColor4.Style = Application.Current.Resources["ColorLabelWhite"] as Style;
}
private void Switch_Toggled_Theme(object sender, ToggledEventArgs e)
{
- if(swTheme.IsToggled == false)
+ if (swTheme.IsToggled == true)
{
- pageContentSetting.Style = Application.Current.Resources["MyBackGroundColorStyle1"] as Style;
+ pageContentSetting.Style = Application.Current.Resources["MyBackGroundColorStyle"] as Style;
+ lbColor0.Style = Application.Current.Resources["ColorLabelDark"] as Style;
+ lbColor1.Style = Application.Current.Resources["ColorLabelDark"] as Style;
+ lbColor2.Style = Application.Current.Resources["ColorLabelDark"] as Style;
+ lbColor3.Style = Application.Current.Resources["ColorLabelDark"] as Style;
+ lbColor4.Style = Application.Current.Resources["ColorLabelDark"] as Style;
}
else
{
- pageContentSetting.Style = Application.Current.Resources["MyBackGroundColorStyle2"] as Style;
+ WhiteTheme();
}
}
}