From 844a0a1c4e146f70469dbc0654c053ab34d64fc1 Mon Sep 17 00:00:00 2001
From: Yan Maniez <yanmaniez@hotmail.com>
Date: Sat, 31 Aug 2019 00:30:14 +0200
Subject: [PATCH] Tests

---
 .../AideDeJeu/Views/Library/ItemPage.xaml.cs  | 28 ++++++----
 AideDeJeu/AideDeJeu/Views/MainShell.xaml      | 51 ++++++++++++++-----
 AideDeJeu/AideDeJeu/Views/MainShell.xaml.cs   | 15 +++++-
 3 files changed, 69 insertions(+), 25 deletions(-)

diff --git a/AideDeJeu/AideDeJeu/Views/Library/ItemPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/Library/ItemPage.xaml.cs
index 8c640f73..cf436f3f 100644
--- a/AideDeJeu/AideDeJeu/Views/Library/ItemPage.xaml.cs
+++ b/AideDeJeu/AideDeJeu/Views/Library/ItemPage.xaml.cs
@@ -13,7 +13,8 @@ using Xamarin.Forms.Xaml;
 namespace AideDeJeu.Views.Library
 {
     [XamlCompilation(XamlCompilationOptions.Compile)]
-	public partial class ItemPage : ContentPage
+    [QueryProperty("Path", "path")]
+    public partial class ItemPage : ContentPage
 	{
         public MainViewModel Main
         {
@@ -28,19 +29,26 @@ namespace AideDeJeu.Views.Library
         public ItemPage()
         {
             InitializeComponent();
+        }
 
-            BindingContext = this.viewModel = new ItemDetailViewModel(new Item()
-            {
-                Name = "Bibliothèque",
-                Id = "index.md",
-                Markdown = AideDeJeu.Tools.Helpers.GetResourceString($"AideDeJeu.Data.index.md"),
-            }
-            ) { Title = "Bibliothèque" };
-
+        protected override void OnAppearing()
+        {
+            base.OnAppearing();
             LoadPageAsync();
         }
 
-        public string Path { get; set; } = "l5r_index_hd.md";
+        private string _Path { get; set; } = "index.md";
+        public string Path
+        {
+            get
+            {
+                return _Path;
+            }
+            set
+            {
+                _Path = value;
+            }
+        }
 
         private async Task LoadPageAsync()
         {
diff --git a/AideDeJeu/AideDeJeu/Views/MainShell.xaml b/AideDeJeu/AideDeJeu/Views/MainShell.xaml
index 32957450..91e91775 100644
--- a/AideDeJeu/AideDeJeu/Views/MainShell.xaml
+++ b/AideDeJeu/AideDeJeu/Views/MainShell.xaml
@@ -15,24 +15,47 @@
     <FlyoutItem Title="Dés" FlyoutIcon="d20.png">
         <ShellContent Title="Dés"  ContentTemplate="{DataTemplate local:DicesPage}" />
     </FlyoutItem>
-    <FlyoutItem Title="Bibliothèque" FlyoutIcon="spell_book.png" FlyoutDisplayOptions="AsMultipleItems">
-        <ShellContent Title="Bibliothèque" Icon="spell_book.png" ContentTemplate="{DataTemplate library:ItemDetailPage}" />
-
-        <ShellContent Title="Héros &amp; Dragons" ContentTemplate="{DataTemplate library:ItemDetailPage}" />
-
-        <ShellContent Title="Manuel des règles" ContentTemplate="{DataTemplate library:ItemDetailPage}" />
-        <ShellContent Title="Cadre de campagne" ContentTemplate="{DataTemplate library:ItemDetailPage}" />
-        <ShellContent Title="Créatures et oppositions" ContentTemplate="{DataTemplate library:ItemDetailPage}" />
-        <ShellContent Title="Les Cinq Royaumes" ContentTemplate="{DataTemplate library:ItemPage}" />
-
-        <ShellContent Title="Livre des monstres" ContentTemplate="{DataTemplate library:ItemDetailPage}" />
-        <ShellContent Title="Monstrueusement Mignons" ContentTemplate="{DataTemplate library:ItemDetailPage}" />
-        <ShellContent Title="Joan of Arc"  ContentTemplate="{DataTemplate library:ItemDetailPage}" />
-        <ShellContent Title="SRD"  ContentTemplate="{DataTemplate library:ItemDetailPage}" />
+    <FlyoutItem Title="Bibliothèque" FlyoutIcon="spell_book.png" Route="data">
+        <ShellContent Title="Bibliothèque" Icon="spell_book.png" Route="item" ContentTemplate="{DataTemplate library:ItemPage}" />
     </FlyoutItem>
+    <!--<FlyoutItem Title="Héros &amp; Dragons">
+        <ShellContent Title="Héros &amp; Dragons" ContentTemplate="{DataTemplate library:ItemDetailPage}" />
+    </FlyoutItem>
+    <FlyoutItem Title="Manuel des règles">
+        <ShellContent Title="Manuel des règles" ContentTemplate="{DataTemplate library:ItemDetailPage}" />
+    </FlyoutItem>
+    <FlyoutItem Title="Cadre de campagne">
+        <ShellContent Title="Cadre de campagne" ContentTemplate="{DataTemplate library:ItemDetailPage}" />
+    </FlyoutItem>
+    <FlyoutItem Title="Créatures et oppositions">
+        <ShellContent Title="Créatures et oppositions" ContentTemplate="{DataTemplate library:ItemDetailPage}" />
+    </FlyoutItem>
+    <FlyoutItem Title="Les Cinq Royaumes" Route="data">
+        <ShellContent Title="Les Cinq Royaumes" Route="l5r_index_hd.md" ContentTemplate="{DataTemplate library:ItemPage}" />
+    </FlyoutItem>
+    <FlyoutItem Title="Livre des monstres">
+        <ShellContent Title="Livre des monstres" ContentTemplate="{DataTemplate library:ItemDetailPage}" />
+    </FlyoutItem>
+    <FlyoutItem Title="Monstrueusement Mignons">
+        <ShellContent Title="Monstrueusement Mignons" ContentTemplate="{DataTemplate library:ItemDetailPage}" />
+    </FlyoutItem>
+    <FlyoutItem Title="Joan of Arc">
+        <ShellContent Title="Joan of Arc"  ContentTemplate="{DataTemplate library:ItemDetailPage}" />
+    </FlyoutItem>
+    <FlyoutItem Title="SRD">
+        <ShellContent Title="SRD"  ContentTemplate="{DataTemplate library:ItemDetailPage}" />
+    </FlyoutItem>-->
+    <MenuItem Text="Les Cinq Royaumes"
+              Command="{Binding ShellNavigateCommand}"
+              CommandParameter="//data/item?path=l5r_index_hd.md"
+              />
     <FlyoutItem Title="A propos de..." FlyoutIcon="wooden_sign.png">
         <ShellContent Title="A propos de..."  ContentTemplate="{DataTemplate local:AboutPage}" />
     </FlyoutItem>
+    <MenuItem Text="Test"
+              Command="{Binding ShellNavigateCommand}"
+              CommandParameter="//data/item?path=l5r_index_hd.md"
+              />
     <!--<ShellItem>
         <ShellSection>
             <ShellContent>
diff --git a/AideDeJeu/AideDeJeu/Views/MainShell.xaml.cs b/AideDeJeu/AideDeJeu/Views/MainShell.xaml.cs
index e812c15a..b0fda418 100644
--- a/AideDeJeu/AideDeJeu/Views/MainShell.xaml.cs
+++ b/AideDeJeu/AideDeJeu/Views/MainShell.xaml.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-
+using System.Windows.Input;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 
@@ -15,6 +15,19 @@ namespace AideDeJeu.Views
         public MainShell()
         {
             InitializeComponent();
+            BindingContext = this;
+        }
+
+        public ICommand ShellNavigateCommand
+        {
+            get
+            {
+                return new Command<string>(async(path) => await ExecuteShellNavigateCommandAsync(path));
+            }
+        }
+        private async Task ExecuteShellNavigateCommandAsync(string path)
+        {
+            await Shell.Current.GoToAsync(path);
         }
     }
 }
\ No newline at end of file