From 0464bba61ab0264e903c2f10a6664ba3ce110af0 Mon Sep 17 00:00:00 2001
From: cldupland <clement.dupland@etu.uca.fr>
Date: Tue, 5 Nov 2019 09:07:32 +0100
Subject: [PATCH] Correction des erreurs de mon binome

---
 .../Properties/AndroidManifest.xml            |  8 ++---
 TheGameExtreme.sln                            |  2 +-
 TheGameExtreme/TheGameExtreme.csproj          | 13 ++-------
 TheGameExtreme/view/App.xaml.cs               |  1 +
 TheGameExtreme/view/HomePage.xaml             | 29 +++++--------------
 TheGameExtreme/view/HomePage.xaml.cs          | 22 +++++---------
 TheGameExtreme/view/MainPage.xaml             |  2 +-
 TheGameExtreme/view/MainPage.xaml.cs          |  2 +-
 TheGameExtreme/view/MultiPlayerMode.xaml      | 14 ---------
 TheGameExtreme/view/MultiPlayerMode.xaml.cs   |  9 ++----
 TheGameExtreme/view/MultiplayerMode.xaml      | 15 ++++++++++
 TheGameExtreme/view/Setting.xaml              | 21 --------------
 TheGameExtreme/view/Setting.xaml.cs           | 20 -------------
 TheGameExtreme/view/Settings.xaml             | 20 +++++++++++++
 TheGameExtreme/view/Settings.xaml.cs          | 15 ++++++++++
 15 files changed, 79 insertions(+), 114 deletions(-)
 delete mode 100644 TheGameExtreme/view/MultiPlayerMode.xaml
 create mode 100644 TheGameExtreme/view/MultiplayerMode.xaml
 delete mode 100644 TheGameExtreme/view/Setting.xaml
 delete mode 100644 TheGameExtreme/view/Setting.xaml.cs
 create mode 100644 TheGameExtreme/view/Settings.xaml
 create mode 100644 TheGameExtreme/view/Settings.xaml.cs

diff --git a/TheGameExtreme.Android/Properties/AndroidManifest.xml b/TheGameExtreme.Android/Properties/AndroidManifest.xml
index cb1c31c..e1c2d4f 100644
--- a/TheGameExtreme.Android/Properties/AndroidManifest.xml
+++ b/TheGameExtreme.Android/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.uca.thegameextreme">
-    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
-    <application android:label="TheGameExtreme.Android"></application>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-</manifest>
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
+	<application android:label="TheGameExtreme.Android"></application>
+	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+</manifest>
\ No newline at end of file
diff --git a/TheGameExtreme.sln b/TheGameExtreme.sln
index 1a37b29..a3b7be5 100644
--- a/TheGameExtreme.sln
+++ b/TheGameExtreme.sln
@@ -6,7 +6,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TheGameExtreme.Android", "T
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TheGameExtreme.iOS", "TheGameExtreme.iOS\TheGameExtreme.iOS.csproj", "{37A0EC21-60A9-43D2-8B43-3851E1CB7932}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TheGameExtreme", "TheGameExtreme\TheGameExtreme.csproj", "{8DE6C881-FF77-4CC4-B8C4-CDEDD9AB13B3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TheGameExtreme", "TheGameExtreme\TheGameExtreme.csproj", "{8DE6C881-FF77-4CC4-B8C4-CDEDD9AB13B3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUnitaire", "TestUnitaire\TestUnitaire.csproj", "{DAB0A3A0-CD99-4819-A813-01F10D77BAB1}"
 EndProject
diff --git a/TheGameExtreme/TheGameExtreme.csproj b/TheGameExtreme/TheGameExtreme.csproj
index 1791075..bdb06a4 100644
--- a/TheGameExtreme/TheGameExtreme.csproj
+++ b/TheGameExtreme/TheGameExtreme.csproj
@@ -25,16 +25,12 @@
     <None Remove="AppRessources.config" />
     <None Remove="view\Image\thegame.jpg" />
     <None Remove="view\MultiPlayerMode.xaml" />
-    <None Remove="view\Setting.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Remove="view\MultiPlayerMode.xaml" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="view\Image\thegame.jpg" />
-    <EmbeddedResource Include="view\MultiPlayerMode.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Include="view\Setting.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="AppRessource.resx">
@@ -52,9 +48,6 @@
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>AppResources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <EmbeddedResource Update="view\HomePage.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <Compile Update="AppRessource.Designer.cs">
diff --git a/TheGameExtreme/view/App.xaml.cs b/TheGameExtreme/view/App.xaml.cs
index 3b6ffc4..ca30df4 100644
--- a/TheGameExtreme/view/App.xaml.cs
+++ b/TheGameExtreme/view/App.xaml.cs
@@ -1,4 +1,5 @@
 using System;
+using TheGameExtreme.view;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 
diff --git a/TheGameExtreme/view/HomePage.xaml b/TheGameExtreme/view/HomePage.xaml
index fd28ac7..2c7ff6b 100644
--- a/TheGameExtreme/view/HomePage.xaml
+++ b/TheGameExtreme/view/HomePage.xaml
@@ -1,22 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ContentView xmlns="http://xamarin.com/schemas/2014/forms" 
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:d="http://xamarin.com/schemas/2014/forms/design"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d"
-             x:Class="TheGameExtreme.view.HomePage">
-  <ContentView.Content>
-        <StackLayout>
-            <StackLayout>
-                <Label Text="THEGAME" TextColor="DarkBlue" HorizontalTextAlignment="Center" Margin="30"></Label>
-                <label Text="test" TextColor="blue" HorizontalTextAlignment="Center" Margin="20"></label>
-                <ImageButton Source="la-rotation-des-engrenages-318-56336.jpg" Clicked="OpenSetting"></ImageButton>
-                <Button Text="Solo" Clicked="OpenGame"/>
-                <Button Text="Multijoueur" Clicked="OpenMultiPlayerMode"/>
-                <
-                <Button Text="Connexion en ligne" Clicked=""/>
-                
-            </StackLayout>           
-        </StackLayout>
-  </ContentView.Content>
-</ContentView>
\ No newline at end of file
+<ContentPage
+    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="TheGameExtreme.view.HomePage">
+
+
+
+</ContentPage>
diff --git a/TheGameExtreme/view/HomePage.xaml.cs b/TheGameExtreme/view/HomePage.xaml.cs
index 357553f..4185041 100644
--- a/TheGameExtreme/view/HomePage.xaml.cs
+++ b/TheGameExtreme/view/HomePage.xaml.cs
@@ -1,36 +1,30 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 using Xamarin.Forms;
-using Xamarin.Forms.Xaml;
 
 namespace TheGameExtreme.view
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class HomePage : ContentView
+    public partial class HomePage : ContentPage
     {
         public HomePage()
         {
             InitializeComponent();
         }
 
-        /*void OpenGame(object sender, EventArgs args)
+        private void OpenGame(object sender, EventArgs args)
         {
-            
+
         }
 
-        async void OpenMultiPlayerMode(object sender, EventArgs args)
+        private void OpenMultiPlayerMode(object sender, EventArgs args)
         {
-            MultiPlayerMode.Open();
+            //MultiPlayerMode.Open();
         }
 
-        async void OpenSetting(object sender, EventArgs args)
+        private void OpenSetting(object sender, EventArgs args)
         {
-            Setting.Open();
+            //Setting.Open();
         }
-        */
     }
-}
\ No newline at end of file
+}
diff --git a/TheGameExtreme/view/MainPage.xaml b/TheGameExtreme/view/MainPage.xaml
index c957131..1714771 100644
--- a/TheGameExtreme/view/MainPage.xaml
+++ b/TheGameExtreme/view/MainPage.xaml
@@ -5,7 +5,7 @@
     xmlns:d="http://xamarin.com/schemas/2014/forms/design"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d"
-    x:Class="TheGameExtreme.MainPage">
+    x:Class="TheGameExtreme.view.MainPage">
 
     <ScrollView
         Orientation="Vertical">
diff --git a/TheGameExtreme/view/MainPage.xaml.cs b/TheGameExtreme/view/MainPage.xaml.cs
index 50b1a01..5832463 100644
--- a/TheGameExtreme/view/MainPage.xaml.cs
+++ b/TheGameExtreme/view/MainPage.xaml.cs
@@ -11,7 +11,7 @@ using Xamarin.Forms.Xaml;
 using TheGameExtreme.model.@event;
 using TheGameExtreme.viewmodel;
 
-namespace TheGameExtreme
+namespace TheGameExtreme.view
 {
     // Learn more about making custom code visible in the Xamarin.Forms previewer
     // by visiting https://aka.ms/xamarinforms-previewer
diff --git a/TheGameExtreme/view/MultiPlayerMode.xaml b/TheGameExtreme/view/MultiPlayerMode.xaml
deleted file mode 100644
index db7eb7e..0000000
--- a/TheGameExtreme/view/MultiPlayerMode.xaml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ContentView xmlns="http://xamarin.com/schemas/2014/forms" 
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:d="http://xamarin.com/schemas/2014/forms/design"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d"
-             x:Class="TheGameExtreme.view.MultiPlayerMode">
-  <ContentView.Content>
-      <StackLayout>
-            <Button text="Connexion Bluetooth" Clicked"" Margin="60"/>
-            <Button text="Connexion Wifi" Clicked""/>
-        </StackLayout>
-  </ContentView.Content>
-</ContentView>
\ No newline at end of file
diff --git a/TheGameExtreme/view/MultiPlayerMode.xaml.cs b/TheGameExtreme/view/MultiPlayerMode.xaml.cs
index 85b5fb7..6d1cb80 100644
--- a/TheGameExtreme/view/MultiPlayerMode.xaml.cs
+++ b/TheGameExtreme/view/MultiPlayerMode.xaml.cs
@@ -1,20 +1,15 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 using Xamarin.Forms;
-using Xamarin.Forms.Xaml;
 
 namespace TheGameExtreme.view
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class MultiPlayerMode : ContentView
+    public partial class MultiPlayerMode : ContentPage
     {
         public MultiPlayerMode()
         {
             InitializeComponent();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/TheGameExtreme/view/MultiplayerMode.xaml b/TheGameExtreme/view/MultiplayerMode.xaml
new file mode 100644
index 0000000..79e19bd
--- /dev/null
+++ b/TheGameExtreme/view/MultiplayerMode.xaml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ContentPage
+    xmlns="http://xamarin.com/schemas/2014/forms" 
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="TheGameExtreme.view.MultiPlayerMode">
+
+    <StackLayout>
+
+        <Button Text="Connexion Bluetooth" Margin="60"/>
+        <Button Text="Connexion Wifi" />
+
+    </StackLayout>
+
+</ContentPage>
\ No newline at end of file
diff --git a/TheGameExtreme/view/Setting.xaml b/TheGameExtreme/view/Setting.xaml
deleted file mode 100644
index d795ded..0000000
--- a/TheGameExtreme/view/Setting.xaml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ContentView xmlns="http://xamarin.com/schemas/2014/forms" 
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:d="http://xamarin.com/schemas/2014/forms/design"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d"
-             x:Class="TheGameExtreme.view.Setting">
-  <ContentView.Content>
-      <StackLayout>
-          <Label Text="langage" Margin="50" />
-            <ComboBox Height="23" Name="comboBox1" Width="120">
-                <ComboBoxItem Content="English"/>
-                <ComboBoxItem Content="Français"/>                
-            </ComboBox>
-            <Label Text="Sound"/>            
-            <Switch IsToggled="true"/>
-            <Label Text="Mode Extreme"/>
-            <Switch IsToggled="true"/>
-        </StackLayout>
-  </ContentView.Content>
-</ContentView>
\ No newline at end of file
diff --git a/TheGameExtreme/view/Setting.xaml.cs b/TheGameExtreme/view/Setting.xaml.cs
deleted file mode 100644
index e4e94d2..0000000
--- a/TheGameExtreme/view/Setting.xaml.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using Xamarin.Forms;
-using Xamarin.Forms.Xaml;
-
-namespace TheGameExtreme.view
-{
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class Setting : ContentView
-    {
-        public Setting()
-        {
-            InitializeComponent();
-        }
-    }
-}
\ No newline at end of file
diff --git a/TheGameExtreme/view/Settings.xaml b/TheGameExtreme/view/Settings.xaml
new file mode 100644
index 0000000..7d932b8
--- /dev/null
+++ b/TheGameExtreme/view/Settings.xaml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<ContentPage
+    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="TheGameExtreme.view.Settings">
+
+    <StackLayout>
+        <Label Text="langage" Margin="50" />
+        <!--<ComboBox Height="23" Name="comboBox1" Width="120">
+            <ComboBoxItem Content="English"/>
+            <ComboBoxItem Content="Français"/>
+        </ComboBox>-->
+        <Label Text="Sound"/>            
+        <Switch IsToggled="true"/>
+        <Label Text="Mode Extreme"/>
+        <Switch IsToggled="true"/>
+    </StackLayout>
+
+</ContentPage>
diff --git a/TheGameExtreme/view/Settings.xaml.cs b/TheGameExtreme/view/Settings.xaml.cs
new file mode 100644
index 0000000..52aac0e
--- /dev/null
+++ b/TheGameExtreme/view/Settings.xaml.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+
+using Xamarin.Forms;
+
+namespace TheGameExtreme.view
+{
+    public partial class Settings : ContentPage
+    {
+        public Settings()
+        {
+            InitializeComponent();
+        }
+    }
+}