From ae2bff581acf0343faf1b86d8265ee3916ac1e3c Mon Sep 17 00:00:00 2001 From: Yan Maniez Date: Wed, 17 Apr 2019 22:25:29 +0200 Subject: [PATCH] Clean --- .../AideDeJeu/MarkdownView/MarkdownView.cs | 2 -- .../AideDeJeu/ViewModels/AboutViewModel.cs | 36 ------------------- .../ViewModels/Library/BookmarksViewModel.cs | 2 +- .../ViewModels/Library/ItemsViewModel.cs | 4 +-- 4 files changed, 3 insertions(+), 41 deletions(-) diff --git a/AideDeJeu/AideDeJeu/MarkdownView/MarkdownView.cs b/AideDeJeu/AideDeJeu/MarkdownView/MarkdownView.cs index 650da7ae..e27c6838 100644 --- a/AideDeJeu/AideDeJeu/MarkdownView/MarkdownView.cs +++ b/AideDeJeu/AideDeJeu/MarkdownView/MarkdownView.cs @@ -385,13 +385,11 @@ } else { - var test = ""; // ? } } else { - var test = ""; // ? } // ? diff --git a/AideDeJeu/AideDeJeu/ViewModels/AboutViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/AboutViewModel.cs index 01d2b748..f8586e1e 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/AboutViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/AboutViewModel.cs @@ -15,11 +15,9 @@ namespace AideDeJeu.ViewModels Title = "À propos de ..."; OpenWebCommand = new Command((param) => Device.OpenUri(new Uri(param))); - UpdateDataCommand = new Command(async() => await ExecuteUpdateDataCommandAsync()); } public ICommand OpenWebCommand { get; } - public ICommand UpdateDataCommand { get; } public string Version { get @@ -44,39 +42,5 @@ namespace AideDeJeu.ViewModels } } - private int countUpdateData = 0; - private async Task ExecuteUpdateDataCommandAsync() - { - //if (countUpdateData++ != 5) return; - - //IsBusy = true; - //var helper = new ItemDatabaseHelper(); - - //using (var spellsScrappers = new SpellsScrappers()) - //{ - // var partialSpells = await spellsScrappers.GetSpells(); - // var spells = new List(); - // foreach (var partialSpell in partialSpells) - // { - // var spell = await spellsScrappers.GetSpell(partialSpell.Id); - // spells.Add(spell); - // } - // await helper.AddOrUpdateSpellsAsync(spells); - //} - - //using (var monstersScrappers = new MonstersScrappers()) - //{ - // var partialMonsters = await monstersScrappers.GetMonsters(); - // var monsters = new List(); - // foreach (var partialMonster in partialMonsters) - // { - // var monster = await monstersScrappers.GetMonster(partialMonster.Id); - // monsters.Add(monster); - // } - // await helper.AddOrUpdateMonstersAsync(monsters); - //} - - //IsBusy = false; - } } } \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu/ViewModels/Library/BookmarksViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/Library/BookmarksViewModel.cs index 0ab47095..053c9334 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/Library/BookmarksViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/Library/BookmarksViewModel.cs @@ -17,7 +17,7 @@ namespace AideDeJeu.ViewModels.Library { public BookmarksViewModel() { - LoadBookmarkCollectionAsync(BookmarkCollectionNames[BookmarkCollectionIndex]); + LoadBookmarkCollectionAsync(BookmarkCollectionNames[BookmarkCollectionIndex]).ConfigureAwait(true); } public ObservableCollection BookmarkCollectionNames { get; set; } = new ObservableCollection() diff --git a/AideDeJeu/AideDeJeu/ViewModels/Library/ItemsViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/Library/ItemsViewModel.cs index b53bc9ff..23ee73c1 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/Library/ItemsViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/Library/ItemsViewModel.cs @@ -85,11 +85,11 @@ namespace AideDeJeu.ViewModels.Library { if (_SelectedItem is LinkItem) { - Main.Navigator.NavigateToLinkAsync("/" + (_SelectedItem as LinkItem).Link); + Main.Navigator.NavigateToLinkAsync("/" + (_SelectedItem as LinkItem).Link).ConfigureAwait(true); } else { - Main.Navigator.GotoItemDetailPageAsync(_SelectedItem); + Main.Navigator.GotoItemDetailPageAsync(_SelectedItem).ConfigureAwait(true); } } }