Correction des erreurs de mon binome

master
cldupland 6 years ago
parent 56dae9807c
commit 0464bba61a

@ -6,7 +6,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TheGameExtreme.Android", "T
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TheGameExtreme.iOS", "TheGameExtreme.iOS\TheGameExtreme.iOS.csproj", "{37A0EC21-60A9-43D2-8B43-3851E1CB7932}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TheGameExtreme.iOS", "TheGameExtreme.iOS\TheGameExtreme.iOS.csproj", "{37A0EC21-60A9-43D2-8B43-3851E1CB7932}"
EndProject 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 EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUnitaire", "TestUnitaire\TestUnitaire.csproj", "{DAB0A3A0-CD99-4819-A813-01F10D77BAB1}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUnitaire", "TestUnitaire\TestUnitaire.csproj", "{DAB0A3A0-CD99-4819-A813-01F10D77BAB1}"
EndProject EndProject

@ -25,16 +25,12 @@
<None Remove="AppRessources.config" /> <None Remove="AppRessources.config" />
<None Remove="view\Image\thegame.jpg" /> <None Remove="view\Image\thegame.jpg" />
<None Remove="view\MultiPlayerMode.xaml" /> <None Remove="view\MultiPlayerMode.xaml" />
<None Remove="view\Setting.xaml" /> </ItemGroup>
<ItemGroup>
<EmbeddedResource Remove="view\MultiPlayerMode.xaml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="view\Image\thegame.jpg" /> <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>
<ItemGroup> <ItemGroup>
<EmbeddedResource Update="AppRessource.resx"> <EmbeddedResource Update="AppRessource.resx">
@ -52,9 +48,6 @@
<Generator>PublicResXFileCodeGenerator</Generator> <Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>AppResources.Designer.cs</LastGenOutput> <LastGenOutput>AppResources.Designer.cs</LastGenOutput>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Update="view\HomePage.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Update="AppRessource.Designer.cs"> <Compile Update="AppRessource.Designer.cs">

@ -1,4 +1,5 @@
using System; using System;
using TheGameExtreme.view;
using Xamarin.Forms; using Xamarin.Forms;
using Xamarin.Forms.Xaml; using Xamarin.Forms.Xaml;

@ -1,22 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ContentView xmlns="http://xamarin.com/schemas/2014/forms" <ContentPage
xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 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"> 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> </ContentPage>
</ContentView>

@ -1,36 +1,30 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Xamarin.Forms; using Xamarin.Forms;
using Xamarin.Forms.Xaml;
namespace TheGameExtreme.view namespace TheGameExtreme.view
{ {
[XamlCompilation(XamlCompilationOptions.Compile)] public partial class HomePage : ContentPage
public partial class HomePage : ContentView
{ {
public HomePage() public HomePage()
{ {
InitializeComponent(); 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();
} }
*/
} }
} }

@ -5,7 +5,7 @@
xmlns:d="http://xamarin.com/schemas/2014/forms/design" xmlns:d="http://xamarin.com/schemas/2014/forms/design"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" mc:Ignorable="d"
x:Class="TheGameExtreme.MainPage"> x:Class="TheGameExtreme.view.MainPage">
<ScrollView <ScrollView
Orientation="Vertical"> Orientation="Vertical">

@ -11,7 +11,7 @@ using Xamarin.Forms.Xaml;
using TheGameExtreme.model.@event; using TheGameExtreme.model.@event;
using TheGameExtreme.viewmodel; using TheGameExtreme.viewmodel;
namespace TheGameExtreme namespace TheGameExtreme.view
{ {
// Learn more about making custom code visible in the Xamarin.Forms previewer // Learn more about making custom code visible in the Xamarin.Forms previewer
// by visiting https://aka.ms/xamarinforms-previewer // by visiting https://aka.ms/xamarinforms-previewer

@ -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>

@ -1,16 +1,11 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Xamarin.Forms; using Xamarin.Forms;
using Xamarin.Forms.Xaml;
namespace TheGameExtreme.view namespace TheGameExtreme.view
{ {
[XamlCompilation(XamlCompilationOptions.Compile)] public partial class MultiPlayerMode : ContentPage
public partial class MultiPlayerMode : ContentView
{ {
public MultiPlayerMode() public MultiPlayerMode()
{ {

@ -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>

@ -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>

@ -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();
}
}
}

@ -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>

@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using Xamarin.Forms;
namespace TheGameExtreme.view
{
public partial class Settings : ContentPage
{
public Settings()
{
InitializeComponent();
}
}
}
Loading…
Cancel
Save