From a16997c1e2231d2c43cfd4fd5e6c504bfa324ad0 Mon Sep 17 00:00:00 2001 From: David Timovski Date: Wed, 29 May 2024 22:49:03 +0200 Subject: [PATCH] fix: update font sizes for markdown headers. Consolidate highlight colors. --- .../{HeaderHighlight.cs => HighlightColor.cs} | 2 +- src/Panoramic.Domain/IWidgetData.cs | 2 +- src/Panoramic.Domain/Widgets/ChecklistData.cs | 4 +-- .../Widgets/LinkCollectionData.cs | 4 +-- src/Panoramic.Domain/Widgets/NoteData.cs | 4 +-- .../Widgets/RecentLinksData.cs | 4 +-- src/Panoramic/App.xaml | 28 +++++++++---------- .../Domain/Checklist/ChecklistWidget.cs | 4 +-- .../LinkCollection/LinkCollectionWidget.cs | 4 +-- .../Models/Domain/Note/NoteWidget.cs | 4 +-- .../Domain/RecentLinks/RecentLinksWidget.cs | 4 +-- src/Panoramic/Package.appxmanifest | 2 +- .../Checklist/ChecklistWidgetPage.xaml | 2 -- src/Panoramic/Panoramic.csproj | 6 ++-- .../Services/Markdown/MarkdownService.cs | 10 +++---- src/Panoramic/Utils/ResourceUtil.cs | 20 ++++++------- .../Checklist/ChecklistSettingsViewModel.cs | 2 +- .../Widgets/Checklist/ChecklistViewModel.cs | 5 ++-- .../LinkCollectionSettingsViewModel.cs | 2 +- .../LinkCollection/LinkCollectionViewModel.cs | 2 +- .../Widgets/Note/NoteSettingsViewModel.cs | 2 +- .../ViewModels/Widgets/Note/NoteViewModel.cs | 2 +- .../RecentLinksSettingsViewModel.cs | 2 +- .../RecentLinks/RecentLinksViewModel.cs | 2 +- 24 files changed, 61 insertions(+), 62 deletions(-) rename src/Panoramic.Domain/{HeaderHighlight.cs => HighlightColor.cs} (80%) diff --git a/src/Panoramic.Domain/HeaderHighlight.cs b/src/Panoramic.Domain/HighlightColor.cs similarity index 80% rename from src/Panoramic.Domain/HeaderHighlight.cs rename to src/Panoramic.Domain/HighlightColor.cs index bd1c134..b4298e4 100644 --- a/src/Panoramic.Domain/HeaderHighlight.cs +++ b/src/Panoramic.Domain/HighlightColor.cs @@ -1,6 +1,6 @@ namespace Panoramic.Data; -public enum HeaderHighlight +public enum HighlightColor { None, Blue, diff --git a/src/Panoramic.Domain/IWidgetData.cs b/src/Panoramic.Domain/IWidgetData.cs index 6722bb0..168db99 100644 --- a/src/Panoramic.Domain/IWidgetData.cs +++ b/src/Panoramic.Domain/IWidgetData.cs @@ -4,5 +4,5 @@ public interface IWidgetData { Guid Id { get; } Area Area { get; } - HeaderHighlight HeaderHighlight { get; } + HighlightColor HeaderHighlight { get; } } diff --git a/src/Panoramic.Domain/Widgets/ChecklistData.cs b/src/Panoramic.Domain/Widgets/ChecklistData.cs index d060df6..60e1bf5 100644 --- a/src/Panoramic.Domain/Widgets/ChecklistData.cs +++ b/src/Panoramic.Domain/Widgets/ChecklistData.cs @@ -10,7 +10,7 @@ public sealed partial class ChecklistData : IWidgetData public required Guid Id { get; init; } public required Area Area { get; init; } - public HeaderHighlight HeaderHighlight { get; init; } + public HighlightColor HeaderHighlight { get; init; } public string Title { get; init; } = "To do"; public bool Searchable { get; init; } = true; public required List Tasks { get; init; } @@ -71,7 +71,7 @@ public static ChecklistData FromMarkdown(string markdown) lineIndex++; var headerHighlightRowValues = lines[lineIndex].Split('|', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries); - var headerHighlight = Enum.Parse(headerHighlightRowValues[1]); + var headerHighlight = Enum.Parse(headerHighlightRowValues[1]); lineIndex++; var searchableRowValues = lines[lineIndex].Split('|', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries); diff --git a/src/Panoramic.Domain/Widgets/LinkCollectionData.cs b/src/Panoramic.Domain/Widgets/LinkCollectionData.cs index 5706784..d0c05e6 100644 --- a/src/Panoramic.Domain/Widgets/LinkCollectionData.cs +++ b/src/Panoramic.Domain/Widgets/LinkCollectionData.cs @@ -10,7 +10,7 @@ public sealed partial class LinkCollectionData : IWidgetData public required Guid Id { get; init; } public required Area Area { get; init; } - public HeaderHighlight HeaderHighlight { get; init; } + public HighlightColor HeaderHighlight { get; init; } public string Title { get; init; } = "My links"; public bool Searchable { get; init; } = true; public required List Links { get; init; } @@ -64,7 +64,7 @@ public static LinkCollectionData FromMarkdown(string markdown) lineIndex++; var headerHighlightRowValues = lines[lineIndex].Split('|', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries); - var headerHighlight = Enum.Parse(headerHighlightRowValues[1]); + var headerHighlight = Enum.Parse(headerHighlightRowValues[1]); lineIndex++; var searchableRowValues = lines[lineIndex].Split('|', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries); diff --git a/src/Panoramic.Domain/Widgets/NoteData.cs b/src/Panoramic.Domain/Widgets/NoteData.cs index 92d57d1..d983776 100644 --- a/src/Panoramic.Domain/Widgets/NoteData.cs +++ b/src/Panoramic.Domain/Widgets/NoteData.cs @@ -9,7 +9,7 @@ public sealed class NoteData : IWidgetData public required Guid Id { get; init; } public required Area Area { get; init; } - public HeaderHighlight HeaderHighlight { get; init; } + public HighlightColor HeaderHighlight { get; init; } public string FontFamily { get; init; } = "Default"; public double FontSize { get; init; } = 15; public string? RelativeFilePath { get; init; } @@ -31,7 +31,7 @@ public static NoteData FromMarkdown(string markdown) lineIndex++; var headerHighlightRowValues = lines[lineIndex].Split('|', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries); - var headerHighlight = Enum.Parse(headerHighlightRowValues[1]); + var headerHighlight = Enum.Parse(headerHighlightRowValues[1]); lineIndex++; var fontFamily = lines[lineIndex].Split('|', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)[1]; diff --git a/src/Panoramic.Domain/Widgets/RecentLinksData.cs b/src/Panoramic.Domain/Widgets/RecentLinksData.cs index c75df05..e4ca9b5 100644 --- a/src/Panoramic.Domain/Widgets/RecentLinksData.cs +++ b/src/Panoramic.Domain/Widgets/RecentLinksData.cs @@ -10,7 +10,7 @@ public sealed partial class RecentLinksData : IWidgetData public required Guid Id { get; init; } public required Area Area { get; init; } - public HeaderHighlight HeaderHighlight { get; init; } + public HighlightColor HeaderHighlight { get; init; } public string Title { get; init; } = "Recent"; public int Capacity { get; init; } = 15; public bool OnlyFromToday { get; init; } @@ -66,7 +66,7 @@ public static RecentLinksData FromMarkdown(string markdown) lineIndex++; var headerHighlightRowValues = lines[lineIndex].Split('|', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries); - var headerHighlight = Enum.Parse(headerHighlightRowValues[1]); + var headerHighlight = Enum.Parse(headerHighlightRowValues[1]); lineIndex++; var capacityRowValues = lines[lineIndex].Split('|', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries); diff --git a/src/Panoramic/App.xaml b/src/Panoramic/App.xaml index 99637fe..4d8de65 100644 --- a/src/Panoramic/App.xaml +++ b/src/Panoramic/App.xaml @@ -27,13 +27,13 @@ - - - - - - - + + + + + + + @@ -53,13 +53,13 @@ - - - - - - - + + + + + + + diff --git a/src/Panoramic/Models/Domain/Checklist/ChecklistWidget.cs b/src/Panoramic/Models/Domain/Checklist/ChecklistWidget.cs index 1cc10aa..ca39311 100644 --- a/src/Panoramic/Models/Domain/Checklist/ChecklistWidget.cs +++ b/src/Panoramic/Models/Domain/Checklist/ChecklistWidget.cs @@ -19,7 +19,7 @@ public sealed class ChecklistWidget : IWidget /// /// Constructs a new link collection widget. /// - public ChecklistWidget(IStorageService storageService, Area area, HeaderHighlight headerHighlight, string title, bool searchable) + public ChecklistWidget(IStorageService storageService, Area area, HighlightColor headerHighlight, string title, bool searchable) { _storageService = storageService; @@ -52,7 +52,7 @@ private ChecklistWidget(IStorageService storageService, ChecklistData data) public Guid Id { get; } public WidgetType Type { get; } = WidgetType.Checklist; public Area Area { get; set; } - public HeaderHighlight HeaderHighlight { get; set; } + public HighlightColor HeaderHighlight { get; set; } public string Title { get; set; } public bool Searchable { get; set; } diff --git a/src/Panoramic/Models/Domain/LinkCollection/LinkCollectionWidget.cs b/src/Panoramic/Models/Domain/LinkCollection/LinkCollectionWidget.cs index 0512740..794ca47 100644 --- a/src/Panoramic/Models/Domain/LinkCollection/LinkCollectionWidget.cs +++ b/src/Panoramic/Models/Domain/LinkCollection/LinkCollectionWidget.cs @@ -19,7 +19,7 @@ public sealed class LinkCollectionWidget : IWidget /// /// Constructs a new link collection widget. /// - public LinkCollectionWidget(IStorageService storageService, Area area, HeaderHighlight headerHighlight, string title, bool searchable) + public LinkCollectionWidget(IStorageService storageService, Area area, HighlightColor headerHighlight, string title, bool searchable) { _storageService = storageService; @@ -52,7 +52,7 @@ private LinkCollectionWidget(IStorageService storageService, LinkCollectionData public Guid Id { get; } public WidgetType Type { get; } = WidgetType.LinkCollection; public Area Area { get; set; } - public HeaderHighlight HeaderHighlight { get; set; } + public HighlightColor HeaderHighlight { get; set; } public string Title { get; set; } public bool Searchable { get; set; } diff --git a/src/Panoramic/Models/Domain/Note/NoteWidget.cs b/src/Panoramic/Models/Domain/Note/NoteWidget.cs index be4ed24..709d68f 100644 --- a/src/Panoramic/Models/Domain/Note/NoteWidget.cs +++ b/src/Panoramic/Models/Domain/Note/NoteWidget.cs @@ -19,7 +19,7 @@ public sealed class NoteWidget : IWidget /// /// Constructs a new note widget. /// - public NoteWidget(IStorageService storageService, Area area, HeaderHighlight headerHighlight, string fontFamily, double fontSize) + public NoteWidget(IStorageService storageService, Area area, HighlightColor headerHighlight, string fontFamily, double fontSize) { _storageService = storageService; @@ -56,7 +56,7 @@ private NoteWidget(IStorageService storageService, NoteData data) public Guid Id { get; } public WidgetType Type { get; } = WidgetType.Note; public Area Area { get; set; } - public HeaderHighlight HeaderHighlight { get; set; } + public HighlightColor HeaderHighlight { get; set; } public string FontFamily { get; set; } public double FontSize { get; set; } public FileSystemItemPath? NotePath { get; set; } diff --git a/src/Panoramic/Models/Domain/RecentLinks/RecentLinksWidget.cs b/src/Panoramic/Models/Domain/RecentLinks/RecentLinksWidget.cs index 997526e..6f60e27 100644 --- a/src/Panoramic/Models/Domain/RecentLinks/RecentLinksWidget.cs +++ b/src/Panoramic/Models/Domain/RecentLinks/RecentLinksWidget.cs @@ -19,7 +19,7 @@ public sealed class RecentLinksWidget : IWidget /// /// Constructs a new recent links widget. /// - public RecentLinksWidget(IStorageService storageService, Area area, HeaderHighlight headerHighlight, string title, int capacity, bool onlyFromToday, bool searchable) + public RecentLinksWidget(IStorageService storageService, Area area, HighlightColor headerHighlight, string title, int capacity, bool onlyFromToday, bool searchable) { _storageService = storageService; @@ -56,7 +56,7 @@ private RecentLinksWidget(IStorageService storageService, RecentLinksData data) public Guid Id { get; } public WidgetType Type { get; } = WidgetType.RecentLinks; public Area Area { get; set; } - public HeaderHighlight HeaderHighlight { get; set; } + public HighlightColor HeaderHighlight { get; set; } public string Title { get; set; } public int Capacity { get; set; } public bool OnlyFromToday { get; set; } diff --git a/src/Panoramic/Package.appxmanifest b/src/Panoramic/Package.appxmanifest index 8946e4a..7195ab8 100644 --- a/src/Panoramic/Package.appxmanifest +++ b/src/Panoramic/Package.appxmanifest @@ -10,7 +10,7 @@ + Version="0.8.1.0" /> diff --git a/src/Panoramic/Pages/Widgets/Checklist/ChecklistWidgetPage.xaml b/src/Panoramic/Pages/Widgets/Checklist/ChecklistWidgetPage.xaml index c6ba56b..b7806e8 100644 --- a/src/Panoramic/Pages/Widgets/Checklist/ChecklistWidgetPage.xaml +++ b/src/Panoramic/Pages/Widgets/Checklist/ChecklistWidgetPage.xaml @@ -9,13 +9,11 @@ - - diff --git a/src/Panoramic/Panoramic.csproj b/src/Panoramic/Panoramic.csproj index 8b1a782..cb27e28 100644 --- a/src/Panoramic/Panoramic.csproj +++ b/src/Panoramic/Panoramic.csproj @@ -26,11 +26,11 @@ - + - - + + diff --git a/src/Panoramic/Services/Markdown/MarkdownService.cs b/src/Panoramic/Services/Markdown/MarkdownService.cs index 0c222f7..cdc47d7 100644 --- a/src/Panoramic/Services/Markdown/MarkdownService.cs +++ b/src/Panoramic/Services/Markdown/MarkdownService.cs @@ -96,7 +96,7 @@ private Paragraph ToHeader1(string text, string noteName, double fontSize) { var paragraph = new Paragraph { - FontSize = fontSize + 10, + FontSize = fontSize + 5, FontWeight = FontWeights.Bold, Margin = new Thickness(0, 0, 0, HeaderMarginBottom) }; @@ -111,7 +111,7 @@ private Paragraph ToHeader2(string text, string noteName, double fontSize) { var paragraph = new Paragraph { - FontSize = fontSize + 8, + FontSize = fontSize + 4, FontWeight = FontWeights.Bold, Margin = new Thickness(0, 0, 0, HeaderMarginBottom) }; @@ -126,7 +126,7 @@ private Paragraph ToHeader3(string text, string noteName, double fontSize) { var paragraph = new Paragraph { - FontSize = fontSize + 6, + FontSize = fontSize + 3, FontWeight = FontWeights.Bold, Margin = new Thickness(0, 0, 0, HeaderMarginBottom) }; @@ -141,7 +141,7 @@ private Paragraph ToHeader4(string text, string noteName, double fontSize) { var paragraph = new Paragraph { - FontSize = fontSize + 4, + FontSize = fontSize + 2, FontWeight = FontWeights.Bold, Margin = new Thickness(0, 0, 0, HeaderMarginBottom) }; @@ -156,7 +156,7 @@ private Paragraph ToHeader5(string text, string noteName, double fontSize) { var paragraph = new Paragraph { - FontSize = fontSize + 2, + FontSize = fontSize + 1, FontWeight = FontWeights.Bold, Margin = new Thickness(0, 0, 0, HeaderMarginBottom) }; diff --git a/src/Panoramic/Utils/ResourceUtil.cs b/src/Panoramic/Utils/ResourceUtil.cs index da29765..fea06fa 100644 --- a/src/Panoramic/Utils/ResourceUtil.cs +++ b/src/Panoramic/Utils/ResourceUtil.cs @@ -22,16 +22,16 @@ static ResourceUtil() HighlightedBackground = (appCurrentThemeDict["PanoramicHighlightedBackgroundBrush"] as SolidColorBrush)!; PaleTextForeground = (appCurrentThemeDict["PanoramicPaleTextForeground"] as SolidColorBrush)!; - WidgetHeaderBrushes = new Dictionary + HighlightBrushes = new Dictionary { - { HeaderHighlight.None, (appCurrentThemeDict["PanoramicWidgetBackgroundBrush"] as SolidColorBrush)! }, - { HeaderHighlight.Blue, (appCurrentThemeDict["PanoramicBlueHeaderHighlight"] as SolidColorBrush)! }, - { HeaderHighlight.Red, (appCurrentThemeDict["PanoramicRedHeaderHighlight"] as SolidColorBrush)! }, - { HeaderHighlight.Green, (appCurrentThemeDict["PanoramicGreenHeaderHighlight"] as SolidColorBrush)! }, - { HeaderHighlight.Yellow, (appCurrentThemeDict["PanoramicYellowHeaderHighlight"] as SolidColorBrush)! }, - { HeaderHighlight.Orange, (appCurrentThemeDict["PanoramicOrangeHeaderHighlight"] as SolidColorBrush)! }, - { HeaderHighlight.Purple, (appCurrentThemeDict["PanoramicPurpleHeaderHighlight"] as SolidColorBrush)! }, - { HeaderHighlight.Teal, (appCurrentThemeDict["PanoramicTealHeaderHighlight"] as SolidColorBrush)! } + { HighlightColor.None, (appCurrentThemeDict["PanoramicWidgetBackgroundBrush"] as SolidColorBrush)! }, + { HighlightColor.Blue, (appCurrentThemeDict["PanoramicBlueHighlight"] as SolidColorBrush)! }, + { HighlightColor.Red, (appCurrentThemeDict["PanoramicRedHighlight"] as SolidColorBrush)! }, + { HighlightColor.Green, (appCurrentThemeDict["PanoramicGreenHighlight"] as SolidColorBrush)! }, + { HighlightColor.Yellow, (appCurrentThemeDict["PanoramicYellowHighlight"] as SolidColorBrush)! }, + { HighlightColor.Orange, (appCurrentThemeDict["PanoramicOrangeHighlight"] as SolidColorBrush)! }, + { HighlightColor.Purple, (appCurrentThemeDict["PanoramicPurpleHighlight"] as SolidColorBrush)! }, + { HighlightColor.Teal, (appCurrentThemeDict["PanoramicTealHighlight"] as SolidColorBrush)! } }; } @@ -42,7 +42,7 @@ static ResourceUtil() public static SolidColorBrush HighlightedBackground { get; } public static SolidColorBrush PaleTextForeground { get; } - public static readonly IReadOnlyDictionary WidgetHeaderBrushes; + public static readonly IReadOnlyDictionary HighlightBrushes; public static SolidColorBrush GetBrushFromPage(string resourceName, Page page) { diff --git a/src/Panoramic/ViewModels/Widgets/Checklist/ChecklistSettingsViewModel.cs b/src/Panoramic/ViewModels/Widgets/Checklist/ChecklistSettingsViewModel.cs index 71f9c3f..dfae67e 100644 --- a/src/Panoramic/ViewModels/Widgets/Checklist/ChecklistSettingsViewModel.cs +++ b/src/Panoramic/ViewModels/Widgets/Checklist/ChecklistSettingsViewModel.cs @@ -47,7 +47,7 @@ public void AttachValidationHandler(EventHandler handler) public async Task SubmitAsync() { - var headerHighlight = Enum.Parse(HeaderHighlight); + var headerHighlight = Enum.Parse(HeaderHighlight); if (Id == Guid.Empty) { diff --git a/src/Panoramic/ViewModels/Widgets/Checklist/ChecklistViewModel.cs b/src/Panoramic/ViewModels/Widgets/Checklist/ChecklistViewModel.cs index 8c86401..dd8ab52 100644 --- a/src/Panoramic/ViewModels/Widgets/Checklist/ChecklistViewModel.cs +++ b/src/Panoramic/ViewModels/Widgets/Checklist/ChecklistViewModel.cs @@ -8,6 +8,7 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media; +using Panoramic.Data; using Panoramic.Models.Domain.Checklist; using Panoramic.Services; using Panoramic.Services.Search; @@ -37,7 +38,7 @@ public ChecklistViewModel(IEventHub eventHub, ISearchService searchService, Disp _titleDefaultForeground = ResourceUtil.WidgetForeground; _titleCompletedForeground = ResourceUtil.HighlightedForeground; _taskDueDateBackground = ResourceUtil.HighlightedBackground; - _taskDueDateOverdueBackground = ResourceUtil.GetBrushFromPage("PanoramicTaskOverdueBackgroundBrush", page); + _taskDueDateOverdueBackground = ResourceUtil.HighlightBrushes[HighlightColor.Red]; _taskDueDateAlmostDueBackground = ResourceUtil.GetBrushFromPage("PanoramicTaskAlmostDueBackgroundBrush", page); _eventHub = eventHub; @@ -55,7 +56,7 @@ public ChecklistViewModel(IEventHub eventHub, ISearchService searchService, Disp _widget.TaskAdded += TaskAdded; _widget.TaskCompleted += TaskCompleted; - HeaderBackgroundBrush = ResourceUtil.WidgetHeaderBrushes[widget.HeaderHighlight]; + HeaderBackgroundBrush = ResourceUtil.HighlightBrushes[widget.HeaderHighlight]; Title = widget.Title; SetViewModel(); diff --git a/src/Panoramic/ViewModels/Widgets/LinkCollection/LinkCollectionSettingsViewModel.cs b/src/Panoramic/ViewModels/Widgets/LinkCollection/LinkCollectionSettingsViewModel.cs index 62dc5df..b52dd40 100644 --- a/src/Panoramic/ViewModels/Widgets/LinkCollection/LinkCollectionSettingsViewModel.cs +++ b/src/Panoramic/ViewModels/Widgets/LinkCollection/LinkCollectionSettingsViewModel.cs @@ -47,7 +47,7 @@ public void AttachValidationHandler(EventHandler handler) public async Task SubmitAsync() { - var headerHighlight = Enum.Parse(HeaderHighlight); + var headerHighlight = Enum.Parse(HeaderHighlight); if (Id == Guid.Empty) { diff --git a/src/Panoramic/ViewModels/Widgets/LinkCollection/LinkCollectionViewModel.cs b/src/Panoramic/ViewModels/Widgets/LinkCollection/LinkCollectionViewModel.cs index a760992..a2f42a5 100644 --- a/src/Panoramic/ViewModels/Widgets/LinkCollection/LinkCollectionViewModel.cs +++ b/src/Panoramic/ViewModels/Widgets/LinkCollection/LinkCollectionViewModel.cs @@ -33,7 +33,7 @@ public LinkCollectionViewModel(IEventHub eventHub, ISearchService searchService, _widget = widget; - HeaderBackgroundBrush = ResourceUtil.WidgetHeaderBrushes[widget.HeaderHighlight]; + HeaderBackgroundBrush = ResourceUtil.HighlightBrushes[widget.HeaderHighlight]; Title = widget.Title; SetViewModel(); diff --git a/src/Panoramic/ViewModels/Widgets/Note/NoteSettingsViewModel.cs b/src/Panoramic/ViewModels/Widgets/Note/NoteSettingsViewModel.cs index bb8d328..0155a77 100644 --- a/src/Panoramic/ViewModels/Widgets/Note/NoteSettingsViewModel.cs +++ b/src/Panoramic/ViewModels/Widgets/Note/NoteSettingsViewModel.cs @@ -60,7 +60,7 @@ public void AttachValidationHandler(EventHandler handler) public async Task SubmitAsync() { var size = double.Parse(FontSize); - var headerHighlight = Enum.Parse(HeaderHighlight); + var headerHighlight = Enum.Parse(HeaderHighlight); if (Id == Guid.Empty) { diff --git a/src/Panoramic/ViewModels/Widgets/Note/NoteViewModel.cs b/src/Panoramic/ViewModels/Widgets/Note/NoteViewModel.cs index b869942..6876195 100644 --- a/src/Panoramic/ViewModels/Widgets/Note/NoteViewModel.cs +++ b/src/Panoramic/ViewModels/Widgets/Note/NoteViewModel.cs @@ -28,7 +28,7 @@ public NoteViewModel(IStorageService storageService, NoteWidget widget) _widget = widget; - HeaderBackgroundBrush = ResourceUtil.WidgetHeaderBrushes[widget.HeaderHighlight]; + HeaderBackgroundBrush = ResourceUtil.HighlightBrushes[widget.HeaderHighlight]; ReloadFiles(); diff --git a/src/Panoramic/ViewModels/Widgets/RecentLinks/RecentLinksSettingsViewModel.cs b/src/Panoramic/ViewModels/Widgets/RecentLinks/RecentLinksSettingsViewModel.cs index a017164..b6bcce3 100644 --- a/src/Panoramic/ViewModels/Widgets/RecentLinks/RecentLinksSettingsViewModel.cs +++ b/src/Panoramic/ViewModels/Widgets/RecentLinks/RecentLinksSettingsViewModel.cs @@ -53,7 +53,7 @@ public void AttachValidationHandler(EventHandler handler) public async Task SubmitAsync() { - var headerHighlight = Enum.Parse(HeaderHighlight); + var headerHighlight = Enum.Parse(HeaderHighlight); if (Id == Guid.Empty) { diff --git a/src/Panoramic/ViewModels/Widgets/RecentLinks/RecentLinksViewModel.cs b/src/Panoramic/ViewModels/Widgets/RecentLinks/RecentLinksViewModel.cs index e431742..80090a6 100644 --- a/src/Panoramic/ViewModels/Widgets/RecentLinks/RecentLinksViewModel.cs +++ b/src/Panoramic/ViewModels/Widgets/RecentLinks/RecentLinksViewModel.cs @@ -43,7 +43,7 @@ public RecentLinksViewModel( _widget = widget; - HeaderBackgroundBrush = ResourceUtil.WidgetHeaderBrushes[widget.HeaderHighlight]; + HeaderBackgroundBrush = ResourceUtil.HighlightBrushes[widget.HeaderHighlight]; Title = widget.Title; SetViewModel();