Merge branch 'avalonia' of https://github.com/SECTL/SecRandom into avalonia

Author: lrsgzs

.github/workflows/Build.yml

@@ -78,10 +78,10 @@ jobs:
           dotnet-quality: preview
 
       - name: 还原依赖
-        run: dotnet restore SecRandom.slnx
+        run: dotnet restore SecRandom.sln
 
       - name: 构建
-        run: dotnet build SecRandom.slnx -c Release --no-restore
+        run: dotnet build SecRandom.sln -c Release --no-restore
 
       - name: 检测测试项目
         shell: bash
@@ -95,7 +95,7 @@ jobs:
 
       - name: 运行测试
         if: env.HAS_TESTS == 'true'
-        run: dotnet test SecRandom.slnx -c Release --no-build
+        run: dotnet test SecRandom.sln -c Release --no-build
 
   version:
     name: 解析版本
@@ -181,7 +181,7 @@ jobs:
 
       - name: 发布
         run: >
-          dotnet publish src/SecRandom.Avalonia/SecRandom.Avalonia.csproj
+          dotnet publish SecRandom.Desktop/SecRandom.Desktop.csproj
           -c Release
           -r ${{ matrix.rid }}
           --self-contained true
@@ -222,11 +222,11 @@ jobs:
           mkdir -p "$pkgroot/usr/share/icons/hicolor/256x256/apps"
 
           cp -a "artifacts/SecRandom-${{ matrix.rid }}/." "$pkgroot/usr/lib/secrandom/"
-          chmod +x "$pkgroot/usr/lib/secrandom/SecRandom" || true
+          chmod +x "$pkgroot/usr/lib/secrandom/SecRandom.Desktop" || true
 
           cat > "$pkgroot/usr/bin/secrandom" << 'EOF'
           #!/bin/sh
-          exec /usr/lib/secrandom/SecRandom "$@"
+          exec /usr/lib/secrandom/SecRandom.Desktop "$@"
           EOF
           chmod +x "$pkgroot/usr/bin/secrandom"
 
@@ -240,8 +240,8 @@ jobs:
           Terminal=false
           EOF
 
-          if [ -f "src/SecRandom.Avalonia/Assets/icon/secrandom-icon-paper.png" ]; then
-            cp "src/SecRandom.Avalonia/Assets/icon/secrandom-icon-paper.png" "$pkgroot/usr/share/icons/hicolor/256x256/apps/secrandom.png"
+          if [ -f "resources/secrandom-icon-paper.png" ]; then
+            cp "resources/secrandom-icon-paper.png" "$pkgroot/usr/share/icons/hicolor/256x256/apps/secrandom.png"
           fi
 
           cat > "$pkgroot/DEBIAN/control" << EOF
@@ -271,7 +271,7 @@ jobs:
           mkdir -p "$work/bundle/SecRandom.app/Contents/Resources"
 
           cp -a "artifacts/SecRandom-${{ matrix.rid }}/." "$work/bundle/SecRandom.app/Contents/MacOS/"
-          chmod +x "$work/bundle/SecRandom.app/Contents/MacOS/SecRandom" || true
+          chmod +x "$work/bundle/SecRandom.app/Contents/MacOS/SecRandom.Desktop" || true
 
           cat > "$work/bundle/SecRandom.app/Contents/Info.plist" << EOF
           <?xml version="1.0" encoding="UTF-8"?>
@@ -283,15 +283,15 @@ jobs:
             <key>CFBundleIdentifier</key><string>top.sectl.secrandom</string>
             <key>CFBundleVersion</key><string>${version_no_v}</string>
             <key>CFBundleShortVersionString</key><string>${version_no_v}</string>
-            <key>CFBundleExecutable</key><string>SecRandom</string>
+            <key>CFBundleExecutable</key><string>SecRandom.Desktop</string>
             <key>CFBundlePackageType</key><string>APPL</string>
             <key>LSMinimumSystemVersion</key><string>11.0</string>
             <key>CFBundleIconFile</key><string>AppIcon</string>
           </dict>
           </plist>
           EOF
 
-          icon_png="src/SecRandom.Avalonia/Assets/icon/secrandom-icon-paper.png"
+          icon_png="resources/secrandom-icon-paper.png"
           if [ -f "$icon_png" ]; then
             iconset="$work/AppIcon.iconset"
             mkdir -p "$iconset"

SecRandom.Desktop/SecRandom.Desktop.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <!--If you are willing to use platform-specific APIs, use conditional compilation.

SecRandom/App.axaml.cs

@@ -135,16 +135,23 @@ public static void ShowMainWindow()
 
     public static void ShowSettingsWindow()
     {
+        if (SettingsWindow is { IsVisible: true })
+        {
+            SettingsWindow.Activate();
+            return;
+        }
+        
         if (SettingsWindow is not { IsLoaded: true })
         {
             SettingsWindow = new MainWindow
             {
                 Content = IAppHost.GetService<SettingsView>(),
                 Title = "SecRandom"
             };
+            SettingsWindow.Closed += (_, _) => SettingsWindow = null;
         }
 
         SettingsWindow.Show();
         SettingsWindow.Activate();
     }
-}
+}

SecRandom/Views/MainView.axaml.cs

@@ -33,6 +33,7 @@ public MainView()
 
         NavigationFrame.NavigationPageFactory = this;
         BuildNavigationMenuItems();
+        SelectNavigationItemById(DefaultMainPageId);
 
         RenderOptions.SetTextRenderingMode(this, TextRenderingMode.Antialias);
         RenderOptions.SetBitmapInterpolationMode(this, BitmapInterpolationMode.HighQuality);
@@ -41,7 +42,10 @@ public MainView()
 
     private void OnLoaded(object? sender, RoutedEventArgs e)
     {
-        SelectNavigationItemById(DefaultMainPageId);
+        if (ViewModel.SelectedPageInfo is null)
+        {
+            SelectNavigationItemById(DefaultMainPageId);
+        }
 
         if (Content is not Control element || _isAdornerAdded)
         {
@@ -139,4 +143,4 @@ private void TogglePaneButton_OnClick(object? sender, RoutedEventArgs e)
 
         return IAppHost.Host!.Services.GetKeyedService<UserControl>(info.Id);
     }
-}
+}

SecRandom/Views/SettingsView.axaml.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
@@ -33,6 +33,7 @@ public SettingsView()
 
         NavigationFrame.NavigationPageFactory = this;
         BuildNavigationMenuItems();
+        SelectNavigationItemById(DefaultMainPageId);
 
         RenderOptions.SetTextRenderingMode(this, TextRenderingMode.Antialias);
         RenderOptions.SetBitmapInterpolationMode(this, BitmapInterpolationMode.HighQuality);
@@ -41,7 +42,10 @@ public SettingsView()
 
     private void OnLoaded(object? sender, RoutedEventArgs e)
     {
-        SelectNavigationItemById(DefaultMainPageId);
+        if (ViewModel.SelectedPageInfo is null)
+        {
+            SelectNavigationItemById(DefaultMainPageId);
+        }
 
         if (Content is not Control element || _isAdornerAdded)
         {
@@ -128,4 +132,4 @@ private void TogglePaneButton_OnClick(object? sender, RoutedEventArgs e)
 
         return IAppHost.Host!.Services.GetKeyedService<UserControl>(info.Id);
     }
-}
+}