From 2d038f47b812acc6953f2f9fe2436d497e67449d Mon Sep 17 00:00:00 2001 From: Yan Maniez Date: Wed, 24 Oct 2018 22:41:37 +0200 Subject: [PATCH] Modifs search --- .../AideDeJeu/MarkdownView/MarkdownTheme.cs | 2 +- .../ViewModels/DeepSearchViewModel.cs | 6 +++--- AideDeJeu/AideDeJeu/Views/DeepSearchPage.xaml | 4 ++-- AideDeJeu/AideDeJeuCmd/Program.cs | 4 ++++ Data/library.db | Bin 7651328 -> 7651328 bytes Data/library.ver | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/AideDeJeu/AideDeJeu/MarkdownView/MarkdownTheme.cs b/AideDeJeu/AideDeJeu/MarkdownView/MarkdownTheme.cs index cbafa4aa..65bda541 100644 --- a/AideDeJeu/AideDeJeu/MarkdownView/MarkdownTheme.cs +++ b/AideDeJeu/AideDeJeu/MarkdownView/MarkdownTheme.cs @@ -69,7 +69,7 @@ namespace Xam.Forms.Markdown Attributes = FontAttributes.None, BorderSize = 4, FontSize = 12, - BackgroundColor = Color.Gray.MultiplyAlpha(.1), + BackgroundColor = Color.White // Color.Gray.MultiplyAlpha(.1), }; this.Separator = new MarkdownStyle diff --git a/AideDeJeu/AideDeJeu/ViewModels/DeepSearchViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/DeepSearchViewModel.cs index 7893ff50..a926abf4 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/DeepSearchViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/DeepSearchViewModel.cs @@ -54,7 +54,7 @@ namespace AideDeJeu.ViewModels int position = markdown.IndexOf(searchText); int startPosition = Math.Max(0, position - 30); int endPosition = Math.Min(markdown.Length, position + searchText.Length + 30); - return markdown.Substring(startPosition, endPosition - startPosition - 1); + return $"\"{markdown.Substring(startPosition, endPosition - startPosition - 1).Replace("\n","")}\""; } public async Task> DeepSearchAllItemsAsync(string searchText) @@ -63,13 +63,13 @@ namespace AideDeJeu.ViewModels { var primary = await context.Items. Where(item => EF.Functions.Like(item.Name, $"%{searchText}%")). - Select(item => new SearchedItem() { Item = item, Preview = item.Name }). + Select(item => new SearchedItem() { Item = item, Preview = item.ParentName != null ? $"> {item.ParentName}" : "" }). ToListAsync(); var secondary = await context.Items. Where(item => EF.Functions.Like(item.Markdown, $"%{searchText}%")). Select(item => new SearchedItem() { - Item = item, Preview = GetPreview(item.Markdown, searchText) + Item = item, Preview = (item.ParentName != null ? $"> {item.ParentName} > " : "") + GetPreview(item.Markdown, searchText) }).ToListAsync(); //var primary = await context.Items. // Where(item => item.Name.Contains(searchText)). diff --git a/AideDeJeu/AideDeJeu/Views/DeepSearchPage.xaml b/AideDeJeu/AideDeJeu/Views/DeepSearchPage.xaml index 3ef7d9bc..be5ec2d8 100644 --- a/AideDeJeu/AideDeJeu/Views/DeepSearchPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/DeepSearchPage.xaml @@ -36,8 +36,8 @@ - diff --git a/AideDeJeu/AideDeJeuCmd/Program.cs b/AideDeJeu/AideDeJeuCmd/Program.cs index 8f5cd0d1..f6462ccc 100644 --- a/AideDeJeu/AideDeJeuCmd/Program.cs +++ b/AideDeJeu/AideDeJeuCmd/Program.cs @@ -300,6 +300,10 @@ namespace AideDeJeuCmd var store = new StoreViewModel(); await store.PreloadAllItemsAsync(); + var index = store._AllItems.Where(it => it.Value.RootId == "index.md").FirstOrDefault(); + index.Value.Id = index.Value.RootId; + index.Value.Name = "Bibliothèque"; + using (var context = await StoreViewModel.GetLibraryContextAsync()) { await context.Database.EnsureDeletedAsync(); diff --git a/Data/library.db b/Data/library.db index f119fbcb72bc7dc109c46e7da85612b405f25629..bddd80bd375370a91712e0a1acdd4dd5a664bf40 100644 GIT binary patch delta 6346 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