diff --git a/TheGameExtreme.Android/Resources/Resource.designer.cs b/TheGameExtreme.Android/Resources/Resource.designer.cs
index 2d03d50..9914a73 100644
--- a/TheGameExtreme.Android/Resources/Resource.designer.cs
+++ b/TheGameExtreme.Android/Resources/Resource.designer.cs
@@ -5713,103 +5713,106 @@ namespace TheGameExtreme.Droid
public const int Apple = 2131165274;
// aapt resource value: 0x7F07005B
- public const int avd_hide_password = 2131165275;
+ public const int ArrowSettingsBack = 2131165275;
// aapt resource value: 0x7F07005C
- public const int avd_show_password = 2131165276;
+ public const int avd_hide_password = 2131165276;
// aapt resource value: 0x7F07005D
- public const int design_bottom_navigation_item_background = 2131165277;
+ public const int avd_show_password = 2131165277;
// aapt resource value: 0x7F07005E
- public const int design_fab_background = 2131165278;
+ public const int design_bottom_navigation_item_background = 2131165278;
// aapt resource value: 0x7F07005F
- public const int design_ic_visibility = 2131165279;
+ public const int design_fab_background = 2131165279;
// aapt resource value: 0x7F070060
- public const int design_ic_visibility_off = 2131165280;
+ public const int design_ic_visibility = 2131165280;
// aapt resource value: 0x7F070061
- public const int design_password_eye = 2131165281;
+ public const int design_ic_visibility_off = 2131165281;
// aapt resource value: 0x7F070062
- public const int design_snackbar_background = 2131165282;
+ public const int design_password_eye = 2131165282;
// aapt resource value: 0x7F070063
- public const int Engrenage = 2131165283;
+ public const int design_snackbar_background = 2131165283;
// aapt resource value: 0x7F070064
- public const int EngrenageV1 = 2131165284;
+ public const int Engrenage = 2131165284;
// aapt resource value: 0x7F070065
- public const int ic_mtrl_chip_checked_black = 2131165285;
+ public const int EngrenageV1 = 2131165285;
// aapt resource value: 0x7F070066
- public const int ic_mtrl_chip_checked_circle = 2131165286;
+ public const int ic_mtrl_chip_checked_black = 2131165286;
// aapt resource value: 0x7F070067
- public const int ic_mtrl_chip_close_circle = 2131165287;
+ public const int ic_mtrl_chip_checked_circle = 2131165287;
// aapt resource value: 0x7F070068
- public const int imagesRules = 2131165288;
+ public const int ic_mtrl_chip_close_circle = 2131165288;
// aapt resource value: 0x7F070069
- public const int mtrl_snackbar_background = 2131165289;
+ public const int imagesRules = 2131165289;
// aapt resource value: 0x7F07006A
- public const int mtrl_tabs_default_indicator = 2131165290;
+ public const int mtrl_snackbar_background = 2131165290;
// aapt resource value: 0x7F07006B
- public const int navigation_empty_icon = 2131165291;
+ public const int mtrl_tabs_default_indicator = 2131165291;
// aapt resource value: 0x7F07006C
- public const int notification_action_background = 2131165292;
+ public const int navigation_empty_icon = 2131165292;
// aapt resource value: 0x7F07006D
- public const int notification_bg = 2131165293;
+ public const int notification_action_background = 2131165293;
// aapt resource value: 0x7F07006E
- public const int notification_bg_low = 2131165294;
+ public const int notification_bg = 2131165294;
// aapt resource value: 0x7F07006F
- public const int notification_bg_low_normal = 2131165295;
+ public const int notification_bg_low = 2131165295;
// aapt resource value: 0x7F070070
- public const int notification_bg_low_pressed = 2131165296;
+ public const int notification_bg_low_normal = 2131165296;
// aapt resource value: 0x7F070071
- public const int notification_bg_normal = 2131165297;
+ public const int notification_bg_low_pressed = 2131165297;
// aapt resource value: 0x7F070072
- public const int notification_bg_normal_pressed = 2131165298;
+ public const int notification_bg_normal = 2131165298;
// aapt resource value: 0x7F070073
- public const int notification_icon_background = 2131165299;
+ public const int notification_bg_normal_pressed = 2131165299;
// aapt resource value: 0x7F070074
- public const int notification_template_icon_bg = 2131165300;
+ public const int notification_icon_background = 2131165300;
// aapt resource value: 0x7F070075
- public const int notification_template_icon_low_bg = 2131165301;
+ public const int notification_template_icon_bg = 2131165301;
// aapt resource value: 0x7F070076
- public const int notification_tile_bg = 2131165302;
+ public const int notification_template_icon_low_bg = 2131165302;
// aapt resource value: 0x7F070077
- public const int notify_panel_notification_icon_bg = 2131165303;
+ public const int notification_tile_bg = 2131165303;
// aapt resource value: 0x7F070078
- public const int rules = 2131165304;
+ public const int notify_panel_notification_icon_bg = 2131165304;
// aapt resource value: 0x7F070079
- public const int rulesImg = 2131165305;
+ public const int rules = 2131165305;
// aapt resource value: 0x7F07007A
- public const int tooltip_frame_dark = 2131165306;
+ public const int rulesImg = 2131165306;
// aapt resource value: 0x7F07007B
- public const int tooltip_frame_light = 2131165307;
+ public const int tooltip_frame_dark = 2131165307;
+
+ // aapt resource value: 0x7F07007C
+ public const int tooltip_frame_light = 2131165308;
static Drawable()
{
diff --git a/TheGameExtreme.Android/Resources/drawable/ArrowSettingsBack.png b/TheGameExtreme.Android/Resources/drawable/ArrowSettingsBack.png
new file mode 100644
index 0000000..cdeadec
Binary files /dev/null and b/TheGameExtreme.Android/Resources/drawable/ArrowSettingsBack.png differ
diff --git a/TheGameExtreme.Android/TheGameExtreme.Android.csproj b/TheGameExtreme.Android/TheGameExtreme.Android.csproj
index 48f8f49..78e17a7 100644
--- a/TheGameExtreme.Android/TheGameExtreme.Android.csproj
+++ b/TheGameExtreme.Android/TheGameExtreme.Android.csproj
@@ -119,5 +119,8 @@
+
+
+
\ No newline at end of file
diff --git a/TheGameExtreme.iOS/Resources/Arrow-left.png b/TheGameExtreme.iOS/Resources/Arrow-left.png
new file mode 100644
index 0000000..b892f54
Binary files /dev/null and b/TheGameExtreme.iOS/Resources/Arrow-left.png differ
diff --git a/TheGameExtreme.iOS/TheGameExtreme.iOS.csproj b/TheGameExtreme.iOS/TheGameExtreme.iOS.csproj
index abdce6e..dd3626e 100644
--- a/TheGameExtreme.iOS/TheGameExtreme.iOS.csproj
+++ b/TheGameExtreme.iOS/TheGameExtreme.iOS.csproj
@@ -154,5 +154,6 @@
+
\ No newline at end of file
diff --git a/TheGameExtreme/view/App.xaml b/TheGameExtreme/view/App.xaml
index 706e71b..0e7de7b 100644
--- a/TheGameExtreme/view/App.xaml
+++ b/TheGameExtreme/view/App.xaml
@@ -1,26 +1,14 @@
-
-
-
-
-
-
+
-
-
-
\ No newline at end of file
diff --git a/TheGameExtreme/view/HomePage.xaml b/TheGameExtreme/view/HomePage.xaml
index 5fcf05b..0ac0962 100644
--- a/TheGameExtreme/view/HomePage.xaml
+++ b/TheGameExtreme/view/HomePage.xaml
@@ -1,6 +1,5 @@
-
@@ -23,7 +22,8 @@
Grid.Row="0" Grid.Column="1"
HorizontalTextAlignment="Center"
FontSize="35"
- VerticalTextAlignment="Center"/>
+ VerticalTextAlignment="Center"
+ FontFamily=""/>
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/TheGameExtreme/view/MultiPlayerMode.xaml.cs b/TheGameExtreme/view/MultiPlayerMode.xaml.cs
index 6d1cb80..07af865 100644
--- a/TheGameExtreme/view/MultiPlayerMode.xaml.cs
+++ b/TheGameExtreme/view/MultiPlayerMode.xaml.cs
@@ -10,6 +10,12 @@ namespace TheGameExtreme.view
public MultiPlayerMode()
{
InitializeComponent();
+ NavigationPage.SetHasNavigationBar(this, false);
+ }
+
+ private async void BackMulti_Clicked(object sender, EventArgs e)
+ {
+ await Navigation.PushAsync(new HomePage());
}
}
}
diff --git a/TheGameExtreme/view/Settings.xaml b/TheGameExtreme/view/Settings.xaml
index 635d06f..811fdd7 100644
--- a/TheGameExtreme/view/Settings.xaml
+++ b/TheGameExtreme/view/Settings.xaml
@@ -1,10 +1,11 @@
-
+ x:Class="TheGameExtreme.view.Settings"
+ Resources="">
@@ -18,54 +19,76 @@
-
-
+
+
+ x:Name="lbColor0"
+ Margin="40,58,0,0"/>
+ x:Name="lbColor1"
+
+ Margin="80,58,0,0"/>
+ CheckedChanged="CBBr_CheckedChanged"
+ Color="SkyBlue"
+ Margin="40,63,0,0"/>
+
+ Margin="80,58,0,0"/>
+ CheckedChanged="CBFr_CheckedChanged"
+ Color="SkyBlue"
+ Margin="40,63,0,0"
+ />
+
+ Margin="40,25,0,0"/>
+ Grid.Column="1" Grid.Row="2"
+ OnColor="SkyBlue"
+ ThumbColor="WhiteSmoke"/>
-
+
+ Margin="40,25,0,0"/>
+
+ Toggled="Switch_Toggled_Theme" x:Name="swTheme"
+ OnColor="SkyBlue" ThumbColor="WhiteSmoke"/>
diff --git a/TheGameExtreme/view/Settings.xaml.cs b/TheGameExtreme/view/Settings.xaml.cs
index 0f06fb2..641d104 100644
--- a/TheGameExtreme/view/Settings.xaml.cs
+++ b/TheGameExtreme/view/Settings.xaml.cs
@@ -13,6 +13,7 @@ namespace TheGameExtreme.view
{
InitializeComponent();
NavigationPage.SetHasNavigationBar(this, false);
+
}
private void CBBr_CheckedChanged(object sender, CheckedChangedEventArgs e)
@@ -37,13 +38,17 @@ namespace TheGameExtreme.view
{
if (swTheme.IsToggled == true)
- {
+ {
+ /*(Application.Current.Resources["ColorLabelText"] 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;
+ lbColor4.Style = Application.Current.Resources["ColorLabelDark"] as Style;*/
+
+
+
}
else
{
@@ -53,7 +58,7 @@ namespace TheGameExtreme.view
private void WhiteTheme()//Change le background color de settings en Blanc et swap la couleur des labels en noir
{
- HomePage page = new HomePage();
+
{
pageContentSetting.Style = Application.Current.Resources["MyBackGroundColorStyle2"] as Style;
lbColor0.Style = Application.Current.Resources["ColorLabelWhite"] as Style;
@@ -61,9 +66,12 @@ namespace TheGameExtreme.view
lbColor2.Style = Application.Current.Resources["ColorLabelWhite"] as Style;
lbColor3.Style = Application.Current.Resources["ColorLabelWhite"] as Style;
lbColor4.Style = Application.Current.Resources["ColorLabelWhite"] as Style;
-
- //ChangeBackGroundColorHomePage();
}
}
+
+ private async void SettingToHomePage(object sender, EventArgs e)
+ {
+ await Navigation.PushAsync(new HomePage());
+ }
}
}