🚧 Misc

at System.Globalization.IdnMapping.IcuGetAsciiCore(String unicodeString, Char* unicode, Int32 count)
   at System.Globalization.IdnMapping.GetAscii(String unicode, Int32 index, Int32 count)
   at System.Security.Cryptography.X509Certificates.SubjectAlternativeNameBuilder.AddDnsName(String dnsName)
   at BD.WTTS.Services.Implementation.CertGenerator.Add(SubjectAlternativeNameBuilder builder, String name)

.github/workflows/CI.yml

@@ -68,19 +68,19 @@ jobs:
         run: dotnet --info
 
       - name: Build BD.WTTS.Client.AppHost
-        run: dotnet build -c Release src\BD.WTTS.Client.AppHost\BD.WTTS.Client.AppHost.csproj --nologo -v q /property:WarningLevel=1 
+        run: dotnet build -c Release src\BD.WTTS.Client.AppHost\BD.WTTS.Client.AppHost.csproj --nologo -v q --property:WarningLevel=1;DebugType=pdbonly 
 
       - name: Build BD.WTTS.Client.Plugins.Accelerator.ReverseProxy
-        run: dotnet build -c Release src\BD.WTTS.Client.Plugins.Accelerator.ReverseProxy\BD.WTTS.Client.Plugins.Accelerator.ReverseProxy.csproj --nologo -v q /property:WarningLevel=1 
+        run: dotnet build -c Release src\BD.WTTS.Client.Plugins.Accelerator.ReverseProxy\BD.WTTS.Client.Plugins.Accelerator.ReverseProxy.csproj --nologo -v q --property:WarningLevel=1;DebugType=pdbonly 
 
       - name: Build BD.WTTS.Client.Avalonia.App
-        run: dotnet build -c Release src\BD.WTTS.Client.Avalonia.App\BD.WTTS.Client.Avalonia.App.csproj --nologo -v q /property:WarningLevel=1 
+        run: dotnet build -c Release src\BD.WTTS.Client.Avalonia.App\BD.WTTS.Client.Avalonia.App.csproj --nologo -v q --property:WarningLevel=1;DebugType=pdbonly 
 
       - name: Build BD.WTTS.Client.Avalonia.Designer.HostApp
-        run: dotnet build -c Release src\BD.WTTS.Client.Avalonia.Designer.HostApp\BD.WTTS.Client.Avalonia.Designer.HostApp.csproj --nologo -v q /property:WarningLevel=1 
+        run: dotnet build -c Release src\BD.WTTS.Client.Avalonia.Designer.HostApp\BD.WTTS.Client.Avalonia.Designer.HostApp.csproj --nologo -v q --property:WarningLevel=1;DebugType=pdbonly 
 
       - name: Test
-        run: dotnet test src/BD.WTTS.UnitTest/BD.WTTS.UnitTest.csproj -c Release -p:GeneratePackageOnBuild=false --nologo -v q /property:WarningLevel=1 
+        run: dotnet test src/BD.WTTS.UnitTest/BD.WTTS.UnitTest.csproj -c Release -p:GeneratePackageOnBuild=false --nologo -v q --property:WarningLevel=1;DebugType=pdbonly 
 
 #  release:
 #    name: Release

WattToolkit.sln

@@ -89,22 +89,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TFM", "TFM", "{3B0CFC2A-F61
 		src\TFM_NETX_WITH_WINDOWS.props = src\TFM_NETX_WITH_WINDOWS.props
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArchiSteamFarm.Library", "ref\ArchiSteamFarm\ArchiSteamFarm.Library\ArchiSteamFarm.Library.csproj", "{6981D5CA-837C-47F8-9568-E3BD451A6C68}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibAPNG", "ref\Avalonia.Image2\LibAPNG\LibAPNG.csproj", "{47B2D651-8EE0-4C05-B451-F2DA264DD5B3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Gif", "ref\Avalonia.Image2\Avalonia.Gif\Avalonia.Gif.csproj", "{5D6D28A7-1CD8-4C30-A0E4-1F8ACF389A29}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ArchiSteamFarm", "ArchiSteamFarm", "{A3A703CC-F22E-40CE-9064-6DF3E55DD556}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Avalonia", "Avalonia", "{E5732454-7455-4078-88A2-E727DCC64D26}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReverseProxy", "ReverseProxy", "{4FA9B783-ADAE-46F6-9AAD-ED32F1839F13}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Steam", "Steam", "{99D97BD4-3F51-48BC-8BD2-647F6D268BB0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Titanium.Web.Proxy", "ref\Titanium-Web-Proxy\src\Titanium.Web.Proxy\Titanium.Web.Proxy.csproj", "{826716DC-65C2-456A-BB6D-5FDEC423E4E6}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gameloop.Vdf", "ref\Gameloop.Vdf\Gameloop.Vdf\Gameloop.Vdf.csproj", "{FE91B979-FE45-43F3-B9C4-430F2360FDDF}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steam4NET", "ref\Steam4NET\Steam4NET\Steam4NET.csproj", "{C8792BC7-33C0-41D4-97F6-684AD4B0B6A5}"
@@ -224,6 +216,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steam++", "src\BD.WTTS.Clie
 EndProject
 Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "BD.WTTS.Client.AppHost.Bridge.Package", "src\BD.WTTS.Client.AppHost.Bridge.Package\BD.WTTS.Client.AppHost.Bridge.Package.wapproj", "{27795C79-2994-4514-8656-BA34FCEE8901}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArchiSteamFarm", "ref\ArchiSteamFarm\ArchiSteamFarm\ArchiSteamFarm.csproj", "{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -238,26 +232,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Debug|ARM.Build.0 = Debug|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Debug|x64.Build.0 = Debug|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Debug|x86.Build.0 = Debug|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Release|ARM.ActiveCfg = Release|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Release|ARM.Build.0 = Release|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Release|ARM64.Build.0 = Release|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Release|x64.ActiveCfg = Release|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Release|x64.Build.0 = Release|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Release|x86.ActiveCfg = Release|Any CPU
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68}.Release|x86.Build.0 = Release|Any CPU
 		{47B2D651-8EE0-4C05-B451-F2DA264DD5B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{47B2D651-8EE0-4C05-B451-F2DA264DD5B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{47B2D651-8EE0-4C05-B451-F2DA264DD5B3}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -298,26 +272,6 @@ Global
 		{5D6D28A7-1CD8-4C30-A0E4-1F8ACF389A29}.Release|x64.Build.0 = Release|Any CPU
 		{5D6D28A7-1CD8-4C30-A0E4-1F8ACF389A29}.Release|x86.ActiveCfg = Release|Any CPU
 		{5D6D28A7-1CD8-4C30-A0E4-1F8ACF389A29}.Release|x86.Build.0 = Release|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Debug|ARM.Build.0 = Debug|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Debug|x64.Build.0 = Debug|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Debug|x86.Build.0 = Debug|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Release|ARM.ActiveCfg = Release|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Release|ARM.Build.0 = Release|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Release|ARM64.Build.0 = Release|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Release|x64.ActiveCfg = Release|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Release|x64.Build.0 = Release|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Release|x86.ActiveCfg = Release|Any CPU
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6}.Release|x86.Build.0 = Release|Any CPU
 		{FE91B979-FE45-43F3-B9C4-430F2360FDDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FE91B979-FE45-43F3-B9C4-430F2360FDDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FE91B979-FE45-43F3-B9C4-430F2360FDDF}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -1308,6 +1262,26 @@ Global
 		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|x86.ActiveCfg = Release|x86
 		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|x86.Build.0 = Release|x86
 		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|x86.Deploy.0 = Release|x86
+		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Debug|ARM.Build.0 = Debug|Any CPU
+		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Debug|x64.Build.0 = Debug|Any CPU
+		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Debug|x86.Build.0 = Debug|Any CPU
+		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Release|ARM.ActiveCfg = Release|Any CPU
+		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Release|ARM.Build.0 = Release|Any CPU
+		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Release|ARM64.Build.0 = Release|Any CPU
+		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Release|x64.ActiveCfg = Release|Any CPU
+		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Release|x64.Build.0 = Release|Any CPU
+		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Release|x86.ActiveCfg = Release|Any CPU
+		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1317,14 +1291,10 @@ Global
 		{202026AE-894E-4E18-9846-B0739CDBE3E9} = {46259E8D-32A4-4065-953D-D6F835B57A28}
 		{F776BA87-0B9B-4C3C-B04F-688DCC021BF1} = {202026AE-894E-4E18-9846-B0739CDBE3E9}
 		{3B0CFC2A-F61B-4000-AC12-6E0AFB5C475C} = {46259E8D-32A4-4065-953D-D6F835B57A28}
-		{6981D5CA-837C-47F8-9568-E3BD451A6C68} = {A3A703CC-F22E-40CE-9064-6DF3E55DD556}
 		{47B2D651-8EE0-4C05-B451-F2DA264DD5B3} = {E5732454-7455-4078-88A2-E727DCC64D26}
 		{5D6D28A7-1CD8-4C30-A0E4-1F8ACF389A29} = {E5732454-7455-4078-88A2-E727DCC64D26}
-		{A3A703CC-F22E-40CE-9064-6DF3E55DD556} = {90E88965-DB90-4B49-94F5-6D2965491988}
 		{E5732454-7455-4078-88A2-E727DCC64D26} = {90E88965-DB90-4B49-94F5-6D2965491988}
-		{4FA9B783-ADAE-46F6-9AAD-ED32F1839F13} = {90E88965-DB90-4B49-94F5-6D2965491988}
 		{99D97BD4-3F51-48BC-8BD2-647F6D268BB0} = {90E88965-DB90-4B49-94F5-6D2965491988}
-		{826716DC-65C2-456A-BB6D-5FDEC423E4E6} = {4FA9B783-ADAE-46F6-9AAD-ED32F1839F13}
 		{FE91B979-FE45-43F3-B9C4-430F2360FDDF} = {99D97BD4-3F51-48BC-8BD2-647F6D268BB0}
 		{C8792BC7-33C0-41D4-97F6-684AD4B0B6A5} = {99D97BD4-3F51-48BC-8BD2-647F6D268BB0}
 		{123F532B-4178-4D03-A4EE-2A8F3E01433F} = {99D97BD4-3F51-48BC-8BD2-647F6D268BB0}
@@ -1378,6 +1348,7 @@ Global
 		{35676E23-8E54-4785-A75B-98EB0650596B} = {99D97BD4-3F51-48BC-8BD2-647F6D268BB0}
 		{26D8AA24-2ACE-4167-BC2B-117B9BB76AA4} = {5541B406-4A9A-4AC8-AA77-CE14E133DB80}
 		{27795C79-2994-4514-8656-BA34FCEE8901} = {5541B406-4A9A-4AC8-AA77-CE14E133DB80}
+		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B} = {99D97BD4-3F51-48BC-8BD2-647F6D268BB0}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {567F588F-E95C-4286-8B30-DB3B2200221C}

build/linux/environment_check.sh

@@ -40,14 +40,14 @@ else
         fi
     }
     certutil_Init() {
-        certutil -d sql:$HOME/.pki/nssdb -L
+        certutil -d $HOME/.pki/nssdb -L
         ret=$?
         if [ $ret -ne 0 ]; then
-            echo "即将初始化 certutil sql:\$HOME/.pki/nssdb"
-            mkdir -p sql:$HOME/.pki
-            mkdir -p sql:$HOME/.pki/nssdb
-            chmod 700 sql:$HOME/.pki/nssdb
-            certutil -d sql:$HOME/.pki/nssdb -N --empty-password
+            echo "即将初始化 certutil \$HOME/.pki/nssdb"
+            mkdir -p $HOME/.pki
+            mkdir -p $HOME/.pki/nssdb
+            chmod 700 $HOME/.pki/nssdb
+            certutil -d $HOME/.pki/nssdb -N --empty-password
         else
             echo "certutil nssdb 正常"
         fi

build/linux/init_desktop.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+#添加桌面文件
+run_path=$(dirname "$0")
+base_path="$(dirname "$run_path")"
+exec_name="Steam++"
+rm -rf "$HOME/Desktop/Watt Toolkit.desktop" 2>/dev/null
+echo "#!/usr/bin/env xdg-open
+[Desktop Entry]
+Name=Watt Toolkit
+Exec=$base_path/$exec_name.sh
+Icon=$base_path/Icons/Watt-Toolkit.png
+Terminal=false
+Type=Application
+StartupNotify=false" >"$HOME/Desktop/Watt Toolkit.desktop"
+chmod +x "$HOME/Desktop/Watt Toolkit.desktop"
+exit 0

build/linux/installWattToolkit.desktop

@@ -0,0 +1,8 @@
+#!/usr/bin/env xdg-open
+[Desktop Entry]
+Name=°²×° Watt Toolkit
+Exec=curl https://steampp.net/pkg/latest/steamdeck/install.sh | bash -s --
+Icon=steamdeck-gaming-return
+Terminal=true
+Type=Application
+StartupNotify=false

build/linux/offline_init.sh

@@ -0,0 +1,208 @@
+#!/bin/bash
+run_path=$(dirname "$0")
+base_path="$(dirname "$run_path")"
+mkdir -p "$base_path"
+cd "$base_path" || exit 1
+appVer_path="$base_path/WattToolkit.AppVer"
+exec_name="Steam++"
+tar_name="WattToolkit.tgz"
+tar_path="$base_path/$tar_name"
+app_name="Watt Toolkit"
+PROCESS_NAMES=("$exec_name" "$app_name")
+export LC_ALL=en_US.UTF-8
+Install_certutil() {
+    # 判断发行版类型
+    if command -v certutil &>/dev/null; then
+        echo "certutil 工具已安装。"
+    else
+        echo "证书导入以及验证需要使用 certutil 工具。"
+        # 判断包管理器
+        if command -v apt &>/dev/null; then
+            # 使用 apt (Debian/Ubuntu)
+            sudo apt update
+            sudo apt install -y libnss3-tools
+        elif command -v dnf &>/dev/null; then
+            # 使用 dnf (Fedora)
+            sudo dnf install -y nss-tools
+        elif command -v yum &>/dev/null; then
+            # 使用 yum (CentOS/Red Hat)
+            sudo yum install -y nss-tools
+        elif command -v pacman &>/dev/null; then
+            # 使用 pacman (Arch Linux)
+            # sudo pacman -S nss
+            echo "请手动安装 certutil 工具。"
+            exit 1
+        else
+            echo "请手动安装 certutil 工具。"
+            exit 1
+        fi
+        echo "certutil 工具已安装。"
+    fi
+}
+certutil_Init() {
+    certutil -d $HOME/.pki/nssdb -L
+    ret=$?
+    if [ $ret -ne 0 ]; then
+        echo "即将初始化 certutil \$HOME/.pki/nssdb"
+        mkdir -p $HOME/.pki
+        mkdir -p $HOME/.pki/nssdb
+        chmod 700 $HOME/.pki/nssdb
+        certutil -d $HOME/.pki/nssdb -N --empty-password
+    else
+        echo "certutil nssdb 正常"
+    fi
+}
+Install_jq() {
+    # Check if jq is already installed
+    if command -v jq &>/dev/null; then
+        echo "jq 工具已安装。"
+    else
+        echo "jq 用来解析版本更新。"
+        # Check the package manager
+        if command -v apt &>/dev/null; then
+            # Using apt (Debian/Ubuntu)
+            sudo apt update
+            sudo apt install -y jq
+        elif command -v dnf &>/dev/null; then
+            # Using dnf (Fedora)
+            sudo dnf install -y jq
+        elif command -v yum &>/dev/null; then
+            # Using yum (CentOS/Red Hat)
+            sudo yum install -y jq
+        elif command -v pacman &>/dev/null; then
+            # Using pacman (Arch Linux)
+            sudo pacman -S jq
+        else
+            echo "请手动安装 jq 工具。"
+            exit 1
+        fi
+        echo "请手动安装 jq 工具。"
+    fi
+}
+Install_zenity() {
+    # 判断发行版类型
+    if command -v zenity &>/dev/null; then
+        echo "zenity 工具已安装。"
+    else
+        echo "安装过程需要 zenity 工具。"
+        # 判断包管理器
+        if command -v apt &>/dev/null; then
+            # 使用 apt (Debian/Ubuntu)
+            sudo apt update
+            sudo apt install -y zenity
+        elif command -v dnf &>/dev/null; then
+            # 使用 dnf (Fedora)
+            sudo dnf install -y zenity
+        elif command -v yum &>/dev/null; then
+            # 使用 yum (CentOS/Red Hat)
+            sudo yum install -y zenity
+        elif command -v pacman &>/dev/null; then
+            # 使用 pacman (Arch Linux)
+            # sudo pacman -S zenity
+            echo "请手动安装 zenity 工具。"
+            exit 1
+        else
+            echo "请手动安装 zenity 工具。"
+            exit 1
+        fi
+        echo "zenity 工具已安装。"
+    fi
+}
+
+Show_Run() {
+    local param1=$1
+    # 显示提示框，询问是否运行程序
+    zenity --question --text="$1" --width=400
+
+    # 获取上一个命令的退出码
+    response=$?
+
+    if [ $response -eq 0 ]; then
+        echo "程序已启动。"
+        exit 0 &
+        # 用户点击了 "运行" 按钮，启动程序
+        /bin/sh -c "$base_path/$exec_name.sh"
+    else
+        # 用户点击了 "关闭" 按钮，退出脚本
+        exit 0
+    fi
+}
+Kill_Process() {
+    # 尝试的次数
+    Kill_MAX_RETRIES=3
+
+    # 循环尝试终止进程
+    for process_name in "${PROCESS_NAMES[@]}"; do
+        kill_retry=1
+        while [ $kill_retry -le $Kill_MAX_RETRIES ]; do
+            pid=$(pgrep "$process_name")
+            if [ -n "$pid" ]; then
+                echo "尝试 $kill_retry: 进程 $process_name 正在运行中。正在终止..."
+                kill $pid
+                sleep 2
+            else
+                break
+            fi
+            kill_retry=$((kill_retry + 1))
+        done
+    done
+
+    for process_name in "${PROCESS_NAMES[@]}"; do
+        # 检查是否成功终止进程
+        if pgrep -x "$process_name" >/dev/null; then
+            echo "无法终止程序 $process_name。尝试次数已达上限。"
+            exit 1
+        else
+            echo "程序 $process_name 已成功终止。"
+        fi
+    done
+
+}
+Install_certutil
+Install_zenity
+Install_jq
+certutil_Init
+Kill_Process
+
+dotnet_exec="$dotnet_path/dotnet/dotnet"
+if [ -x "$dotnet_exec" ]; then
+    echo "文件具有执行权限。"
+else
+    chmod +x "$dotnet_exec"
+fi
+chmod +x "$base_path/$exec_name.sh"
+# xdg-icon-resource install "$base_path/Icons/Watt-Toolkit.png" --size 128 Watt-Toolkit
+InitDesktop() {
+    while true; do
+        # 使用 zenity 提示用户选择安装路径或使用默认路径
+        choice=$(zenity --list --radiolist --title="请选择要添加到的位置" --column="选择" --column="路径" TRUE "$HOME/.local/share/applications/" FALSE "$HOME/Desktop")
+
+        # 检查用户输入
+        if [ "$choice" == "$HOME/.local/share/applications/" ]; then
+            target_dir="$HOME/.local/share/applications/"
+            break
+        elif [ "$choice" == "$HOME/Desktop" ]; then
+            target_dir="$HOME/Desktop/"
+            break
+        else
+            echo "无效选项，请输入 1 或 2。"
+        fi
+    done
+    #添加桌面文件
+    rm -rf "$target_dir/Watt Toolkit.desktop" 2>/dev/null
+    echo "#!/usr/bin/env xdg-open
+[Desktop Entry]
+Name=Watt Toolkit
+Exec=$base_path/$exec_name.sh
+Icon=$base_path/Icons/Watt-Toolkit.png
+Terminal=false
+Type=Application
+StartupNotify=false" >"$target_dir/Watt Toolkit.desktop"
+    chmod +x "$target_dir/Watt Toolkit.desktop"
+
+}
+InitDesktop
+# update-desktop-database ~/.local/share/applications
+#运行程序
+Show_Run "下载安装完成，是否启动程序？"
+exit 0

build/linux/online_install.sh

@@ -1,7 +1,38 @@
 #!/bin/bash
-base_path="$HOME/WattToolkit"
-mkdir -p "$base_path"
-cd "$base_path" || exit 1
+# 设置默认的 base_path 参数
+default_base_path="$HOME/WattToolkit"
+base_path="$default_base_path"
+
+# 循环直到用户输入有效路径或直接回车
+while true; do
+    # 使用 zenity 提示用户选择安装路径或使用默认路径
+    custom_base_path=$(zenity --entry --title="安装路径" --text="请输入安装路径（默认为 $default_base_path，不输入则使用默认路径）")
+
+    # 如果用户提供了自定义路径，则使用该路径
+    if [ -n "$custom_base_path" ]; then
+        base_path="$custom_base_path"
+        break
+    elif [ -z "$custom_base_path" ]; then
+        # 用户直接回车，使用默认路径
+        break
+    else
+        # 用户输入无效路径，重新提示
+        echo "无效路径，请重新输入。"
+    fi
+done
+
+# 创建安装路径
+mkdir -p "$base_path" || {
+    echo "无法创建安装路径 $base_path，请检查权限或路径是否正确。"
+    exit 1
+}
+
+# 切换到安装路径
+cd "$base_path" || {
+    echo "无法切换到安装路径 $base_path，请检查权限或路径是否正确。"
+    exit 1
+}
+
 appVer_path="$base_path/WattToolkit.AppVer"
 exec_name="Steam++"
 tar_name="WattToolkit.tgz"
@@ -41,14 +72,14 @@ Install_certutil() {
     fi
 }
 certutil_Init() {
-    certutil -d sql:$HOME/.pki/nssdb -L
+    certutil -d $HOME/.pki/nssdb -L
     ret=$?
     if [ $ret -ne 0 ]; then
-        echo "即将初始化 certutil sql:\$HOME/.pki/nssdb"
-        mkdir -p sql:$HOME/.pki
-        mkdir -p sql:$HOME/.pki/nssdb
-        chmod 700 sql:$HOME/.pki/nssdb
-        certutil -d sql:$HOME/.pki/nssdb -N --empty-password
+        echo "即将初始化 certutil \$HOME/.pki/nssdb"
+        mkdir -p $HOME/.pki
+        mkdir -p $HOME/.pki/nssdb
+        chmod 700 $HOME/.pki/nssdb
+        certutil -d $HOME/.pki/nssdb -N --empty-password
     else
         echo "certutil nssdb 正常"
     fi
@@ -182,7 +213,9 @@ Get_NewVer() {
 
     sleep 1
     #本地版本 Hash
-    o_sha384=$(cat "AppVer")
+    if [ -f "AppVer" ]; then
+        o_sha384=$(cat "AppVer")
+    fi
     if [ -e "AppVer" ]; then
         if [ "${o_sha384,,}" = "${n_sha384,,}" ]; then
             Show_Run "已是最新版本，是否启动程序？"
@@ -326,17 +359,36 @@ Kill_Process
 #解压
 Decompression
 # xdg-icon-resource install "$base_path/Icons/Watt-Toolkit.png" --size 128 Watt-Toolkit
-#添加桌面文件
-rm -rf "$HOME/Desktop/Watt Toolkit.desktop" 2>/dev/null
-echo "#!/usr/bin/env xdg-open
+InitDesktop() {
+    while true; do
+        # 使用 zenity 提示用户选择安装路径或使用默认路径
+        choice=$(zenity --list --radiolist --title="请选择要添加到的位置" --column="选择" --column="路径" TRUE "$HOME/.local/share/applications/" FALSE "$HOME/Desktop")
+
+        # 检查用户输入
+        if [ "$choice" == "$HOME/.local/share/applications/" ]; then
+            target_dir="$HOME/.local/share/applications/"
+            break
+        elif [ "$choice" == "$HOME/Desktop" ]; then
+            target_dir="$HOME/Desktop/"
+            break
+        else
+            echo "无效选项，请输入 1 或 2。"
+        fi
+    done
+    #添加桌面文件
+    rm -rf "$target_dir/Watt Toolkit.desktop" 2>/dev/null
+    echo "#!/usr/bin/env xdg-open
 [Desktop Entry]
 Name=Watt Toolkit
 Exec=$base_path/$exec_name.sh
 Icon=$base_path/Icons/Watt-Toolkit.png
 Terminal=false
 Type=Application
-StartupNotify=false" >"$HOME/Desktop/Watt Toolkit.desktop"
-chmod +x "$HOME/Desktop/Watt Toolkit.desktop"
+StartupNotify=false" >"$target_dir/Watt Toolkit.desktop"
+    chmod +x "$target_dir/Watt Toolkit.desktop"
+
+}
+InitDesktop
 # update-desktop-database ~/.local/share/applications
 #运行程序
 Show_Run "下载安装完成，是否启动程序？"

build/linux/uninstall.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
-base_path="$HOME/WattToolkit"
-export LC_ALL=en_US.UTF-8
+run_path=$(dirname "$0")
+base_path="$(dirname "$run_path")"
 exec_name="Steam++"
 app_name="Watt Toolkit"
 AppData="$XDG_DATA_HOME/Steam++"
@@ -8,7 +8,37 @@ AppData_t="$HOME/.local/share/Steam++"
 Cache="$XDG_CACHE_HOME/Steam++"
 Cache_t="$HOME/.cache/Steam+"
 PROCESS_NAMES=("$exec_name" "$app_name")
+export LC_ALL=en_US.UTF-8
+#检查是否存在 Steam++.sh 避免卸载错误
+file_to_check="$base_path/Steam++.sh"
+folders_to_check=("dotnet" "modules" "native" "script" "assemblies")
+if [ -e "$file_to_check" ]; then
+    echo "文件 $file_to_check 存在"
+else
+    echo "文件 $file_to_check 不存在"
+    exit 1
+fi
 
+for folder in "${folders_to_check[@]}"; do
+    folder_path="$base_path/$folder"
+    if [ -d "$folder_path" ]; then
+        echo "文件夹 $folder_path 存在"
+    else
+        echo "文件夹 $folder_path 不存在"
+        exit 1
+    fi
+done
+echo "验证该文件夹是 $app_name 安装目录，请确认是否卸载。"
+
+read -p "所有文件和文件夹都存在，确认卸载吗？ (输入 'y' 确认): " confirmation
+
+if [ "${confirmation,,}" == "y" ]; then
+    echo "开始执行卸载操作"
+    # 在这里添加您的卸载操作
+else
+    echo "用户取消卸载操作"
+    exit 0
+fi
 Kill_Process() {
     # 尝试的次数
     Kill_MAX_RETRIES=3
@@ -42,19 +72,28 @@ Kill_Process() {
 }
 Kill_Process
 
-zenity --question --text="是否删除用户数据" --width=400
+zenity --question --text="是否删除证书?" --width=400
 # 获取上一个命令的退出码
-response=$?
+delCer=$?
 
-if [ $response -eq 0 ]; then
-    rm -rfq "$AppData" 2>/dev/null
-    rm -rfq "$AppData_t" 2>/dev/null
+if [ $delCer -eq 0 ]; then
+    certutil -D -d $HOME/.pki/nssdb -n "SteamTools"
+fi
+
+zenity --question --text="是否删除用户数据?" --width=400
+# 获取上一个命令的退出码
+delUserData=$?
+
+if [ $delUserData -eq 0 ]; then
+    rm -rf $AppData 2>/dev/null
+    rm -rf $AppData_t 2>/dev/null
+    certutil -D -d $HOME/.pki/nssdb -n "SteamTools"
 else
     echo "保留用户数据方便下次安装。"
     echo "如需删除可手动删除该目录:$AppData 或者 $AppData_t"
 fi
-rm -rfq "$Cache" 2>/dev/null
-rm -rfq "$Cache_t" 2>/dev/null
-rm -rfq "$base_path" 2>/dev/null
-rm -rfq "$HOME/Desktop/Watt Toolkit.desktop" 2>/dev/null
+rm -rf $Cache 2>/dev/null
+rm -rf $Cache_t 2>/dev/null
+rm -rf $base_path 2>/dev/null
+rm -rf "$HOME/Desktop/Watt Toolkit.desktop" 2>/dev/null
 zenity --info --text="卸载完成!" --width=300

build/macos/build.sh

@@ -10,11 +10,12 @@ Base_Path="/Users/moxiansheng/Documents/GitHub/SteamTools"
 App_Path="$Base_Path/src/BD.WTTS.Client.Avalonia.App"
 Publish_Path="bin/Release/Publish/assemblies"
 Plugins_Release_Path="bin/Release"
-CodesignKey_Name="mossimo CodesignKey"
+CodesignKey_Name="mossimo code"
 App_Modules_Path="$App_Path/$Publish_Path/modules"
 echo "编译主程序"
 cd "$App_Path"
-dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net7.0-macos -p:CreatePackage=false -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net8.0-macos -p:CreatePackage=false -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+
 rm -r "$App_Modules_Path"
 mkdir -p "$App_Modules_Path"
 echo "编译插件"
@@ -29,53 +30,67 @@ Copy_Plugins() {
 echo "编译加速插件"
 Plugins_Accelerator_Path="$Base_Path/src/BD.WTTS.Client.Plugins.Accelerator"
 cd "$Plugins_Accelerator_Path"
-dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net7.0-macos
-Copy_Plugins "$Plugins_Release_Path/net7.0-macos" "Accelerator" "BD.WTTS.Client.Plugins.Accelerator.dll"
+dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net8.0-macos
+Copy_Plugins "$Plugins_Release_Path/net8.0-macos" "Accelerator" "BD.WTTS.Client.Plugins.Accelerator.dll"
 
 Plugins_Accelerator_ReverseProxy_Path="$Base_Path/src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy"
 cd "$Plugins_Accelerator_ReverseProxy_Path"
 # 根据 Build_Mode 执行不同逻辑
 if [ "$Build_Mode" = "any" ]; then
-    dotnet publish -c Release -p:PublishDir="$Publish_Path/arm64" -f net7.0 -r osx-arm64 -p:PublishSingleFile=true --self-contained  -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
-    dotnet publish -c Release -p:PublishDir="$Publish_Path/x64" -f net7.0 -r osx-x64 -p:PublishSingleFile=true --self-contained  -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+    dotnet publish -c Release -p:PublishDir="$Publish_Path/arm64" -f net8.0 -r osx-arm64 -p:PublishSingleFile=true --self-contained -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+    dotnet publish -c Release -p:PublishDir="$Publish_Path/x64" -f net8.0 -r osx-x64 -p:PublishSingleFile=true --self-contained -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
     lipo -create "$Publish_Path/arm64/Steam++.Accelerator" "$Publish_Path/x64/Steam++.Accelerator" -output "$Publish_Path/Steam++.Accelerator"
     Copy_Plugins "$Publish_Path" "Accelerator" "Steam++.Accelerator"
 elif [ "$Build_Mode" = "arm64" ]; then
-    dotnet publish -c Release -p:PublishDir="$Publish_Path/arm64" -f net7.0 -r osx-arm64 -p:PublishSingleFile=true --self-contained  -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+    dotnet publish -c Release -p:PublishDir="$Publish_Path/arm64" -f net8.0 -r osx-arm64 -p:PublishSingleFile=true --self-contained -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
     Copy_Plugins "$Publish_Path/arm64" "Accelerator" "Steam++.Accelerator"
 elif [ "$Build_Mode" = "x64" ]; then
-    dotnet publish -c Release -p:PublishDir="$Publish_Path/x64" -f net7.0 -r osx-x64 -p:PublishSingleFile=true --self-contained  -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+    dotnet publish -c Release -p:PublishDir="$Publish_Path/x64" -f net8.0 -r osx-x64 -p:PublishSingleFile=true --self-contained -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
     Copy_Plugins "$Publish_Path/x64" "Accelerator" "Steam++.Accelerator"
 fi
 
 echo "编译令牌插件"
 Plugins_Authenticator_Path="$Base_Path/src/BD.WTTS.Client.Plugins.Authenticator"
 cd "$Plugins_Authenticator_Path"
-dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net7.0-macos  -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
-Copy_Plugins "$Plugins_Release_Path/net7.0-macos" "Authenticator" "BD.WTTS.Client.Plugins.Authenticator.dll"
+dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net8.0-macos -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+Copy_Plugins "$Plugins_Release_Path/net8.0-macos" "Authenticator" "BD.WTTS.Client.Plugins.Authenticator.dll"
 
 echo "编译账户插件"
 Plugins_GameAccount_Path="$Base_Path/src/BD.WTTS.Client.Plugins.GameAccount"
 cd "$Plugins_GameAccount_Path"
-dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net7.0-macos  -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
-Copy_Plugins "$Plugins_Release_Path/net7.0-macos" "GameAccount" "BD.WTTS.Client.Plugins.GameAccount.dll"
+dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net8.0-macos -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+Copy_Plugins "$Plugins_Release_Path/net8.0-macos" "GameAccount" "BD.WTTS.Client.Plugins.GameAccount.dll"
 
 echo "编译游戏库插件"
 Plugins_GameList_Path="$Base_Path/src/BD.WTTS.Client.Plugins.GameList"
 cd "$Plugins_GameList_Path"
-dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net7.0-macos  -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
-Copy_Plugins "$Plugins_Release_Path/net7.0-macos" "GameList" "BD.WTTS.Client.Plugins.GameList.dll"
+dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net8.0-macos -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+Copy_Plugins "$Plugins_Release_Path/net8.0-macos" "GameList" "BD.WTTS.Client.Plugins.GameList.dll"
 
 echo "复制插件到程序目录"
 cd "$App_Path"
 
 # 根据 Build_Mode 执行不同逻辑
 if [ "$Build_Mode" = "any" ]; then
-    cp -r "$App_Modules_Path" "$Plugins_Release_Path/net7.0-macos/Steam++.app/Contents/MonoBundle"
+    cp -r "$App_Modules_Path" "$Plugins_Release_Path/net8.0-macos/Steam++.app/Contents/MonoBundle"
 elif [ "$Build_Mode" = "arm64" ]; then
-    cp -r "$App_Modules_Path" "$Plugins_Release_Path/net7.0-macos/osx-arm64/Steam++.app/Contents/MonoBundle"
-    cp -r "$Plugins_Release_Path/net7.0-macos/Steam++.app/Contents/Resources" "$Plugins_Release_Path/net7.0-macos/Steam++.app/Contents"
+    cp -r "$App_Modules_Path" "$Plugins_Release_Path/net8.0-macos/osx-arm64/Steam++.app/Contents/MonoBundle"
+    cp -r "$Plugins_Release_Path/net8.0-macos/Steam++.app/Contents/Resources" "$Plugins_Release_Path/net8.0-macos/Steam++.app/Contents"
 elif [ "$Build_Mode" = "x64" ]; then
-    cp -r "$App_Modules_Path" "$Plugins_Release_Path/net7.0-macos/osx-x64/Steam++.app/Contents/MonoBundle"
-    cp -r "$Plugins_Release_Path/net7.0-macos/Steam++.app/Contents/Resources" "$Plugins_Release_Path/net7.0-macos/Steam++.app/Contents"
+    cp -r "$App_Modules_Path" "$Plugins_Release_Path/net8.0-macos/osx-x64/Steam++.app/Contents/MonoBundle"
+    cp -r "$Plugins_Release_Path/net8.0-macos/Steam++.app/Contents/Resources" "$Plugins_Release_Path/net8.0-macos/Steam++.app/Contents"
 fi
+
+echo "代码签名重新手动签名"
+App_Publish_Path="$App_Path/bin/Release/net8.0-macos/Steam++.app"
+# #代码签名重新手动签名
+codesign --remove-signature "$App_Publish_Path"
+codesign --remove-signature "$App_Publish_Path/Contents/MacOS/Steam++"
+dylibs=$(find "$App_Publish_Path/Contents/MonoBundle" -type f -name "*.dylib")
+for dylib in $dylibs; do
+    codesign --remove-signature "$dylib"
+    codesign -f -s "$CodesignKey_Name" "$dylib"
+done
+codesign -f -s   "$CodesignKey_Name" "$App_Publish_Path/Contents/MacOS/Steam++"
+codesign -f -s "$CodesignKey_Name" "$App_Publish_Path"
+sudo xattr -rd com.apple.quarantine "$App_Publish_Path"

build/settings_v4_app.json

@@ -212,6 +212,15 @@
           "Summary": "菜单排序",
           "IsRegionOrEndregion": null,
           "IsValueType": null
+        },
+        {
+          "TypeName": "string",
+          "PropertyName": "StartDefaultPageName",
+          "DefaultValue": "null",
+          "DefaultValueIsConst": true,
+          "Summary": "程序启动时默认页",
+          "IsRegionOrEndregion": null,
+          "IsValueType": null
         }
       ],
       "Usings": ""
@@ -487,6 +496,15 @@
           "Summary": "账号平台设置集合",
           "IsRegionOrEndregion": null,
           "IsValueType": null
+        },
+        {
+          "TypeName": "bool",
+          "PropertyName": "IsShowAccountName",
+          "DefaultValue": "false",
+          "DefaultValueIsConst": false,
+          "Summary": "是否显示账号用户名",
+          "IsRegionOrEndregion": null,
+          "IsValueType": null
         }
       ],
       "Usings": ""
@@ -498,7 +516,7 @@
         {
           "TypeName": "bool",
           "PropertyName": "GameInstalledFilter",
-          "DefaultValue": "true",
+          "DefaultValue": "false",
           "DefaultValueIsConst": true,
           "Summary": "已安装游戏筛选",
           "IsRegionOrEndregion": null,
@@ -943,6 +961,236 @@
         },
         {
           "Sharp": "endif"
+        },
+        {
+          "TypeName": "bool",
+          "PropertyName": "UseDoh",
+          "DefaultValue": "true",
+          "DefaultValueIsConst": true,
+          "Summary": "启用 DNS over HTTPS",
+          "IsRegionOrEndregion": null,
+          "IsValueType": null
+        },
+        {
+          "TypeName": "string",
+          "PropertyName": "CustomDohAddres",
+          "DefaultValue": "null",
+          "DefaultValueIsConst": true,
+          "Summary": "自定义 DNS over HTTPS 地址",
+          "IsRegionOrEndregion": null,
+          "IsValueType": null
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "AcceleratorTabsSelectedIndex",
+          "DefaultValue": "0",
+          "DefaultValueIsConst": false,
+          "Summary": "加速页面 Tab 选项卡选中下标",
+          "IsRegionOrEndregion": null,
+          "IsValueType": null
+        }
+      ],
+      "Usings": ""
+    },
+    "SteamIdleSettings": {
+      "ClassFilePath": "..\\src\\BD.WTTS.Client.Plugins.SteamIdleCard\\Settings",
+      "InterfaceFilePath": "..\\src\\BD.WTTS.Client.Plugins.SteamIdleCard\\Settings\\Abstractions",
+      "Properties": [
+        {
+          "TypeName": "TimeSpan",
+          "PropertyName": "IdleTime",
+          "DefaultValue": "TimeSpan.FromMinutes(6)",
+          "DefaultValueIsConst": false,
+          "Summary": "挂卡状态更新时间",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "IdleRule",
+          "PropertyName": "IdleRule",
+          "DefaultValue": "IdleRule.FastMode",
+          "DefaultValueIsConst": false,
+          "Summary": "运行规则",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "IdleSequentital",
+          "PropertyName": "IdleSequentital",
+          "DefaultValue": "IdleSequentital.Default",
+          "DefaultValueIsConst": false,
+          "Summary": "运行顺序",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "MaxIdleCount",
+          "DefaultValue": "30",
+          "DefaultValueIsConst": false,
+          "Summary": "最大并行运行游戏数量",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "double",
+          "PropertyName": "MinRunTime",
+          "DefaultValue": "2",
+          "DefaultValueIsConst": false,
+          "Summary": "最少游戏时间 hours",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "double",
+          "PropertyName": "SwitchTime",
+          "DefaultValue": "5000",
+          "DefaultValueIsConst": false,
+          "Summary": "自动切换游戏时间间隔 ms",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "double",
+          "PropertyName": "RefreshBadgesTime",
+          "DefaultValue": "6",
+          "DefaultValueIsConst": false,
+          "Summary": "自动刷新徽章数据时间间隔 min",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        }
+      ],
+      "Usings": ""
+    },
+    "ASFSettings": {
+      "ClassFilePath": "..\\src\\BD.WTTS.Client.Plugins.ArchiSteamFarmPlus\\Settings",
+      "InterfaceFilePath": "..\\src\\BD.WTTS.Client.Plugins.ArchiSteamFarmPlus\\Settings\\Abstractions",
+      "Properties": [
+        {
+          "TypeName": "string",
+          "PropertyName": "ArchiSteamFarmExePath",
+          "DefaultValue": "string.Empty",
+          "DefaultValueIsConst": false,
+          "Summary": "ASF 路径",
+          "IsRegionOrEndregion": null,
+          "IsValueType": false
+        },
+        {
+          "TypeName": "bool",
+          "PropertyName": "AutoRunArchiSteamFarm",
+          "DefaultValue": "false",
+          "DefaultValueIsConst": false,
+          "Summary": "程序启动时自动运行 ASF",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "bool",
+          "PropertyName": "CheckArchiSteamFarmExe",
+          "DefaultValue": "false",
+          "DefaultValueIsConst": false,
+          "Summary": "检查文件安全性",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "ConsoleMaxLineDefault",
+          "DefaultValue": "200",
+          "DefaultValueIsConst": true,
+          "Summary": "控制台默认最大行数",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "MinRangeConsoleMaxLine",
+          "DefaultValue": "DefaultConsoleMaxLineDefault",
+          "DefaultValueIsConst": true,
+          "Summary": "控制台默认最大行数范围最小值",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "MaxRangeConsoleMaxLine",
+          "DefaultValue": "5000",
+          "DefaultValueIsConst": true,
+          "Summary": "控制台默认最大行数范围最大值",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "ConsoleMaxLine",
+          "DefaultValue": "DefaultConsoleMaxLineDefault",
+          "DefaultValueIsConst": false,
+          "Summary": "控制台最大行数",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "ConsoleFontSizeDefault",
+          "DefaultValue": "14",
+          "DefaultValueIsConst": true,
+          "Summary": "",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "MinRangeConsoleFontSize",
+          "DefaultValue": "8",
+          "DefaultValueIsConst": true,
+          "Summary": "",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "MaxRangeConsoleFontSize",
+          "DefaultValue": "24",
+          "DefaultValueIsConst": true,
+          "Summary": "",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "ConsoleFontSize",
+          "DefaultValue": "DefaultConsoleFontSizeDefault",
+          "DefaultValueIsConst": false,
+          "Summary": "控制台字体大小",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "IPCPortIdValue",
+          "DefaultValue": "6242",
+          "DefaultValueIsConst": true,
+          "Summary": "",
+          "IsRegionOrEndregion": null,
+          "IsValueType": null
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "IPCPortId",
+          "DefaultValue": "DefaultIPCPortIdValue",
+          "DefaultValueIsConst": false,
+          "Summary": "IPC 端口号，默认值为 <see cref=\"DefaultIPCPortIdValue\" />",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "bool",
+          "PropertyName": "IPCPortOccupiedRandom",
+          "DefaultValue": "true",
+          "DefaultValueIsConst": false,
+          "Summary": "IPC 端口号被占用时是否随机一个未使用的端口号，默认值 <see langword=\"true\" />",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
         }
       ],
       "Usings": ""

src/AssemblyInfo.Constants.cs

@@ -3,25 +3,35 @@ namespace BD.WTTS;
 /// <summary>
 /// 提供用来获取应用程序信息（如版本号、说明、加载的程序集等）的属性。
 /// </summary>
+[Mobius3(
+"""
+Mobius.AssemblyInfo
+AssemblyInfo.cs
+AssemblyInfo.Version.cs
+AssemblyInfo.Version.NativeHost.cs
+AssemblyInfo.Version.Setup.Windows.cs
+""")]
 public static partial class AssemblyInfo
 {
+    const string Version2 = "3.0";
+
     /// <summary>
     /// 语义化应用程序版本
     /// https://semver.org/lang/zh-CN/
     /// </summary>
-    public const string Version = "3.0.0";
+    public const string Version = $"{Version2}.0";
 
     /// <summary>
     /// 预览版本号，范围 1~9，只增不减
     /// </summary>
-    const string ver_for_preview = "7";
+    const string ver_for_preview = "8";
 
     /// <summary>
     /// RC 版本号，范围 0~9，只增不减
     /// </summary>
-    const string ver_for_rc = "1";
+    const string ver_for_rc = "8";
 
-    public const string FileVersion = $"{Version}.{ver_for_rc}0{ver_for_preview}";
+    public const string FileVersion = $"{Version2}.{ver_for_rc}0{ver_for_preview}.0";
 
     //public const string InformationalVersion = Version;
     //public const string InformationalVersion = $"{Version}-preview.{ver_for_preview}";
@@ -144,4 +154,20 @@ false
 
 #endif
 
+}
+
+[AttributeUsage(AttributeTargets.All, Inherited = false)]
+sealed class Mobius3Attribute : Attribute
+{
+    public Mobius3Attribute()
+    {
+
+    }
+
+    public Mobius3Attribute(string str)
+    {
+
+    }
+
+    public bool Obsolete { get; set; }
 }

src/AssemblyInfo.Xaml.cs

@@ -1,3 +1,4 @@
+// Mobius Properties\XmlnsDefinition.cs
 #if (WINDOWS || MACCATALYST || MACOS || LINUX) && !(IOS || ANDROID)
 // C# 10 定义全局 using
 
@@ -22,6 +23,9 @@ global using Avalonia.Metadata;
 [assembly: XmlnsDefinition("https://steampp.net/ui", "BD.WTTS.Converters")]
 [assembly: XmlnsDefinition("https://steampp.net/ui", "BD.WTTS.Markup")]
 [assembly: XmlnsDefinition("https://steampp.net/ui", "BD.WTTS.Client.Resources")]
+[assembly: XmlnsDefinition("https://steampp.net/ui", "Mobius.Models")]
+[assembly: XmlnsDefinition("https://steampp.net/ui", "Mobius")]
+
 [assembly: XmlnsDefinition("https://steampp.net/services", "BD.WTTS.Services")]
 [assembly: XmlnsDefinition("https://steampp.net/services", "BD.WTTS.Plugins")]
 [assembly: XmlnsDefinition("https://steampp.net/services", "BD.WTTS.Plugins.Abstractions")]

src/Avalonia.Skia.Internals/IFontManagerImpl2.cs

@@ -38,9 +38,9 @@ public interface IFontManagerImpl2 : IFontManagerImpl
         return Impl.TryCreateGlyphTypeface(familyName, style, weight, stretch, out glyphTypeface);
     }
 
-    bool IFontManagerImpl.TryCreateGlyphTypeface(Stream stream, [NotNullWhen(returnValue: true)] out IGlyphTypeface? glyphTypeface)
+    bool IFontManagerImpl.TryCreateGlyphTypeface(Stream stream, FontSimulations fontSimulations, [NotNullWhen(returnValue: true)] out IGlyphTypeface? glyphTypeface)
     {
-        return Impl.TryCreateGlyphTypeface(stream, out glyphTypeface);
+        return Impl.TryCreateGlyphTypeface(stream, fontSimulations, out glyphTypeface);
     }
 
     //IGlyphTypeface IFontManagerImpl.CreateGlyphTypeface(Typeface typeface)

src/BD.WTTS.Client.AppHost.Bridge.Package/Package.appxmanifest

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 
 <Package
   xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
@@ -8,70 +8,67 @@
   xmlns:desktop2="http://schemas.microsoft.com/appx/manifest/desktop/windows10/2"
   IgnorableNamespaces="uap rescap desktop desktop2">
 
-  <Identity
-    Name="4651ED44255E.47979655102CE"
-    Publisher="CN=A90E406B-B2D3-4A23-B061-0FA1D65C4F66"
-    Version="3.0.0.0" />
+	<Identity
+	  Name="4651ED44255E.47979655102CE"
+	  Publisher="CN=A90E406B-B2D3-4A23-B061-0FA1D65C4F66"
+	  Version="3.0.999.0" />
 
-  <Properties>
-    <DisplayName>Watt Toolkit</DisplayName>
-    <PublisherDisplayName>软妹币玩家</PublisherDisplayName>
-    <Logo>Images\StoreLogo.png</Logo>
-  </Properties>
+	<Properties>
+		<DisplayName>Watt Toolkit</DisplayName>
+		<PublisherDisplayName>软妹币玩家</PublisherDisplayName>
+		<Logo>Images\StoreLogo.png</Logo>
+	</Properties>
 
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
-  </Dependencies>
+	<Dependencies>
+		<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+		<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+	</Dependencies>
 
-  <Resources>
-    <Resource Language="x-generate"/>
-  </Resources>
+	<Resources>
+		<Resource Language="x-generate"/>
+	</Resources>
 
-  <Applications>
-    <Application Id="App"
-      Executable="$targetnametoken$.exe"
-      EntryPoint="$targetentrypoint$">
-      <uap:VisualElements
-        DisplayName="Watt Toolkit"
-        Description="「Watt Toolkit」是一个开源跨平台的多功能游戏工具箱，此工具的大部分功能都是需要您下载安装 Steam 才能使用。"
-        BackgroundColor="transparent"
-        Square150x150Logo="Images\Square150x150Logo.png"
-        Square44x44Logo="Images\Square44x44Logo.png">
-        <uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png"  Square71x71Logo="Images\SmallTile.png" Square310x310Logo="Images\LargeTile.png" ShortName="Steam++">
-          <uap:ShowNameOnTiles>
-            <uap:ShowOn Tile="square150x150Logo"/>
-            <uap:ShowOn Tile="wide310x150Logo"/>
-            <uap:ShowOn Tile="square310x310Logo"/>
-          </uap:ShowNameOnTiles>
-        </uap:DefaultTile >
-        <uap:SplashScreen Image="Images\SplashScreen.png" />
-        <uap:InitialRotationPreference>
-          <uap:Rotation Preference="landscape"/>
-        </uap:InitialRotationPreference>
-        <uap:LockScreen BadgeLogo="Images\BadgeLogo.png" Notification="badgeAndTileText"/>
-      </uap:VisualElements>
-      <Extensions>
-        <desktop:Extension Category="windows.fullTrustProcess" Executable="Steam++\Steam++.exe" />
-        <desktop:Extension Category="windows.startupTask" Executable="Steam++\Steam++.exe" EntryPoint="Windows.FullTrustApplication">
-          <desktop:StartupTask TaskId="BootAutoStartTask" Enabled="true" DisplayName="Steam++ System Boot Run" />
-        </desktop:Extension>
-      </Extensions>
-    </Application>
-  </Applications>
+	<Applications>
+		<Application Id="App"
+		  Executable="$targetnametoken$.exe"
+		  EntryPoint="$targetentrypoint$">
+			<uap:VisualElements
+			  DisplayName="Watt Toolkit"
+			  Description="「Watt Toolkit」是一个开源跨平台的多功能游戏工具箱，此工具的大部分功能都是需要您下载安装 Steam 才能使用。"
+			  BackgroundColor="transparent"
+			  Square150x150Logo="Images\Square150x150Logo.png"
+			  Square44x44Logo="Images\Square44x44Logo.png">
+				<uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png"  Square71x71Logo="Images\SmallTile.png" Square310x310Logo="Images\LargeTile.png" ShortName="Steam++">
+					<uap:ShowNameOnTiles>
+						<uap:ShowOn Tile="square150x150Logo"/>
+						<uap:ShowOn Tile="wide310x150Logo"/>
+						<uap:ShowOn Tile="square310x310Logo"/>
+					</uap:ShowNameOnTiles>
+				</uap:DefaultTile >
+				<uap:SplashScreen Image="Images\SplashScreen.png" />
+				<uap:InitialRotationPreference>
+					<uap:Rotation Preference="landscape"/>
+				</uap:InitialRotationPreference>
+				<uap:LockScreen BadgeLogo="Images\BadgeLogo.png" Notification="badgeAndTileText"/>
+			</uap:VisualElements>
+			<Extensions>
+				<desktop:Extension Category="windows.fullTrustProcess" Executable="Steam++\Steam++.exe" />
+				<desktop:Extension Category="windows.startupTask" Executable="Steam++\Steam++.exe" EntryPoint="Windows.FullTrustApplication">
+					<desktop:StartupTask TaskId="BootAutoStartTask" Enabled="true" DisplayName="Steam++ System Boot Run" />
+				</desktop:Extension>
+				<uap:Extension Category="windows.protocol">
+					<uap:Protocol Name="spp">
+						<uap:Logo>Images\Square44x44Logo.png</uap:Logo>
+						<uap:DisplayName>Steam++ URI Scheme</uap:DisplayName>
+					</uap:Protocol>
+				</uap:Extension>
+			</Extensions>
+		</Application>
+	</Applications>
 
-  <Extensions>
-    <desktop2:Extension Category="windows.firewallRules">
-      <desktop2:FirewallRules Executable="Steam++\Steam++.exe">
-        <desktop2:Rule Direction="in" IPProtocol="TCP" Profile="all" />
-        <desktop2:Rule Direction="in" IPProtocol="UDP" Profile="all" />
-      </desktop2:FirewallRules>
-    </desktop2:Extension>
-  </Extensions>
-
-  <Capabilities>
-    <Capability Name="internetClient" />
-    <rescap:Capability Name="runFullTrust" />
-    <rescap:Capability Name="allowElevation" />
-  </Capabilities>
+	<Capabilities>
+		<Capability Name="internetClient" />
+		<rescap:Capability Name="runFullTrust" />
+		<rescap:Capability Name="allowElevation" />
+	</Capabilities>
 </Package>

src/BD.WTTS.Client.AppHost.Bridge/App.config

@@ -9,6 +9,6 @@
 		<legacyCorruptedStateExceptionsPolicy enabled="true"/>
 	</runtime>
 	<appSettings>
-		<add key="d" value="7.0.10"/>
+		<add key="d" value="7.0.11"/>
 	</appSettings>
 </configuration>

src/BD.WTTS.Client.AppHost/App.config

@@ -10,6 +10,6 @@
 		<legacyCorruptedStateExceptionsPolicy enabled="true"/>
 	</runtime>
 	<appSettings>
-		<add key="d" value="7.0.10"/>
+		<add key="d" value="8.0.0"/>
 	</appSettings>
 </configuration>

src/BD.WTTS.Client.AppHost/Program.cs

@@ -16,9 +16,9 @@ static unsafe partial class Program
 {
     static Program()
     {
-        dotnet_version_major = "7";
+        dotnet_version_major = "8";
         dotnet_version_minor = "0";
-        dotnet_version_build = "10";
+        dotnet_version_build = "0";
         dotnet_version = $"{dotnet_version_major}.{dotnet_version_minor}.{dotnet_version_build}";
     }
 
@@ -27,7 +27,7 @@ static unsafe partial class Program
     //#else
     //    public const string dotnet_version_major = "7";
     //    public const string dotnet_version_minor = "0";
-    //    public const string dotnet_version_build = "10";
+    //    public const string dotnet_version_build = "11";
     //    public const string dotnet_version = $"{dotnet_version_major}.{dotnet_version_minor}.{dotnet_version_build}";
     //#endif
 

src/BD.WTTS.Client.AppHost/Properties/app.manifest

@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?><assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1"><assemblyIdentity version="1.0.0.0" name="BeyondDimension.WattToolkit.AppHost"/><trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"><security><requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3"><requestedExecutionLevel level="asInvoker" uiAccess="false" /></requestedPrivileges></security></trustInfo><compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"><application><supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" /><supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" /><supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" /><supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" /><supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" /></application></compatibility></assembly>
+<?xml version="1.0" encoding="utf-8"?><assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1"><assemblyIdentity version="1.0.0.0" name="BeyondDimension.WattToolkit.AppHost"/><trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"><security><requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3"><requestedExecutionLevel level="requireAdministrator" uiAccess="false" /></requestedPrivileges></security></trustInfo><compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"><application><supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" /><supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" /><supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" /><supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" /><supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" /></application></compatibility></assembly>

src/BD.WTTS.Client.Avalonia.App/BD.WTTS.Client.Avalonia.App.csproj

@@ -98,14 +98,14 @@
 		<ProjectReference Include="..\BD.WTTS.Client\BD.WTTS.Client.csproj" />
 	</ItemGroup>
 
-	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows' AND Exists('$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\runtimes\win\lib\net7.0\System.Drawing.Common.dll')">
+	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows' AND Exists('$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\lib\net8.0\System.Drawing.Common.dll')">
 		<!-- Windows Only -->
 		<!-- 修复：存在 Microsoft.WindowsDesktop.App 依赖时不会将 System.Drawing.Common.dll 复制到输出目录-->
-		<None Include="$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\runtimes\win\lib\net7.0\System.Drawing.Common.dll">
+		<None Include="$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\lib\net8.0\System.Drawing.Common.dll">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<Reference Include="System.Drawing.Common">
-			<HintPath>$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\runtimes\win\lib\net7.0\System.Drawing.Common.dll</HintPath>
+			<HintPath>$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\lib\net8.0\System.Drawing.Common.dll</HintPath>
 		</Reference>
 	</ItemGroup>
 

src/BD.WTTS.Client.Avalonia.App/Info.plist

@@ -22,6 +22,8 @@
 	<string>NSApplication</string>
 	<key>XSAppIconAssets</key>
 	<string>Assets.xcassets/AppIcon.appiconset</string>
+	<key>CFBundleIconFile</key>
+	<string>AppIcon.icns</string>
 	<key>CFBundleIdentifier</key>
 	<string>net.steampp.app</string>
 	<key>CFBundleURLTypes</key>

src/BD.WTTS.Client.Avalonia.App/Properties/app.manifest

@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?><assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1"><assemblyIdentity version="1.0.0.0" name="BeyondDimension.WattToolkit.App"/><trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"><security><requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3"><requestedExecutionLevel level="asInvoker" uiAccess="false" /></requestedPrivileges></security></trustInfo><compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"><application><supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" /><supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" /><supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" /><supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" /><supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" /></application></compatibility></assembly>
+<?xml version="1.0" encoding="utf-8"?><assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1"><assemblyIdentity version="1.0.0.0" name="BeyondDimension.WattToolkit.App"/><trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"><security><requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3"><requestedExecutionLevel level="requireAdministrator" uiAccess="false" /></requestedPrivileges></security></trustInfo><compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"><application><supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" /><supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" /><supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" /><supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" /><supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" /></application></compatibility></assembly>

src/BD.WTTS.Client.Avalonia.App/Properties/launchSettings.json

@@ -1,8 +1,7 @@
 {
   "profiles": {
     "BD.WTTS.Client.Avalonia.App": {
-      "commandName": "Project",
-      "commandLineArgs": "-clt devtools -steamrun"
+      "commandName": "Project"
     }
   }
 }

src/BD.WTTS.Client.Avalonia.App/Startup.cs

@@ -248,7 +248,7 @@ sealed partial class Program : Startup
 
     sealed class Essentials_AppVerS : IApplicationVersionService
     {
-        string IApplicationVersionService.ApplicationVersion => AssemblyInfo.Version;
+        string IApplicationVersionService.ApplicationVersion => AssemblyInfo.FileVersion;
 
         string IApplicationVersionService.AssemblyTrademark => AssemblyInfo.Trademark;
     }

src/BD.WTTS.Client.Avalonia/BD.WTTS.Client.Avalonia.csproj

@@ -81,8 +81,10 @@
 		<PackageReference Include="Avalonia" />
 		<PackageReference Include="Avalonia.ReactiveUI" />
 		<PackageReference Include="Avalonia.Controls.DataGrid" />
+		<PackageReference Include="Avalonia.Controls.ItemsRepeater" />
 		<PackageReference Include="Avalonia.Xaml.Behaviors" />
-		<!--<PackageReference Include="Avalonia.AvaloniaEdit" />-->
+		<PackageReference Include="Avalonia.AvaloniaEdit" />
+		<PackageReference Include="AvaloniaEdit.TextMate" />
 		<!--<PackageReference Include="Markdown.Avalonia" />-->
 		<PackageReference Include="FluentAvaloniaUI" />
 		<PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" />
@@ -126,6 +128,15 @@
 		<ProjectReference Include="..\BD.WTTS.Client\BD.WTTS.Client.csproj" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <Compile Update="UI\Views\Controls\Widgets\CarouselItems.cs">
+	    <DependentUpon>%(Filename)</DependentUpon>
+	  </Compile>
+	  <Compile Update="UI\Views\Pages\PluginStorePage.axaml.cs">
+	    <DependentUpon>PluginStorePage.axaml</DependentUpon>
+	  </Compile>
+	</ItemGroup>
+
 	<Import Project="..\TFM_NETX_WITH_DESKTOP.props" />
 
 </Project>

src/BD.WTTS.Client.Avalonia/Converters/BitmapAssetValueConverter.cs

@@ -1,5 +1,9 @@
 namespace BD.WTTS.Converters;
 
+[Mobius(
+"""
+Mobius.UI.Converters.WaveProgressGradientOffsetConverter
+""")]
 public sealed class BitmapAssetValueConverter : ImageValueConverter
 {
     public override object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)

src/BD.WTTS.Client.Avalonia/Converters/ColorStringToBrushConverter.cs

@@ -1,5 +1,9 @@
 namespace BD.WTTS.Converters;
 
+[Mobius(
+"""
+Mobius.UI.Converters.ColorStringToBrushConverter
+""")]
 public sealed class ColorStringToBrushConverter : IValueConverter
 {
     public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)

src/BD.WTTS.Client.Avalonia/Converters/EnumConverter.cs

@@ -1,5 +1,9 @@
 namespace BD.WTTS.Converters;
 
+[Mobius(
+"""
+Mobius.UI.Converters.EnumConverter
+""")]
 public sealed class EnumConverter : IValueConverter
 {
     public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)

src/BD.WTTS.Client.Avalonia/Converters/EnumEqualValueConverter.cs

@@ -2,6 +2,10 @@ using IBinding = BD.WTTS.Converters.Abstractions.IBinding;
 
 namespace BD.WTTS.Converters;
 
+[Mobius(
+"""
+Mobius.UI.Converters.EnumEqualValueConverter
+""")]
 public sealed class EnumEqualValueConverter : IValueConverter
 {
     public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)

src/BD.WTTS.Client.Avalonia/Converters/EnumLocalizationNameConverter.cs

@@ -1,5 +1,9 @@
 namespace BD.WTTS.Converters;
 
+[Mobius(
+"""
+Mobius.UI.Converters.EnumLocalizationNameConverter
+""")]
 public sealed class EnumLocalizationNameConverter : IValueConverter
 {
     public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
@@ -18,6 +22,8 @@ public sealed class EnumLocalizationNameConverter : IValueConverter
             else
             {
                 text = Strings.ResourceManager.GetString(desc, Strings.Culture);
+                if (string.IsNullOrEmpty(text))
+                    return desc;
             }
 
             if (!string.IsNullOrEmpty(text))

src/BD.WTTS.Client.Avalonia/Converters/ImageValueConverter.cs

@@ -2,6 +2,10 @@ using SkiaSharp;
 
 namespace BD.WTTS.Converters;
 
+[Mobius(
+"""
+Mobius.UI.Converters.Abstractions.ImageValueConverter
+""")]
 public abstract class ImageValueConverter : IValueConverter
 {
     public abstract object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture);
@@ -46,6 +50,7 @@ public abstract class ImageValueConverter : IValueConverter
     /// <param name="clipStream"></param>
     /// <param name="bitmap"></param>
     /// <returns></returns>
+    [Mobius("", Obsolete = true)]
     static bool TryGetBitmap([NotNullWhen(true)] ImageSource.ClipStream? clipStream, [NotNullWhen(true)] out SKBitmap? bitmap)
     {
         if (clipStream?.Stream == null)

src/BD.WTTS.Client.Avalonia/Converters/IsNullConverter.cs

@@ -1,5 +1,9 @@
 namespace BD.WTTS.Converters;
 
+[Mobius(
+"""
+Mobius.UI.Converters.IsNullConverter
+""")]
 public sealed class IsNullConverter : IValueConverter
 {
     public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)

src/BD.WTTS.Client.Avalonia/Converters/NameToFontFamilyConverter.cs

@@ -1,5 +1,9 @@
 namespace BD.WTTS.Converters;
 
+[Mobius(
+"""
+Mobius.UI.Converters.NameToFontFamilyConverter
+""")]
 public sealed class NameToFontFamilyConverter : IValueConverter
 {
     public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)

src/BD.WTTS.Client.Avalonia/Converters/RangeToSweepConverter.cs

@@ -1,5 +1,9 @@
 namespace BD.WTTS.Converters;
 
+[Mobius(
+"""
+Mobius.UI.Converters.RangeToSweepConverter
+""")]
 public sealed class RangeToSweepConverter : IMultiValueConverter
 {
     public object? Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture)

src/BD.WTTS.Client.Avalonia/Converters/ResourceKeyValueConverter.cs

@@ -1,5 +1,9 @@
 namespace BD.WTTS.Converters;
 
+[Mobius(
+"""
+Mobius.UI.Converters.ResourceKeyValueConverter
+""")]
 public sealed class ResourceKeyValueConverter : IValueConverter
 {
     public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)

src/BD.WTTS.Client.Avalonia/Converters/StringEqualsConverter.cs

@@ -1,5 +1,9 @@
 namespace BD.WTTS.Converters;
 
+[Mobius(
+"""
+Mobius.UI.Converters.StringEqualsConverter
+""")]
 public class StringEqualsConverter : IValueConverter
 {
     static string ToString(object? obj) => obj?.ToString() ?? string.Empty;

src/BD.WTTS.Client.Avalonia/Converters/StringFormatConverter.cs

@@ -2,6 +2,10 @@ using SteamKit2;
 
 namespace BD.WTTS.Converters;
 
+[Mobius(
+"""
+Mobius.UI.Converters.StringFormatConverter
+""")]
 public sealed class StringFormatConverter : IValueConverter, IMultiValueConverter
 {
     const string Size = "size";

src/BD.WTTS.Client.Avalonia/Converters/VisibleStringConverter.cs

@@ -1,19 +1,27 @@
 namespace BD.WTTS.Converters;
 
-public sealed class VisbleStringConverter : IMultiValueConverter
+[Mobius(
+"""
+Mobius.UI.Converters.VisibleStringConverter
+""")]
+public sealed class VisibleStringConverter : IMultiValueConverter
 {
     public object? Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture)
     {
-        if (values.Count >= 3 && values.FirstOrDefault() is bool isVisble)
+        if (values.Count >= 2 && values.FirstOrDefault() is bool isVisble)
         {
             if (isVisble)
             {
                 return values[1];
             }
-            else
+            else if (values.Count >= 3)
             {
                 return values[2];
             }
+            else
+            {
+                return null;
+            }
         }
         return values;
     }

src/BD.WTTS.Client.Avalonia/Converters/WaveProgress/WaveProgressValueConverter.cs

@@ -0,0 +1,127 @@
+namespace BD.WTTS.Converters;
+
+[Mobius(
+"""
+Mobius.UI.Converters.WaveProgressValueConverter
+""")]
+public sealed class WaveProgressValueConverter : IValueConverter
+{
+    public static readonly WaveProgressValueConverter Instance = new();
+
+    /// <inheritdoc/>
+    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (value is not double i) return 0;
+        return 155 - (i * 2.1);
+    }
+
+    /// <inheritdoc/>
+    public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        return BindingOperations.DoNothing;
+    }
+}
+
+[Mobius(
+"""
+Mobius.UI.Converters.WaveProgressValueColorConverter
+""")]
+public class WaveProgressValueColorConverter : IValueConverter
+{
+    public static readonly WaveProgressValueColorConverter Instance = new();
+
+    /// <inheritdoc/>
+    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (value is not double d) return Brushes.Black;
+        if (d > 50) return Brushes.GhostWhite;
+        return Application.Current?.ActualThemeVariant == ThemeVariant.Dark ? Brushes.GhostWhite : Brushes.Black;
+    }
+
+    /// <inheritdoc/>
+    public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        return BindingOperations.DoNothing;
+    }
+}
+
+[Mobius(
+"""
+Mobius.UI.Converters.WaveProgressValueTextConverter
+""")]
+public class WaveProgressValueTextConverter : IValueConverter
+{
+    public static readonly WaveProgressValueTextConverter Instance = new();
+
+    /// <inheritdoc/>
+    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        return value is not double d ? "0%" : $"{d:#0}%";
+    }
+
+    /// <inheritdoc/>
+    public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        return BindingOperations.DoNothing;
+    }
+}
+
+[Mobius(
+"""
+Mobius.UI.Converters.WaveProgressGradientOffsetConverter
+""")]
+public class WaveProgressGradientOffsetConverter : IValueConverter
+{
+    public static readonly WaveProgressGradientOffsetConverter Instance = new();
+
+    /// <inheritdoc/>
+    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (value is not double v)
+            return Brushes.Blue;
+
+        var app = Application.Current;
+        if (app == null)
+            return null;
+
+        Color primaryColor = Colors.DodgerBlue;
+        Color accentColor = Colors.Transparent;
+
+        try
+        {
+            if (app.FindResource("SystemAccentColor") is Color primaryColor2)
+            {
+                primaryColor = primaryColor2;
+            }
+            if (app.FindResource("SystemAccentColorLight2") is Color accentColor2)
+            {
+                accentColor = accentColor2;
+            }
+        }
+        catch { }
+
+        var isLight = app.RequestedThemeVariant == ThemeVariant.Light;
+
+        v /= 100;
+        v += isLight ? 0.2 : 0.4;
+        if (v > 1)
+            v = 1;
+
+        return new LinearGradientBrush()
+        {
+            EndPoint = new RelativePoint(0.5, 1, RelativeUnit.Relative),
+            StartPoint = new RelativePoint(0.5, 0, RelativeUnit.Relative),
+            GradientStops = new GradientStops()
+            {
+                new GradientStop() { Color = primaryColor, Offset = 0 },
+                new GradientStop() { Color = isLight ? Colors.Transparent : accentColor, Offset = v },
+            },
+        };
+    }
+
+    /// <inheritdoc/>
+    public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        return BindingOperations.DoNothing;
+    }
+}

src/BD.WTTS.Client.Avalonia/Extensions/ControlExtensions.cs

@@ -2,7 +2,11 @@ namespace BD.WTTS.UI;
 
 public static class ControlExtensions
 {
-    public static void SetViewModel<T>(this Control c, bool useCache = true) where T : ViewModelBase
+    [Mobius(
+"""
+Mobius.UI.ControlExtensions.SetViewModel
+""")]
+    public static void SetViewModel<T>(this Control c, bool useCache = false) where T : ViewModelBase, new()
     {
         if (c.DataContext == null || c.DataContext.GetType() != typeof(T))
         {
@@ -11,7 +15,7 @@ public static class ControlExtensions
             if (useCache)
                 cx = IViewModelManager.Instance.Get<T>();
             else
-                cx = Activator.CreateInstance<T>();
+                cx = new T();
 
             c.DataContext = cx;
         }

src/BD.WTTS.Client.Avalonia/Extensions/IEnumerableExtensions.cs

@@ -0,0 +1,35 @@
+namespace BD.WTTS;
+
+/// <summary>
+/// <see cref="IEnumerable"/> extensions methods
+/// </summary>
+[Mobius(
+"""
+Mobius.IEnumerableExtensions
+""")]
+public static class IEnumerableExtensions
+{
+    public static IEnumerable<IEnumerable> Batch(this IEnumerable source, int size)
+    {
+        object[]? bucket = null;
+        var count = 0;
+
+        foreach (var item in source)
+        {
+            bucket ??= new object[size];
+
+            bucket[count++] = item;
+
+            if (count == size)
+            {
+                yield return bucket;
+                bucket = null;
+                count = 0;
+            }
+        }
+
+        if (bucket != null && count > 0)
+            yield return bucket.Take(count).ToArray();
+    }
+}
+

src/BD.WTTS.Client.Avalonia/Extensions/WindowExtensions.cs

@@ -1,6 +1,10 @@
 // ReSharper disable once CheckNamespace
 namespace Avalonia.Controls;
 
+[BD.Mobius(
+"""
+Mobius.UI.WindowExtensions
+""")]
 public static partial class WindowExtensions
 {
     [MethodImpl(MethodImplOptions.AggressiveInlining)]

src/BD.WTTS.Client.Avalonia/Extensions/WindowTransparencyLevelExtensions.cs

@@ -3,6 +3,10 @@ namespace BD.WTTS;
 
 public static class WindowTransparencyLevelExtensions
 {
+    [Mobius(
+"""
+Mobius.Enums.UI.WindowTransparencyLevelExtensions
+""")]
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static WindowTransparencyLevel ToWindowTransparencyLevel(
         this WindowBackgroundMaterial value)

src/BD.WTTS.Client.Avalonia/Markup/OnPlatformExtension.cs

@@ -2,6 +2,10 @@ using BD.WTTS.Markup.Abstractions;
 
 namespace BD.WTTS.Markup;
 
+[Mobius(
+"""
+Mobius.UI.Markup.OnPlatformExtension
+""")]
 public sealed class OnPlatformExtension : MarkupExtension<bool>
 {
     public OnPlatformExtension(string member) : base(member)

src/BD.WTTS.Client.Avalonia/Services.Implementation/App/AvaloniaApplicationUpdateServiceImpl.cs

@@ -5,46 +5,19 @@ namespace BD.WTTS.Services.Implementation;
 /// <inheritdoc cref="IAppUpdateService"/>
 sealed class AvaloniaApplicationUpdateServiceImpl : AppUpdateServiceBaseImpl
 {
-    readonly IWindowManager windowManager;
-
     public AvaloniaApplicationUpdateServiceImpl(
         IApplication application,
         INotificationService notificationService,
-        IWindowManager windowManager,
         IToast toast,
         IMicroServiceClient client,
         IOptions<AppSettings> options) : base(application, notificationService, toast, client, options)
     {
-        this.windowManager = windowManager;
+
     }
 
-    protected override async Task ShowNewVersionWindowAsync()
+    protected override bool HasActiveWindow()
     {
-        await windowManager.ShowAsync(typeof(object), AppEndPoint.NewVersion, isParent: false);
-    }
-
-    public override async void OnMainOpenTryShowNewVersionWindow()
-    {
-        if (ShowNewVersionWindowOnMainOpen)
-        {
-            ShowNewVersionWindowOnMainOpen = false;
-            await ShowNewVersionWindowAsync();
-        }
-    }
-
-    protected override async void OnExistNewVersion()
-    {
-        base.OnExistNewVersion();
-
         var hasActiveWindow = App.Instance.HasActiveWindow();
-        if (hasActiveWindow)
-        {
-            await ShowNewVersionWindowAsync();
-        }
-        else
-        {
-            ShowNewVersionWindowOnMainOpen = true;
-            notification.Notify(AppResources.NewVersionUpdateNotifyText_.Format(NewVersionInfo?.Version), NotificationType.NewVersion);
-        }
+        return hasActiveWindow;
     }
 }

src/BD.WTTS.Client.Avalonia/Services.Implementation/UI/MainThreadPlatformServiceImpl.cs

@@ -1,5 +1,9 @@
 namespace BD.WTTS.Services.Implementation;
 
+[Mobius(
+"""
+BD.Common8.Essentials.Services.Implementation.AvaloniaMainThreadPlatformServiceImpl
+""")]
 sealed class MainThreadPlatformServiceImpl : IMainThreadPlatformService
 {
     public bool PlatformIsMainThread

src/BD.WTTS.Client.Avalonia/Services.Implementation/UI/Views/Windows/AvaloniaWindowManagerImpl.cs

@@ -4,10 +4,18 @@ using System.Collections.Immutable;
 namespace BD.WTTS.Services.Implementation;
 
 /// <inheritdoc cref="IWindowManager"/>
-sealed class AvaloniaWindowManagerImpl : IWindowManagerImpl
+[Mobius(
+"""
+Mobius.Services.WindowManagerService
+""")]
+public sealed class AvaloniaWindowManagerImpl : IWindowManagerImpl
 {
     Type? IWindowManagerImpl.WindowType => typeof(Window);
 
+    [Mobius(
+"""
+Mobius.Services.WindowManagerService.GetWindowTopLevel
+""")]
     public static TopLevel? GetWindowTopLevel()
     {
         if (App.Instance.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
@@ -113,10 +121,9 @@ sealed class AvaloniaWindowManagerImpl : IWindowManagerImpl
 
         if (viewModel != null)
         {
-
             if (viewModel is IWindowViewModel window)
             {
-                window.Close = () => td?.Hide(TaskDialogStandardResult.Close);
+                window.Close = b => td?.Hide(b ? TaskDialogStandardResult.OK : TaskDialogStandardResult.Close);
             }
 
             td.DataContext = viewModel;

src/BD.WTTS.Client.Avalonia/Services.Implementation/UI/Widgets/AvaloniaClipboardPlatformService.cs

@@ -3,6 +3,10 @@ using static System.Net.Mime.MediaTypeNames;
 
 namespace BD.WTTS.Services.Implementation;
 
+[Mobius(
+"""
+BD.Common8.Essentials.Services.Implementation.AvaloniaClipboardPlatformServiceImpl
+""")]
 public sealed class AvaloniaClipboardPlatformService : IClipboardPlatformService
 {
     public bool PlatformHasText => !string.IsNullOrEmpty(PlatformGetTextAsync().GetAwaiter().GetResult());

src/BD.WTTS.Client.Avalonia/Services.Implementation/UI/Widgets/AvaloniaToastServiceImpl.cs

@@ -5,6 +5,10 @@ using AvaNotificationType = Avalonia.Controls.Notifications.NotificationType;
 
 namespace BD.WTTS.Services.Implementation;
 
+[Mobius(
+"""
+Mobius.Services.ToastService
+""")]
 [TemplatePart("PART_Items", typeof(Panel))]
 [PseudoClasses(":topleft", ":topright", ":bottomleft", ":bottomright")]
 sealed class AvaloniaToastServiceImpl : IToastService

src/BD.WTTS.Client.Avalonia/Services.Implementation/UI/Widgets/JumpListServiceImpl.cs

@@ -8,6 +8,10 @@ using WinUI = Windows.UI.StartScreen;
 namespace BD.WTTS.Services.Implementation;
 
 /// <inheritdoc cref="IJumpListService"/>
+[Mobius(
+"""
+Mobius.Services.Platform.Windows.Abstractions.IJumpListService
+""")]
 internal sealed class JumpListServiceImpl : IJumpListService
 {
 #if WINDOWS

src/BD.WTTS.Client.Avalonia/Services.Implementation/UI/Widgets/NavigationService.cs

@@ -6,12 +6,26 @@ using System.Xml.Linq;
 
 namespace BD.WTTS.Services.Implementation;
 
+[Mobius(
+"""
+Mobius.Services.NavigationService
+""")]
 public sealed class NavigationService : INavigationService
 {
     public static NavigationService Instance { get; } = (NavigationService)Ioc.Get<INavigationService>();
 
-    public Control? PreviousPage { get; set; }
+    //public Type? PreviousPage { get; set; }
 
+    public Type? CurrnetPage => _frame?.CurrentSourcePageType;
+
+    [Mobius(
+"""
+isCreateInstance = true
+Mobius.Services.NavigationService.GetViewModelToPageContent
+
+isCreateInstance = false
+Mobius.Services.NavigationService.GetViewModelToPageContentType
+""")]
     public object? GetViewModelToPageContent(object viewModel, bool isCreateInstance = true)
     {
         string name;
@@ -54,7 +68,8 @@ public sealed class NavigationService : INavigationService
 
     public void Navigate(Type? t, NavigationTransitionEffect effect = NavigationTransitionEffect.None, bool useCache = true)
     {
-        _frame.ThrowIsNull();
+        if (_frame == null)
+            return;
 
         var navOptions = new FrameNavigationOptions
         {

src/BD.WTTS.Client.Avalonia/UI/App.Theme.cs

@@ -7,12 +7,28 @@ namespace BD.WTTS.UI;
 
 partial class App
 {
+    [Mobius(
+"""
+App.DefaultActualTheme
+""")]
     const AppTheme _DefaultActualTheme = AppTheme.FollowingSystem;
 
+    [Mobius(
+"""
+App.DefaultActualTheme
+""")]
     AppTheme IApplication.DefaultActualTheme => _DefaultActualTheme;
 
+    [Mobius(
+"""
+App.mTheme
+""")]
     AppTheme mTheme = _DefaultActualTheme;
 
+    [Mobius(
+"""
+App.Theme
+""")]
     public AppTheme Theme
     {
         get => mTheme;
@@ -50,6 +66,10 @@ partial class App
         }
     }
 
+    [Mobius(
+"""
+App.SetThemeNotChangeValue
+""")]
     public void SetThemeNotChangeValue(AppTheme value)
     {
         var mode = value switch
@@ -71,6 +91,10 @@ partial class App
         }
     }
 
+    [Mobius(
+"""
+App.SetThemeAccent
+""")]
     public static void SetThemeAccent(string? colorHex)
     {
         if (colorHex == null)

src/BD.WTTS.Client.Avalonia/UI/App.TrayIcon.cs

@@ -1,18 +1,42 @@
+using Avalonia.Controls;
 using BD.SteamClient.Services;
 using BD.WTTS.Client.Resources;
 using BD.WTTS.Converters;
+using System.Collections.Specialized;
 using static BD.WTTS.Services.INotificationService;
 
 namespace BD.WTTS.UI;
 
 partial class App
 {
+    [Mobius(
+"""
+App.TrayMenus
+""")]
+    public Dictionary<string, TrayMenuItem> TrayMenus { get; } = new Dictionary<string, TrayMenuItem>();
+
+    [Mobius(
+"""
+App.TrayIcons
+""")]
     public TrayIcons TrayIcons { get; init; } = new TrayIcons();
 
+    [Mobius(
+"""
+App.trayIconMenus
+""")]
     readonly Dictionary<string, ICommand> trayIconMenus = new();
 
+    [Mobius(
+"""
+App.TrayIconMenus
+""")]
     public IReadOnlyDictionary<string, ICommand> TrayIconMenus => trayIconMenus;
 
+    [Mobius(
+"""
+App.InitTrayIcon
+""")]
     void InitTrayIcon()
     {
         if (ApplicationLifetime is not
@@ -32,51 +56,11 @@ partial class App
                     ToolTipText = AssemblyInfo.Trademark,
                     Command = ReactiveCommand.Create(RestoreMainWindow),
                     //[!TrayIcon.IsVisibleProperty] = new Binding { Path = "Value", Source = GeneralSettings.IsEnableTrayIcon, Mode = BindingMode.OneWay },
-                    Menu = new NativeMenu
-                    {
-                        //new NativeMenuItem
-                        //{
-                        //    Header = "Test",
-                        //},
-                        //new NativeMenuItemSeparator(),
-                        new NativeMenuItem
-                        {
-                            [!NativeMenuItem.HeaderProperty] = new MultiBinding {
-                                Bindings = new List<Avalonia.Data.IBinding>()
-                                {
-                                    new Binding { Path = "IsRunningSteamProcess", Source = SteamConnectService.Current, Mode = BindingMode.OneWay },
-                                    new Binding { Path = "Res.CloseSteam", Source = ResourceService.Current, Mode = BindingMode.OneWay },
-                                    new Binding { Path = "Res.StartSteam", Source = ResourceService.Current, Mode = BindingMode.OneWay },
-                                },
-                                Converter = (VisbleStringConverter)App.Instance.FindResource("VisbleStringConverter")!,
-                            },
-                            Command = ReactiveCommand.Create(() =>
-                            {
-                                if(ISteamService.Instance.IsRunningSteamProcess)
-                                {
-                                    ISteamService.Instance.TryKillSteamProcess();
-                                }
-                                else
-                                {
-                                    ISteamService.Instance.StartSteamWithParameter();
-                                }
-                            })
-                        },
-                        new NativeMenuItemSeparator(),
-                        new NativeMenuItem
-                        {
-                            [!NativeMenuItem.HeaderProperty] = new Binding { Path = "Res.OpenMainWindow", Source = ResourceService.Current, Mode = BindingMode.OneWay },
-                            Command = ReactiveCommand.Create(RestoreMainWindow)
-                        },
-                        new NativeMenuItemSeparator(),
-                        new NativeMenuItem
-                        {
-                            [!NativeMenuItem.HeaderProperty] = new Binding { Path = "Res.Exit", Source = ResourceService.Current, Mode = BindingMode.OneWay },
-                            Command = ReactiveCommand.Create(() => { Shutdown(); })
-                        }
-                    }
+                    Menu = new NativeMenu(),
                 });
 
+                UpdateMenuItems();
+
                 //IViewModelManager.Instance.InitTaskBarWindowViewModel();
                 //NotifyIconHelper.Init(this,
                 //    notifyIconClick: (_, _) => RestoreMainWindow());
@@ -102,4 +86,124 @@ partial class App
 
         }
     }
+
+    [Mobius(
+"""
+App.UpdateMenuItems
+""")]
+    public void UpdateMenuItems()
+    {
+        MainThread2.BeginInvokeOnMainThread(() =>
+        {
+            var menus = TrayIcons.FirstOrDefault()?.Menu;
+
+            if (menus != null)
+            {
+                menus.Items.Clear();
+
+                var defaultTrayMenus = new List<NativeMenuItemBase>()
+                    {
+                        new NativeMenuItem
+                        {
+                            [!NativeMenuItem.HeaderProperty] = new MultiBinding {
+                                Bindings = new List<Avalonia.Data.IBinding>()
+                                {
+                                    new Binding { Path = "IsRunningSteamProcess", Source = SteamConnectService.Current, Mode = BindingMode.OneWay },
+                                    new Binding { Path = "Res.CloseSteam", Source = ResourceService.Current, Mode = BindingMode.OneWay },
+                                    new Binding { Path = "Res.StartSteam", Source = ResourceService.Current, Mode = BindingMode.OneWay },
+                                },
+                                Converter = (VisibleStringConverter)App.Instance.FindResource(nameof(VisibleStringConverter))!,
+                            },
+                            Command = ReactiveCommand.Create(async () =>
+                            {
+                                if(ISteamService.Instance.IsRunningSteamProcess)
+                                {
+                                   await ISteamService.Instance.TryKillSteamProcess();
+                                }
+                                else
+                                {
+                                    ISteamService.Instance.StartSteamWithParameter();
+                                }
+                            }),
+                        },
+                        //new NativeMenuItemSeparator(),
+                        new NativeMenuItem
+                        {
+                            [!NativeMenuItem.HeaderProperty] = new Binding { Path = "Res.OpenMainWindow", Source = ResourceService.Current, Mode = BindingMode.OneWay },
+                            Command = ReactiveCommand.Create(RestoreMainWindow),
+                        },
+                        new NativeMenuItemSeparator(),
+                        new NativeMenuItem
+                        {
+                            [!NativeMenuItem.HeaderProperty] = new Binding { Path = "Res.Exit", Source = ResourceService.Current, Mode = BindingMode.OneWay },
+                            Command = ReactiveCommand.Create(() => { Shutdown(); })
+                        },
+                    };
+
+                if (TrayMenus.Any_Nullable())
+                {
+                    foreach (var item in TrayMenus)
+                    {
+                        NativeMenu? subMenu = null;
+                        if (item.Value.Items.Any_Nullable())
+                        {
+                            subMenu = new NativeMenu();
+                            foreach (var sub in item.Value.Items)
+                            {
+                                var menu = new NativeMenuItem
+                                {
+                                    Header = sub.Name,
+                                    Command = sub.Command,
+                                    CommandParameter = sub.CommandParameter,
+                                };
+
+                                if (sub.IsVisible is Avalonia.Data.IBinding v)
+                                    menu[!NativeMenuItem.IsVisibleProperty] = v;
+                                if (sub.IsEnabled is Avalonia.Data.IBinding e)
+                                    menu[!NativeMenuItem.IsEnabledProperty] = e;
+                                subMenu.Add(menu);
+                            }
+                            menus.Add(new NativeMenuItem
+                            {
+                                Header = item.Value.Name,
+                                Menu = subMenu,
+                            });
+                        }
+                        else
+                        {
+                            menus.Add(new NativeMenuItem
+                            {
+                                Header = item.Value.Name,
+                                Command = item.Value.Command,
+                                CommandParameter = item.Value.CommandParameter,
+                            });
+                        }
+                    }
+                    menus.Add(new NativeMenuItemSeparator());
+                }
+
+                foreach (var item in defaultTrayMenus)
+                {
+                    menus.Add(item);
+                }
+            }
+        });
+    }
+
+    [Mobius(
+"""
+App.UpdateMenuItems
+""")]
+    public void UpdateMenuItems(string menuKey, TrayMenuItem trayMenuItem)
+    {
+        if (TrayMenus != null)
+        {
+            if (TrayMenus.ContainsKey(menuKey))
+                TrayMenus[menuKey] = trayMenuItem;
+            else
+                TrayMenus.Add(menuKey, trayMenuItem);
+
+            UpdateMenuItems();
+        }
+    }
 }

src/BD.WTTS.Client.Avalonia/UI/App.axaml

@@ -17,7 +17,7 @@
         <spp:EnumEqualValueConverter x:Key="EnumEqualValueConverter" />
         <spp:StringEqualsConverter x:Key="StringEqualsConverter" />
         <spp:EnumLocalizationNameConverter x:Key="EnumLocalizationNameConverter" />
-        <spp:VisbleStringConverter x:Key="VisbleStringConverter" />
+        <spp:VisibleStringConverter x:Key="VisibleStringConverter" />
     </Application.Resources>
     <Application.Styles>
         <sty:FluentAvaloniaTheme PreferSystemTheme="False" PreferUserAccentColor="True" />

src/BD.WTTS.Client.Avalonia/UI/App.axaml.cs

@@ -7,10 +7,20 @@ using System.Drawing.Drawing2D;
 
 namespace BD.WTTS.UI;
 
+[Mobius(
+"""
+Mobius.UI.App
+""")]
 public sealed partial class App : Application
 {
     const string TAG = "AvaApp";
 
+    public App()
+    {
+        OpenBrowserCommand = ReactiveCommand.Create<object?>(OpenBrowserCommandCore);
+        CopyToClipboardCommand = ReactiveCommand.Create<object?>(CopyToClipboardCommandCore);
+    }
+
     /// <summary>
     /// 获取当前主窗口
     /// </summary>
@@ -44,6 +54,9 @@ public sealed partial class App : Application
             AvaloniaXamlLoader.Load(this);
 
 #if WINDOWS || LINUX || MACOS
+            if (GeneralSettings.MinimizeOnStartup.Value)
+                Startup.Instance.IsMinimize = true;
+
             if (Startup.Instance.IsSteamRun)
             {
                 try
@@ -90,8 +103,18 @@ public sealed partial class App : Application
     {
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
-            MainWindow = InitializeMainWindow?.Invoke(this);
-            desktop.MainWindow = MainWindow ??= new MainWindow();
+            MainWindow = InitializeMainWindow?.Invoke(this) ?? new MainWindow();
+
+            desktop.MainWindow =
+#if !UI_DEMO
+                Startup.Instance.IsMinimize && MainWindow is MainWindow ? null :
+#endif
+                MainWindow;
+
+            if (Startup.Instance.IsMinimize && MainWindow is AppWindow appWindow)
+            {
+                Task2.InBackground(() => appWindow.SplashScreen?.RunTasks(CancellationToken.None));
+            }
         }
         else if (ApplicationLifetime is ISingleViewApplicationLifetime singleView)
         {
@@ -212,16 +235,38 @@ public sealed partial class App : Application
 
     public static FontFamily DefaultFontFamily => _DefaultFontFamily.Value;
 
-    public void OpenBrowserCommand(object url)
+    public ICommand OpenBrowserCommand { get; }
+
+    [Mobius(
+"""
+Mobius.UI.App.OpenBrowserCommandCore
+1. 不提示 打开链接失败
+2. 使用统一的 OpenAuthUrl
+""")]
+    public async void OpenBrowserCommandCore(object? url)
     {
         try
         {
-            if (url == null || string.IsNullOrEmpty(url.ToString()))
+            var urlString = url?.ToString();
+            if (string.IsNullOrEmpty(urlString))
             {
                 Toast.Show(ToastIcon.Warning, "打开链接失败");
                 return;
             }
-            Browser2.Open(url.ToString());
+            try
+            {
+                Uri uri = new(urlString);
+                if (uri.Host.EndsWith("steampp.net", StringComparison.OrdinalIgnoreCase) ||
+                    uri.Host.EndsWith("mossimo.net", StringComparison.OrdinalIgnoreCase))
+                {
+                    await UserService.Current.OpenAuthUrl(urlString);
+                    return;
+                }
+            }
+            catch
+            {
+            }
+            Browser2.Open(urlString);
         }
         catch (Exception ex)
         {
@@ -229,7 +274,14 @@ public sealed partial class App : Application
         }
     }
 
-    public async void CopyToClipboardCommand(object text)
+    public ICommand CopyToClipboardCommand { get; }
+
+    [Mobius(
+"""
+Mobius.UI.App.OpenBrowserCommandCore
+1. 不提示 复制内容失败
+""")]
+    public async void CopyToClipboardCommandCore(object? text)
     {
         try
         {

src/BD.WTTS.Client.Avalonia/UI/Input/Animations.cs

@@ -5,6 +5,10 @@ using Visual = Avalonia.Visual;
 
 namespace BD.WTTS.UI;
 
+[Mobius(
+"""
+Mobius.UI.Animations.Animations
+""")]
 public static class Animations
 {
     private static readonly Easing DefaultEasing = new LinearEasing();

src/BD.WTTS.Client.Avalonia/UI/Input/Command.cs

@@ -3,6 +3,10 @@ using System.Windows.Input;
 
 namespace BD.WTTS.UI;
 
+[Mobius(
+"""
+Mobius.UI.Views.Controls.Stepper.DelegateInputCommand
+""")]
 internal class Command : ICommand
 {
     private readonly Action<object?> _onExecute;

src/BD.WTTS.Client.Avalonia/UI/Input/FrameEffect.cs

@@ -3,6 +3,10 @@ using FluentAvalonia.UI.Media.Animation;
 
 namespace BD.WTTS.UI;
 
+[Mobius(
+"""
+Mobius.UI.Animations.FrameEffect
+""")]
 public static class FrameEffect
 {
     public static SlideNavigationTransitionEffect GetEffect(int oldIndex, int index)

src/BD.WTTS.Client.Avalonia/UI/Input/ItemDragBehavior.cs

@@ -6,6 +6,10 @@ using System.Collections.Specialized;
 
 namespace BD.WTTS.UI;
 
+[Mobius(
+"""
+Mobius.UI.Behaviors.ItemDragBehavior
+""")]
 public class ItemDragBehavior : Behavior<Control>
 {
     private bool _enableDrag;

src/BD.WTTS.Client.Avalonia/UI/Styling/Controls.axaml

@@ -6,15 +6,16 @@
     x:CompileBindings="True">
     <Styles.Resources>
         <ResourceDictionary>
-            <sys:Double x:Key="TitleBarHeight">60</sys:Double>
-            <Thickness x:Key="TitleBarAfterMargin">0,60,0,0</Thickness>
+            <sys:Double x:Key="TitleBarHeight">50</sys:Double>
+            <Thickness x:Key="TitleBarAfterMargin">0,50,0,0</Thickness>
             <sys:Double x:Key="SplashScreenImageWidth">100</sys:Double>
 
             <Thickness x:Key="PageMargin">10</Thickness>
             <sys:Double x:Key="SettingsSpacing">3</sys:Double>
 
-            <!--<sys:Char x:Key="PasswordChar">&#x25CF;</sys:Char>-->
-            <sys:Char x:Key="PasswordChar">•</sys:Char>
+            <sys:Char x:Key="PasswordChar">&#x25CF;</sys:Char>
+            <!--<sys:Char x:Key="PasswordChar">•</sys:Char>
+            <sys:Char x:Key="PasswordChar">·</sys:Char>-->
             <FontFamily x:Key="ContentControlThemeFontFamily">Null</FontFamily>
             <BoxShadows x:Key="InfoBoxShadow">4 4 32 0 #66000000</BoxShadows>
 
@@ -44,6 +45,7 @@
 
     <StyleInclude Source="/UI/Styling/InfoBox.axaml" />
     <StyleInclude Source="/UI/Styling/Controls/PageBase.axaml" />
+    <StyleInclude Source="/UI/Styling/Controls/CarouselItems.axaml" />
     <StyleInclude Source="/UI/Styling/Controls/OptionsDisplayItem.axaml" />
     <StyleInclude Source="/UI/Styling/Controls/RippleEffect.axaml" />
     <StyleInclude Source="/UI/Styling/Controls/Draggable.axaml" />
@@ -64,6 +66,7 @@
     <StyleInclude Source="/UI/Styling/Controls/IconElement.axaml" />
     <StyleInclude Source="/UI/Styling/Controls/CustomFilePicker.axaml" />
     <StyleInclude Source="/UI/Styling/Controls/NumericUpDown.axaml" />
+    <StyleInclude Source="/UI/Styling/Controls/Skeleton.axaml" />
 
     <Style Selector="FlyoutPresenter.NoPadding">
         <Setter Property="Padding" Value="0" />

src/BD.WTTS.Client.Avalonia/UI/Styling/Controls/AppItem.axaml

@@ -180,6 +180,7 @@
                             <TextBlock
                                 Grid.Row="2"
                                 Grid.Column="1"
+                                Grid.ColumnSpan="2"
                                 Margin="0,5"
                                 VerticalAlignment="Top"
                                 Classes="CaptionTextBlockStyle"

src/BD.WTTS.Client.Avalonia/UI/Styling/Controls/AutoCompleteBox.axaml

@@ -16,7 +16,7 @@
 
     <!--  AutoCompleteBox  -->
     <Style Selector="AutoCompleteBox.Search /template/ TextBox#PART_TextBox">
-        <Setter Property="Watermark" Value="{ReflectionBinding Path=Res.Search, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
+        <Setter Property="Watermark" Value="{Binding Path=Res.Search, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
         <Setter Property="InnerRightContent">
             <Template>
                 <StackPanel Orientation="Horizontal">

src/BD.WTTS.Client.Avalonia/UI/Styling/Controls/Button.axaml

@@ -7,7 +7,7 @@
         <Border Padding="20">
             <!--  Add Controls for Previewer Here  -->
             <StackPanel Spacing="10">
-                <ui:HyperlinkButton Content="更新日志" />
+                <HyperlinkButton Content="更新日志" />
                 <Button Content="更新日志" Theme="{StaticResource HyperlinkButton}" />
                 <Button
                     Content="更新日志"
@@ -87,7 +87,7 @@
             <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
             <Setter Property="Template">
                 <ControlTemplate>
-                    <ui:FABorder
+                    <Border
                         Name="Root"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
@@ -101,19 +101,19 @@
                             Content="{TemplateBinding Content}"
                             ContentTemplate="{TemplateBinding ContentTemplate}"
                             RecognizesAccessKey="True" />
-                    </ui:FABorder>
+                    </Border>
                 </ControlTemplate>
             </Setter>
 
 
             <Style Selector="^:pointerover">
-                <Style Selector="^ /template/ ui|FABorder#Root">
+                <Style Selector="^ /template/ Border#Root">
                     <Setter Property="Background" Value="{DynamicResource SubtleFillColorSecondaryBrush}" />
                 </Style>
             </Style>
 
             <Style Selector="^:pressed">
-                <Style Selector="^ /template/ ui|FABorder#Root">
+                <Style Selector="^ /template/ Border#Root">
                     <Setter Property="Background" Value="{DynamicResource SubtleFillColorTertiaryBrush}" />
                 </Style>
                 <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
@@ -122,7 +122,7 @@
             </Style>
 
             <Style Selector="^:disabled">
-                <Style Selector="^ /template/ ui|FABorder#Root">
+                <Style Selector="^ /template/ Border#Root">
                     <Setter Property="Background" Value="{DynamicResource SubtleFillColorDisabledBrush}" />
                 </Style>
                 <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
@@ -131,7 +131,7 @@
             </Style>
 
             <Style Selector="^:checked">
-                <Style Selector="^ /template/ ui|FABorder#Root">
+                <Style Selector="^ /template/ Border#Root">
                     <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundChecked}" />
                 </Style>
                 <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
@@ -140,7 +140,7 @@
 
 
                 <Style Selector="^:pointerover">
-                    <Style Selector="^ /template/ ui|FABorder#Root">
+                    <Style Selector="^ /template/ Border#Root">
                         <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundCheckedPointerOver}" />
                     </Style>
                     <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
@@ -149,7 +149,7 @@
                 </Style>
 
                 <Style Selector="^:pressed">
-                    <Style Selector="^ /template/ ui|FABorder#Root">
+                    <Style Selector="^ /template/ Border#Root">
                         <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundCheckedPressed}" />
                     </Style>
                     <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
@@ -158,7 +158,7 @@
                 </Style>
 
                 <Style Selector="^:disabled">
-                    <Style Selector="^ /template/ ui|FABorder#Root">
+                    <Style Selector="^ /template/ Border#Root">
                         <Setter Property="Background" Value="{DynamicResource SubtleFillColorDisabledBrush}" />
                     </Style>
                     <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
@@ -168,19 +168,19 @@
             </Style>
 
             <Style Selector="^:indeterminate">
-                <Style Selector="^ /template/ ui|FABorder#Root">
+                <Style Selector="^ /template/ Border#Root">
                     <Setter Property="Background" Value="{DynamicResource SubtleFillColorTransparentBrush}" />
                 </Style>
 
 
                 <Style Selector="^:pointerover">
-                    <Style Selector="^ /template/ ui|FABorder#Root">
+                    <Style Selector="^ /template/ Border#Root">
                         <Setter Property="Background" Value="{DynamicResource SubtleFillColorSecondaryBrush}" />
                     </Style>
                 </Style>
 
                 <Style Selector="^:pressed">
-                    <Style Selector="^ /template/ ui|FABorder#Root">
+                    <Style Selector="^ /template/ Border#Root">
                         <Setter Property="Background" Value="{DynamicResource SubtleFillColorTertiaryBrush}" />
                     </Style>
                     <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
@@ -189,7 +189,7 @@
                 </Style>
 
                 <Style Selector="^:disabled">
-                    <Style Selector="^ /template/ ui|FABorder#Root">
+                    <Style Selector="^ /template/ Border#Root">
                         <Setter Property="Background" Value="{DynamicResource SubtleFillColorDisabledBrush}" />
                     </Style>
                     <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
@@ -214,10 +214,13 @@
     <Style Selector="Button.Plain:pointerover">
         <Setter Property="Background" Value="Transparent" />
     </Style>
-    <Style Selector="Button.Plain:pointerover /template/ ui|FABorder#Root">
+    <Style Selector="Button.Plain:pointerover /template/ Border#Root">
         <Setter Property="Background" Value="Transparent" />
     </Style>
     <Style Selector="Button.Plain:pointerover /template/ ContentPresenter">
         <Setter Property="Background" Value="Transparent" />
     </Style>
+
+
+
 </Styles>

src/BD.WTTS.Client.Avalonia/UI/Styling/Controls/CarouselItems.axaml

@@ -0,0 +1,111 @@
+<Styles
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:generic="using:System.Collections.Generic"
+    xmlns:spp="https://steampp.net/ui"
+    xmlns:sys="using:System"
+    xmlns:ui="using:FluentAvalonia.UI.Controls"
+    x:CompileBindings="True">
+    <Design.PreviewWith>
+        <Border Padding="20">
+            <spp:CarouselItems>
+                <spp:CarouselItems.Items>
+                    <Border Background="Red" />
+                    <Border Background="Blue" />
+                    <Border Background="Black" />
+                    <Border Background="Yellow" />
+                </spp:CarouselItems.Items>
+            </spp:CarouselItems>
+        </Border>
+    </Design.PreviewWith>
+
+    <Style Selector="spp|CarouselItems">
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Border
+                    BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"
+                    BorderThickness="0"
+                    ClipToBounds="True"
+                    CornerRadius="8">
+                    <Grid RowDefinitions="*,5,Auto">
+                        <Carousel Name="CarouselControl" Classes="AnimeSlide">
+                            <Carousel.ItemTemplate>
+                                <DataTemplate DataType="sys:Object">
+                                    <ItemsControl ItemTemplate="{Binding $parent[spp:CarouselItems].ItemTemplate}" ItemsSource="{Binding}">
+                                        <ItemsControl.ItemsPanel>
+                                            <ItemsPanelTemplate>
+                                                <spp:FixedWrapPanel ItemsPerLine="{Binding $parent[spp:CarouselItems].ItemsPerPage}" Spacing="5" />
+                                            </ItemsPanelTemplate>
+                                        </ItemsControl.ItemsPanel>
+                                    </ItemsControl>
+                                </DataTemplate>
+                            </Carousel.ItemTemplate>
+                        </Carousel>
+                        <Button
+                            Name="Left"
+                            HorizontalAlignment="Left"
+                            Background="#80000000"
+                            Classes="action"
+                            IsVisible="False">
+                            <ui:SymbolIcon FontSize="18" Symbol="ChevronLeft" />
+                        </Button>
+                        <Button
+                            Name="Right"
+                            HorizontalAlignment="Right"
+                            Background="#80000000"
+                            Classes="action"
+                            IsVisible="False">
+                            <ui:SymbolIcon FontSize="18" Symbol="ChevronRight" />
+                        </Button>
+
+                        <Panel
+                            Grid.Row="2"
+                            Height="10"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Bottom">
+                            <ItemsControl Name="Swiper" IsVisible="False">
+                                <ItemsControl.ItemsPanel>
+                                    <ItemsPanelTemplate>
+                                        <StackPanel Orientation="Horizontal" Spacing="8" />
+                                    </ItemsPanelTemplate>
+                                </ItemsControl.ItemsPanel>
+                                <ItemsControl.ItemTemplate>
+                                    <DataTemplate>
+                                        <DataTemplate.DataType>
+                                            <x:Type x:TypeArguments="x:Int32, x:String" TypeName="generic:KeyValuePair" />
+                                        </DataTemplate.DataType>
+                                        <Button
+                                            Padding="0"
+                                            Classes="Plain"
+                                            Command="{Binding $parent[spp:CarouselItems].CarouselBannerIndexCommand}"
+                                            CommandParameter="{Binding Key}">
+                                            <Ellipse
+                                                Name="IndexEllipse"
+                                                Width="10"
+                                                Height="10"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                Fill="{Binding Value}"
+                                                Opacity="0.6"
+                                                StrokeThickness="0" />
+                                        </Button>
+                                    </DataTemplate>
+                                </ItemsControl.ItemTemplate>
+                            </ItemsControl>
+                        </Panel>
+                    </Grid>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+    </Style>
+
+
+    <Style Selector="spp|CarouselItems /template/ Button.action">
+        <Setter Property="Width" Value="36" />
+        <Setter Property="Height" Value="64" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Foreground" Value="White" />
+    </Style>
+</Styles>

src/BD.WTTS.Client.Avalonia/UI/Styling/Controls/ContentLoader.axaml

@@ -18,27 +18,15 @@
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         IsVisible="{TemplateBinding IsLoading}"
-                        Spacing="8">
-                        <spp:Image2
+                        Spacing="10">
+                        <!--<spp:Image2
                             Width="100"
                             Height="100"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Bottom"
                             RenderOptions.BitmapInterpolationMode="HighQuality"
                             Source="avares://BD.WTTS.Client.Avalonia/UI/Assets/mona-loading-default.gif"
-                            Stretch="UniformToFill" />
-                        <TextBlock
-                            HorizontalAlignment="Center"
-                            Text="{Binding Path=Res.GameList_IsLoading, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
-                            Theme="{StaticResource SubtitleTextBlockStyle}" />
-                        <TextBlock
-                            HorizontalAlignment="Center"
-                            Foreground="{DynamicResource TextFillColorSecondaryBrush}"
-                            IsVisible="{TemplateBinding CustomLoadingText,
-                                                        Converter={StaticResource IsNullConverter},
-                                                        ConverterParameter=invert}"
-                            Text="{TemplateBinding CustomLoadingText}"
-                            Theme="{StaticResource BodyStrongTextBlockStyle}" />
+                            Stretch="UniformToFill" />-->
                         <Border
                             Width="35"
                             Height="35"
@@ -51,6 +39,18 @@
                                 Minimum="{TemplateBinding Minimum}"
                                 Value="{TemplateBinding ProgressValue}" />
                         </Border>
+                        <TextBlock
+                            HorizontalAlignment="Center"
+                            Text="{Binding Path=Res.GameList_IsLoading, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
+                            Theme="{StaticResource SubtitleTextBlockStyle}" />
+                        <TextBlock
+                            HorizontalAlignment="Center"
+                            Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+                            IsVisible="{TemplateBinding CustomLoadingText,
+                                                        Converter={StaticResource IsNullConverter},
+                                                        ConverterParameter=invert}"
+                            Text="{TemplateBinding CustomLoadingText}"
+                            Theme="{StaticResource BodyStrongTextBlockStyle}" />
                     </StackPanel>
 
                     <!--<TextBlock
@@ -75,21 +75,34 @@
                         </ContentPresenter.IsVisible>-->
                     </ContentPresenter>
 
-                    <ContentPresenter
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Content="{TemplateBinding NoResultMessage}"
-                        Foreground="{TemplateBinding Foreground}"
-                        Theme="{StaticResource SubtitleTextBlockStyle}">
-                        <ContentPresenter.IsVisible>
+                    <Panel HorizontalAlignment="Center" VerticalAlignment="Center">
+                        <spp:Image2
+                            Width="100"
+                            Height="100"
+                            Margin="0,0,0,120"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            RenderOptions.BitmapInterpolationMode="HighQuality"
+                            Source="avares://BD.WTTS.Client.Avalonia/UI/Assets/Icons/empty.png"
+                            Stretch="UniformToFill" />
+                        <Panel.IsVisible>
                             <MultiBinding Converter="{x:Static BoolConverters.And}">
                                 <Binding Path="IsShowNoResultText" RelativeSource="{RelativeSource TemplatedParent}" />
                                 <Binding Path="!IsLoading" RelativeSource="{RelativeSource TemplatedParent}" />
                             </MultiBinding>
-                        </ContentPresenter.IsVisible>
-                    </ContentPresenter>
+                        </Panel.IsVisible>
+                        <ContentPresenter
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Content="{TemplateBinding NoResultMessage}"
+                            Foreground="{TemplateBinding Foreground}"
+                            Theme="{StaticResource SubtitleTextBlockStyle}" />
+                    </Panel>
                 </Panel>
             </ControlTemplate>
         </Setter>
+        <Style Selector="^:loading /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Effect" Value="blur(5)" />
+        </Style>
     </ControlTheme>
 </ResourceDictionary>

src/BD.WTTS.Client.Avalonia/UI/Styling/Controls/CustomFilePicker.axaml

@@ -39,8 +39,8 @@
                             ContentTemplate="{TemplateBinding ContentTemplate}" />
                         <Panel
                             Name="FilePickerTipBorder"
-                            MaxWidth="{ReflectionBinding $parent.Bounds.Width}"
-                            MaxHeight="{ReflectionBinding $parent.Bounds.Height}">
+                            MaxWidth="{Binding $parent.Bounds.Width}"
+                            MaxHeight="{Binding $parent.Bounds.Height}">
                             <Border Background="{DynamicResource ControlOnImageFillColorSecondaryBrush}" Opacity="0.8">
                                 <StackPanel
                                     Margin="10,5"
@@ -49,9 +49,7 @@
                                     <ui:SymbolIcon FontSize="30" Symbol="Download" />
                                     <TextBlock
                                         Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                                        Text="{ReflectionBinding Path=Res.CustomFilePicker_Tip,
-                                                                 Mode=OneWay,
-                                                                 Source={x:Static s:ResourceService.Current}}"
+                                        Text="{Binding Path=Res.CustomFilePicker_Tip, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
                                         TextAlignment="Center"
                                         Theme="{StaticResource BodyStrongTextBlockStyle}" />
                                 </StackPanel>

src/BD.WTTS.Client.Avalonia/UI/Styling/Controls/OptionsDisplayItem.axaml

@@ -46,25 +46,23 @@
         <Setter Property="Template">
             <ControlTemplate>
                 <StackPanel>
-                    <ui:FABorder
+                    <Border
                         Name="LayoutRoot"
                         Padding="{TemplateBinding Padding}"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding CornerRadius}">
-                        <ui:FABorder.Transitions>
+                        <Border.Transitions>
                             <Transitions>
                                 <BrushTransition Property="Background" Duration="00:00:00.083" />
                                 <BrushTransition Property="BorderBrush" Duration="00:00:00.083" />
                             </Transitions>
-                        </ui:FABorder.Transitions>
-                        <Grid
-                            MinHeight="{TemplateBinding MinHeight}"
-                            ColumnDefinitions="Auto,*,Auto,Auto"
-                            RowDefinitions="*,Auto">
+                        </Border.Transitions>
+                        <Grid MinHeight="{TemplateBinding MinHeight}" ColumnDefinitions="Auto,*,Auto,Auto">
                             <Viewbox
                                 Name="IconHost"
+                                Grid.RowSpan="2"
                                 Width="{DynamicResource SettingsExpanderItemIconSize}"
                                 Height="{DynamicResource SettingsExpanderItemIconSize}"
                                 HorizontalAlignment="Left"
@@ -76,28 +74,31 @@
                                 Margin="{DynamicResource SettingsExpanderItemContentMargin}"
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Center">
-                                <TextBlock
+                                <ContentPresenter
                                     Name="HeaderText"
                                     HorizontalAlignment="Left"
                                     VerticalAlignment="Center"
                                     Classes="BaseTextBlockStyle"
-                                    Text="{TemplateBinding Header}"
+                                    Content="{TemplateBinding Header}"
                                     TextTrimming="CharacterEllipsis" />
 
-                                <TextBlock
+                                <ContentPresenter
+                                    HorizontalAlignment="Stretch"
                                     VerticalAlignment="Top"
+                                    HorizontalContentAlignment="Stretch"
                                     Classes="CaptionTextBlockStyle"
+                                    Content="{TemplateBinding Description}"
                                     FontSize="12"
                                     Foreground="{DynamicResource TextFillColorSecondaryBrush}"
                                     IsVisible="{TemplateBinding Description,
                                                                 Converter={StaticResource IsNullConverter},
                                                                 ConverterParameter=invert}"
-                                    Text="{TemplateBinding Description}"
                                     TextWrapping="Wrap" />
                             </StackPanel>
 
                             <ContentPresenter
                                 Name="ActionButton"
+                                Grid.RowSpan="2"
                                 Grid.Column="2"
                                 Margin="{DynamicResource SettingsExpanderItemFooterMargin}"
                                 HorizontalAlignment="Right"
@@ -106,12 +107,13 @@
 
                             <ui:SymbolIcon
                                 Name="Chevron"
+                                Grid.RowSpan="2"
                                 Grid.Column="3"
                                 Margin="24,4,0,4"
                                 VerticalAlignment="Center"
                                 FontSize="18" />
                         </Grid>
-                    </ui:FABorder>
+                    </Border>
 
                     <ContentPresenter
                         Name="ExpandedContentPresenter"
@@ -142,10 +144,10 @@
         <Setter Property="IsVisible" Value="False" />
     </Style>
 
-    <Style Selector="spp|OptionsDisplayItem /template/ ui|FABorder#LayoutRoot:pointerover">
+    <Style Selector="spp|OptionsDisplayItem /template/ Border#LayoutRoot:pointerover">
         <Setter Property="Background" Value="{DynamicResource ControlFillColorSecondaryBrush}" />
     </Style>
-    <Style Selector="spp|OptionsDisplayItem:pressed /template/ ui|FABorder#LayoutRoot:pointerover">
+    <Style Selector="spp|OptionsDisplayItem:pressed /template/ Border#LayoutRoot:pointerover">
         <Setter Property="Background" Value="{DynamicResource ControlFillColorTertiaryBrush}" />
     </Style>
 
@@ -177,7 +179,7 @@
         <Setter Property="CornerRadius" Value="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomCornerRadiusFilterConverter}}" />
     </Style>
 
-    <Style Selector="spp|OptionsDisplayItem:expanded /template/ ui|FABorder#LayoutRoot">
+    <Style Selector="spp|OptionsDisplayItem:expanded /template/ Border#LayoutRoot">
         <Setter Property="CornerRadius" Value="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
     </Style>
 
@@ -193,19 +195,19 @@
     <Style Selector="spp|OptionsDisplayItem.Vertical">
         <Setter Property="Template">
             <ControlTemplate>
-                <ui:FABorder
+                <Border
                     Name="LayoutRoot"
                     Padding="12"
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
                     CornerRadius="{TemplateBinding CornerRadius}">
-                    <ui:FABorder.Transitions>
+                    <Border.Transitions>
                         <Transitions>
                             <BrushTransition Property="Background" Duration="00:00:00.083" />
                             <BrushTransition Property="BorderBrush" Duration="00:00:00.083" />
                         </Transitions>
-                    </ui:FABorder.Transitions>
+                    </Border.Transitions>
                     <Grid RowDefinitions="*,*">
                         <Border
                             Width="72"
@@ -239,7 +241,7 @@
                                 TextWrapping="Wrap" />
                         </StackPanel>
                     </Grid>
-                </ui:FABorder>
+                </Border>
             </ControlTemplate>
         </Setter>
     </Style>

src/BD.WTTS.Client.Avalonia/UI/Styling/Controls/ProgressBar.axaml

@@ -17,10 +17,7 @@
                     Classes="Circle"
                     Value="60" />
                 <ProgressBar Width="150" IsIndeterminate="True" />
-                <ProgressBar
-                    Width="150"
-                    Classes="notransitions"
-                    Value="50" />
+                <ProgressBar Width="150" Value="50" />
 
                 <TextBlock Text="Material Progress" />
                 <ProgressBar
@@ -31,7 +28,6 @@
                 <ProgressBar
                     Width="150"
                     Height="5"
-                    Classes="Material notransitions"
                     Value="50" />
             </StackPanel>
         </Border>
@@ -58,7 +54,7 @@
         <Setter Property="Width" Value="{DynamicResource ProgressBarMinHeight}" />
     </Style>
 
-    <Style Selector="ProgressBar:not(.notransitions) /template/ Border#PART_Indicator">
+    <Style Selector="ProgressBar[IsIndeterminate=False] /template/ Border#PART_Indicator">
         <Setter Property="Transitions">
             <Transitions>
                 <DoubleTransition

src/BD.WTTS.Client.Avalonia/UI/Styling/Controls/SettingsExpander.axaml

@@ -38,18 +38,18 @@
         <Setter Property="MinHeight" Value="{DynamicResource SettingsExpanderItemMinHeight}" />
         <Setter Property="Template">
             <ControlTemplate>
-                <ui:FABorder
+                <Border
                     Name="Root"
                     Padding="{TemplateBinding Padding}"
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}">
-                    <ui:FABorder.Transitions>
+                    <Border.Transitions>
                         <Transitions>
                             <BrushTransition Property="Background" Duration="00:00:00.083" />
                             <BrushTransition Property="BorderBrush" Duration="00:00:00.083" />
                         </Transitions>
-                    </ui:FABorder.Transitions>
+                    </Border.Transitions>
 
                     <Grid ColumnDefinitions="*,Auto,Auto" RowDefinitions="*,Auto">
                         <Viewbox
@@ -102,7 +102,7 @@
                             <ContentPresenter Name="ExpandChevronActionIconContainer" Content="{Binding TemplateSettings.ActionIcon, RelativeSource={RelativeSource TemplatedParent}}" />
                         </Viewbox>
                     </Grid>
-                </ui:FABorder>
+                </Border>
             </ControlTemplate>
         </Setter>
 
@@ -110,7 +110,7 @@
             <Setter Property="IsVisible" Value="False" />
         </Style>
 
-        <Style Selector="^:nth-last-child(1) /template/ ui|FABorder#Root">
+        <Style Selector="^:nth-last-child(1) /template/ Border#Root">
             <Setter Property="CornerRadius" Value="{Binding Source={StaticResource ControlCornerRadius}, Converter={StaticResource BottomCornerRadiusFilterConverter}}" />
         </Style>
 
@@ -152,11 +152,11 @@
         </Style>
 
         <Style Selector="^:allowClick">
-            <Style Selector="^:pointerover /template/ ui|FABorder#Root">
+            <Style Selector="^:pointerover /template/ Border#Root">
                 <Setter Property="Background" Value="{DynamicResource ControlFillColorSecondaryBrush}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ControlFillColorSecondaryBrush}" />
             </Style>
-            <Style Selector="^:pressed /template/ ui|FABorder#Root">
+            <Style Selector="^:pressed /template/ Border#Root">
                 <Setter Property="Background" Value="{DynamicResource ControlFillColorTertiaryBrush}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ControlStrokeColorDefaultBrush}" />
                 <Setter Property="TextElement.Foreground" Value="{DynamicResource TextFillColorSecondaryBrush}" />
@@ -164,7 +164,7 @@
         </Style>
 
         <Style Selector="^:disabled">
-            <Style Selector="^ /template/ ui|FABorder#Root">
+            <Style Selector="^ /template/ Border#Root">
                 <Setter Property="Background" Value="{DynamicResource ControlFillColorDisabledBrush}" />
                 <Setter Property="BorderBrush" Value="{DynamicResource ControlStrokeColorDefaultBrush}" />
                 <Setter Property="TextElement.Foreground" Value="{DynamicResource TextFillColorDisabledBrush}" />

src/BD.WTTS.Client.Avalonia/UI/Styling/Controls/Skeleton.axaml

@@ -0,0 +1,111 @@
+<Styles
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:spp="https://steampp.net/ui"
+    x:CompileBindings="True">
+    <Design.PreviewWith>
+        <Border Padding="20">
+            <!--  Add Controls for Previewer Here  -->
+            <StackPanel>
+                <ToggleSwitch Name="loading" Content="Loading" />
+                <ToggleSwitch Name="active" Content="Active" />
+                <Grid
+                    MinWidth="400"
+                    HorizontalAlignment="Left"
+                    ColumnDefinitions="auto,*">
+                    <spp:Skeleton
+                        Width="100"
+                        Height="100"
+                        VerticalAlignment="Center"
+                        CornerRadius="2"
+                        IsActive="{Binding #active.IsChecked}"
+                        IsLoading="{Binding #loading.IsChecked}">
+                        <Image RenderOptions.BitmapInterpolationMode="HighQuality" Source="avares://BD.WTTS.Client.Avalonia/UI/Assets/ApplicationIcon.ico" />
+                    </spp:Skeleton>
+                    <UniformGrid
+                        Grid.Column="1"
+                        Margin="5,0"
+                        Columns="1"
+                        Rows="3">
+                        <spp:Skeleton
+                            Margin="0,0,200,0"
+                            VerticalAlignment="Top"
+                            CornerRadius="2"
+                            IsActive="{Binding #active.IsChecked}"
+                            IsLoading="{Binding #loading.IsChecked}">
+                            <SelectableTextBlock Margin="0,2" Text="是先有鸡还是先有蛋" />
+                        </spp:Skeleton>
+                        <spp:Skeleton
+                            Margin="0,0,100,0"
+                            VerticalAlignment="Center"
+                            CornerRadius="2"
+                            IsActive="{Binding #active.IsChecked}"
+                            IsLoading="{Binding #loading.IsChecked}">
+                            <SelectableTextBlock Margin="0,2" Text="什么是工匠精神" />
+                        </spp:Skeleton>
+                        <spp:Skeleton
+                            VerticalAlignment="Bottom"
+                            CornerRadius="2"
+                            IsActive="{Binding #active.IsChecked}"
+                            IsLoading="{Binding #loading.IsChecked}">
+                            <SelectableTextBlock Margin="0,2" Text="看山不是山，看水不是水，看山还是山，看水还是水" />
+                        </spp:Skeleton>
+                    </UniformGrid>
+                </Grid>
+            </StackPanel>
+        </Border>
+    </Design.PreviewWith>
+
+    <Styles.Resources>
+        <ControlTheme x:Key="{x:Type spp:Skeleton}" TargetType="spp:Skeleton">
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="Template">
+                <ControlTemplate TargetType="spp:Skeleton">
+                    <Border
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        ClipToBounds="{TemplateBinding ClipToBounds}"
+                        CornerRadius="{TemplateBinding CornerRadius}">
+                        <Panel>
+                            <ContentPresenter
+                                x:Name="PART_ContentPresenter"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}" />
+                            <spp:PureRectangle
+                                x:Name="PART_LoadingBorder"
+                                Background="{DynamicResource SkeletonDefaultBackground}"
+                                Classes.Active="{Binding Path=IsActive, RelativeSource={RelativeSource TemplatedParent}}"
+                                IsHitTestVisible="{TemplateBinding IsLoading}"
+                                IsVisible="{TemplateBinding IsLoading}" />
+                            <spp:PureRectangle
+                                x:Name="PART_ActiveBorder"
+                                IsHitTestVisible="{TemplateBinding IsLoading}"
+                                IsVisible="{TemplateBinding IsLoading}" />
+                        </Panel>
+                    </Border>
+                </ControlTemplate>
+            </Setter>
+        </ControlTheme>
+    </Styles.Resources>
+
+    <Style Selector="spp|Skeleton[IsActive=True][IsLoading=True] /template/ spp|PureRectangle#PART_ActiveBorder">
+        <Style.Animations>
+            <Animation
+                Easing="CubicEaseInOut"
+                FillMode="None"
+                IterationCount="Infinite"
+                PlaybackDirection="Alternate"
+                Duration="0:0:1.4">
+                <KeyFrame Cue="0%">
+                    <Setter Property="Background" Value="{DynamicResource SkeletonStartAnimationBackground}" />
+                </KeyFrame>
+                <KeyFrame Cue="100%">
+                    <Setter Property="Background" Value="{DynamicResource SkeletonEndAnimationBackground}" />
+                </KeyFrame>
+            </Animation>
+        </Style.Animations>
+    </Style>
+</Styles>

src/BD.WTTS.Client.Avalonia/UI/Styling/Controls/Snackbar.axaml

@@ -95,7 +95,7 @@
             <Setter Property="Template">
                 <ControlTemplate>
                     <LayoutTransformControl Name="PART_LayoutTransformControl" UseRenderTransform="True">
-                        <ui:FABorder
+                        <Border
                             Name="ContentRoot"
                             VerticalAlignment="Top"
                             BorderBrush="{DynamicResource InfoBarBorderBrush}"
@@ -205,13 +205,13 @@
                                     </Button>
                                 </Grid>
                             </Panel>
-                        </ui:FABorder>
+                        </Border>
                     </LayoutTransformControl>
                 </ControlTemplate>
             </Setter>
 
             <Style Selector="^:informational">
-                <Style Selector="^ /template/ ui|FABorder#ContentRoot">
+                <Style Selector="^ /template/ Border#ContentRoot">
                     <!--<Setter Property="Background" Value="{DynamicResource InfoBarInformationalSeverityBackgroundBrush}" />-->
                     <Setter Property="Background" Value="{DynamicResource SolidBackgroundFillColorBaseBrush}" />
                 </Style>
@@ -226,7 +226,7 @@
             </Style>
 
             <Style Selector="^:error">
-                <Style Selector="^ /template/ ui|FABorder#ContentRoot">
+                <Style Selector="^ /template/ Border#ContentRoot">
                     <Setter Property="Background" Value="{DynamicResource InfoBarErrorSeverityBackgroundBrush}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#IconBackground">
@@ -241,7 +241,7 @@
             </Style>
 
             <Style Selector="^:warning">
-                <Style Selector="^ /template/ ui|FABorder#ContentRoot">
+                <Style Selector="^ /template/ Border#ContentRoot">
                     <Setter Property="Background" Value="{DynamicResource InfoBarWarningSeverityBackgroundBrush}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#IconBackground">
@@ -255,7 +255,7 @@
             </Style>
 
             <Style Selector="^:success">
-                <Style Selector="^ /template/ ui|FABorder#ContentRoot">
+                <Style Selector="^ /template/ Border#ContentRoot">
                     <Setter Property="Background" Value="{DynamicResource InfoBarSuccessSeverityBackgroundBrush}" />
                 </Style>
                 <Style Selector="^ /template/ Ellipse#IconBackground">
@@ -294,7 +294,7 @@
             </Style>
 
             <!--  Visible  -->
-            <Style Selector="^:hidden /template/ ui|FABorder#ContentRoot">
+            <Style Selector="^:hidden /template/ Border#ContentRoot">
                 <Setter Property="IsVisible" Value="False" />
             </Style>
 

src/BD.WTTS.Client.Avalonia/UI/Styling/Controls/TabStrip.axaml

@@ -75,7 +75,7 @@
             <Setter Property="VerticalAlignment" Value="Stretch" />
             <Setter Property="Template">
                 <ControlTemplate>
-                    <ui:FABorder
+                    <Border
                         Name="Root"
                         VerticalAlignment="{TemplateBinding VerticalAlignment}"
                         Background="{TemplateBinding Background}"
@@ -83,19 +83,19 @@
                         BorderThickness="1"
                         CornerRadius="{TemplateBinding CornerRadius}"
                         TemplatedControl.IsTemplateFocusTarget="True">
-                        <ui:FABorder.Transitions>
+                        <Border.Transitions>
                             <Transitions>
                                 <BrushTransition Property="Background" Duration="00:00:00.083" />
                             </Transitions>
-                        </ui:FABorder.Transitions>
+                        </Border.Transitions>
 
                         <Panel>
-                            <ui:FABorder
+                            <Border
                                 Name="Hover"
                                 Margin="3"
                                 Background="Transparent"
                                 CornerRadius="{TemplateBinding CornerRadius}">
-                                <ui:FABorder.Transitions>
+                                <Border.Transitions>
                                     <Transitions>
                                         <BrushTransition Property="Background" Duration="00:00:00.083" />
                                         <TransformOperationsTransition
@@ -103,8 +103,8 @@
                                             Property="RenderTransform"
                                             Duration="00:00:00.167" />
                                     </Transitions>
-                                </ui:FABorder.Transitions>
-                            </ui:FABorder>
+                                </Border.Transitions>
+                            </Border>
 
                             <ContentPresenter
                                 Name="PART_ContentPresenter"
@@ -139,19 +139,19 @@
                             </Rectangle>
 
                         </Panel>
-                    </ui:FABorder>
+                    </Border>
                 </ControlTemplate>
             </Setter>
 
 
             <Style Selector="^:pointerover">
-                <Style Selector="^ /template/ ui|FABorder#Hover">
+                <Style Selector="^ /template/ Border#Hover">
                     <Setter Property="Background" Value="{DynamicResource SubtleFillColorSecondaryBrush}" />
                 </Style>
             </Style>
 
             <Style Selector="^:pressed">
-                <Style Selector="^ /template/ ui|FABorder#Hover">
+                <Style Selector="^ /template/ Border#Hover">
                     <Setter Property="Background" Value="{DynamicResource SubtleFillColorTertiaryBrush}" />
                     <Setter Property="RenderTransform" Value="scale(0.96)" />
                 </Style>
@@ -161,10 +161,10 @@
             </Style>
 
             <Style Selector="^:selected">
-                <Style Selector="^ /template/ ui|FABorder#Hover">
+                <Style Selector="^ /template/ Border#Hover">
                     <Setter Property="IsVisible" Value="False" />
                 </Style>
-                <Style Selector="^ /template/ ui|FABorder#Root">
+                <Style Selector="^ /template/ Border#Root">
                     <Setter Property="Background" Value="{DynamicResource ControlFillColorDefaultBrush}" />
                     <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
                 </Style>
@@ -181,10 +181,10 @@
             </Style>
 
             <Style Selector="^:disabled">
-                <Style Selector="^ /template/ ui|FABorder#Hover">
+                <Style Selector="^ /template/ Border#Hover">
                     <Setter Property="IsVisible" Value="False" />
                 </Style>
-                <Style Selector="^ /template/ ui|FABorder#Root">
+                <Style Selector="^ /template/ Border#Root">
                     <Setter Property="Background" Value="{DynamicResource ControlFillColorDisabledBrush}" />
                     <Setter Property="BorderBrush" Value="{DynamicResource ControlAltFillColorSecondaryBrush}" />
                 </Style>

src/BD.WTTS.Client.Avalonia/UI/Styling/Controls/TaskDialogEx.axaml

@@ -80,7 +80,7 @@
         <Setter Property="Template">
             <ControlTemplate>
                 <Panel Name="LayoutRoot" Background="{x:Null}">
-                    <ui:FABorder
+                    <Border
                         Name="ContentRoot"
                         MinWidth="{DynamicResource TaskDialogMinWidth}"
                         MinHeight="{DynamicResource TaskDialogMinHeight}"
@@ -216,7 +216,7 @@
                                 </ItemsControl>
                             </Border>
                         </Grid>
-                    </ui:FABorder>
+                    </Border>
                 </Panel>
             </ControlTemplate>
         </Setter>
@@ -303,7 +303,7 @@
             <Style Selector="^ /template/ Panel#LayoutRoot">
                 <Setter Property="Background" Value="{DynamicResource TaskDialogSmokeFill}" />
             </Style>
-            <Style Selector="^ /template/ ui|FABorder#ContentRoot">
+            <Style Selector="^ /template/ Border#ContentRoot">
                 <Setter Property="BorderBrush" Value="{DynamicResource TaskDialogBorderBrush}" />
                 <Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
                 <Setter Property="BorderThickness" Value="{DynamicResource TaskDialogBorderWidth}" />
@@ -332,7 +332,7 @@
                     </Animation>
                 </Style.Animations>
             </Style>
-            <Style Selector="^:hidden /template/ ui|FABorder#ContentRoot">
+            <Style Selector="^:hidden /template/ Border#ContentRoot">
                 <Style.Animations>
                     <Animation FillMode="Forward" Duration="00:00:00.167">
                         <KeyFrame Cue="0%">
@@ -368,7 +368,7 @@
                     </Animation>
                 </Style.Animations>
             </Style>
-            <Style Selector="^:open /template/ ui|FABorder#ContentRoot">
+            <Style Selector="^:open /template/ Border#ContentRoot">
                 <Style.Animations>
                     <Animation FillMode="Forward" Duration="00:00:00.250">
                         <KeyFrame Cue="0%">
@@ -389,7 +389,7 @@
             <Setter Property="Template">
                 <ControlTemplate>
                     <Panel Name="LayoutRoot" Background="{x:Null}">
-                        <ui:FABorder
+                        <Border
                             Name="ContentRoot"
                             MinWidth="{DynamicResource TaskDialogMinWidth}"
                             MinHeight="{DynamicResource TaskDialogMinHeight}"
@@ -521,7 +521,7 @@
                                     </ItemsControl>
                                 </Border>
                             </Grid>
-                        </ui:FABorder>
+                        </Border>
                     </Panel>
                 </ControlTemplate>
             </Setter>

src/BD.WTTS.Client.Avalonia/UI/Styling/Controls/ToggleSwitch.axaml

@@ -296,8 +296,8 @@
     </Styles.Resources>
 
     <Style Selector="ToggleSwitch">
-        <Setter Property="OffContent" Value="{ReflectionBinding Path=Res.Off, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
-        <Setter Property="OnContent" Value="{ReflectionBinding Path=Res.On, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
+        <Setter Property="OffContent" Value="{Binding Path=Res.Off, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
+        <Setter Property="OnContent" Value="{Binding Path=Res.On, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
         <Setter Property="MinWidth" Value="0" />
     </Style>
 

src/BD.WTTS.Client.Avalonia/UI/Styling/CustomTheme.axaml

@@ -14,4 +14,5 @@
     </Styles.Resources>
 
     <StyleInclude Source="/UI/Styling/Controls.axaml" />
+    <StyleInclude Source="avares://AvaloniaEdit/Themes/Fluent/AvaloniaEdit.xaml" />
 </Styles>

src/BD.WTTS.Client.Avalonia/UI/Styling/CustomTheme.axaml.cs

@@ -3,6 +3,10 @@ namespace BD.WTTS.UI.Styling;
 /// <summary>
 /// Includes the fluent theme in an application.
 /// </summary>
+[Mobius(
+"""
+Mobius.UI.Styling.CustomTheme
+""")]
 public class CustomTheme : Styles, IResourceProvider
 {
     public const string LightModeString = "Light";

src/BD.WTTS.Client.Avalonia/UI/Styling/Icons.axaml

@@ -38,6 +38,7 @@
     <x:String x:Key="Back">&#xE112;</x:String>
     <x:String x:Key="Sort">&#xE174;</x:String>
     <x:String x:Key="Move">&#xE7C2;</x:String>
+    <x:String x:Key="Device">&#xE7FB;</x:String>
 
 
     <ui:ImageIconSource x:Key="AppIcon" Source="avares://BD.WTTS.Client.Avalonia/UI/Assets/ApplicationIcon.ico" />

src/BD.WTTS.Client.Avalonia/UI/Styling/Theme/Dark.axaml

@@ -21,4 +21,16 @@
             </OnPlatform>
         </RenderOptions.BitmapInterpolationMode>-->
     </ImageBrush>
+
+    <LinearGradientBrush x:Key="SkeletonStartAnimationBackground" StartPoint="0%,100%" EndPoint="100%,100%">
+        <GradientStop Offset="0" Color="#FF1C1F23" />
+        <GradientStop Offset="0" Color="#FF2E3238" />
+        <GradientStop Offset="1" Color="#FF1C1F23" />
+    </LinearGradientBrush>
+    <LinearGradientBrush x:Key="SkeletonEndAnimationBackground" StartPoint="0%,100%" EndPoint="100%,100%">
+        <GradientStop Offset="0" Color="#FF1C1F23" />
+        <GradientStop Offset="1" Color="#FF2E3238" />
+        <GradientStop Offset="1" Color="#FF1C1F23" />
+    </LinearGradientBrush>
+    <SolidColorBrush x:Key="SkeletonDefaultBackground" Color="#FF1C1F23" />
 </ResourceDictionary>

src/BD.WTTS.Client.Avalonia/UI/Styling/Theme/Light.axaml

@@ -21,4 +21,16 @@
             </OnPlatform>
         </RenderOptions.BitmapInterpolationMode>-->
     </ImageBrush>
+
+    <LinearGradientBrush x:Key="SkeletonStartAnimationBackground" StartPoint="0%,100%" EndPoint="100%,100%">
+        <GradientStop Offset="0" Color="#FFF9F9F9" />
+        <GradientStop Offset="0" Color="#FFE6E8EA" />
+        <GradientStop Offset="1" Color="#FFF9F9F9" />
+    </LinearGradientBrush>
+    <LinearGradientBrush x:Key="SkeletonEndAnimationBackground" StartPoint="0%,100%" EndPoint="100%,100%">
+        <GradientStop Offset="0" Color="#FFF9F9F9" />
+        <GradientStop Offset="1" Color="#FFE6E8EA" />
+        <GradientStop Offset="1" Color="#FFF9F9F9" />
+    </LinearGradientBrush>
+    <SolidColorBrush x:Key="SkeletonDefaultBackground" Color="#FFF9F9F9" />
 </ResourceDictionary>

src/BD.WTTS.Client.Avalonia/UI/Styling/Window.axaml

@@ -210,7 +210,7 @@
                     <wnd:MinMaxCloseControl
                         Name="SystemCaptionButtons"
                         Height="{Binding TemplateSettings.TitleBarHeight, RelativeSource={RelativeSource TemplatedParent}}"
-                        Margin="18,0"
+                        Margin="14,0"
                         HorizontalAlignment="Right"
                         VerticalAlignment="Top" />
 

src/BD.WTTS.Client.Avalonia/UI/Views/Abstractions/Pages/PageBase.cs

@@ -1,12 +1,20 @@
 using Avalonia.Markup.Xaml.MarkupExtensions;
 using Avalonia.Rendering.Composition;
+using FluentAvalonia.UI.Controls.Experimental;
+using FluentAvalonia.UI.Navigation;
 
 namespace BD.WTTS.UI.Views.Pages;
 
+[Mobius(
+"""
+Mobius.UI.Views.Pages.Abstractions.PageBase
+""")]
 public class PageBase : UserControl
 {
     public PageBase() : base()
     {
+        _disposables = new();
+
         SizeChanged += PageBaseSizeChanged;
 
         if (HeaderBackground == null)
@@ -14,6 +22,8 @@ public class PageBase : UserControl
             this[!HeaderBackgroundProperty] = new DynamicResourceExtension("PageHeaderBackgroundBrush");
         }
 
+        _disposables.Add(UISettings.WindowBackgroundCustomImage.Subscribe(x => IsShowBackgroundImage = !x));
+
         //AddHandler(Frame.NavigatingFromEvent, FrameNavigatingFrom, RoutingStrategies.Direct);
         //AddHandler(Frame.NavigatedToEvent, FrameNavigatedTo, RoutingStrategies.Direct);
     }
@@ -139,6 +149,7 @@ public class PageBase : UserControl
 
         //_previewImageHost = e.NameScope.Find<IconSourceElement>("PreviewImageElement");
         //_detailsHost = e.NameScope.Find<StackPanel>("DetailsTextHost");
+
         _optionsHost = e.NameScope.Find<Panel>("OptionsRegion");
         _tabsHost = e.NameScope.Find<Border>("TabRegion");
         _detailsPanel = e.NameScope.Find<Panel>("PageDetails");
@@ -157,6 +168,7 @@ public class PageBase : UserControl
     {
         base.OnUnloaded(e);
         _hasLoaded = false;
+        _disposables.Dispose();
     }
 
     private void PageBaseSizeChanged(object? sender, SizeChangedEventArgs e)
@@ -266,33 +278,28 @@ public class PageBase : UserControl
         ec.ImplicitAnimations = ani;
     }
 
-    //private void FrameNavigatingFrom(object sender, NavigatingCancelEventArgs e)
+    //private void FrameNavigatingFrom(object? sender, NavigatingCancelEventArgs e)
     //{
-    //    // If TargetType is not set, we know we're currently on a CoreControls page since those
-    //    // are grouped pages - whereas, FA controls only display one control per page and
-    //    // set all the extra properties
-    //    bool isFAControlPage = TargetType != null;
-
     //    // Only setup the ConnectedAnimation if it makes sense
-    //    if ((!isFAControlPage && e.SourcePageType == typeof(CoreControlsPageViewModel)) ||
-    //        (isFAControlPage && e.SourcePageType == typeof(FAControlsOverviewPageViewModel)))
+    //    if ((e.SourcePageType == typeof(HomePageViewModel)) ||
+    //        (e.SourcePageType == typeof(PluginStorePageViewModel)))
     //    {
     //        // Only setup the Back connected animation if we're going back to the
     //        // controls list pages
     //        var svc = ConnectedAnimationService.GetForView(TopLevel.GetTopLevel(this));
     //        svc.PrepareToAnimate("BackAnimation", (Control)_previewImageHost.Parent);
-    //        NavigationService.Instance.PreviousPage = this;
+    //        //NavigationService.Instance.PreviousPage = this;
     //    }
     //}
 
-    //private void FrameNavigatedTo(object sender, NavigationEventArgs e)
+    //private void FrameNavigatedTo(object? sender, NavigationEventArgs e)
     //{
     //    var svc = ConnectedAnimationService.GetForView(TopLevel.GetTopLevel(this));
     //    var animation = svc.GetAnimation("ForwardAnimation");
 
     //    if (animation != null)
     //    {
-    //        var coordinated = new List<Visual>
+    //        var coordinated = new List<Visual?>
     //        {
     //            _optionsHost,
     //            _detailsHost,
@@ -315,8 +322,13 @@ public class PageBase : UserControl
     //private IconSourceElement? _previewImageHost;
     //private StackPanel? _detailsHost;
     private ScrollViewer? _scroller;
+    private CompositeDisposable _disposables;
 }
 
+[Mobius(
+"""
+Mobius.UI.Views.Pages.Abstractions.PageBase<TViewModel>
+""")]
 public class PageBase<TViewModel> : PageBase, IViewFor<TViewModel> where TViewModel : class
 {
     public static readonly StyledProperty<TViewModel?> ViewModelProperty = AvaloniaProperty.Register<PageBase<TViewModel>, TViewModel?>(nameof(ViewModel));
@@ -324,13 +336,14 @@ public class PageBase<TViewModel> : PageBase, IViewFor<TViewModel> where TViewMo
     /// <summary>
     /// Initializes a new instance of the <see cref="PageBase{TViewModel}"/> class.
     /// </summary>
-    public PageBase()
+    public PageBase() : base()
     {
         // This WhenActivated block calls ViewModel's WhenActivated
         // block if the ViewModel implements IActivatableViewModel.
+
         this.WhenActivated(disposables =>
         {
-            disposables.Add(UISettings.WindowBackgroundCustomImage.Subscribe(x => IsShowBackgroundImage = !x));
+            //disposables.Add(UISettings.WindowBackgroundCustomImage.Subscribe(x => IsShowBackgroundImage = !x));
         });
         this.GetObservable(ViewModelProperty).Subscribe(OnViewModelChanged);
     }

src/BD.WTTS.Client.Avalonia/UI/Views/Abstractions/Windows/ReactiveAppWindow.cs

@@ -7,6 +7,10 @@ namespace BD.WTTS.UI.Views.Windows;
 /// and vice versa.
 /// </summary>
 /// <typeparam name="TViewModel">ViewModel type.</typeparam>
+[Mobius(
+"""
+Mobius.UI.Views.Windows.Abstractions.ReactiveAppWindow<TViewModel>
+""")]
 public class ReactiveAppWindow<TViewModel> : AppWindow, IViewFor<TViewModel>, IViewFor, IActivatableView where TViewModel : class
 {
     public static readonly StyledProperty<TViewModel?> ViewModelProperty = ReactiveWindow<TViewModel>.ViewModelProperty.AddOwner<ReactiveAppWindow<TViewModel>>();
@@ -52,7 +56,7 @@ public class ReactiveAppWindow<TViewModel> : AppWindow, IViewFor<TViewModel>, IV
 
         //SystemDecorations = SystemDecorations.BorderOnly;
         Background = null;
-        TransparencyBackgroundFallback = Brushes.Transparent;
+        TransparencyBackgroundFallback = OperatingSystem2.IsMacOS() ? Brushes.Black : Brushes.Transparent;
         TransparencyLevelHint = new WindowTransparencyLevel[] { UISettings.WindowBackgroundMaterial.Value.ToWindowTransparencyLevel() };
 
         if (IsSaveWindowSize)

src/BD.WTTS.Client.Avalonia/UI/Views/Controls/AdControl.axaml

@@ -8,9 +8,7 @@
     xmlns:spp="https://steampp.net/ui"
     d:DesignHeight="450"
     d:DesignWidth="800"
-    IsVisible="{ReflectionBinding IsShowAdvertise,
-                                  Mode=OneWay,
-                                  Source={x:Static s:AdvertiseService.Current}}"
+    IsVisible="{Binding IsShowAdvertise, Mode=OneWay, Source={x:Static s:AdvertiseService.Current}}"
     mc:Ignorable="d">
     <Border ClipToBounds="True" CornerRadius="{DynamicResource ControlCornerRadius}">
         <Panel>
@@ -20,15 +18,14 @@
                         <Button
                             Padding="0"
                             Classes="Plain"
-                            Command="{ReflectionBinding ClickAdvertisementCommand,
-                                                        Mode=OneWay,
-                                                        Source={x:Static s:AdvertiseService.Current}}"
+                            Command="{Binding ClickAdvertisementCommand, Mode=OneWay, Source={x:Static s:AdvertiseService.Current}}"
                             CommandParameter="{Binding}"
                             Cursor="Hand"
                             ToolTip.Tip="{Binding Describe}">
                             <spp:Image2
                                 Width="{Binding $parent[UserControl].Bounds.Width}"
                                 Height="{Binding $parent[UserControl].Bounds.Height}"
+                                EnableCancelToken="False"
                                 Source="{Binding ImageUrl}"
                                 Stretch="UniformToFill" />
                         </Button>
@@ -39,17 +36,13 @@
                 Margin="10"
                 FontSize="10"
                 Foreground="White"
-                Text="{ReflectionBinding Path=Res.Advertisement,
-                                         Mode=OneWay,
-                                         Source={x:Static s:ResourceService.Current}}" />
+                Text="{Binding Path=Res.Advertisement, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
             <Button
                 Name="CloseAdBtn"
                 HorizontalAlignment="Right"
                 VerticalAlignment="Top"
                 Background="Transparent"
-                Content="{ReflectionBinding Path=Res.Advertisement_Close,
-                                            Mode=OneWay,
-                                            Source={x:Static s:ResourceService.Current}}"
+                Content="{Binding Path=Res.Advertisement_Close, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
                 Cursor="Hand"
                 Foreground="White" />
         </Panel>

src/BD.WTTS.Client.Avalonia/UI/Views/Controls/AdControl.axaml.cs

@@ -4,6 +4,10 @@ using FluentAvalonia.Core;
 
 namespace BD.WTTS.UI.Views.Controls;
 
+[Mobius(
+"""
+Mobius.UI.Views.Controls
+""")]
 public partial class AdControl : UserControl
 {
     /// <summary>

src/BD.WTTS.Client.Avalonia/UI/Views/Controls/AppItem.cs

@@ -4,6 +4,10 @@ using System.Numerics;
 
 namespace BD.WTTS.UI.Views.Controls;
 
+[Mobius(
+"""
+Mobius.UI.Views.Controls
+""")]
 public class AppItem : TemplatedControl
 {
     public static readonly StyledProperty<string> TitleProperty =

src/BD.WTTS.Client.Avalonia/UI/Views/Controls/ContentLoader.cs

@@ -4,6 +4,10 @@ using FluentAvalonia.Core;
 
 namespace BD.WTTS.UI.Views.Controls;
 
+[Mobius(
+"""
+Mobius.UI.Views.Controls
+""")]
 public class ContentLoader : ContentControl
 {
     /// <summary>

src/BD.WTTS.Client.Avalonia/UI/Views/Controls/CustomFilePicker.cs

@@ -2,6 +2,10 @@ using Avalonia.Input;
 
 namespace BD.WTTS.UI.Views.Controls;
 
+[Mobius(
+"""
+Mobius.UI.Views.Controls
+""")]
 public sealed class CustomFilePicker : ContentControl
 {
     public static readonly StyledProperty<string?> FileNameProperty = AvaloniaProperty.Register<CustomFilePicker, string?>(nameof(FileName), null);