diff --git a/AideDeJeu/AideDeJeu/AideDeJeu.csproj b/AideDeJeu/AideDeJeu/AideDeJeu.csproj index 6e6ec5b9..0451bc2a 100644 --- a/AideDeJeu/AideDeJeu/AideDeJeu.csproj +++ b/AideDeJeu/AideDeJeu/AideDeJeu.csproj @@ -123,6 +123,21 @@ ItemPickerView.xaml + + AbilitiesPage.xaml + + + BackgroundPage.xaml + + + ClassPage.xaml + + + FinalizePage.xaml + + + RacePage.xaml + @@ -167,7 +182,7 @@ MSBuild:UpdateDesignTimeXaml - + MSBuild:UpdateDesignTimeXaml @@ -176,16 +191,16 @@ MSBuild:UpdateDesignTimeXaml - + MSBuild:UpdateDesignTimeXaml - + MSBuild:UpdateDesignTimeXaml MSBuild:UpdateDesignTimeXaml - + MSBuild:UpdateDesignTimeXaml @@ -200,7 +215,7 @@ MSBuild:UpdateDesignTimeXaml - + MSBuild:UpdateDesignTimeXaml diff --git a/AideDeJeu/AideDeJeu/Views/Library/ItemPage.xaml b/AideDeJeu/AideDeJeu/Views/Library/ItemPage.xaml index 67b4e048..b3130ce2 100644 --- a/AideDeJeu/AideDeJeu/Views/Library/ItemPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/Library/ItemPage.xaml @@ -17,7 +17,7 @@ - + + + + + + + + + + diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/AbilitiesView.xaml b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/AbilitiesPage.xaml similarity index 94% rename from AideDeJeu/AideDeJeu/Views/PlayerCharacter/AbilitiesView.xaml rename to AideDeJeu/AideDeJeu/Views/PlayerCharacter/AbilitiesPage.xaml index 20ccbe70..ea86ef20 100644 --- a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/AbilitiesView.xaml +++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/AbilitiesPage.xaml @@ -1,18 +1,22 @@  - - + x:Class="AideDeJeu.Views.PlayerCharacter.AbilitiesPage" + x:Name="This"> + - - + + + + + @@ -100,5 +104,5 @@ - - \ No newline at end of file + + \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/AbilitiesView.xaml.cs b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/AbilitiesPage.xaml.cs similarity index 61% rename from AideDeJeu/AideDeJeu/Views/PlayerCharacter/AbilitiesView.xaml.cs rename to AideDeJeu/AideDeJeu/Views/PlayerCharacter/AbilitiesPage.xaml.cs index 4486a581..1584a374 100644 --- a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/AbilitiesView.xaml.cs +++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/AbilitiesPage.xaml.cs @@ -10,11 +10,13 @@ using Xamarin.Forms.Xaml; namespace AideDeJeu.Views.PlayerCharacter { [XamlCompilation(XamlCompilationOptions.Compile)] - public partial class AbilitiesView : ContentView + public partial class AbilitiesPage : ContentPage { - public AbilitiesView() + public AbilitiesPage() { InitializeComponent(); + + BindingContext = DependencyService.Get(); } } } \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/BackgroundView.xaml b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/BackgroundPage.xaml similarity index 93% rename from AideDeJeu/AideDeJeu/Views/PlayerCharacter/BackgroundView.xaml rename to AideDeJeu/AideDeJeu/Views/PlayerCharacter/BackgroundPage.xaml index 198272e5..c38c498a 100644 --- a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/BackgroundView.xaml +++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/BackgroundPage.xaml @@ -1,17 +1,21 @@  - - + x:Class="AideDeJeu.Views.PlayerCharacter.BackgroundPage" + x:Name="This"> + - - + + + + + @@ -72,5 +76,5 @@ - - \ No newline at end of file + + \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/BackgroundPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/BackgroundPage.xaml.cs new file mode 100644 index 00000000..e09dba39 --- /dev/null +++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/BackgroundPage.xaml.cs @@ -0,0 +1,16 @@ +using Xamarin.Forms; +using Xamarin.Forms.Xaml; + +namespace AideDeJeu.Views.PlayerCharacter +{ + [XamlCompilation(XamlCompilationOptions.Compile)] + public partial class BackgroundPage : ContentPage + { + public BackgroundPage() + { + InitializeComponent(); + + BindingContext = DependencyService.Get(); + } + } +} \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/BackgroundView.xaml.cs b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/BackgroundView.xaml.cs deleted file mode 100644 index 9ac59fad..00000000 --- a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/BackgroundView.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 AideDeJeu.Views.PlayerCharacter -{ - [XamlCompilation(XamlCompilationOptions.Compile)] - public partial class BackgroundView : ContentView - { - public BackgroundView() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/ClassView.xaml b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/ClassPage.xaml similarity index 87% rename from AideDeJeu/AideDeJeu/Views/PlayerCharacter/ClassView.xaml rename to AideDeJeu/AideDeJeu/Views/PlayerCharacter/ClassPage.xaml index 6cb47f90..2956e772 100644 --- a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/ClassView.xaml +++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/ClassPage.xaml @@ -1,17 +1,21 @@  - - + x:Class="AideDeJeu.Views.PlayerCharacter.ClassPage" + x:Name="This"> + - - + + + + + @@ -48,5 +52,5 @@ - - \ No newline at end of file + + \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/ClassPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/ClassPage.xaml.cs new file mode 100644 index 00000000..1789cdd7 --- /dev/null +++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/ClassPage.xaml.cs @@ -0,0 +1,16 @@ +using Xamarin.Forms; +using Xamarin.Forms.Xaml; + +namespace AideDeJeu.Views.PlayerCharacter +{ + [XamlCompilation(XamlCompilationOptions.Compile)] + public partial class ClassPage : ContentPage + { + public ClassPage() + { + InitializeComponent(); + + BindingContext = DependencyService.Get(); + } + } +} \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/FinalizeView.xaml b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/FinalizePage.xaml similarity index 79% rename from AideDeJeu/AideDeJeu/Views/PlayerCharacter/FinalizeView.xaml rename to AideDeJeu/AideDeJeu/Views/PlayerCharacter/FinalizePage.xaml index e191b2fa..1d890885 100644 --- a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/FinalizeView.xaml +++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/FinalizePage.xaml @@ -1,17 +1,21 @@  - - + x:Class="AideDeJeu.Views.PlayerCharacter.FinalizePage" + x:Name="This"> + - - + + + + + @@ -39,5 +43,5 @@ - - \ No newline at end of file + + \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/ClassView.xaml.cs b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/FinalizePage.xaml.cs similarity index 61% rename from AideDeJeu/AideDeJeu/Views/PlayerCharacter/ClassView.xaml.cs rename to AideDeJeu/AideDeJeu/Views/PlayerCharacter/FinalizePage.xaml.cs index bf09241a..41ff154b 100644 --- a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/ClassView.xaml.cs +++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/FinalizePage.xaml.cs @@ -10,11 +10,13 @@ using Xamarin.Forms.Xaml; namespace AideDeJeu.Views.PlayerCharacter { [XamlCompilation(XamlCompilationOptions.Compile)] - public partial class ClassView : ContentView + public partial class FinalizePage : ContentPage { - public ClassView() + public FinalizePage() { InitializeComponent(); + + BindingContext = DependencyService.Get(); } } } \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/FinalizeView.xaml.cs b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/FinalizeView.xaml.cs deleted file mode 100644 index bde5d893..00000000 --- a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/FinalizeView.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 AideDeJeu.Views.PlayerCharacter -{ - [XamlCompilation(XamlCompilationOptions.Compile)] - public partial class FinalizeView : ContentView - { - public FinalizeView() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml index b6fa53af..46135474 100644 --- a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml @@ -63,7 +63,7 @@ - +