From 5cb823b0745e84d3cee60a1089959777fad24a4b Mon Sep 17 00:00:00 2001
From: Yan Maniez <yanmaniez@hotmail.com>
Date: Sun, 13 Oct 2019 01:03:21 +0200
Subject: [PATCH] =?UTF-8?q?Navigation=20shell=20ok,=20reste=20=C3=A0=20net?=
 =?UTF-8?q?toyer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AideDeJeu/AideDeJeu/ViewModels/Navigator.cs | 18 ++++++++++++------
 AideDeJeu/AideDeJeu/Views/MainShell.xaml    | 14 +++++++-------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs b/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs
index ed05ef68..9eb92fc4 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs
@@ -42,7 +42,8 @@ namespace AideDeJeu.ViewModels
 
         public async Task GotoAboutPageAsync()
         {
-            await Navigation.PushAsync(new Views.AboutPage(), true);
+            //await Navigation.PushAsync(new Views.AboutPage(), true);
+            await Shell.Current.GoToAsync("//about", true);
         }
 
         private Command _LibraryCommand = null;
@@ -78,7 +79,8 @@ namespace AideDeJeu.ViewModels
         {
             //await Navigation.PushAsync(new Views.ItemDetailPage(),true);
             //await Navigation.PushAsync(new Views.Library.MainTabbedPage(), true);
-            await Navigation.PushAsync(new Views.Library.ItemPage("index.md"), true);
+            //await Navigation.PushAsync(new Views.Library.ItemPage("index.md"), true);
+            await Shell.Current.GoToAsync("//library", true);
             //TestNotify = new NotifyTaskCompletion<bool>(TestGotoAsync(), true);
         }
 
@@ -93,7 +95,8 @@ namespace AideDeJeu.ViewModels
 
         public async Task GotoBookmarksPageAsync()
         {
-            await Navigation.PushAsync(new Views.Library.BookmarksPage(), true);
+            //await Navigation.PushAsync(new Views.Library.BookmarksPage(), true);
+            await Shell.Current.GoToAsync("//bookmarks", true);
         }
 
 
@@ -118,12 +121,14 @@ namespace AideDeJeu.ViewModels
 
         public async Task GotoPlayerCharacterEditorPageAsync()
         {
-            await Navigation.PushAsync(new Views.PlayerCharacter.PlayerCharacterEditorPage(), true);
+            //await Navigation.PushAsync(new Views.PlayerCharacter.PlayerCharacterEditorPage(), true);
+            await Shell.Current.GoToAsync("//pceditor", true);
         }
 
         public async Task GotoDicesPageAsync()
         {
-            await Navigation.PushAsync(new Views.DicesPage(), true);
+            //await Navigation.PushAsync(new Views.DicesPage(), true);
+            await Shell.Current.GoToAsync("//dices", true);
         }
 
         private Command _DeepSearchCommand = null;
@@ -137,7 +142,8 @@ namespace AideDeJeu.ViewModels
 
         public async Task GotoDeepSearchPageAsync()
         {
-            await Navigation.PushAsync(new Views.Library.DeepSearchPage(), true);
+            //await Navigation.PushAsync(new Views.Library.DeepSearchPage(), true);
+            await Shell.Current.GoToAsync("//deepsearch", true);
         }
 
         private Command _AddToFavoritesCommand = null;
diff --git a/AideDeJeu/AideDeJeu/Views/MainShell.xaml b/AideDeJeu/AideDeJeu/Views/MainShell.xaml
index 1ac19874..1cc1cbb1 100644
--- a/AideDeJeu/AideDeJeu/Views/MainShell.xaml
+++ b/AideDeJeu/AideDeJeu/Views/MainShell.xaml
@@ -130,11 +130,11 @@
         <!--</StackLayout>-->
     </Shell.FlyoutHeader>
 
-    <ShellContent Title="Accueil" ContentTemplate="{DataTemplate local:MainPage}" />
-    <ShellContent Title="Personnages" Icon="battle_axe.png" ContentTemplate="{DataTemplate pc:PlayerCharacterEditorPage}" />
-    <ShellContent Title="Dés" Icon="d20.png" ContentTemplate="{DataTemplate local:DicesPage}" />
+    <ShellContent Title="Accueil" Route="home" ContentTemplate="{DataTemplate local:MainPage}" />
+    <ShellContent Title="Personnages" Route="pceditor" Icon="battle_axe.png" ContentTemplate="{DataTemplate pc:PlayerCharacterEditorPage}" />
+    <ShellContent Title="Dés" Icon="d20.png" Route="dices" ContentTemplate="{DataTemplate local:DicesPage}" />
     <FlyoutItem FlyoutDisplayOptions="AsMultipleItems">
-        <ShellContent Title="Bibliothèque" Icon="spell_book.png">
+        <ShellContent Title="Bibliothèque" Route="library" Icon="spell_book.png">
             <ShellContent.ContentTemplate>
                 <DataTemplate>
                     <library:ItemPage>
@@ -145,10 +145,10 @@
                 </DataTemplate>
             </ShellContent.ContentTemplate>
         </ShellContent>
-        <ShellContent Title="Favoris"  ContentTemplate="{DataTemplate library:BookmarksPage}" Icon="stars_stack.png" />
-        <ShellContent Title="Recherche"  ContentTemplate="{DataTemplate library:DeepSearchPage}"  Icon="crystal_ball.png" />
+        <ShellContent Title="Favoris" Route="bookmarks" ContentTemplate="{DataTemplate library:BookmarksPage}" Icon="stars_stack.png" />
+        <ShellContent Title="Recherche" Route="deepsearch" ContentTemplate="{DataTemplate library:DeepSearchPage}"  Icon="crystal_ball.png" />
     </FlyoutItem>
-    <ShellContent Title="A propos de..." Icon="wooden_sign.png" ContentTemplate="{DataTemplate local:AboutPage}" />
+    <ShellContent Title="A propos de..." Route="about" Icon="wooden_sign.png" ContentTemplate="{DataTemplate local:AboutPage}" />
     <!--<ShellItem Title="Accueil" FlyoutDisplayOptions="AsSingleItem">
         <ShellContent Title="Accueil" ContentTemplate="{DataTemplate local:MainPage}" />
         <ShellContent Title="Personnages" Icon="battle_axe.png" ContentTemplate="{DataTemplate pc:PlayerCharacterEditorPage}" />