From ecd019dd6b0c286a6cf223cf598bc1fc57dd4279 Mon Sep 17 00:00:00 2001 From: Jack251970 <1160210343@qq.com> Date: Tue, 8 Apr 2025 15:56:54 +0800 Subject: [PATCH] Move ThemeData class to SharedModels --- Flow.Launcher.Core/Resource/Theme.cs | 1 + Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs | 6 +++--- Flow.Launcher.Plugin/{ => SharedModels}/ThemeData.cs | 2 +- .../SettingPages/ViewModels/SettingsPaneThemeViewModel.cs | 1 + Plugins/Flow.Launcher.Plugin.Sys/ThemeSelector.cs | 1 + 5 files changed, 7 insertions(+), 4 deletions(-) rename Flow.Launcher.Plugin/{ => SharedModels}/ThemeData.cs (97%) diff --git a/Flow.Launcher.Core/Resource/Theme.cs b/Flow.Launcher.Core/Resource/Theme.cs index 4cf9ce7a7..f3eba7ba7 100644 --- a/Flow.Launcher.Core/Resource/Theme.cs +++ b/Flow.Launcher.Core/Resource/Theme.cs @@ -16,6 +16,7 @@ using Flow.Launcher.Infrastructure; using Flow.Launcher.Infrastructure.Logger; using Flow.Launcher.Infrastructure.UserSettings; using Flow.Launcher.Plugin; +using Flow.Launcher.Plugin.SharedModels; using Microsoft.Win32; namespace Flow.Launcher.Core.Resource diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs index 64bdcec34..1090a3a1e 100644 --- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs +++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs @@ -1,6 +1,4 @@ -using Flow.Launcher.Plugin.SharedModels; -using JetBrains.Annotations; -using System; +using System; using System.Collections.Generic; using System.ComponentModel; using System.IO; @@ -8,6 +6,8 @@ using System.Runtime.CompilerServices; using System.Threading; using System.Threading.Tasks; using System.Windows; +using Flow.Launcher.Plugin.SharedModels; +using JetBrains.Annotations; namespace Flow.Launcher.Plugin { diff --git a/Flow.Launcher.Plugin/ThemeData.cs b/Flow.Launcher.Plugin/SharedModels/ThemeData.cs similarity index 97% rename from Flow.Launcher.Plugin/ThemeData.cs rename to Flow.Launcher.Plugin/SharedModels/ThemeData.cs index 1888be65e..6a5e54f55 100644 --- a/Flow.Launcher.Plugin/ThemeData.cs +++ b/Flow.Launcher.Plugin/SharedModels/ThemeData.cs @@ -1,6 +1,6 @@ using System; -namespace Flow.Launcher.Plugin; +namespace Flow.Launcher.Plugin.SharedModels; /// /// Theme data model diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs index 58cf3a314..f78704ef2 100644 --- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs +++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs @@ -12,6 +12,7 @@ using Flow.Launcher.Helper; using Flow.Launcher.Infrastructure; using Flow.Launcher.Infrastructure.UserSettings; using Flow.Launcher.Plugin; +using Flow.Launcher.Plugin.SharedModels; using Flow.Launcher.ViewModel; using ModernWpf; using ThemeManagerForColorSchemeSwitch = ModernWpf.ThemeManager; diff --git a/Plugins/Flow.Launcher.Plugin.Sys/ThemeSelector.cs b/Plugins/Flow.Launcher.Plugin.Sys/ThemeSelector.cs index 4b99efe3b..feacc3f99 100644 --- a/Plugins/Flow.Launcher.Plugin.Sys/ThemeSelector.cs +++ b/Plugins/Flow.Launcher.Plugin.Sys/ThemeSelector.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Linq; +using Flow.Launcher.Plugin.SharedModels; namespace Flow.Launcher.Plugin.Sys {