Init | 3.0

Author: kitUIN

ShadowViewer.Plugin.Local

@@ -1,12 +1,15 @@
-using System;
+using CustomExtensions.WinUI;
 using Microsoft.UI.Xaml;
 using Microsoft.Windows.AppLifecycle;
+using ShadowObservableConfig.Json;
+using ShadowObservableConfig.Yaml;
+using ShadowPluginLoader.WinUI;
+using ShadowViewer.Sdk.Configs;
 using ShadowViewer.Sdk.Helpers;
+using System;
 using Windows.ApplicationModel.Activation;
 using Windows.Storage;
-using CustomExtensions.WinUI;
-using ShadowObservableConfig.Json;
-using ShadowObservableConfig.Yaml;
+using DryIoc;
 
 namespace ShadowViewer
 {
@@ -22,6 +25,8 @@ public App()
                     new JsonConfigLoader(),
                     new YamlConfigLoader()
                 ]);
+
+            DiFactory.Services.RegisterInstance(CoreConfig.Load());
         }
 
         /// <summary>
@@ -37,10 +42,9 @@ protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs ar
             {
                 firstUri = data.Uri;
             }
+
             var startupWindow = new MainWindow(firstUri);
             WindowHelper.TrackWindow(startupWindow);
-            ThemeHelper.Initialize(startupWindow);
-             
             startupWindow.Activate();
             // // 导航
         }

ShadowViewer.Plugin.PluginManager

@@ -27,6 +27,6 @@ public object ConvertBack(object value, Type targetType, object parameter, strin
         {
             return (ElementTheme)value;
         }
-        return ThemeHelper.RootTheme;
+        return ElementTheme.Default;
     }
 }

ShadowViewer.Sdk

@@ -82,8 +82,7 @@ private async Task OnLoading()
         var sw = new Stopwatch();
         sw.Start();
 #endif
-        var coreConfig = CoreConfig.Load();
-        DiFactory.Services.RegisterInstance(coreConfig);
+        var coreConfig = DiFactory.Services.Resolve<CoreConfig>();
         Log.Information($"Debug Mode: {coreConfig.IsDebug}");
         InitDi();
         // 数据库

ShadowViewer/App.xaml.cs

@@ -52,7 +52,7 @@
                                        Description="{i18N:Locale Key=ThemeDescription}"
                                        Header="{i18N:Locale Key=Theme}">
                     <ComboBox
-                        SelectedIndex="{x:Bind helper:ThemeHelper.RootTheme, Mode=TwoWay, Converter={StaticResource ThemeComboConverter}}">
+                        SelectedIndex="{x:Bind CoreConfig.Theme, Mode=TwoWay, Converter={StaticResource ThemeComboConverter}}">
                         <ComboBoxItem Content="{i18N:Locale Key=Default}" Tag="Default" />
                         <ComboBoxItem Content="{i18N:Locale Key=Light}" Tag="Light" />
                         <ComboBoxItem Content="{i18N:Locale Key=Dark}" Tag="Dark" />

ShadowViewer/Converters/ThemeComboConverter.cs

@@ -35,8 +35,8 @@ protected override void OnNavigatedFrom(NavigationEventArgs e)
     {
     }
 
-    private async void LogButton_Click(object sender, RoutedEventArgs e)
+    private void LogButton_Click(object sender, RoutedEventArgs e)
     {
-        await CoreConfig.LaunchLogFolderAsync();
+        CoreConfig.LaunchLogFolder();
     }
 }

ShadowViewer/MainWindow.xaml.cs

@@ -96,7 +96,7 @@
 
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)' == 'Debug' Or '$(GithubAction)' == 'true'">
-	  <ProjectReference Include="..\ShadowViewer.Core\ShadowViewer.Core\ShadowViewer.Sdk.csproj" />
+	  <ProjectReference Include="..\ShadowViewer.Sdk\ShadowViewer.Sdk\ShadowViewer.Sdk.csproj" />
 	  <ProjectReference Include="..\ShadowViewer.Controls\ShadowViewer.Controls.TitleBar\ShadowViewer.Controls.TitleBar.csproj" />	
 	  <!-- <ProjectReference Include="..\ShadowViewer.Plugin.Local\ShadowViewer.Plugin.Local\ShadowViewer.Plugin.Local.csproj" /> -->
 	  <!-- <ProjectReference Include="..\ShadowViewer.Plugin.PluginManager\ShadowViewer.Plugin.PluginManager.csproj" /> -->