From 9acef8cc5cd634fffec646409c572eeda41b4638 Mon Sep 17 00:00:00 2001 From: Yan Maniez Date: Wed, 29 Aug 2018 13:48:39 +0200 Subject: [PATCH] Bookmarks suite --- AideDeJeu/AideDeJeu/ViewModels/BookmarksViewModel.cs | 10 +++++----- AideDeJeu/AideDeJeu/Views/BookmarksPage.xaml.cs | 2 +- AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml.cs | 8 +++++++- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/AideDeJeu/AideDeJeu/ViewModels/BookmarksViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/BookmarksViewModel.cs index f5420f1b..e44fa052 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/BookmarksViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/BookmarksViewModel.cs @@ -14,7 +14,7 @@ namespace AideDeJeu.ViewModels { public BookmarksViewModel() { - LoadBookmarkCollection(); + LoadBookmarkCollection(BookmarkCollectionNames[BookmarkCollectionIndex]); } public ObservableCollection BookmarkCollectionNames { get; set; } = new ObservableCollection() @@ -34,7 +34,7 @@ namespace AideDeJeu.ViewModels set { SetProperty(ref _BookmarkCollectionIndex, value); - LoadBookmarkCollection(); + LoadBookmarkCollection(BookmarkCollectionNames[BookmarkCollectionIndex]); } } private ObservableCollection _BookmarkCollection = new ObservableCollection(); @@ -59,9 +59,9 @@ namespace AideDeJeu.ViewModels } return null; } - public void LoadBookmarkCollection() + public void LoadBookmarkCollection(string key) { - var items = GetBookmarkCollection(BookmarkCollectionNames[BookmarkCollectionIndex]); + var items = GetBookmarkCollection(key); BookmarkCollection.Clear(); if (items != null) { @@ -79,7 +79,7 @@ namespace AideDeJeu.ViewModels } items.Add(linkItem); await SaveBookmarksAsync(key, items); - LoadBookmarkCollection(); + BookmarkCollectionIndex = BookmarkCollectionNames.IndexOf(key); } public async Task SaveBookmarksAsync(string key, List items) diff --git a/AideDeJeu/AideDeJeu/Views/BookmarksPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/BookmarksPage.xaml.cs index 2c2fb44d..f7ec12a5 100644 --- a/AideDeJeu/AideDeJeu/Views/BookmarksPage.xaml.cs +++ b/AideDeJeu/AideDeJeu/Views/BookmarksPage.xaml.cs @@ -17,7 +17,7 @@ namespace AideDeJeu.Views { InitializeComponent (); - BindingContext = new BookmarksViewModel(); + BindingContext = DependencyService.Get(); } } } \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml.cs index 2e42b2ae..212cd66d 100644 --- a/AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml.cs +++ b/AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml.cs @@ -35,7 +35,13 @@ namespace AideDeJeu.Views { InitializeComponent(); - BindingContext = this.viewModel = new ItemDetailViewModel(new HomeItem() { Name = "Bibliothèque", Id = "index.md" }) { Title = "Bibliothèque" }; + BindingContext = this.viewModel = new ItemDetailViewModel(new Item() + { + Name = "Bibliothèque", + Id = "index.md", + Markdown = AideDeJeu.Tools.Helpers.GetResourceString($"AideDeJeu.Data.index.md"), + } + ) { Title = "Bibliothèque" }; //var item = new Item //{ // Name = "",