Merge pull request #33 from Crequency/dev=main

[Pull Request] Adapt to new project structure

.github/workflows/mirror.yml

@@ -0,0 +1,24 @@
+name: Mirror Repo
+
+on:
+    push:
+        branches:
+            - "*"
+    workflow_dispatch:
+
+jobs:
+    mirror-repo:
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Mirror
+              uses: Yikun/hub-mirror-action@master
+              with:
+                  src: github/Crequency
+                  dst: gitee/Crequency
+                  dst_key: ${{ secrets.GITEE_SYNC_KEY }}
+                  dst_token: ${{ secrets.GITEE_SYNC_TOKEN }}
+                  account_type: org
+                  static_list: "KitX-Dashboard"
+                  force_update: true
+                  debug: true

KitX Dashboard/App.axaml.cs

@@ -23,7 +23,7 @@ namespace KitX.Dashboard;
 public partial class App : Application
 {
     public static readonly Bitmap DefaultIcon = new(
-        $"{ConstantTable.AssetsPath}{Instances.ConfigManager.AppConfig.App.CoverIconFileName}".GetFullPath()
+        $"{ConstantTable.AssetsPath}{ConfigManager.Instance.AppConfig.App.CoverIconFileName}".GetFullPath()
     );
 
     private AppViewModel? viewModel;
@@ -32,21 +32,34 @@ public override void Initialize()
     {
         AvaloniaXamlLoader.Load(this);
 
+        LoadTheme();
+
         LoadLanguage();
 
         CalculateThemeColor();
 
-        InitLiveCharts();
+        InitializeLiveCharts();
 
         // Must construct after `LoadLanguage()` function.
         viewModel = new();
 
         DataContext = viewModel;
     }
 
+    private void LoadTheme()
+    {
+        RequestedThemeVariant = ConfigManager.Instance.AppConfig.App.Theme switch
+        {
+            "Light" => ThemeVariant.Light,
+            "Dark" => ThemeVariant.Dark,
+            "Follow" => ThemeVariant.Default,
+            _ => ThemeVariant.Default
+        };
+    }
+
     private void LoadLanguage()
     {
-        var config = Instances.ConfigManager.AppConfig;
+        var config = ConfigManager.Instance.AppConfig;
         var lang = config.App.AppLanguage;
         var backup_lang = config.App.SurpportLanguages.Keys.First();
         var path = $"{ConstantTable.LanguageFilePath}/{lang}.axaml".GetFullPath();
@@ -100,26 +113,28 @@ private void LoadLanguage()
 
     private static void CalculateThemeColor()
     {
-        Color c = Color.Parse(Instances.ConfigManager.AppConfig.App.ThemeColor);
+        Color c = Color.Parse(ConfigManager.Instance.AppConfig.App.ThemeColor);
 
         if (Current is not null)
         {
-            Current.Resources["ThemePrimaryAccent"] =
-                new SolidColorBrush(new Color(c.A, c.R, c.G, c.B));
+            Current.Resources["ThemePrimaryAccent"] = new SolidColorBrush(new Color(c.A, c.R, c.G, c.B));
+
             for (char i = 'A'; i <= 'E'; ++i)
             {
-                Current.Resources[$"ThemePrimaryAccentTransparent{i}{i}"] =
-                    new SolidColorBrush(new Color((byte)(170 + (i - 'A') * 17), c.R, c.G, c.B));
+                Current.Resources[$"ThemePrimaryAccentTransparent{i}{i}"] = new SolidColorBrush(
+                    new Color((byte)(170 + (i - 'A') * 17), c.R, c.G, c.B)
+                );
             }
             for (int i = 1; i <= 9; ++i)
             {
-                Current.Resources[$"ThemePrimaryAccentTransparent{i}{i}"] =
-                    new SolidColorBrush(new Color((byte)(i * 10 + i), c.R, c.G, c.B));
+                Current.Resources[$"ThemePrimaryAccentTransparent{i}{i}"] = new SolidColorBrush(
+                    new Color((byte)(i * 10 + i), c.R, c.G, c.B)
+                );
             }
         }
     }
 
-    private static void InitLiveCharts()
+    private static void InitializeLiveCharts()
     {
         {
             var usingLightTheme = Current?.ActualThemeVariant == ThemeVariant.Light;
@@ -155,7 +170,7 @@ public override void OnFrameworkInitializationCompleted()
             };
         }
 
-        if (Instances.ConfigManager.AppConfig.App.ShowAnnouncementWhenStart)
+        if (ConfigManager.Instance.AppConfig.App.ShowAnnouncementWhenStart)
             new Thread(async () =>
             {
                 try

KitX Dashboard/AppFramework.cs

@@ -47,11 +47,9 @@ public static void RunFramework()
         if (File.Exists("./dump.log".GetFullPath()))
             File.Delete("./dump.log".GetFullPath());
 
-        Instances.Initialize();
-
-        Instances.ConfigManager.AppConfig.App.RanTime++;
+        ConfigManager.Instance.AppConfig.App.RanTime++;
 
-        var config = Instances.ConfigManager.AppConfig;
+        var config = ConfigManager.Instance.AppConfig;
 
         ProcessStartupArguments();
 
@@ -94,6 +92,8 @@ public static void RunFramework()
 
         #endregion
 
+        Instances.Initialize();
+
         #region Initialize global exception catching
 
         AppDomain.CurrentDomain.UnhandledException += (sender, e) =>
@@ -237,20 +237,19 @@ public static void EnsureExit()
 
                 Instances.FileWatcherManager?.Clear();
 
-                Instances.ConfigManager.SaveAll();
+                ConfigManager.Instance.SaveAll();
 
                 Log.CloseAndFlush();
 
                 if (Instances.WebManager is not null)
                     await Instances.WebManager.CloseAsync(new());
-                Instances.WebManager?.Dispose();
 
                 Instances.ActivitiesDataBase?.Commit();
                 Instances.ActivitiesDataBase?.Dispose();
 
                 ConstantTable.Running = false;
 
-                Thread.Sleep(Instances.ConfigManager.AppConfig.App.LastBreakAfterExit);
+                Thread.Sleep(ConfigManager.Instance.AppConfig.App.LastBreakAfterExit);
 
                 Environment.Exit(0);
             }

KitX Dashboard/Configuration/AppConfig.cs

@@ -142,10 +142,6 @@ public class Config_SettingsPage
 
             public string SelectedViewName { get; set; } = "View_General";
 
-            public bool MicaAreaExpanded { get; set; } = true;
-
-            public bool MicaToolTipIsOpen { get; set; } = true;
-
             public bool PaletteAreaExpanded { get; set; } = false;
 
             public bool WebRelatedAreaExpanded { get; set; } = true;
@@ -180,6 +176,8 @@ public class Config_Web
 
         public List<string>? AcceptedNetworkInterfaces { get; set; } = null;
 
+        public int? UserSpecifiedDevicesServerPort { get; set; } = null;
+
         public int? UserSpecifiedPluginsServerPort { get; set; } = null;
 
         public int UdpPortSend { get; set; } = 23404;

KitX Dashboard/Configuration/ConfigFetcher.cs

@@ -1,6 +1,8 @@
-namespace KitX.Dashboard.Configuration;
+using KitX.Dashboard.Managers;
+
+namespace KitX.Dashboard.Configuration;
 
 public class ConfigFetcher
 {
-    public static AppConfig AppConfig => Instances.ConfigManager.AppConfig;
+    public static AppConfig AppConfig => ConfigManager.Instance.AppConfig;
 }

KitX Dashboard/Configuration/PluginsConfig.cs

@@ -5,5 +5,5 @@ namespace KitX.Dashboard.Configuration;
 
 public class PluginsConfig : ConfigBase
 {
-    public List<Plugin> Plugins { get; set; } = [];
+    public List<PluginInstallation> Plugins { get; set; } = [];
 }

KitX Dashboard/ConstantTable.cs

@@ -29,6 +29,8 @@ internal static class ConstantTable
 
     internal static string ThirdPartLicenseFilePath => thirdPartLicenseFilePath.GetFullPath();
 
+    internal static int DevicesServerPort = -1;
+
     internal static int PluginsServerPort = -1;
 
     internal static bool Running = true;
@@ -37,9 +39,11 @@ internal static class ConstantTable
 
     internal static bool IsMainMachine = false;
 
-    internal static bool SkipNetworkSystemOnStartup = false;
+    internal static string? MainMachineAddress;
 
-    internal static int DevicesServerPort = -1;
+    internal static int MainMachinePort = -1;
+
+    internal static bool SkipNetworkSystemOnStartup = false;
 
     internal static DateTime ServerBuildTime = new();
 

KitX Dashboard/Converters/ActivityStatusConverters.cs

@@ -1,9 +1,8 @@
 using Avalonia.Data.Converters;
 using Common.Activity;
+using Material.Icons;
 using System;
 using System.Globalization;
-using Material.Icons;
-using Avalonia.Media;
 
 namespace KitX.Dashboard.Converters;
 

KitX Dashboard/Converters/DeviceInfoConverters.cs

@@ -0,0 +1,42 @@
+using Avalonia.Data.Converters;
+using KitX.Shared.CSharp.Device;
+using System;
+using System.Globalization;
+
+namespace KitX.Dashboard.Converters;
+
+public class PluginsServerAddressConverter : IValueConverter
+{
+    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (value is not DeviceInfo info) return null;
+
+        return $"{info.Device.IPv4}:{info.PluginsServerPort}";
+    }
+
+    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) => throw new NotImplementedException();
+}
+
+public class DevicesServerAddressConverter : IValueConverter
+{
+    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (value is not DeviceInfo info) return null;
+
+        return $"{info.Device.IPv4}:{info.DevicesServerPort}";
+    }
+
+    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) => throw new NotImplementedException();
+}
+
+public class DeviceLastOnLineTimeConverter : IValueConverter
+{
+    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (value is not DateTime time) return null;
+
+        return time.ToLocalTime().ToString("yyyy.MM.dd HH:mm:ss");
+    }
+
+    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) => throw new NotImplementedException();
+}

KitX Dashboard/Converters/OperatingSystemUtils.cs

@@ -0,0 +1,66 @@
+using Avalonia.Data.Converters;
+using KitX.Shared.CSharp.Device;
+using Material.Icons;
+using System;
+using System.Globalization;
+
+namespace KitX.Dashboard.Converters;
+
+public static class OperatingSystemUtils
+{
+    public static OperatingSystems GetOSType()
+    {
+        if (OperatingSystem.IsAndroid())
+            return OperatingSystems.Android;
+        if (OperatingSystem.IsBrowser())
+            return OperatingSystems.Browser;
+        if (OperatingSystem.IsFreeBSD())
+            return OperatingSystems.FreeBSD;
+        if (OperatingSystem.IsIOS())
+            return OperatingSystems.IOS;
+        if (OperatingSystem.IsLinux())
+            return OperatingSystems.Linux;
+        if (OperatingSystem.IsMacCatalyst())
+            return OperatingSystems.MacCatalyst;
+        if (OperatingSystem.IsMacOS())
+            return OperatingSystems.MacOS;
+        if (OperatingSystem.IsTvOS())
+            return OperatingSystems.TvOS;
+        if (OperatingSystem.IsWatchOS())
+            return OperatingSystems.WatchOS;
+        if (OperatingSystem.IsWindows())
+            return OperatingSystems.Windows;
+
+        return OperatingSystems.Unknown;
+    }
+}
+
+public class OperatingSystemToIconConverter : IValueConverter
+{
+    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (value is null) return null;
+
+        var os = (OperatingSystems)value;
+
+        return os switch
+        {
+            OperatingSystems.Unknown => MaterialIconKind.QuestionMarkCircle,
+            OperatingSystems.Android => MaterialIconKind.Android,
+            OperatingSystems.Browser => MaterialIconKind.MicrosoftEdge,
+            OperatingSystems.FreeBSD => MaterialIconKind.Freebsd,
+            OperatingSystems.IOS => MaterialIconKind.AppleIos,
+            OperatingSystems.Linux => MaterialIconKind.Linux,
+            OperatingSystems.MacCatalyst => MaterialIconKind.Apple,
+            OperatingSystems.MacOS => MaterialIconKind.AppleKeyboardCommand,
+            OperatingSystems.TvOS => MaterialIconKind.Apple,
+            OperatingSystems.WatchOS => MaterialIconKind.Apple,
+            OperatingSystems.Windows => MaterialIconKind.MicrosoftWindows,
+            OperatingSystems.IoT => MaterialIconKind.Chip,
+            OperatingSystems.AppleVisionOS => MaterialIconKind.Apple,
+            _ => MaterialIconKind.QuestionMarkCircle,
+        };
+    }
+
+    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) => throw new NotImplementedException();
+}

KitX Dashboard/Converters/PluginInfoConverters.cs

@@ -1,4 +1,5 @@
 using Avalonia.Data.Converters;
+using KitX.Dashboard.Managers;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -15,7 +16,7 @@ public class PluginMultiLanguagePropertyConverter : IValueConverter
         if (value is Dictionary<string, string> dict)
         {
             var result = dict.TryGetValue(
-                Instances.ConfigManager.AppConfig.App.AppLanguage,
+                ConfigManager.Instance.AppConfig.App.AppLanguage,
                 out var lang
             ) ? lang : dict.Values.First();