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 @@
ItemDetailPage.xaml
+
+ FilteredItemsPage.xaml
+
ItemsPage.xaml
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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();
+ }
+ }
+ //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 @@
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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();
}
}
- //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