From f8e5423d8fda497b5f599ae3974068089ba6f870 Mon Sep 17 00:00:00 2001
From: Yan Maniez <yanmaniez@hotmail.com>
Date: Sun, 22 Jul 2018 16:29:39 +0200
Subject: [PATCH] =?UTF-8?q?S=C3=A9paration=20ItemsPage=20/=20FilteredItems?=
 =?UTF-8?q?Page?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AideDeJeu/AideDeJeu/AideDeJeu.csproj          |  3 +
 .../AideDeJeu/ViewModels/MainViewModel.cs     |  9 ++-
 AideDeJeu/AideDeJeu/ViewModels/Navigator.cs   |  8 ++
 .../AideDeJeu/Views/FilteredItemsPage.xaml    | 70 +++++++++++++++++
 .../AideDeJeu/Views/FilteredItemsPage.xaml.cs | 77 +++++++++++++++++++
 AideDeJeu/AideDeJeu/Views/ItemsPage.xaml      | 77 ++++---------------
 AideDeJeu/AideDeJeu/Views/ItemsPage.xaml.cs   | 34 +-------
 7 files changed, 184 insertions(+), 94 deletions(-)
 create mode 100644 AideDeJeu/AideDeJeu/Views/FilteredItemsPage.xaml
 create mode 100644 AideDeJeu/AideDeJeu/Views/FilteredItemsPage.xaml.cs

diff --git a/AideDeJeu/AideDeJeu/AideDeJeu.csproj b/AideDeJeu/AideDeJeu/AideDeJeu.csproj
index 70d39623..f11dbeab 100644
--- a/AideDeJeu/AideDeJeu/AideDeJeu.csproj
+++ b/AideDeJeu/AideDeJeu/AideDeJeu.csproj
@@ -39,6 +39,9 @@
     <Compile Update="Views\ItemDetailPage.xaml.cs">
       <DependentUpon>ItemDetailPage.xaml</DependentUpon>
     </Compile>
+    <Compile Update="Views\FilteredItemsPage.xaml.cs">
+      <DependentUpon>FilteredItemsPage.xaml</DependentUpon>
+    </Compile>
     <Compile Update="Views\ItemsPage.xaml.cs">
       <DependentUpon>ItemsPage.xaml</DependentUpon>
     </Compile>
diff --git a/AideDeJeu/AideDeJeu/ViewModels/MainViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/MainViewModel.cs
index eed7f437..4062834c 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/MainViewModel.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/MainViewModel.cs
@@ -81,7 +81,14 @@ namespace AideDeJeu.ViewModels
                         {
                             var itemsViewModel = new ItemsViewModel() { AllItems = items };
                             itemsViewModel.LoadItemsCommand.Execute(null);
-                            await Navigator.GotoItemsPageAsync(itemsViewModel);
+                            if (items.GetNewFilterViewModel() == null)
+                            {
+                                await Navigator.GotoItemsPageAsync(itemsViewModel);
+                            }
+                            else
+                            {
+                                await Navigator.GotoFilteredItemsPageAsync(itemsViewModel);
+                            }
                         }
                     }
                     else
diff --git a/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs b/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs
index e1d5ad4d..39e112ee 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs
@@ -42,5 +42,13 @@ namespace AideDeJeu.ViewModels
             await Navigation.PushAsync(new ItemsPage(itemsVM));
         }
 
+        public async Task GotoFilteredItemsPageAsync(ItemsViewModel itemsVM)
+        {
+            if (itemsVM == null)
+                return;
+
+            await Navigation.PushAsync(new FilteredItemsPage(itemsVM));
+        }
+
     }
 }
diff --git a/AideDeJeu/AideDeJeu/Views/FilteredItemsPage.xaml b/AideDeJeu/AideDeJeu/Views/FilteredItemsPage.xaml
new file mode 100644
index 00000000..bbe5816f
--- /dev/null
+++ b/AideDeJeu/AideDeJeu/Views/FilteredItemsPage.xaml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<MasterDetailPage 
+    xmlns="http://xamarin.com/schemas/2014/forms" 
+    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:Name="This" 
+    IsPresented="False" 
+    Title="{Binding Title}">
+    <MasterDetailPage.ToolbarItems>
+        <ToolbarItem Name="About" Text="À propos de..." Order="Secondary" Icon="wooden_sign.png" Command="{Binding Main.AboutCommand}" />
+    </MasterDetailPage.ToolbarItems>
+    <MasterDetailPage.Resources>
+        <ResourceDictionary>
+        </ResourceDictionary>
+    </MasterDetailPage.Resources>
+    <MasterDetailPage.Master>
+        <ContentPage Title=" ">
+            <StackLayout Orientation="Vertical">
+                <ListView SelectionMode="None" ItemsSource="{Binding Filter.Filters}" HasUnevenRows="True" RowHeight="-1" SeparatorVisibility="None" IsPullToRefreshEnabled="False" HorizontalOptions="FillAndExpand" >
+                    <ListView.ItemTemplate>
+                        <DataTemplate>
+                            <ViewCell>
+                                <ViewCell.View>
+                                    <StackLayout Margin="10,5,10,0" Padding="0" Spacing="0">
+                                        <Label BindingContext="{Binding}" Text="{Binding Name}" Style="{StaticResource Key=subsubsection}" />
+                                        <Picker HorizontalOptions="FillAndExpand" ItemsSource="{Binding KeyValues, Mode=OneWay}" ItemDisplayBinding="{Binding Value, Mode=OneWay}" SelectedIndex="{Binding Index}" />
+                                    </StackLayout>
+                                </ViewCell.View>
+                            </ViewCell>
+                        </DataTemplate>
+                    </ListView.ItemTemplate>
+                </ListView>
+            </StackLayout>
+        </ContentPage>
+    </MasterDetailPage.Master>
+    <MasterDetailPage.Detail>
+        <ContentPage Title="">
+            <Grid VerticalOptions="Fill" HorizontalOptions="Fill">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="auto" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <Button Grid.Column="0" Grid.Row="0" Text="=" Clicked="Button_Clicked"/>
+                <SearchBar Grid.Column="1" Grid.Row="0" x:Name="SearchBar" HeightRequest="42" SearchCommand="{Binding SearchCommand}" SearchCommandParameter="{Binding Text, Source={x:Reference SearchBar}}">
+                    <SearchBar.Behaviors>
+                        <tools:TextChangedBehavior />
+                    </SearchBar.Behaviors>
+                </SearchBar>
+                <ListView Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" x:Name="ItemsListView" ItemsSource="{Binding Items}" VerticalOptions="FillAndExpand" HasUnevenRows="true" CachingStrategy="RecycleElement" SelectedItem="{Binding SelectedItem}" ItemTapped="ItemsListView_ItemTapped">
+                    <ListView.ItemTemplate>
+                        <DataTemplate>
+                            <ViewCell AutomationProperties.IsInAccessibleTree="True" AutomationId="machin" AutomationProperties.Name="hop">
+                                <StackLayout Padding="10" Orientation="Vertical">
+                                    <Label Text="{Binding Name}" LineBreakMode="NoWrap" Style="{DynamicResource subsubsection}" FontSize="16" />
+                                    <Label Text="{Binding AltNameText}" LineBreakMode="NoWrap" Style="{DynamicResource subsubsection}" FontSize="12" />
+                                </StackLayout>
+                            </ViewCell>
+                        </DataTemplate>
+                    </ListView.ItemTemplate>
+                </ListView>
+            </Grid>
+        </ContentPage>
+    </MasterDetailPage.Detail>
+</MasterDetailPage>
\ No newline at end of file
diff --git a/AideDeJeu/AideDeJeu/Views/FilteredItemsPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/FilteredItemsPage.xaml.cs
new file mode 100644
index 00000000..7e7b3503
--- /dev/null
+++ b/AideDeJeu/AideDeJeu/Views/FilteredItemsPage.xaml.cs
@@ -0,0 +1,77 @@
+using AideDeJeu.ViewModels;
+using System;
+using System.Linq;
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace AideDeJeu.Views
+{
+    [XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class FilteredItemsPage : MasterDetailPage
+    {
+        MainViewModel Main
+        {
+            get
+            {
+                return DependencyService.Get<MainViewModel>();
+            }
+        }
+        //INavig//ator Navigator;
+
+        public ItemsViewModel _ItemsViewModel;
+        public ItemsViewModel ItemsViewModel
+        {
+            get
+            {
+                return _ItemsViewModel;
+            }
+        }
+        public FilteredItemsPage (ItemsViewModel itemsViewModel)
+		{
+			InitializeComponent ();
+
+            BindingContext = _ItemsViewModel = itemsViewModel; // Main;
+
+            //this.SizeChanged += (o, e) => {
+            //    if(this.Width > 0 && this.Height > 0)
+            //    {
+            //        this.IsPresented = this.Width > this.Height;
+            //    }
+            //};
+        }
+        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)
+        {
+            if (e.Item == null) return;
+            ((ListView)sender).SelectedItem = null;
+        }
+
+        private void Button_Clicked(object sender, EventArgs e)
+        {
+            this.IsPresented = !this.IsPresented;
+        }
+    }
+}
\ No newline at end of file
diff --git a/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml b/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml
index 2c348d57..a93e1f38 100644
--- a/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml
@@ -1,70 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<MasterDetailPage 
+<ContentPage 
     xmlns="http://xamarin.com/schemas/2014/forms" 
     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.ItemsPage" 
     x:Name="This" 
-    IsPresented="False" 
     Title="{Binding Title}">
-    <MasterDetailPage.ToolbarItems>
+    <ContentPage.ToolbarItems>
         <ToolbarItem Name="About" Text="À propos de..." Order="Secondary" Icon="wooden_sign.png" Command="{Binding Main.AboutCommand}" />
-    </MasterDetailPage.ToolbarItems>
-    <MasterDetailPage.Resources>
-        <ResourceDictionary>
-        </ResourceDictionary>
-    </MasterDetailPage.Resources>
-    <MasterDetailPage.Master>
-        <ContentPage Title=" ">
-            <StackLayout Orientation="Vertical">
-                <ListView SelectionMode="None" ItemsSource="{Binding Filter.Filters}" HasUnevenRows="True" RowHeight="-1" SeparatorVisibility="None" IsPullToRefreshEnabled="False" HorizontalOptions="FillAndExpand" >
-                    <ListView.ItemTemplate>
-                        <DataTemplate>
-                            <ViewCell>
-                                <ViewCell.View>
-                                    <StackLayout Margin="10,5,10,0" Padding="0" Spacing="0">
-                                        <Label BindingContext="{Binding}" Text="{Binding Name}" Style="{StaticResource Key=subsubsection}" />
-                                        <Picker HorizontalOptions="FillAndExpand" ItemsSource="{Binding KeyValues, Mode=OneWay}" ItemDisplayBinding="{Binding Value, Mode=OneWay}" SelectedIndex="{Binding Index}" />
-                                    </StackLayout>
-                                </ViewCell.View>
-                            </ViewCell>
-                        </DataTemplate>
-                    </ListView.ItemTemplate>
-                </ListView>
-            </StackLayout>
-        </ContentPage>
-    </MasterDetailPage.Master>
-    <MasterDetailPage.Detail>
-        <ContentPage Title="">
-            <Grid VerticalOptions="Fill" HorizontalOptions="Fill">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="auto" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="auto" />
-                    <RowDefinition Height="*" />
-                </Grid.RowDefinitions>
-                <Button Grid.Column="0" Grid.Row="0" Text="=" Clicked="Button_Clicked"/>
-                <SearchBar Grid.Column="1" Grid.Row="0" x:Name="SearchBar" HeightRequest="42" SearchCommand="{Binding SearchCommand}" SearchCommandParameter="{Binding Text, Source={x:Reference SearchBar}}">
-                    <SearchBar.Behaviors>
-                        <tools:TextChangedBehavior />
-                    </SearchBar.Behaviors>
-                </SearchBar>
-                <ListView Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" x:Name="ItemsListView" ItemsSource="{Binding Items}" VerticalOptions="FillAndExpand" HasUnevenRows="true" CachingStrategy="RecycleElement" SelectedItem="{Binding SelectedItem}" ItemTapped="ItemsListView_ItemTapped">
-                    <ListView.ItemTemplate>
-                        <DataTemplate>
-                            <ViewCell AutomationProperties.IsInAccessibleTree="True" AutomationId="machin" AutomationProperties.Name="hop">
-                                <StackLayout Padding="10" Orientation="Vertical">
-                                    <Label Text="{Binding Name}" LineBreakMode="NoWrap" Style="{DynamicResource subsubsection}" FontSize="16" />
-                                    <Label Text="{Binding AltNameText}" LineBreakMode="NoWrap" Style="{DynamicResource subsubsection}" FontSize="12" />
-                                </StackLayout>
-                            </ViewCell>
-                        </DataTemplate>
-                    </ListView.ItemTemplate>
-                </ListView>
-            </Grid>
-        </ContentPage>
-    </MasterDetailPage.Detail>
-</MasterDetailPage>
\ No newline at end of file
+    </ContentPage.ToolbarItems>
+    <ListView HorizontalOptions="Fill" x:Name="ItemsListView" ItemsSource="{Binding Items}" VerticalOptions="FillAndExpand" HasUnevenRows="true" CachingStrategy="RecycleElement" SelectedItem="{Binding SelectedItem}" ItemTapped="ItemsListView_ItemTapped">
+        <ListView.ItemTemplate>
+            <DataTemplate>
+                <ViewCell AutomationProperties.IsInAccessibleTree="True" AutomationId="machin" AutomationProperties.Name="hop">
+                    <StackLayout Padding="10" Orientation="Vertical">
+                        <Label Text="{Binding Name}" LineBreakMode="NoWrap" Style="{DynamicResource subsubsection}" FontSize="16" />
+                        <Label Text="{Binding AltNameText}" LineBreakMode="NoWrap" Style="{DynamicResource subsubsection}" FontSize="12" />
+                    </StackLayout>
+                </ViewCell>
+            </DataTemplate>
+        </ListView.ItemTemplate>
+    </ListView>
+</ContentPage>
\ No newline at end of file
diff --git a/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml.cs
index ebd60d40..0288666d 100644
--- a/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml.cs
+++ b/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml.cs
@@ -7,7 +7,7 @@ using Xamarin.Forms.Xaml;
 namespace AideDeJeu.Views
 {
     [XamlCompilation(XamlCompilationOptions.Compile)]
-	public partial class ItemsPage : MasterDetailPage
+	public partial class ItemsPage : ContentPage
     {
         MainViewModel Main
         {
@@ -16,7 +16,6 @@ namespace AideDeJeu.Views
                 return DependencyService.Get<MainViewModel>();
             }
         }
-        //INavig//ator Navigator;
 
         public ItemsViewModel _ItemsViewModel;
         public ItemsViewModel ItemsViewModel
@@ -30,37 +29,13 @@ namespace AideDeJeu.Views
 		{
 			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 ItemsPage()
         {
             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)
@@ -68,10 +43,5 @@ namespace AideDeJeu.Views
             if (e.Item == null) return;
             ((ListView)sender).SelectedItem = null;
         }
-
-        private void Button_Clicked(object sender, EventArgs e)
-        {
-            this.IsPresented = !this.IsPresented;
-        }
     }
 }
\ No newline at end of file