From 4ede047c622de1e64d105952ca84a0a4dc971867 Mon Sep 17 00:00:00 2001
From: Yan Maniez <yanmaniez@hotmail.com>
Date: Sun, 29 Jul 2018 22:29:10 +0200
Subject: [PATCH] Modifs filtres

---
 .../AideDeJeu/ViewModels/ItemsViewModel.cs    | 10 +++----
 AideDeJeu/AideDeJeu/ViewModels/Navigator.cs   |  7 +++--
 .../AideDeJeu/Views/FilteredItemsPage.xaml.cs | 29 ++-----------------
 .../AideDeJeu/Views/ItemDetailPage.xaml.cs    |  2 +-
 4 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/AideDeJeu/AideDeJeu/ViewModels/ItemsViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/ItemsViewModel.cs
index 84f086a6..bfd05160 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/ItemsViewModel.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/ItemsViewModel.cs
@@ -38,6 +38,10 @@ namespace AideDeJeu.ViewModels
             set
             {
                 SetProperty(ref _Filter, value);
+                if(_Filter != null)
+                {
+                    _Filter.LoadItemsCommand = LoadItemsCommand;
+                }
             }
         }
 
@@ -68,7 +72,7 @@ namespace AideDeJeu.ViewModels
                 {
                     if (_SelectedItem is LinkItem)
                     {
-                        Main.Navigator.NavigateToLink("/" + (_SelectedItem as LinkItem).Link);
+                        Main.Navigator.NavigateToLinkAsync("/" + (_SelectedItem as LinkItem).Link);
                     }
                     else
                     { 
@@ -92,10 +96,6 @@ namespace AideDeJeu.ViewModels
                 {
                     Title = _AllItems.Name;
                     Filter = _AllItems.GetNewFilterViewModel();
-                    if (Filter != null)
-                    {
-                        Filter.LoadItemsCommand = LoadItemsCommand;
-                    }
                 }
             }
         }
diff --git a/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs b/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs
index 07ebaee3..63d3c4da 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs
@@ -53,7 +53,7 @@ namespace AideDeJeu.ViewModels
         }
 
 
-        public async Task NavigateToLink(string s)
+        public async Task NavigateToLinkAsync(string s)
         {
             if (s != null)
             {
@@ -77,9 +77,10 @@ namespace AideDeJeu.ViewModels
                         }
                         else
                         {
-                            var itemsViewModel = new ItemsViewModel() { AllItems = items };
+                            var filterViewModel = items.GetNewFilterViewModel();
+                            var itemsViewModel = new ItemsViewModel() { AllItems = items, Filter = filterViewModel };
                             itemsViewModel.LoadItemsCommand.Execute(null);
-                            if (items.GetNewFilterViewModel() == null)
+                            if (filterViewModel == null)
                             {
                                 await GotoItemsPageAsync(itemsViewModel);
                             }
diff --git a/AideDeJeu/AideDeJeu/Views/FilteredItemsPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/FilteredItemsPage.xaml.cs
index 89a35e0f..5c215195 100644
--- a/AideDeJeu/AideDeJeu/Views/FilteredItemsPage.xaml.cs
+++ b/AideDeJeu/AideDeJeu/Views/FilteredItemsPage.xaml.cs
@@ -16,7 +16,6 @@ namespace AideDeJeu.Views
                 return DependencyService.Get<MainViewModel>();
             }
         }
-        //INavig//ator Navigator;
 
         public ItemsViewModel _ItemsViewModel;
         public ItemsViewModel ItemsViewModel
@@ -28,39 +27,15 @@ namespace AideDeJeu.Views
         }
         public FilteredItemsPage (ItemsViewModel itemsViewModel)
 		{
-			InitializeComponent ();
+			InitializeComponent();
 
-            BindingContext = _ItemsViewModel = itemsViewModel; // Main;
-
-            //this.SizeChanged += (o, e) => {
-            //    if(this.Width > 0 && this.Height > 0)
-            //    {
-            //        this.IsPresented = this.Width > this.Height;
-            //    }
-            //};
+            BindingContext = _ItemsViewModel = itemsViewModel;
         }
         public FilteredItemsPage()
         {
             InitializeComponent();
 
             BindingContext = Main;
-
-            //this.SizeChanged += (o, e) => {
-            //    if (this.Width > 0 && this.Height > 0)
-            //    {
-            //        this.IsPresented = this.Width > this.Height;
-            //    }
-            //};
-        }
-
-        protected override void OnAppearing()
-        {
-            base.OnAppearing();
-
-            //this.MasterBehavior = MasterBehavior.Popover;
-
-            //if (Main.Items.Count() == 0)
-                //Main.LoadItemsCommand.Execute(null);
         }
 
         private void ItemsListView_ItemTapped(object sender, ItemTappedEventArgs e)
diff --git a/AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml.cs
index 7aa4901c..e48afc43 100644
--- a/AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml.cs
+++ b/AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml.cs
@@ -19,7 +19,7 @@ namespace AideDeJeu.Views
 
             BindingContext = this.viewModel = itemVM;
 
-            mdMarkdown.NavigateToLink = async (s) => await viewModel.Main.Navigator.NavigateToLink(s);
+            mdMarkdown.NavigateToLink = async (s) => await viewModel.Main.Navigator.NavigateToLinkAsync(s);
         }
 
         public ItemDetailPage()