5E/AideDeJeu
1
0
Fork 0
mirror of https://github.com/Nioux/AideDeJeu.git synced 2025-10-30 23:16:09 +00:00
Code Issues Projects Releases Wiki Activity

Modifs filtres

Browse source
This commit is contained in:
Yan Maniez 2018-07-29 22:29:10 +02:00
parent 4b037da1e9
commit 4ede047c62
4 changed files with 12 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

10
AideDeJeu/AideDeJeu/ViewModels/ItemsViewModel.cs
View file

@ -38,6 +38,10 @@ namespace AideDeJeu.ViewModels
set set
{ {
SetProperty(ref _Filter, value); SetProperty(ref _Filter, value);
if(_Filter != null)
{
_Filter.LoadItemsCommand = LoadItemsCommand;
}
} }
} }
@ -68,7 +72,7 @@ namespace AideDeJeu.ViewModels
{ {
if (_SelectedItem is LinkItem) if (_SelectedItem is LinkItem)
{ {
Main.Navigator.NavigateToLink("/" + (_SelectedItem as LinkItem).Link); Main.Navigator.NavigateToLinkAsync("/" + (_SelectedItem as LinkItem).Link);
} }
else else
{ {
@ -92,10 +96,6 @@ namespace AideDeJeu.ViewModels
{ {
Title = _AllItems.Name; Title = _AllItems.Name;
Filter = _AllItems.GetNewFilterViewModel(); Filter = _AllItems.GetNewFilterViewModel();
if (Filter != null)
{
Filter.LoadItemsCommand = LoadItemsCommand;
}
} }
} }
} }

7
AideDeJeu/AideDeJeu/ViewModels/Navigator.cs
View file

@ -53,7 +53,7 @@ namespace AideDeJeu.ViewModels
} }
public async Task NavigateToLink(string s) public async Task NavigateToLinkAsync(string s)
{ {
if (s != null) if (s != null)
{ {
@ -77,9 +77,10 @@ namespace AideDeJeu.ViewModels
} }
else else
{ {
var itemsViewModel = new ItemsViewModel() { AllItems = items }; var filterViewModel = items.GetNewFilterViewModel();
var itemsViewModel = new ItemsViewModel() { AllItems = items, Filter = filterViewModel };
itemsViewModel.LoadItemsCommand.Execute(null); itemsViewModel.LoadItemsCommand.Execute(null);
if (items.GetNewFilterViewModel() == null) if (filterViewModel == null)
{ {
await GotoItemsPageAsync(itemsViewModel); await GotoItemsPageAsync(itemsViewModel);
} }

29
AideDeJeu/AideDeJeu/Views/FilteredItemsPage.xaml.cs
View file

@ -16,7 +16,6 @@ namespace AideDeJeu.Views
return DependencyService.Get<MainViewModel>(); return DependencyService.Get<MainViewModel>();
} }
} }
//INavig//ator Navigator;
public ItemsViewModel _ItemsViewModel; public ItemsViewModel _ItemsViewModel;
public ItemsViewModel ItemsViewModel public ItemsViewModel ItemsViewModel
@ -28,39 +27,15 @@ namespace AideDeJeu.Views
} }
public FilteredItemsPage (ItemsViewModel itemsViewModel) public FilteredItemsPage (ItemsViewModel itemsViewModel)
{ {
InitializeComponent (); InitializeComponent();
BindingContext = _ItemsViewModel = itemsViewModel; // Main; BindingContext = _ItemsViewModel = itemsViewModel;
//this.SizeChanged += (o, e) => {
// if(this.Width > 0 && this.Height > 0)
// {
// this.IsPresented = this.Width > this.Height;
// }
//};
} }
public FilteredItemsPage() public FilteredItemsPage()
{ {
InitializeComponent(); InitializeComponent();
BindingContext = Main; 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) private void ItemsListView_ItemTapped(object sender, ItemTappedEventArgs e)

2
AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml.cs
View file

@ -19,7 +19,7 @@ namespace AideDeJeu.Views
BindingContext = this.viewModel = itemVM; 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() public ItemDetailPage()