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 f119fbcb..bddd80bd 100644 Binary files a/Data/library.db and b/Data/library.db differ diff --git a/Data/library.ver b/Data/library.ver index f11c82a4..9d607966 100644 --- a/Data/library.ver +++ b/Data/library.ver @@ -1 +1 @@ -9 \ No newline at end of file +11 \ No newline at end of file