Format

kitUIN · kitUIN · commit c25261ebcf80 · 2025-12-15T16:31:30.000+08:00
diff --git a/ShadowViewer.Plugin.Local b/ShadowViewer.Plugin.Local
@@ -1 +1 @@
-Subproject commit 8932cf5529330633af56a8db73e658edd6412933
+Subproject commit da7dc4a9b140a86d92f5b81d3ff44162eb5ffd0a
diff --git a/ShadowViewer.Plugin.PluginManager b/ShadowViewer.Plugin.PluginManager
@@ -1 +1 @@
-Subproject commit 7351dfc3e045828922e12f6c53d98b98597fd5b3
+Subproject commit 1f7c3d48f39f592180fac7251eae438873a8132d
diff --git a/ShadowViewer.Sdk b/ShadowViewer.Sdk
@@ -1 +1 @@
-Subproject commit 549c2d8f0bc4eeb509c8ed6d7fb1b35e40eb51eb
+Subproject commit 8351202a8ee8c6ae032bfb04d701ff87766505c7
diff --git a/ShadowViewer/App.xaml.cs b/ShadowViewer/App.xaml.cs
@@ -1,5 +1,4 @@
 using CustomExtensions.WinUI;
-using Microsoft.UI.Xaml;
 using Microsoft.Windows.AppLifecycle;
 using ShadowObservableConfig.Json;
 using ShadowObservableConfig.Yaml;
@@ -13,7 +12,7 @@
 
 namespace ShadowViewer
 {
-    public partial class App : Application
+    public partial class App
     {
         public App()
         {
diff --git a/ShadowViewer/Converters/ThemeComboConverter.cs b/ShadowViewer/Converters/ThemeComboConverter.cs
@@ -1,7 +1,6 @@
 ﻿using System;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Data;
-using ShadowViewer.Sdk.Helpers;
 
 namespace ShadowViewer.Converters;
 /// <summary>
diff --git a/ShadowViewer/MainWindow.xaml.cs b/ShadowViewer/MainWindow.xaml.cs
@@ -21,7 +21,6 @@
 using ShadowPluginLoader.WinUI.Config;
 using ShadowViewer.Plugin.Local;
 using ShadowViewer.Plugin.PluginManager;
-using ShadowViewer.Plugin.PluginManager.Configs;
 using ShadowViewer.Sdk.Configs;
 
 namespace ShadowViewer;
diff --git a/ShadowViewer/Pages/ComicPage.xaml b/ShadowViewer/Pages/ComicPage.xaml
diff --git a/ShadowViewer/Pages/ComicPage.xaml.cs b/ShadowViewer/Pages/ComicPage.xaml.cs
diff --git a/ShadowViewer/Pages/DownloadPage.xaml b/ShadowViewer/Pages/DownloadPage.xaml
diff --git a/ShadowViewer/Pages/DownloadPage.xaml.cs b/ShadowViewer/Pages/DownloadPage.xaml.cs
diff --git a/ShadowViewer/Pages/NavigationPage.xaml.cs b/ShadowViewer/Pages/NavigationPage.xaml.cs
@@ -14,11 +14,10 @@
 using ShadowViewer.Sdk.Services;
 using ShadowViewer.ViewModels;
 using ShadowViewer.Services;
-using ShadowViewer.Sdk.Controls;
 
 namespace ShadowViewer.Pages
 {
-    public sealed partial class NavigationPage : ShadowPage
+    public sealed partial class NavigationPage
     {
         public static ILogger Logger { get; } = Log.ForContext<NavigationPage>();
         private NavigationViewModel ViewModel { get; } = DiFactory.Services.Resolve<NavigationViewModel>();
diff --git a/ShadowViewer/Pages/SettingsPage.xaml.cs b/ShadowViewer/Pages/SettingsPage.xaml.cs
@@ -1,19 +1,13 @@
-using System;
-using System.IO;
-using Windows.Storage;
 using DryIoc;
 using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Navigation;
 using ShadowPluginLoader.WinUI;
 using ShadowViewer.Sdk.Configs;
-using ShadowViewer.Sdk.Extensions;
-using ShadowViewer.Sdk.Helpers;
 using ShadowViewer.ViewModels;
 
 namespace ShadowViewer.Pages;
 
-public sealed partial class SettingsPage : Page
+public sealed partial class SettingsPage
 {
     private SettingsViewModel ViewModel { get; } = DiFactory.Services.Resolve<SettingsViewModel>();
     private CoreConfig CoreConfig { get; } = DiFactory.Services.Resolve<CoreConfig>();
diff --git a/ShadowViewer/Pages/ShadowTitleBar.xaml b/ShadowViewer/Pages/ShadowTitleBar.xaml
@@ -8,7 +8,6 @@
     xmlns:controls="using:ShadowViewer.Controls"
     xmlns:i18N="using:ShadowViewer.I18n"
     xmlns:interfaces="using:ShadowViewer.Sdk.Models.Interfaces"
-    xmlns:settings="using:ShadowViewer.Sdk.Settings"
     xmlns:converters="using:ShadowViewer.Converters"
     x:Name="RootElement"
     mc:Ignorable="d">
diff --git a/ShadowViewer/Pages/ShadowTitleBar.xaml.cs b/ShadowViewer/Pages/ShadowTitleBar.xaml.cs
@@ -17,7 +17,7 @@ namespace ShadowViewer.Pages;
 /// <summary>
 /// 
 /// </summary>
-public sealed partial class ShadowTitleBar : UserControl
+public sealed partial class ShadowTitleBar
 {
     /// <summary>
     /// 
diff --git a/ShadowViewer/Pages/UserPage.xaml b/ShadowViewer/Pages/UserPage.xaml
diff --git a/ShadowViewer/Pages/UserPage.xaml.cs b/ShadowViewer/Pages/UserPage.xaml.cs
diff --git a/ShadowViewer/Program.cs b/ShadowViewer/Program.cs
@@ -52,7 +52,6 @@ private static bool DecideRedirection()
     {
         var isRedirect = false;
         var args = AppInstance.GetCurrent().GetActivatedEventArgs();
-        var kind = args.Kind;
         var keyInstance = AppInstance.FindOrRegisterForKey("SingleShadowViewer");
 
         if (keyInstance.IsCurrent)
@@ -104,7 +103,7 @@ public static void RedirectActivationTo(AppActivationArguments args,
         const uint infinite = 0xFFFFFFFF;
         _ = CoWaitForMultipleObjects(
             camoDefault, infinite, 1,
-            [_redirectEventHandle], out var handleIndex);
+            [_redirectEventHandle], out _);
 
         // Bring the window to the foreground
         var process = Process.GetProcessById((int)keyInstance.ProcessId);
diff --git a/ShadowViewer/Services/CallableService.cs b/ShadowViewer/Services/CallableService.cs
@@ -12,7 +12,7 @@ namespace ShadowViewer.Services;
 /// <summary>
 /// 触发器服务类
 /// </summary>
-internal partial class CallableService(ILogger logger) : ICallableService
+internal class CallableService(ILogger logger) : ICallableService
 {
     /// <summary>
     /// Logger
diff --git a/ShadowViewer/Services/NavigateService.cs b/ShadowViewer/Services/NavigateService.cs
@@ -7,7 +7,6 @@
 using ShadowViewer.Pages;
 using ShadowViewer.Sdk.Args;
 using ShadowViewer.Sdk.Helpers;
-using ShadowViewer.Sdk.Responders;
 using ShadowViewer.Sdk.Services;
 
 namespace ShadowViewer.Services;
diff --git a/ShadowViewer/ShadowViewer.csproj b/ShadowViewer/ShadowViewer.csproj
@@ -24,7 +24,7 @@
 	  <AppxPackageDir>..\AppPackages\</AppxPackageDir>
 	  <NoWarn>MSB3277</NoWarn>
 	  <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
-	  <LangVersion>12</LangVersion>
+	  <LangVersion>preview</LangVersion>
 	  <PublishReadyToRun>false</PublishReadyToRun>
 	  <DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
 	  <PackageCertificateKeyFile>ShadowViewer_TemporaryKey.pfx</PackageCertificateKeyFile>
diff --git a/ShadowViewer/ViewModels/NavigationViewModel.cs b/ShadowViewer/ViewModels/NavigationViewModel.cs
@@ -2,10 +2,8 @@
 using System.Linq;
 using CommunityToolkit.Mvvm.ComponentModel;
 using ShadowPluginLoader.WinUI.Enums;
-using Serilog;
 using ShadowViewer.Sdk.Responders;
 using ShadowViewer.Sdk.Models.Interfaces;
-using ShadowViewer.Sdk.Services;
 using ShadowViewer.Sdk;
 using ShadowViewer.Sdk.Helpers;
 using ShadowViewer.Sdk.Utils;
@@ -14,18 +12,12 @@ namespace ShadowViewer.ViewModels;
 
 public partial class NavigationViewModel : ObservableObject
 {
-    private ILogger Logger { get; }
-    private ICallableService Caller { get; }
     private PluginLoader PluginService { get; }
 
     /// <summary />
-    /// <param name="callableService"></param>
     /// <param name="pluginService"></param>
-    /// <param name="logger"></param>
-    public NavigationViewModel(ICallableService callableService, PluginLoader pluginService, ILogger logger)
+    public NavigationViewModel(PluginLoader pluginService)
     {
-        Logger = logger;
-        Caller = callableService;
         PluginService = pluginService;
     }
 
@@ -116,10 +108,6 @@ public void ReloadItems(string pluginId, PluginStatus status)
                     DeleteFooterMenuItems(item1);
                 break;
             }
-            default:
-            {
-                break;
-            }
         }
     }
 }
diff --git a/ShadowViewer/ViewModels/SettingsViewModel.cs b/ShadowViewer/ViewModels/SettingsViewModel.cs
@@ -1,13 +1,8 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using DryIoc;
-using Serilog;
 using ShadowPluginLoader.WinUI;
-using ShadowPluginLoader.WinUI.Services;
-using ShadowViewer.Sdk;
-using ShadowViewer.Sdk.Configs;
 using ShadowViewer.Sdk.Models.Interfaces;
-using ShadowViewer.Sdk.Services;
 using System;
 using System.Collections.ObjectModel;
 using System.Threading.Tasks;
@@ -23,17 +18,10 @@ public partial class SettingsViewModel : ObservableObject
     {
         #region DI
 
-        private ICallableService Caller { get; }
-        private ILogger Logger { get; }
-        private PluginLoader PluginService { get; }
-
-        public SettingsViewModel(ICallableService callableService, PluginLoader pluginService, ILogger logger)
+        public SettingsViewModel()
         {
-            Caller = callableService;
-            PluginService = pluginService;
             var v = Package.Current.Id.Version;
             Version = $"v{v.Major}.{v.Minor}.{v.Build}.{v.Revision}";
-            Logger = logger;
             InitSettingsFolders();
         }
 
diff --git a/ShadowViewer/ViewModels/TitleBarViewModel.cs b/ShadowViewer/ViewModels/TitleBarViewModel.cs
@@ -13,7 +13,6 @@
 using ShadowViewer.Sdk.Responders;
 using ShadowViewer.Sdk.Services;
 using ShadowViewer.Sdk.Utils;
-using ShadowViewer.I18n;
 using ShadowViewer.Models;
 
 namespace ShadowViewer.ViewModels;
@@ -23,15 +22,15 @@ public partial class TitleBarViewModel : ObservableObject
     /// <summary>
     /// 历史记录
     /// </summary>
-    public ObservableCollection<IHistory> HistoryCollection { get; } = new();
+    public ObservableCollection<IHistory> HistoryCollection { get; } = [];
 
     [Autowired] public PluginLoader PluginService { get; }
     [Autowired] public ICallableService Caller { get; }
     [Autowired] public INavigateService NavigateService { get; }
 
     [ObservableProperty]
-    private string
-        subTitle = ""; // = CoreSettings.Instance.IsDebug ? ResourcesHelper.GetString(ResourceKey.Debug) : "";
+    public partial string SubTitle { get; set; } = ""; 
+    // = CoreSettings.Instance.IsDebug ? ResourcesHelper.GetString(ResourceKey.Debug) : "";
 
 
     /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using CustomExtensions.WinUI;`
`2`		`-using Microsoft.UI.Xaml;`
`3`	`2`	`using Microsoft.Windows.AppLifecycle;`
`4`	`3`	`using ShadowObservableConfig.Json;`
`5`	`4`	`using ShadowObservableConfig.Yaml;`
`@@ -13,7 +12,7 @@`
`13`	`12`
`14`	`13`	`namespace ShadowViewer`
`15`	`14`	`{`
`16`		`- public partial class App : Application`
	`15`	`+ public partial class App`
`17`	`16`	`{`
`18`	`17`	`public App()`
`19`	`18`	`{`