From b151e422403d65960297ae40a18a2047840cd950 Mon Sep 17 00:00:00 2001
From: Yan Maniez <yan.maniez@atos.net>
Date: Mon, 14 Oct 2019 11:34:00 +0200
Subject: [PATCH] =?UTF-8?q?Binding=20compil=C3=A9=20sur=20vue=20item?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/Library/ItemViewModel.cs       | 13 ++++++-
 .../AideDeJeu/Views/Library/ItemPage.xaml     | 14 +++++--
 .../AideDeJeu/Views/Library/ItemPage.xaml.cs  | 37 ++++++++++---------
 3 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/AideDeJeu/AideDeJeu/ViewModels/Library/ItemViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/Library/ItemViewModel.cs
index dccd542d..c7f25b84 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/Library/ItemViewModel.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/Library/ItemViewModel.cs
@@ -27,7 +27,18 @@ namespace AideDeJeu.ViewModels.Library
 
         CancellationTokenSource cancellationTokenSource;
 
-        public ItemViewModel(Item item = null)
+        public ItemViewModel()
+        {
+            LoadItemsCommand = new Command(async () => await ExecuteLoadItemsCommandAsync().ConfigureAwait(false));
+            SearchCommand = new Command<string>((text) =>
+            {
+                if (Filter != null)
+                {
+                    Filter.SearchText = text;
+                }
+            });
+        }
+        public ItemViewModel(Item item)
         {
             Title = item?.Name;
             Item = item;
diff --git a/AideDeJeu/AideDeJeu/Views/Library/ItemPage.xaml b/AideDeJeu/AideDeJeu/Views/Library/ItemPage.xaml
index b3130ce2..1ce07c23 100644
--- a/AideDeJeu/AideDeJeu/Views/Library/ItemPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/Library/ItemPage.xaml
@@ -3,10 +3,16 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:tools="clr-namespace:AideDeJeu.Tools"
              xmlns:mdview="clr-namespace:Xam.Forms.Markdown"
+             xmlns:libvm="clr-namespace:AideDeJeu.ViewModels.Library"
+             xmlns:lib="clr-namespace:AideDeJeuLib"
              x:Class="AideDeJeu.Views.Library.ItemPage"
              Title="{Binding Title}"
              Icon="spell_book.png"
-             x:Name="This">
+             x:Name="This"
+             x:DataType="libvm:ItemViewModel">
+    <ContentPage.BindingContext>
+        <libvm:ItemViewModel />
+    </ContentPage.BindingContext>
     <ContentPage.Resources>
         <ResourceDictionary>
             <tools:MonsterMarkdownTheme x:Key="MonsterMarkdownTheme" />
@@ -27,16 +33,16 @@
                 NavigateToLinkCommand="{Binding Main.Navigator.NavigateToLinkCommand}"
                 />
         </ScrollView>-->
-        <ListView Grid.Column="0" Grid.Row="0" x:Name="ItemsListView" ItemsSource="{Binding Item.Children}" VerticalOptions="FillAndExpand" HasUnevenRows="true" CachingStrategy="RecycleElement" SelectedItem="{Binding Item.SelectedItem}" ItemTapped="ItemsListView_ItemTapped">
+        <ListView Grid.Column="0" Grid.Row="0" x:Name="ItemsListView" ItemsSource="{Binding Children}" VerticalOptions="FillAndExpand" HasUnevenRows="true" CachingStrategy="RecycleElement" SelectedItem="{Binding SelectedItem}" ItemTapped="ItemsListView_ItemTapped">
             <ListView.Header>
                 <mdview:MarkdownView 
                 Theme="{StaticResource MonsterMarkdownTheme}" 
-                Markdown="{Binding Item.Item.Markdown}" 
+                Markdown="{Binding Item.Markdown}" 
                 NavigateToLinkCommand="{Binding Main.Navigator.NavigateToLinkCommand}"
                 />
             </ListView.Header>
             <ListView.ItemTemplate>
-                <DataTemplate>
+                <DataTemplate x:DataType="lib:Item">
                     <ViewCell>
                         <StackLayout Padding="10" Orientation="Vertical">
                             <Label Text="{Binding Name}" LineBreakMode="WordWrap" TextColor="{StaticResource HDBlue}" Style="{Binding NameLevel,Converter={StaticResource HeaderLevelToStyleConverter}, ConverterParameter=2}" />
diff --git a/AideDeJeu/AideDeJeu/Views/Library/ItemPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/Library/ItemPage.xaml.cs
index 0490de4a..563bf50a 100644
--- a/AideDeJeu/AideDeJeu/Views/Library/ItemPage.xaml.cs
+++ b/AideDeJeu/AideDeJeu/Views/Library/ItemPage.xaml.cs
@@ -20,36 +20,37 @@ namespace AideDeJeu.Views.Library
     [QueryProperty("Path", "path")]
     public partial class ItemPage : ContentPage, INotifyPropertyChanged
     {
-        public MainViewModel Main
-        {
-            get
-            {
-                return DependencyService.Get<MainViewModel>();
-            }
-        }
+        //public MainViewModel Main
+        //{
+        //    get
+        //    {
+        //        return DependencyService.Get<MainViewModel>();
+        //    }
+        //}
 
-        private ItemViewModel _Item = new ItemViewModel();
+        //private ItemViewModel _Item = new ItemViewModel();
         public ItemViewModel Item
         {
             get
             {
-                return _Item;
-            }
-            set
-            {
-                SetProperty(ref _Item, value);
+                return BindingContext as ItemViewModel;
+                //return _Item;
             }
+            //set
+            //{
+            //    SetProperty(ref _Item, value);
+            //}
         }
 
         public ItemPage()
         {
-            BindingContext = this;
+            //BindingContext = this;
             InitializeComponent();
         }
 
         public ItemPage(string id)
         {
-            BindingContext = this;
+            //BindingContext = this;
             InitializeComponent();
             Path = id;
             //LoadPageAsync();
@@ -57,7 +58,7 @@ namespace AideDeJeu.Views.Library
 
         public ItemPage(ItemViewModel itemViewModel)
         {
-            BindingContext = this;
+            //BindingContext = this;
             InitializeComponent();
             Path = itemViewModel.Item.Id;
             //Item = itemViewModel;
@@ -72,13 +73,13 @@ namespace AideDeJeu.Views.Library
         protected override void OnAppearing()
         {
             base.OnAppearing();
-            Main.CurrentItem = Item;
+            Item.Main.CurrentItem = Item;
         }
 
         protected override void OnDisappearing()
         {
             base.OnDisappearing();
-            Main.CurrentItem = null;
+            Item.Main.CurrentItem = null;
         }
         private string _Path { get; set; } = null; //"index.md";
         public string Path