Suite refactor

AideDeJeu/AideDeJeu/AideDeJeu.csproj

@@ -62,10 +62,10 @@
     <Compile Update="Views\Library\MainTabbedPage.xaml.cs">
       <DependentUpon>MainTabbedPage.xaml</DependentUpon>
     </Compile>
-    <Compile Update="Views\PlayerCharacter\ItemPicker.xaml.cs">
+    <Compile Update="Views\ItemPicker.xaml.cs">
       <DependentUpon>ItemPicker.xaml</DependentUpon>
     </Compile>
-    <Compile Update="Views\PlayerCharacter\ItemPickerView.xaml.cs">
+    <Compile Update="Views\ItemPickerView.xaml.cs">
       <DependentUpon>ItemPickerView.xaml</DependentUpon>
     </Compile>
   </ItemGroup>
@@ -106,10 +106,10 @@
     <EmbeddedResource Update="Views\PlayerCharacter\PlayerCharacterEditorPage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Update="Views\PlayerCharacter\StringPicker.xaml">
+    <EmbeddedResource Update="Views\StringPicker.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Update="Views\PlayerCharacter\StringPickerView.xaml">
+    <EmbeddedResource Update="Views\StringPickerView.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
     <EmbeddedResource Update="Views\TextInputCancellableView.xaml">

AideDeJeu/AideDeJeu/ViewModels/Navigator.cs

@@ -1,6 +1,7 @@
 using AideDeJeu.Tools;
 using AideDeJeu.ViewModels.Library;
 using AideDeJeu.Views;
+using AideDeJeu.Views.Library;
 using AideDeJeuLib;
 using Rg.Plugins.Popup.Services;
 using System;
@@ -73,7 +74,7 @@ namespace AideDeJeu.ViewModels
         public async Task GotoLibraryPageAsync()
         {
             //await Navigation.PushAsync(new Views.ItemDetailPage(),true);
-            await Navigation.PushAsync(new Views.MainTabbedPage(), true);
+            await Navigation.PushAsync(new Views.Library.MainTabbedPage(), true);
             //TestNotify = new NotifyTaskCompletion<bool>(TestGotoAsync(), true);
         }
 
@@ -88,7 +89,7 @@ namespace AideDeJeu.ViewModels
 
         public async Task GotoBookmarksPageAsync()
         {
-            await Navigation.PushAsync(new Views.BookmarksPage(), true);
+            await Navigation.PushAsync(new Views.Library.BookmarksPage(), true);
         }
 
 
@@ -104,7 +105,7 @@ namespace AideDeJeu.ViewModels
 
         public async Task GotoPlayerCharacterEditorPageAsync()
         {
-            await Navigation.PushAsync(new Views.PlayerCharacterEditorPage(), true);
+            await Navigation.PushAsync(new Views.PlayerCharacter.PlayerCharacterEditorPage(), true);
         }
 
         private Command _DeepSearchCommand = null;
@@ -118,7 +119,7 @@ namespace AideDeJeu.ViewModels
 
         public async Task GotoDeepSearchPageAsync()
         {
-            await Navigation.PushAsync(new Views.DeepSearchPage(), true);
+            await Navigation.PushAsync(new Views.Library.DeepSearchPage(), true);
         }
 
         private Command _AddToFavoritesCommand = null;

AideDeJeu/AideDeJeu/Views/Library/BookmarksPage.xaml

@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
             xmlns:android="clr-namespace:Xamarin.Forms.PlatformConfiguration.AndroidSpecific;assembly=Xamarin.Forms.Core"
              xmlns:tools="clr-namespace:AideDeJeu.Tools"
-             x:Class="AideDeJeu.Views.BookmarksPage"
+             x:Class="AideDeJeu.Views.Library.BookmarksPage"
              x:Name="This"
              Title="Favoris"
              Icon="stars_stack.png">

AideDeJeu/AideDeJeu/Views/Library/BookmarksPage.xaml.cs

@@ -10,7 +10,7 @@ using System.Threading.Tasks;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 
-namespace AideDeJeu.Views
+namespace AideDeJeu.Views.Library
 {
 	[XamlCompilation(XamlCompilationOptions.Compile)]
 	public partial class BookmarksPage : ContentPage

AideDeJeu/AideDeJeu/Views/Library/DeepSearchPage.xaml

@@ -2,7 +2,7 @@
 <ContentPage 
     xmlns="http://xamarin.com/schemas/2014/forms"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="AideDeJeu.Views.DeepSearchPage"
+    x:Class="AideDeJeu.Views.Library.DeepSearchPage"
     xmlns:tools="clr-namespace:AideDeJeu.Tools" 
     xmlns:properties="clr-namespace:AideDeJeu.Properties"
     x:Name="This" 

AideDeJeu/AideDeJeu/Views/Library/DeepSearchPage.xaml.cs

@@ -10,7 +10,7 @@ using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 using static AideDeJeu.ViewModels.Library.DeepSearchViewModel;
 
-namespace AideDeJeu.Views
+namespace AideDeJeu.Views.Library
 {
 	[XamlCompilation(XamlCompilationOptions.Compile)]
 	public partial class DeepSearchPage : ContentPage

AideDeJeu/AideDeJeu/Views/Library/FilteredItemsPage.xaml

@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
     xmlns:local="clr-namespace:AideDeJeu.Views" 
     xmlns:tools="clr-namespace:AideDeJeu.Tools" 
-    x:Class="AideDeJeu.Views.FilteredItemsPage" 
+    x:Class="AideDeJeu.Views.Library.FilteredItemsPage" 
     x:Name="This" 
     Title="{Binding Title}">
     <MasterDetailPage.Resources>

AideDeJeu/AideDeJeu/Views/Library/FilteredItemsPage.xaml.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 
-namespace AideDeJeu.Views
+namespace AideDeJeu.Views.Library
 {
     [XamlCompilation(XamlCompilationOptions.Compile)]
 	public partial class FilteredItemsPage : MasterDetailPage

AideDeJeu/AideDeJeu/Views/Library/ItemDetailPage.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.ItemDetailPage"
+             x:Class="AideDeJeu.Views.Library.ItemDetailPage"
              Title="{Binding Title}"
              Icon="spell_book.png"
              x:Name="This">

AideDeJeu/AideDeJeu/Views/Library/ItemDetailPage.xaml.cs

@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 
-namespace AideDeJeu.Views
+namespace AideDeJeu.Views.Library
 {
     [XamlCompilation(XamlCompilationOptions.Compile)]
 	public partial class ItemDetailPage : ContentPage

AideDeJeu/AideDeJeu/Views/Library/ItemsPage.xaml

@@ -5,7 +5,7 @@
     xmlns:local="clr-namespace:AideDeJeu.Views" 
     xmlns:tools="clr-namespace:AideDeJeu.Tools" 
     xmlns:mdview="clr-namespace:Xam.Forms.Markdown"
-    x:Class="AideDeJeu.Views.ItemsPage" 
+    x:Class="AideDeJeu.Views.Library.ItemsPage" 
     x:Name="This" 
     Title="{Binding Title}">
     <ContentPage.Resources>

AideDeJeu/AideDeJeu/Views/Library/ItemsPage.xaml.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 
-namespace AideDeJeu.Views
+namespace AideDeJeu.Views.Library
 {
     [XamlCompilation(XamlCompilationOptions.Compile)]
 	public partial class ItemsPage : ContentPage

AideDeJeu/AideDeJeu/Views/Library/MainTabbedPage.xaml

@@ -3,9 +3,11 @@
     xmlns="http://xamarin.com/schemas/2014/forms"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:views="clr-namespace:AideDeJeu.Views"
+    xmlns:libviews="clr-namespace:AideDeJeu.Views.Library"
+    xmlns:pcviews="clr-namespace:AideDeJeu.Views.PlayerCharacter"
     xmlns:windows="clr-namespace:Xamarin.Forms.PlatformConfiguration.WindowsSpecific;assembly=Xamarin.Forms.Core"
     xmlns:android="clr-namespace:Xamarin.Forms.PlatformConfiguration.AndroidSpecific;assembly=Xamarin.Forms.Core"
-    x:Class="AideDeJeu.Views.MainTabbedPage"
+    x:Class="AideDeJeu.Views.Library.MainTabbedPage"
     Padding="0"
     IsEnabled="{Binding Main.IsEnabled}"
     SelectedTabColor="{StaticResource HDRed}"
@@ -21,21 +23,21 @@
             </x:Arguments>
         </Size>
     </windows:TabbedPage.HeaderIconsSize>
-    <views:ItemDetailPage x:Name="NavigationPage" Title="Bibliothèque" Icon="spell_book.png">
+    <libviews:ItemDetailPage x:Name="NavigationPage" Title="Bibliothèque" Icon="spell_book.png">
         <!--<x:Arguments>
             <views:ItemDetailPage />
         </x:Arguments>-->
-    </views:ItemDetailPage>
+    </libviews:ItemDetailPage>
-    <views:BookmarksPage Title="Favoris" Icon="stars_stack.png">
+    <libviews:BookmarksPage Title="Favoris" Icon="stars_stack.png">
         <!--<x:Arguments>
             <views:BookmarksPage />
         </x:Arguments>-->
-    </views:BookmarksPage>
+    </libviews:BookmarksPage>
-    <views:DeepSearchPage Title="Recherche" Icon="crystal_ball.png">
+    <libviews:DeepSearchPage Title="Recherche" Icon="crystal_ball.png">
         <!--<x:Arguments>
             <views:DeepSearchPage />
         </x:Arguments>-->
-    </views:DeepSearchPage>
+    </libviews:DeepSearchPage>
     <!--<views:AboutPage Title="À propos de..." Icon="wooden_sign.png">
     </views:AboutPage>-->
 </TabbedPage>

AideDeJeu/AideDeJeu/Views/Library/MainTabbedPage.xaml.cs

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 
-namespace AideDeJeu.Views
+namespace AideDeJeu.Views.Library
 {
     [XamlCompilation(XamlCompilationOptions.Compile)]
     public partial class MainTabbedPage : TabbedPage

AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml

@@ -2,7 +2,7 @@
 <TabbedPage 
         xmlns="http://xamarin.com/schemas/2014/forms"
         xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-        x:Class="AideDeJeu.Views.PlayerCharacterEditorPage"
+        x:Class="AideDeJeu.Views.PlayerCharacter.PlayerCharacterEditorPage"
         xmlns:windows="clr-namespace:Xamarin.Forms.PlatformConfiguration.WindowsSpecific;assembly=Xamarin.Forms.Core"
         xmlns:android="clr-namespace:Xamarin.Forms.PlatformConfiguration.AndroidSpecific;assembly=Xamarin.Forms.Core"
         xmlns:tools="clr-namespace:AideDeJeu.Tools"

AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml.cs

@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 
-namespace AideDeJeu.Views
+namespace AideDeJeu.Views.PlayerCharacter
 {
     [XamlCompilation(XamlCompilationOptions.Compile)]
     public partial class PlayerCharacterEditorPage : TabbedPage