From 082d8098824d786506b715ed85aef81f56074dc7 Mon Sep 17 00:00:00 2001 From: Yan Maniez Date: Thu, 2 May 2019 00:52:17 +0200 Subject: [PATCH] =?UTF-8?q?D=C3=A9placement=20pickers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AideDeJeu/AideDeJeu/AideDeJeu.csproj | 10 ++-- AideDeJeu/AideDeJeu/Views/DicesPage.xaml | 8 +-- .../Views/{ => Pickers}/ItemPicker.xaml | 2 +- .../Views/{ => Pickers}/ItemPicker.xaml.cs | 2 +- .../Views/{ => Pickers}/ItemPickerView.xaml | 2 +- .../{ => Pickers}/ItemPickerView.xaml.cs | 4 +- .../Views/{ => Pickers}/ItemView.xaml | 2 +- .../Views/{ => Pickers}/ItemView.xaml.cs | 2 +- .../Views/{ => Pickers}/StringPicker.xaml | 2 +- .../Views/{ => Pickers}/StringPicker.xaml.cs | 2 +- .../Views/{ => Pickers}/StringPickerView.xaml | 2 +- .../{ => Pickers}/StringPickerView.xaml.cs | 4 +- .../PlayerCharacterEditorPage.xaml | 55 ++++++++++--------- 13 files changed, 49 insertions(+), 48 deletions(-) rename AideDeJeu/AideDeJeu/Views/{ => Pickers}/ItemPicker.xaml (96%) rename AideDeJeu/AideDeJeu/Views/{ => Pickers}/ItemPicker.xaml.cs (94%) rename AideDeJeu/AideDeJeu/Views/{ => Pickers}/ItemPickerView.xaml (98%) rename AideDeJeu/AideDeJeu/Views/{ => Pickers}/ItemPickerView.xaml.cs (97%) rename AideDeJeu/AideDeJeu/Views/{ => Pickers}/ItemView.xaml (95%) rename AideDeJeu/AideDeJeu/Views/{ => Pickers}/ItemView.xaml.cs (98%) rename AideDeJeu/AideDeJeu/Views/{ => Pickers}/StringPicker.xaml (96%) rename AideDeJeu/AideDeJeu/Views/{ => Pickers}/StringPicker.xaml.cs (94%) rename AideDeJeu/AideDeJeu/Views/{ => Pickers}/StringPickerView.xaml (97%) rename AideDeJeu/AideDeJeu/Views/{ => Pickers}/StringPickerView.xaml.cs (97%) diff --git a/AideDeJeu/AideDeJeu/AideDeJeu.csproj b/AideDeJeu/AideDeJeu/AideDeJeu.csproj index 76002c1e..c560dc1f 100644 --- a/AideDeJeu/AideDeJeu/AideDeJeu.csproj +++ b/AideDeJeu/AideDeJeu/AideDeJeu.csproj @@ -96,7 +96,7 @@ Code - + ItemView.xaml @@ -111,10 +111,10 @@ MainTabbedPage.xaml - + ItemPicker.xaml - + ItemPickerView.xaml @@ -158,10 +158,10 @@ MSBuild:UpdateDesignTimeXaml - + MSBuild:UpdateDesignTimeXaml - + MSBuild:UpdateDesignTimeXaml diff --git a/AideDeJeu/AideDeJeu/Views/DicesPage.xaml b/AideDeJeu/AideDeJeu/Views/DicesPage.xaml index 4c91d2a1..7d8a973f 100644 --- a/AideDeJeu/AideDeJeu/Views/DicesPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/DicesPage.xaml @@ -2,7 +2,7 @@ @@ -10,9 +10,9 @@ VerticalOptions="CenterAndExpand" HorizontalOptions="CenterAndExpand" />--> - - - + + + diff --git a/AideDeJeu/AideDeJeu/Views/ItemPicker.xaml b/AideDeJeu/AideDeJeu/Views/Pickers/ItemPicker.xaml similarity index 96% rename from AideDeJeu/AideDeJeu/Views/ItemPicker.xaml rename to AideDeJeu/AideDeJeu/Views/Pickers/ItemPicker.xaml index c899d29b..985cad88 100644 --- a/AideDeJeu/AideDeJeu/Views/ItemPicker.xaml +++ b/AideDeJeu/AideDeJeu/Views/Pickers/ItemPicker.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:mdview="clr-namespace:Xam.Forms.Markdown" xmlns:tools="clr-namespace:AideDeJeu.Tools" - x:Class="AideDeJeu.Views.ItemPicker" + x:Class="AideDeJeu.Views.Pickers.ItemPicker" Title="{Binding Title}"> diff --git a/AideDeJeu/AideDeJeu/Views/ItemPicker.xaml.cs b/AideDeJeu/AideDeJeu/Views/Pickers/ItemPicker.xaml.cs similarity index 94% rename from AideDeJeu/AideDeJeu/Views/ItemPicker.xaml.cs rename to AideDeJeu/AideDeJeu/Views/Pickers/ItemPicker.xaml.cs index 7d815862..5c69171d 100644 --- a/AideDeJeu/AideDeJeu/Views/ItemPicker.xaml.cs +++ b/AideDeJeu/AideDeJeu/Views/Pickers/ItemPicker.xaml.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; using Xamarin.Forms; using Xamarin.Forms.Xaml; -namespace AideDeJeu.Views +namespace AideDeJeu.Views.Pickers { [XamlCompilation(XamlCompilationOptions.Compile)] public partial class ItemPicker : ContentPage diff --git a/AideDeJeu/AideDeJeu/Views/ItemPickerView.xaml b/AideDeJeu/AideDeJeu/Views/Pickers/ItemPickerView.xaml similarity index 98% rename from AideDeJeu/AideDeJeu/Views/ItemPickerView.xaml rename to AideDeJeu/AideDeJeu/Views/Pickers/ItemPickerView.xaml index 8e5718ca..6eb7facf 100644 --- a/AideDeJeu/AideDeJeu/Views/ItemPickerView.xaml +++ b/AideDeJeu/AideDeJeu/Views/Pickers/ItemPickerView.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:tools="clr-namespace:AideDeJeu.Tools" xmlns:mdview="clr-namespace:Xam.Forms.Markdown" - x:Class="AideDeJeu.Views.ItemPickerView" + x:Class="AideDeJeu.Views.Pickers.ItemPickerView" x:Name="this"> diff --git a/AideDeJeu/AideDeJeu/Views/ItemPickerView.xaml.cs b/AideDeJeu/AideDeJeu/Views/Pickers/ItemPickerView.xaml.cs similarity index 97% rename from AideDeJeu/AideDeJeu/Views/ItemPickerView.xaml.cs rename to AideDeJeu/AideDeJeu/Views/Pickers/ItemPickerView.xaml.cs index 49bd6848..2221bf74 100644 --- a/AideDeJeu/AideDeJeu/Views/ItemPickerView.xaml.cs +++ b/AideDeJeu/AideDeJeu/Views/Pickers/ItemPickerView.xaml.cs @@ -9,7 +9,7 @@ using System.Windows.Input; using Xamarin.Forms; using Xamarin.Forms.Xaml; -namespace AideDeJeu.Views +namespace AideDeJeu.Views.Pickers { [XamlCompilation(XamlCompilationOptions.Compile)] public partial class ItemPickerView : StackLayout @@ -87,7 +87,7 @@ namespace AideDeJeu.Views } private async Task ExecuteItemPickerCommandAsync(System.Collections.IEnumerable items) { - var picker = new Views.ItemPicker(); + var picker = new Views.Pickers.ItemPicker(); var vm = picker.ViewModel; vm.Title = Title; vm.Description = Description; diff --git a/AideDeJeu/AideDeJeu/Views/ItemView.xaml b/AideDeJeu/AideDeJeu/Views/Pickers/ItemView.xaml similarity index 95% rename from AideDeJeu/AideDeJeu/Views/ItemView.xaml rename to AideDeJeu/AideDeJeu/Views/Pickers/ItemView.xaml index c093fc6a..e8b902d3 100644 --- a/AideDeJeu/AideDeJeu/Views/ItemView.xaml +++ b/AideDeJeu/AideDeJeu/Views/Pickers/ItemView.xaml @@ -4,7 +4,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:tools="clr-namespace:AideDeJeu.Tools" xmlns:mdview="clr-namespace:Xam.Forms.Markdown" - x:Class="AideDeJeu.Views.ItemView" + x:Class="AideDeJeu.Views.Pickers.ItemView" x:Name="this" > diff --git a/AideDeJeu/AideDeJeu/Views/ItemView.xaml.cs b/AideDeJeu/AideDeJeu/Views/Pickers/ItemView.xaml.cs similarity index 98% rename from AideDeJeu/AideDeJeu/Views/ItemView.xaml.cs rename to AideDeJeu/AideDeJeu/Views/Pickers/ItemView.xaml.cs index 93189535..2eab8f53 100644 --- a/AideDeJeu/AideDeJeu/Views/ItemView.xaml.cs +++ b/AideDeJeu/AideDeJeu/Views/Pickers/ItemView.xaml.cs @@ -9,7 +9,7 @@ using System.Windows.Input; using Xamarin.Forms; using Xamarin.Forms.Xaml; -namespace AideDeJeu.Views +namespace AideDeJeu.Views.Pickers { [XamlCompilation(XamlCompilationOptions.Compile)] public partial class ItemView : StackLayout diff --git a/AideDeJeu/AideDeJeu/Views/StringPicker.xaml b/AideDeJeu/AideDeJeu/Views/Pickers/StringPicker.xaml similarity index 96% rename from AideDeJeu/AideDeJeu/Views/StringPicker.xaml rename to AideDeJeu/AideDeJeu/Views/Pickers/StringPicker.xaml index 6569aed5..3b4c1fdf 100644 --- a/AideDeJeu/AideDeJeu/Views/StringPicker.xaml +++ b/AideDeJeu/AideDeJeu/Views/Pickers/StringPicker.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:mdview="clr-namespace:Xam.Forms.Markdown" xmlns:tools="clr-namespace:AideDeJeu.Tools" - x:Class="AideDeJeu.Views.StringPicker" + x:Class="AideDeJeu.Views.Pickers.StringPicker" Title="{Binding Title}"> diff --git a/AideDeJeu/AideDeJeu/Views/StringPicker.xaml.cs b/AideDeJeu/AideDeJeu/Views/Pickers/StringPicker.xaml.cs similarity index 94% rename from AideDeJeu/AideDeJeu/Views/StringPicker.xaml.cs rename to AideDeJeu/AideDeJeu/Views/Pickers/StringPicker.xaml.cs index e4a2d193..c7eaccd6 100644 --- a/AideDeJeu/AideDeJeu/Views/StringPicker.xaml.cs +++ b/AideDeJeu/AideDeJeu/Views/Pickers/StringPicker.xaml.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; using Xamarin.Forms; using Xamarin.Forms.Xaml; -namespace AideDeJeu.Views +namespace AideDeJeu.Views.Pickers { [XamlCompilation(XamlCompilationOptions.Compile)] public partial class StringPicker : ContentPage diff --git a/AideDeJeu/AideDeJeu/Views/StringPickerView.xaml b/AideDeJeu/AideDeJeu/Views/Pickers/StringPickerView.xaml similarity index 97% rename from AideDeJeu/AideDeJeu/Views/StringPickerView.xaml rename to AideDeJeu/AideDeJeu/Views/Pickers/StringPickerView.xaml index 389cae90..3ac80089 100644 --- a/AideDeJeu/AideDeJeu/Views/StringPickerView.xaml +++ b/AideDeJeu/AideDeJeu/Views/Pickers/StringPickerView.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:tools="clr-namespace:AideDeJeu.Tools" xmlns:mdview="clr-namespace:Xam.Forms.Markdown" - x:Class="AideDeJeu.Views.StringPickerView" + x:Class="AideDeJeu.Views.Pickers.StringPickerView" x:Name="this"> diff --git a/AideDeJeu/AideDeJeu/Views/StringPickerView.xaml.cs b/AideDeJeu/AideDeJeu/Views/Pickers/StringPickerView.xaml.cs similarity index 97% rename from AideDeJeu/AideDeJeu/Views/StringPickerView.xaml.cs rename to AideDeJeu/AideDeJeu/Views/Pickers/StringPickerView.xaml.cs index c820b93c..151375b4 100644 --- a/AideDeJeu/AideDeJeu/Views/StringPickerView.xaml.cs +++ b/AideDeJeu/AideDeJeu/Views/Pickers/StringPickerView.xaml.cs @@ -8,7 +8,7 @@ using System.Windows.Input; using Xamarin.Forms; using Xamarin.Forms.Xaml; -namespace AideDeJeu.Views +namespace AideDeJeu.Views.Pickers { [XamlCompilation(XamlCompilationOptions.Compile)] public partial class StringPickerView : StackLayout @@ -88,7 +88,7 @@ namespace AideDeJeu.Views { if (strings != null) { - var picker = new Views.StringPicker(); + var picker = new Views.Pickers.StringPicker(); var vm = picker.ViewModel; vm.Title = Title; vm.Description = Description; diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml index 269a3edd..2fe8604e 100644 --- a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml @@ -7,7 +7,8 @@ xmlns:android="clr-namespace:Xamarin.Forms.PlatformConfiguration.AndroidSpecific;assembly=Xamarin.Forms.Core" xmlns:tools="clr-namespace:AideDeJeu.Tools" xmlns:mdview="clr-namespace:Xam.Forms.Markdown" - xmlns:views="clr-namespace:AideDeJeu.Views" + xmlns:views="clr-namespace:AideDeJeu.Views" + xmlns:pickers="clr-namespace:AideDeJeu.Views.Pickers" x:Name="This" Title="Création de personnage" SelectedTabColor="{StaticResource HDRed}" @@ -58,7 +59,7 @@ - + @@ -105,29 +106,29 @@ - + - - - + + + - - - - - + + + + + - + - + @@ -149,8 +150,8 @@ - + - + - + - + - + @@ -205,12 +206,12 @@ - - - - - - + + + + + + @@ -225,7 +226,7 @@ - +