🐛 修复 Ubuntu 版本文件不存在中断问题

🐛 修复替换令牌时恢复代码不显示的问题

.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

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/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

@@ -14,7 +14,7 @@ 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"
@@ -30,59 +30,59 @@ 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/net7.0-macos/Steam++.app"
+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++"

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": ""
@@ -964,6 +973,209 @@
         }
       ],
       "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

@@ -16,12 +16,12 @@ public static partial class AssemblyInfo
     /// <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 = "3";
+    const string ver_for_rc = "8";
 
     public const string FileVersion = $"{Version2}.{ver_for_rc}0{ver_for_preview}.0";
 

src/AssemblyInfo.Xaml.cs

@@ -22,6 +22,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,76 @@
   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.207.0" />
+	<Identity
+	  Name="4651ED44255E.47979655102CE"
+	  Publisher="CN=A90E406B-B2D3-4A23-B061-0FA1D65C4F66"
+	  Version="3.0.207.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++\modules\Accelerator\Steam++.Accelerator.exe">
-        <desktop2:Rule Direction="in" IPProtocol="TCP" Profile="all"/>
-        <desktop2:Rule Direction="in" IPProtocol="UDP" Profile="all"/>
-      </desktop2:FirewallRules>
-    </desktop2:Extension>
-  </Extensions>
+	<Extensions>
+		<desktop2:Extension Category="windows.firewallRules">
+			<desktop2:FirewallRules Executable="Steam++\modules\Accelerator\Steam++.Accelerator.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/App.config

@@ -10,6 +10,6 @@
 		<legacyCorruptedStateExceptionsPolicy enabled="true"/>
 	</runtime>
 	<appSettings>
-		<add key="d" value="7.0.11"/>
+		<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 = "11";
+        dotnet_version_build = "0";
         dotnet_version = $"{dotnet_version_major}.{dotnet_version_minor}.{dotnet_version_build}";
     }
 

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/BD.WTTS.Client.Avalonia.csproj

@@ -126,6 +126,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/EnumLocalizationNameConverter.cs

@@ -18,6 +18,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/StringOmitConverter.cs

@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BD.WTTS.Converters;
-
-public sealed class StringOmitConverter : IValueConverter
-{
-    public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-    {
-        string s = value.ToString();
-        int leng;
-        if (int.TryParse(parameter.ToString(), out leng))
-        {
-            if (s.Length <= leng)
-                return s;
-            else
-                return s[..leng] + "...";
-        }
-        else
-            return string.Empty;
-    }
-
-    public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-    {
-        throw new NotImplementedException();
-    }
-}

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

@@ -1,19 +1,23 @@
 namespace BD.WTTS.Converters;
 
-public sealed class VisbleStringConverter : IMultiValueConverter
+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,111 @@
+namespace BD.WTTS.Converters;
+
+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;
+    }
+}
+
+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;
+    }
+}
+
+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;
+    }
+}
+
+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,7 @@ namespace BD.WTTS.UI;
 
 public static class ControlExtensions
 {
-    public static void SetViewModel<T>(this Control c, bool useCache = true) where T : ViewModelBase
+    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 +11,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,31 @@
+namespace BD.WTTS;
+
+/// <summary>
+/// <see cref="IEnumerable"/> extensions methods
+/// </summary>
+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/Services.Implementation/UI/Views/Windows/AvaloniaWindowManagerImpl.cs

@@ -4,7 +4,7 @@ using System.Collections.Immutable;
 namespace BD.WTTS.Services.Implementation;
 
 /// <inheritdoc cref="IWindowManager"/>
-sealed class AvaloniaWindowManagerImpl : IWindowManagerImpl
+public sealed class AvaloniaWindowManagerImpl : IWindowManagerImpl
 {
     Type? IWindowManagerImpl.WindowType => typeof(Window);
 
@@ -113,10 +113,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/UI/App.TrayIcon.cs

@@ -88,7 +88,7 @@ partial class App
                                     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")!,
+                                Converter = (VisibleStringConverter)App.Instance.FindResource(nameof(VisibleStringConverter))!,
                             },
                             Command = ReactiveCommand.Create(async () =>
                             {
@@ -125,12 +125,20 @@ partial class App
                         {
                             subMenu = new NativeMenu();
                             foreach (var sub in item.Value.Items)
-                                subMenu.Add(new NativeMenuItem
+                            {
+                                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,

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

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

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

@@ -11,6 +11,12 @@ public sealed partial class App : Application
 {
     const string TAG = "AvaApp";
 
+    public App()
+    {
+        OpenBrowserCommand = ReactiveCommand.Create<object?>(OpenBrowserCommandCore);
+        CopyToClipboardCommand = ReactiveCommand.Create<object?>(CopyToClipboardCommandCore);
+    }
+
     /// <summary>
     /// 获取当前主窗口
     /// </summary>
@@ -46,6 +52,7 @@ public sealed partial class App : Application
 #if WINDOWS || LINUX || MACOS
             if (GeneralSettings.MinimizeOnStartup.Value)
                 Startup.Instance.IsMinimize = true;
+
             if (Startup.Instance.IsSteamRun)
             {
                 try
@@ -93,15 +100,16 @@ public sealed partial class App : Application
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
             MainWindow = InitializeMainWindow?.Invoke(this) ?? new MainWindow();
+
             desktop.MainWindow =
 #if !UI_DEMO
-                Startup.Instance.IsMinimize ? null :
+                Startup.Instance.IsMinimize && MainWindow is MainWindow ? null :
 #endif
                 MainWindow;
 
             if (Startup.Instance.IsMinimize && MainWindow is AppWindow appWindow)
             {
-                Task2.InBackground(() => appWindow.SplashScreen.RunTasks(CancellationToken.None));
+                Task2.InBackground(() => appWindow.SplashScreen?.RunTasks(CancellationToken.None));
             }
         }
         else if (ApplicationLifetime is ISingleViewApplicationLifetime singleView)
@@ -223,16 +231,32 @@ public sealed partial class App : Application
 
     public static FontFamily DefaultFontFamily => _DefaultFontFamily.Value;
 
-    public void OpenBrowserCommand(object url)
+    public ICommand OpenBrowserCommand { get; }
+
+    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)
         {
@@ -240,7 +264,9 @@ public sealed partial class App : Application
         }
     }
 
-    public async void CopyToClipboardCommand(object text)
+    public ICommand CopyToClipboardCommand { get; }
+
+    public async void CopyToClipboardCommandCore(object? text)
     {
         try
         {

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

@@ -1,21 +1,21 @@
 <Styles
     xmlns="https://github.com/avaloniaui"
-    xmlns:spp="https://steampp.net/ui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:ms="https://steampp.net/settings"
     xmlns:sys="using:System"
     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>
 
@@ -45,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" />
@@ -65,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

@@ -1,6 +1,5 @@
 <Styles
     xmlns="https://github.com/avaloniaui"
-    xmlns:spp="https://steampp.net/ui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:s="https://steampp.net/services"
     x:CompileBindings="True">
@@ -17,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 spp:Strings.Search}}" />
+        <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/Border.axaml

@@ -1,6 +1,5 @@
 <Styles
     xmlns="https://github.com/avaloniaui"
-    xmlns:spp="https://steampp.net/ui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
     <Design.PreviewWith>

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

@@ -1,6 +1,5 @@
 <Styles
     xmlns="https://github.com/avaloniaui"
-    xmlns:spp="https://steampp.net/ui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:ui="using:FluentAvalonia.UI.Controls"
     x:CompileBindings="True">
@@ -8,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="更新日志"
@@ -221,4 +220,7 @@
     <Style Selector="Button.Plain:pointerover /template/ ContentPresenter">
         <Setter Property="Background" Value="Transparent" />
     </Style>
+
+
+
 </Styles>

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

@@ -1,6 +1,5 @@
 <Styles
     xmlns="https://github.com/avaloniaui"
-    xmlns:spp="https://steampp.net/ui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
     <Design.PreviewWith>

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

@@ -0,0 +1,112 @@
+<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">
+                            <ItemsRepeater Name="Swiper" IsVisible="False">
+                                <ItemsRepeater.Layout>
+                                    <StackLayout
+                                        DisableVirtualization="True"
+                                        Orientation="Horizontal"
+                                        Spacing="8" />
+                                </ItemsRepeater.Layout>
+                                <ItemsRepeater.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>
+                                </ItemsRepeater.ItemTemplate>
+                            </ItemsRepeater>
+                        </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 spp:Strings.GameList_IsLoading}}"
-                            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 spp:Strings.CustomFilePicker_Tip}}"
+                                        Text="{Binding Path=Res.CustomFilePicker_Tip, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
                                         TextAlignment="Center"
                                         Theme="{StaticResource BodyStrongTextBlockStyle}" />
                                 </StackPanel>
@@ -76,4 +74,4 @@
     <Style Selector="spp|CustomFilePicker:pointerover /template/ Panel#FilePickerTipBorder">
         <Setter Property="IsVisible" Value="True" />
     </Style>
-</Styles>
+</Styles>

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

@@ -1,6 +1,5 @@
 <Styles
     xmlns="https://github.com/avaloniaui"
-    xmlns:spp="https://steampp.net/ui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
     <Design.PreviewWith>

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

@@ -1,6 +1,5 @@
 <Styles
     xmlns="https://github.com/avaloniaui"
-    xmlns:spp="https://steampp.net/ui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:ui="using:FluentAvalonia.UI.Controls"
     x:CompileBindings="True">

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

@@ -1,6 +1,5 @@
 <Styles
     xmlns="https://github.com/avaloniaui"
-    xmlns:spp="https://steampp.net/ui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
     <Design.PreviewWith>

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

@@ -59,12 +59,10 @@
                                 <BrushTransition Property="BorderBrush" Duration="00:00:00.083" />
                             </Transitions>
                         </ui:FABorder.Transitions>
-                        <Grid
-                            MinHeight="{TemplateBinding MinHeight}"
-                            ColumnDefinitions="Auto,*,Auto,Auto"
-                            RowDefinitions="*,Auto">
+                        <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,6 +107,7 @@
 
                             <ui:SymbolIcon
                                 Name="Chevron"
+                                Grid.RowSpan="2"
                                 Grid.Column="3"
                                 Margin="24,4,0,4"
                                 VerticalAlignment="Center"

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

@@ -86,4 +86,4 @@
             </Transitions>
         </Setter>
     </Style>
-</Styles>
+</Styles>

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

@@ -1,6 +1,5 @@
 <Styles
     xmlns="https://github.com/avaloniaui"
-    xmlns:spp="https://steampp.net/ui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
     <Design.PreviewWith>

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

@@ -1,6 +1,5 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
-    xmlns:spp="https://steampp.net/ui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:ui="using:FluentAvalonia.UI.Controls"
     x:CompileBindings="True">

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/TabControl.axaml

@@ -1,6 +1,5 @@
 <Styles
     xmlns="https://github.com/avaloniaui"
-    xmlns:spp="https://steampp.net/ui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
     <Design.PreviewWith>

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

@@ -1,6 +1,5 @@
 <Styles
     xmlns="https://github.com/avaloniaui"
-    xmlns:spp="https://steampp.net/ui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:ui="using:FluentAvalonia.UI.Controls"
     xmlns:uip="using:FluentAvalonia.UI.Controls.Primitives"

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

@@ -1,6 +1,5 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
-    xmlns:spp="https://steampp.net/ui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:ms="https://steampp.net/settings"
     x:CompileBindings="True">

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

@@ -1,6 +1,5 @@
 <Styles
     xmlns="https://github.com/avaloniaui"
-    xmlns:spp="https://steampp.net/ui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:s="https://steampp.net/services"
     xmlns:ui="using:FluentAvalonia.UI.Controls"
@@ -28,26 +27,26 @@
             <MenuItem
                 x:Name="TextBoxContextMenuCutItem"
                 Command="{Binding $parent[TextBox].Cut}"
-                Header="{Binding Path=Res.Cut, Mode=OneWay, Source={x:Static spp:Strings.Cut}}"
+                Header="{Binding Path=Res.Cut, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
                 InputGesture="{x:Static TextBox.CutGesture}"
                 IsEnabled="{Binding $parent[TextBox].CanCut}" />
             <MenuItem
                 x:Name="TextBoxContextMenuCopyItem"
                 Command="{Binding $parent[TextBox].Copy}"
-                Header="{Binding Path=Res.Copy, Mode=OneWay, Source={x:Static spp:Strings.Copy}}"
+                Header="{Binding Path=Res.Copy, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
                 InputGesture="{x:Static TextBox.CopyGesture}"
                 IsEnabled="{Binding $parent[TextBox].CanCopy}" />
             <MenuItem
                 x:Name="TextBoxContextMenuPasteItem"
                 Command="{Binding $parent[TextBox].Paste}"
-                Header="{Binding Path=Res.Paste, Mode=OneWay, Source={x:Static spp:Strings.Paste}}"
+                Header="{Binding Path=Res.Paste, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
                 InputGesture="{x:Static TextBox.PasteGesture}"
                 IsEnabled="{Binding $parent[TextBox].CanPaste}" />
             <MenuItem Header="-" />
             <MenuItem
                 x:Name="TextBoxContextMenuSelectAllItem"
                 Command="{Binding $parent[TextBox].SelectAll}"
-                Header="{Binding Path=Res.SelectAll, Mode=OneWay, Source={x:Static spp:Strings.SelectAll}}"
+                Header="{Binding Path=Res.SelectAll, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
                 InputGesture="Ctrl + A"
                 IsEnabled="{Binding $parent[TextBox].Text, Converter={StaticResource IsNullConverter}, ConverterParameter=invert}" />
         </MenuFlyout>

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

@@ -1,6 +1,5 @@
 <Styles
     xmlns="https://github.com/avaloniaui"
-    xmlns:spp="https://steampp.net/ui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:s="https://steampp.net/services"
     xmlns:ui="using:FluentAvalonia.UI.Controls"
@@ -297,8 +296,8 @@
     </Styles.Resources>
 
     <Style Selector="ToggleSwitch">
-        <Setter Property="OffContent" Value="{ReflectionBinding Path=Res.Off, Mode=OneWay, Source={x:Static spp:Strings.Off}}" />
-        <Setter Property="OnContent" Value="{ReflectionBinding Path=Res.On, Mode=OneWay, Source={x:Static spp:Strings.On}}" />
+        <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

@@ -1,6 +1,5 @@
 <Styles
     x:Class="BD.WTTS.UI.Styling.CustomTheme"
-    xmlns:spp="https://steampp.net/ui"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">

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

@@ -1,6 +1,5 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
-    xmlns:spp="https://steampp.net/ui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:sys="using:System"
     xmlns:ui="https://steampp.net/ui"

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

@@ -1,6 +1,5 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
-    xmlns:spp="https://steampp.net/ui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:ui="using:FluentAvalonia.UI.Controls"
     x:CompileBindings="True">
@@ -39,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/InfoBox.axaml

@@ -1,6 +1,5 @@
 <Styles
     xmlns="https://github.com/avaloniaui"
-    xmlns:spp="https://steampp.net/ui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:sys="using:System"
     xmlns:ui="using:FluentAvalonia.UI.Controls"

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

@@ -1,6 +1,4 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-	xmlns:spp="https://steampp.net/ui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Add Resources Here  -->
     <LinearGradientBrush x:Key="HeaderOpacityMaskBrush" StartPoint="0,0" EndPoint="0%,100%">
         <GradientStop Offset="0" Color="#FF000000" />
@@ -23,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/HighContrastTheme.axaml

@@ -1,6 +1,4 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-    xmlns:spp="https://steampp.net/ui"
-	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Add Resources Here  -->
     <LinearGradientBrush x:Key="HeaderOpacityMaskBrush" StartPoint="0,0" EndPoint="0%,100%">
         <GradientStop Color="#00000000" />

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

@@ -1,6 +1,4 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-    xmlns:spp="https://steampp.net/ui"
-	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Add Resources Here  -->
     <LinearGradientBrush x:Key="HeaderOpacityMaskBrush" StartPoint="0,0" EndPoint="0%,100%">
         <GradientStop Offset="0" Color="#FF000000" />
@@ -23,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

@@ -97,27 +97,27 @@
                         Content=""
                         Theme="{StaticResource FA_SystemCaptionButton}"
                         ToolTip.Placement="Bottom"
-                        ToolTip.Tip="{Binding Path=Res.Minimize, Mode=OneWay, Source={x:Static spp:Strings.Minimize}}" />
+                        ToolTip.Tip="{Binding Path=Res.Minimize, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
                     <Button
                         Name="MaxRestoreButton"
                         Content="&#xE922;"
                         Theme="{StaticResource FA_SystemCaptionButton}"
                         ToolTip.Placement="Bottom"
-                        ToolTip.Tip="{Binding Path=Res.Maximize, Mode=OneWay, Source={x:Static spp:Strings.Maximize}}" />
+                        ToolTip.Tip="{Binding Path=Res.Maximize, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
                     <Button
                         Name="CloseButton"
                         Classes="Close"
                         Content="{StaticResource Close}"
                         Theme="{StaticResource FA_SystemCaptionButton}"
                         ToolTip.Placement="Bottom"
-                        ToolTip.Tip="{Binding Path=Res.Close, Mode=OneWay, Source={x:Static spp:Strings.Close}}" />
+                        ToolTip.Tip="{Binding Path=Res.Close, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
                 </StackPanel>
             </ControlTemplate>
         </Setter>
 
         <Style Selector="^:maximized /template/ Button#MaxRestoreButton">
             <Setter Property="Content" Value="&#xE923;" />
-            <Setter Property="ToolTip.Tip" Value="{Binding Path=Res.Restore, Mode=OneWay, Source={x:Static spp:Strings.Restore}}" />
+            <Setter Property="ToolTip.Tip" Value="{Binding Path=Res.Restore, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
         </Style>
     </ControlTheme>
 
@@ -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,5 +1,7 @@
 using Avalonia.Markup.Xaml.MarkupExtensions;
 using Avalonia.Rendering.Composition;
+using FluentAvalonia.UI.Controls.Experimental;
+using FluentAvalonia.UI.Navigation;
 
 namespace BD.WTTS.UI.Views.Pages;
 
@@ -7,6 +9,8 @@ public class PageBase : UserControl
 {
     public PageBase() : base()
     {
+        _disposables = new();
+
         SizeChanged += PageBaseSizeChanged;
 
         if (HeaderBackground == null)
@@ -14,6 +18,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 +145,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 +164,7 @@ public class PageBase : UserControl
     {
         base.OnUnloaded(e);
         _hasLoaded = false;
+        _disposables.Dispose();
     }
 
     private void PageBaseSizeChanged(object? sender, SizeChangedEventArgs e)
@@ -266,33 +274,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,6 +318,7 @@ public class PageBase : UserControl
     //private IconSourceElement? _previewImageHost;
     //private StackPanel? _detailsHost;
     private ScrollViewer? _scroller;
+    private CompositeDisposable _disposables;
 }
 
 public class PageBase<TViewModel> : PageBase, IViewFor<TViewModel> where TViewModel : class
@@ -324,13 +328,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

@@ -52,7 +52,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 spp:Strings.Advertisement}}" />
+                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 spp:Strings.Advertisement_Close}}"
+                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/Flex/AlignContent.cs

@@ -0,0 +1,13 @@
+namespace BD.WTTS.UI.Views.Controls;
+
+public enum AlignContent
+{
+    FlexStart,
+    FlexEnd,
+    Center,
+    Stretch,
+    SpaceBetween,
+    SpaceAround,
+    SpaceEvenly
+}
+

src/BD.WTTS.Client.Avalonia/UI/Views/Controls/Flex/AlignItems.cs

@@ -0,0 +1,10 @@
+namespace BD.WTTS.UI.Views.Controls;
+
+[SuppressMessage("Naming", "CA1717:Only FlagsAttribute enums should have plural names")]
+public enum AlignItems
+{
+    FlexStart,
+    FlexEnd,
+    Center,
+    Stretch
+}

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

@@ -0,0 +1,183 @@
+namespace BD.WTTS.UI.Views.Controls;
+
+public static class Flex
+{
+    /// <summary>
+    /// Defines an attached property to control the alignment of a specific child in a flex layout.
+    /// </summary>
+    public static readonly AttachedProperty<AlignItems?> AlignSelfProperty =
+        AvaloniaProperty.RegisterAttached<Layoutable, AlignItems?>("AlignSelf", typeof(Flex));
+
+    /// <summary>
+    /// Defines an attached property to control the order of a specific child in a flex layout.
+    /// </summary>
+    public static readonly AttachedProperty<int> OrderProperty =
+        AvaloniaProperty.RegisterAttached<Layoutable, int>("Order", typeof(Flex));
+
+    public static readonly AttachedProperty<FlexBasis> BasisProperty =
+        AvaloniaProperty.RegisterAttached<Layoutable, FlexBasis>("Basis", typeof(Flex), FlexBasis.Auto);
+
+    public static readonly AttachedProperty<double> ShrinkProperty =
+        AvaloniaProperty.RegisterAttached<Layoutable, double>("Shrink", typeof(Flex), 1.0, validate: v => v >= 0.0);
+
+    public static readonly AttachedProperty<double> GrowProperty =
+        AvaloniaProperty.RegisterAttached<Layoutable, double>("Grow", typeof(Flex), 0.0, validate: v => v >= 0.0);
+
+    internal static readonly AttachedProperty<double> BaseLengthProperty =
+        AvaloniaProperty.RegisterAttached<Layoutable, double>("BaseLength", typeof(Flex), 0.0);
+
+    internal static readonly AttachedProperty<double> CurrentLengthProperty =
+        AvaloniaProperty.RegisterAttached<Layoutable, double>("CurrentLength", typeof(Flex), 0.0);
+
+    /// <summary>
+    /// Gets the child alignment in a flex layout
+    /// </summary>
+    public static AlignItems? GetAlignSelf(Layoutable layoutable)
+    {
+        if (layoutable is null)
+        {
+            throw new ArgumentNullException(nameof(layoutable));
+        }
+
+        return layoutable.GetValue(AlignSelfProperty);
+    }
+
+    /// <summary>
+    /// Sets the child alignment in a flex layout
+    /// </summary>
+    public static void SetAlignSelf(Layoutable layoutable, AlignItems? value)
+    {
+        if (layoutable is null)
+        {
+            throw new ArgumentNullException(nameof(layoutable));
+        }
+
+        layoutable.SetValue(AlignSelfProperty, value);
+    }
+
+    /// <summary>
+    /// Gets the child order in a flex layout
+    /// </summary>
+    public static int GetOrder(Layoutable layoutable)
+    {
+        if (layoutable is null)
+        {
+            throw new ArgumentNullException(nameof(layoutable));
+        }
+
+        return layoutable.GetValue(OrderProperty);
+    }
+
+    /// <summary>
+    /// Sets the child order in a flex layout
+    /// </summary>
+    public static void SetOrder(Layoutable layoutable, int value)
+    {
+        if (layoutable is null)
+        {
+            throw new ArgumentNullException(nameof(layoutable));
+        }
+
+        layoutable.SetValue(OrderProperty, value);
+    }
+
+    public static FlexBasis GetBasis(Layoutable layoutable)
+    {
+        if (layoutable is null)
+        {
+            throw new ArgumentNullException(nameof(layoutable));
+        }
+
+        return layoutable.GetValue(BasisProperty);
+    }
+
+    public static void SetBasis(Layoutable layoutable, FlexBasis value)
+    {
+        if (layoutable is null)
+        {
+            throw new ArgumentNullException(nameof(layoutable));
+        }
+
+        layoutable.SetValue(BasisProperty, value);
+    }
+
+    public static double GetShrink(Layoutable layoutable)
+    {
+        if (layoutable is null)
+        {
+            throw new ArgumentNullException(nameof(layoutable));
+        }
+
+        return layoutable.GetValue(ShrinkProperty);
+    }
+
+    public static void SetShrink(Layoutable layoutable, double value)
+    {
+        if (layoutable is null)
+        {
+            throw new ArgumentNullException(nameof(layoutable));
+        }
+
+        layoutable.SetValue(ShrinkProperty, value);
+    }
+
+    public static double GetGrow(Layoutable layoutable)
+    {
+        if (layoutable is null)
+        {
+            throw new ArgumentNullException(nameof(layoutable));
+        }
+
+        return layoutable.GetValue(GrowProperty);
+    }
+
+    public static void SetGrow(Layoutable layoutable, double value)
+    {
+        if (layoutable is null)
+        {
+            throw new ArgumentNullException(nameof(layoutable));
+        }
+
+        layoutable.SetValue(GrowProperty, value);
+    }
+
+    internal static double GetBaseLength(Layoutable layoutable)
+    {
+        if (layoutable is null)
+        {
+            throw new ArgumentNullException(nameof(layoutable));
+        }
+
+        return layoutable.GetValue(BaseLengthProperty);
+    }
+
+    internal static void SetBaseLength(Layoutable layoutable, double value)
+    {
+        if (layoutable is null)
+        {
+            throw new ArgumentNullException(nameof(layoutable));
+        }
+
+        layoutable.SetValue(BaseLengthProperty, value);
+    }
+
+    internal static double GetCurrentLength(Layoutable layoutable)
+    {
+        if (layoutable is null)
+        {
+            throw new ArgumentNullException(nameof(layoutable));
+        }
+
+        return layoutable.GetValue(CurrentLengthProperty);
+    }
+
+    internal static void SetCurrentLength(Layoutable layoutable, double value)
+    {
+        if (layoutable is null)
+        {
+            throw new ArgumentNullException(nameof(layoutable));
+        }
+
+        layoutable.SetValue(CurrentLengthProperty, value);
+    }
+}

src/BD.WTTS.Client.Avalonia/UI/Views/Controls/Flex/FlexBasis.cs

@@ -0,0 +1,66 @@
+namespace BD.WTTS.UI.Views.Controls;
+
+public readonly struct FlexBasis : IEquatable<FlexBasis>
+{
+    public double Value { get; }
+
+    public FlexBasisKind Kind { get; }
+
+    public FlexBasis(double value, FlexBasisKind kind)
+    {
+        if (value < 0 || double.IsNaN(value) || double.IsInfinity(value))
+            throw new ArgumentException($"Invalid basis value: {value}", nameof(value));
+        if (kind < FlexBasisKind.Auto || kind > FlexBasisKind.Relative)
+            throw new ArgumentException($"Invalid basis kind: {kind}", nameof(kind));
+        Value = value;
+        Kind = kind;
+    }
+
+    public FlexBasis(double value) : this(value, FlexBasisKind.Absolute) { }
+
+    public static FlexBasis Auto => new(0.0, FlexBasisKind.Auto);
+
+    public bool IsAuto => Kind == FlexBasisKind.Auto;
+
+    public bool IsAbsolute => Kind == FlexBasisKind.Absolute;
+
+    public bool IsRelative => Kind == FlexBasisKind.Relative;
+
+    [SuppressMessage("ReSharper", "CompareOfFloatsByEqualityOperator")]
+    public bool Equals(FlexBasis other) =>
+        (IsAuto && other.IsAuto) || (Value == other.Value && Kind == other.Kind);
+
+    public override bool Equals(object? obj) =>
+        obj is FlexBasis other && Equals(other);
+
+    public override int GetHashCode() =>
+        HashCode.Combine(Value, (int)Kind);
+
+    public static bool operator ==(FlexBasis left, FlexBasis right) =>
+        left.Equals(right);
+
+    public static bool operator !=(FlexBasis left, FlexBasis right) =>
+        !left.Equals(right);
+
+    public override string ToString()
+    {
+        return Kind switch
+        {
+            FlexBasisKind.Auto => "Auto",
+            FlexBasisKind.Absolute => FormattableString.Invariant($"{Value:G17}"),
+            FlexBasisKind.Relative => FormattableString.Invariant($"{Value * 100:G17}%"),
+            _ => throw new InvalidOperationException(),
+        };
+    }
+
+    public static FlexBasis Parse(string str)
+    {
+        return str.ToUpperInvariant() switch
+        {
+            "AUTO" => Auto,
+            var s when s.EndsWith("%") => new FlexBasis(ParseDouble(s[..^1].Trim()) / 100, FlexBasisKind.Relative),
+            _ => new FlexBasis(ParseDouble(str), FlexBasisKind.Absolute),
+        };
+        double ParseDouble(string s) => double.Parse(s, CultureInfo.InvariantCulture);
+    }
+}

src/BD.WTTS.Client.Avalonia/UI/Views/Controls/Flex/FlexBasisKind.cs

@@ -0,0 +1,8 @@
+namespace BD.WTTS.UI.Views.Controls;
+
+public enum FlexBasisKind
+{
+    Auto,
+    Absolute,
+    Relative,
+}

src/BD.WTTS.Client.Avalonia/UI/Views/Controls/Flex/FlexDirection.cs

@@ -0,0 +1,9 @@
+namespace BD.WTTS.UI.Views.Controls;
+
+public enum FlexDirection
+{
+    Row,
+    RowReverse,
+    Column,
+    ColumnReverse
+}

src/BD.WTTS.Client.Avalonia/UI/Views/Controls/Flex/FlexPanel.cs

@@ -0,0 +1,468 @@
+namespace BD.WTTS.UI.Views.Controls;
+
+public sealed class FlexPanel : Panel
+{
+    private static readonly Func<Layoutable, int> s_getOrder = x => x is { } y ? Flex.GetOrder(y) : 0;
+    private static readonly Func<Layoutable, bool> s_isVisible = x => x.IsVisible;
+
+    /// <summary>
+    /// Defines the <see cref="Direction"/> property.
+    /// </summary>
+    public static readonly StyledProperty<FlexDirection> DirectionProperty =
+        AvaloniaProperty.Register<FlexPanel, FlexDirection>(nameof(Direction));
+
+    /// <summary>
+    /// Defines the <see cref="JustifyContent"/> property.
+    /// </summary>
+    public static readonly StyledProperty<JustifyContent> JustifyContentProperty =
+        AvaloniaProperty.Register<FlexPanel, JustifyContent>(nameof(JustifyContent));
+
+    /// <summary>
+    /// Defines the <see cref="AlignItems"/> property.
+    /// </summary>
+    public static readonly StyledProperty<AlignItems> AlignItemsProperty =
+        AvaloniaProperty.Register<FlexPanel, AlignItems>(nameof(AlignItems));
+
+    /// <summary>
+    /// Defines the <see cref="AlignContent"/> property.
+    /// </summary>
+    public static readonly StyledProperty<AlignContent> AlignContentProperty =
+        AvaloniaProperty.Register<FlexPanel, AlignContent>(nameof(AlignContent));
+
+    /// <summary>
+    /// Defines the <see cref="Wrap"/> property.
+    /// </summary>
+    public static readonly StyledProperty<FlexWrap> WrapProperty =
+        AvaloniaProperty.Register<FlexPanel, FlexWrap>(nameof(Wrap), FlexWrap.Wrap);
+
+    /// <summary>
+    /// Defines the <see cref="ColumnSpacing"/> property.
+    /// </summary>
+    public static readonly StyledProperty<double> ColumnSpacingProperty =
+        AvaloniaProperty.Register<FlexPanel, double>(nameof(ColumnSpacing));
+
+    /// <summary>
+    /// Defines the <see cref="RowSpacing"/> property.
+    /// </summary>
+    public static readonly StyledProperty<double> RowSpacingProperty =
+        AvaloniaProperty.Register<FlexPanel, double>(nameof(RowSpacing));
+
+    private FlexLayoutState? _state;
+
+    static FlexPanel()
+    {
+        AffectsMeasure<FlexPanel>(
+            DirectionProperty,
+            JustifyContentProperty,
+            WrapProperty,
+            ColumnSpacingProperty,
+            RowSpacingProperty);
+
+        AffectsArrange<FlexPanel>(
+            AlignItemsProperty,
+            AlignContentProperty);
+
+        AffectsParentMeasure<FlexPanel>(
+            HorizontalAlignmentProperty,
+            VerticalAlignmentProperty,
+            Flex.OrderProperty,
+            Flex.BasisProperty,
+            Flex.ShrinkProperty,
+            Flex.GrowProperty);
+
+        AffectsParentArrange<FlexPanel>(
+            Flex.AlignSelfProperty);
+    }
+
+    /// <summary>
+    /// Gets or sets the flex direction
+    /// </summary>
+    public FlexDirection Direction
+    {
+        get => GetValue(DirectionProperty);
+        set => SetValue(DirectionProperty, value);
+    }
+
+    /// <summary>
+    /// Gets or sets the flex justify content mode
+    /// </summary>
+    public JustifyContent JustifyContent
+    {
+        get => GetValue(JustifyContentProperty);
+        set => SetValue(JustifyContentProperty, value);
+    }
+
+    /// <summary>
+    /// Gets or sets the flex align items mode
+    /// </summary>
+    public AlignItems AlignItems
+    {
+        get => GetValue(AlignItemsProperty);
+        set => SetValue(AlignItemsProperty, value);
+    }
+
+    /// <summary>
+    /// Gets or sets the flex align content mode
+    /// </summary>
+    public AlignContent AlignContent
+    {
+        get => GetValue(AlignContentProperty);
+        set => SetValue(AlignContentProperty, value);
+    }
+
+    /// <summary>
+    /// Gets or sets the flex wrap mode
+    /// </summary>
+    public FlexWrap Wrap
+    {
+        get => GetValue(WrapProperty);
+        set => SetValue(WrapProperty, value);
+    }
+
+    /// <summary>
+    /// Gets or sets the column spacing
+    /// </summary>
+    public double ColumnSpacing
+    {
+        get => GetValue(ColumnSpacingProperty);
+        set => SetValue(ColumnSpacingProperty, value);
+    }
+
+    /// <summary>
+    /// Gets or sets the row spacing
+    /// </summary>
+    public double RowSpacing
+    {
+        get => GetValue(RowSpacingProperty);
+        set => SetValue(RowSpacingProperty, value);
+    }
+
+    /// <inheritdoc />
+    protected override Size MeasureOverride(Size availableSize)
+    {
+        var children = (IReadOnlyList<Layoutable>)Children;
+
+        var isColumn = Direction is FlexDirection.Column or FlexDirection.ColumnReverse;
+
+        var max = Uv.FromSize(availableSize, isColumn);
+        var spacing = Uv.FromSize(ColumnSpacing, RowSpacing, isColumn);
+
+        var (lineU, lineV, lineShrink, lineGrow, lineAutoMargins) = (0.0, 0.0, 0.0, 0.0, 0);
+        var (childIndex, firstChildIndex, itemIndex, lineIndex) = (0, 0, 0, 0);
+
+        var lines = new List<FlexLine>();
+        children = children.Where(s_isVisible).OrderBy(s_getOrder).ToArray();
+
+        foreach (var element in children)
+        {
+            var basis = Flex.GetBasis(element);
+            var flexConstraint = basis.Kind switch
+            {
+                FlexBasisKind.Auto => max.U,
+                FlexBasisKind.Absolute => basis.Value,
+                FlexBasisKind.Relative => max.U * basis.Value / 100,
+                _ => throw new InvalidOperationException()
+            };
+            element.Measure(Uv.ToSize(max.WithU(flexConstraint), isColumn));
+
+            var size = Uv.FromSize(element.DesiredSize, isColumn);
+            var flexLength = basis.Kind switch
+            {
+                FlexBasisKind.Auto => size.U,
+                FlexBasisKind.Absolute or FlexBasisKind.Relative => Math.Max(size.U, flexConstraint),
+                _ => throw new InvalidOperationException()
+            };
+            size = size.WithU(flexLength);
+            Flex.SetBaseLength(element, flexLength);
+            Flex.SetCurrentLength(element, flexLength);
+
+            if (Wrap != FlexWrap.NoWrap && lineU + size.U + itemIndex * spacing.U > max.U)
+            {
+                lines.Add(new FlexLine(firstChildIndex, childIndex - 1,
+                    lineU, lineV, lineShrink, lineGrow, lineAutoMargins));
+                (lineU, lineV, lineShrink, lineGrow, lineAutoMargins) = (0.0, 0.0, 0.0, 0.0, 0);
+                firstChildIndex = childIndex;
+                itemIndex = 0;
+                lineIndex++;
+            }
+
+            lineU += size.U;
+            lineV = Math.Max(lineV, size.V);
+            lineShrink += Flex.GetShrink(element);
+            lineGrow += Flex.GetGrow(element);
+            lineAutoMargins += GetItemAutoMargins(element, isColumn);
+            itemIndex++;
+            childIndex++;
+        }
+
+        if (itemIndex != 0)
+        {
+            lines.Add(new FlexLine(firstChildIndex, firstChildIndex + itemIndex - 1,
+                lineU, lineV, lineShrink, lineGrow, lineAutoMargins));
+        }
+
+        var state = new FlexLayoutState(children, lines, Wrap);
+
+        var totalSpacingV = (lines.Count - 1) * spacing.V;
+        var panelSizeU = lines.Count > 0 ? lines.Max(line => line.U + (line.Count - 1) * spacing.U) : 0.0;
+
+        // Reizing along main axis using grow and shrink factors can affect cross axis, so remeasure affected items and lines.
+        foreach (var line in lines)
+        {
+            var (itemsCount, totalSpacingU, totalU, freeU) = GetLineMeasureU(line, max.U, spacing.U);
+            var (lineMult, autoMargins, remainingFreeU) = GetLineMultInfo(line, freeU);
+            if (lineMult != 0.0 && remainingFreeU != 0.0)
+            {
+                foreach (var element in state.GetLineItems(line))
+                {
+                    var baseLength = Flex.GetBaseLength(element);
+                    var mult = GetItemMult(element, freeU);
+                    if (mult != 0.0)
+                    {
+                        var length = Math.Max(0.0, baseLength + remainingFreeU * mult / lineMult);
+                        element.Measure(Uv.ToSize(max.WithU(length), isColumn));
+                    }
+                }
+
+                line.V = state.GetLineItems(line).Max(i => Uv.FromSize(i.DesiredSize, isColumn).V);
+            }
+        }
+
+        _state = state;
+        var totalLineV = lines.Sum(l => l.V);
+        var panelSize = lines.Count == 0 ? default : new Uv(panelSizeU, totalLineV + totalSpacingV);
+        return Uv.ToSize(panelSize, isColumn);
+    }
+
+    /// <inheritdoc />
+    protected override Size ArrangeOverride(Size finalSize)
+    {
+        var state = _state ?? throw new InvalidOperationException();
+
+        var isColumn = Direction is FlexDirection.Column or FlexDirection.ColumnReverse;
+        var isReverse = Direction is FlexDirection.RowReverse or FlexDirection.ColumnReverse;
+
+        var panelSize = Uv.FromSize(finalSize, isColumn);
+        var spacing = Uv.FromSize(ColumnSpacing, RowSpacing, isColumn);
+
+        var linesCount = state.Lines.Count;
+        var totalLineV = state.Lines.Sum(s => s.V);
+        var totalSpacingV = (linesCount - 1) * spacing.V;
+        var totalV = totalLineV + totalSpacingV;
+        var freeV = panelSize.V - totalV;
+
+        var alignContent = freeV >= 0.0 ? AlignContent : AlignContent switch
+        {
+            AlignContent.FlexStart or AlignContent.Stretch or AlignContent.SpaceBetween => AlignContent.FlexStart,
+            AlignContent.Center or AlignContent.SpaceAround or AlignContent.SpaceEvenly => AlignContent.Center,
+            AlignContent.FlexEnd => AlignContent.FlexEnd,
+            _ => throw new InvalidOperationException()
+        };
+
+        var (spacingV, v) = alignContent switch
+        {
+            AlignContent.FlexStart => (spacing.V, 0.0),
+            AlignContent.FlexEnd => (spacing.V, freeV),
+            AlignContent.Center => (spacing.V, freeV / 2),
+            AlignContent.Stretch => (spacing.V, 0.0),
+            AlignContent.SpaceBetween => (spacing.V + freeV / (linesCount - 1), 0.0),
+            AlignContent.SpaceAround => (spacing.V + freeV / linesCount, freeV / linesCount / 2),
+            AlignContent.SpaceEvenly => (spacing.V + freeV / (linesCount + 1), freeV / (linesCount + 1)),
+            _ => throw new InvalidOperationException()
+        };
+
+        var scaleV = alignContent == AlignContent.Stretch ? (panelSize.V - totalSpacingV) / totalLineV : 1.0;
+
+        foreach (var line in state.Lines)
+        {
+            var lineV = scaleV * line.V;
+            var (itemsCount, totalSpacingU, totalU, freeU) = GetLineMeasureU(line, panelSize.U, spacing.U);
+            var (lineMult, lineAutoMargins, remainingFreeU) = GetLineMultInfo(line, freeU);
+
+            var currentFreeU = remainingFreeU;
+            if (lineMult != 0.0 && remainingFreeU != 0.0)
+            {
+                foreach (var element in state.GetLineItems(line))
+                {
+                    var baseLength = Flex.GetBaseLength(element);
+                    var mult = GetItemMult(element, freeU);
+                    if (mult != 0.0)
+                    {
+                        var length = Math.Max(0.0, baseLength + remainingFreeU * mult / lineMult);
+                        Flex.SetCurrentLength(element, length);
+                        currentFreeU -= length - baseLength;
+                    }
+                }
+            }
+            remainingFreeU = currentFreeU;
+
+            if (lineAutoMargins != 0 && remainingFreeU != 0.0)
+            {
+                foreach (var element in state.GetLineItems(line))
+                {
+                    var baseLength = Flex.GetCurrentLength(element);
+                    var autoMargins = GetItemAutoMargins(element, isColumn);
+                    if (autoMargins != 0)
+                    {
+                        var length = Math.Max(0.0, baseLength + remainingFreeU * autoMargins / lineAutoMargins);
+                        Flex.SetCurrentLength(element, length);
+                        currentFreeU -= length - baseLength;
+                    }
+                }
+            }
+            remainingFreeU = currentFreeU;
+
+            var (spacingU, u) = line.Grow > 0 ? (spacing.U, 0.0) : JustifyContent switch
+            {
+                JustifyContent.FlexStart => (spacing.U, 0.0),
+                JustifyContent.FlexEnd => (spacing.U, remainingFreeU),
+                JustifyContent.Center => (spacing.U, remainingFreeU / 2),
+                JustifyContent.SpaceBetween => (spacing.U + remainingFreeU / (itemsCount - 1), 0.0),
+                JustifyContent.SpaceAround => (spacing.U + remainingFreeU / itemsCount, remainingFreeU / itemsCount / 2),
+                JustifyContent.SpaceEvenly => (spacing.U + remainingFreeU / (itemsCount + 1), remainingFreeU / (itemsCount + 1)),
+                _ => throw new InvalidOperationException()
+            };
+
+            foreach (var element in state.GetLineItems(line))
+            {
+                var size = Uv.FromSize(element.DesiredSize, isColumn).WithU(Flex.GetCurrentLength(element));
+                var align = Flex.GetAlignSelf(element) ?? AlignItems;
+
+                var positionV = align switch
+                {
+                    AlignItems.FlexStart => v,
+                    AlignItems.FlexEnd => v + lineV - size.V,
+                    AlignItems.Center => v + (lineV - size.V) / 2,
+                    AlignItems.Stretch => v,
+                    _ => throw new InvalidOperationException()
+                };
+
+                size = size.WithV(align == AlignItems.Stretch ? lineV : size.V);
+                var position = new Uv(isReverse ? panelSize.U - size.U - u : u, positionV);
+                element.Arrange(new Rect(Uv.ToPoint(position, isColumn), Uv.ToSize(size, isColumn)));
+
+                u += size.U + spacingU;
+            }
+
+            v += lineV + spacingV;
+        }
+
+        return finalSize;
+    }
+
+    private static (int ItemsCount, double TotalSpacingU, double TotalU, double FreeU) GetLineMeasureU(
+        FlexLine line, double panelSizeU, double spacingU)
+    {
+        var itemsCount = line.Count;
+        var totalSpacingU = (itemsCount - 1) * spacingU;
+        var totalU = line.U + totalSpacingU;
+        var freeU = panelSizeU - totalU;
+        return (itemsCount, totalSpacingU, totalU, freeU);
+    }
+
+    private static (double LineMult, double LineAutoMargins, double RemainingFreeU) GetLineMultInfo(FlexLine line, double freeU)
+    {
+        var lineMult = freeU switch
+        {
+            < 0 => line.Shrink,
+            > 0 => line.Grow,
+            _ => 0.0,
+        };
+        // https://www.w3.org/TR/css-flexbox-1/#remaining-free-space
+        // Sum of flex factors less than 1 reduces remaining free space to be distributed.
+        return lineMult is > 0 and < 1
+            ? (lineMult, line.AutoMargins, freeU * lineMult)
+            : (lineMult, line.AutoMargins, freeU);
+    }
+
+    private static double GetItemMult(Layoutable element, double freeU)
+    {
+        var mult = freeU switch
+        {
+            < 0 => Flex.GetShrink(element),
+            > 0 => Flex.GetGrow(element),
+            _ => 0.0,
+        };
+        return mult;
+    }
+
+    private static int GetItemAutoMargins(Layoutable element, bool isColumn)
+    {
+        return isColumn
+            ? element.VerticalAlignment switch
+            {
+                VerticalAlignment.Stretch => 0,
+                VerticalAlignment.Top or VerticalAlignment.Bottom => 1,
+                VerticalAlignment.Center => 2,
+                _ => throw new InvalidOperationException()
+            }
+            : element.HorizontalAlignment switch
+            {
+                HorizontalAlignment.Stretch => 0,
+                HorizontalAlignment.Left or HorizontalAlignment.Right => 1,
+                HorizontalAlignment.Center => 2,
+                _ => throw new InvalidOperationException()
+            };
+    }
+
+    private readonly struct FlexLayoutState
+    {
+        private readonly IReadOnlyList<Layoutable> _children;
+
+        public IReadOnlyList<FlexLine> Lines { get; }
+
+        public FlexLayoutState(IReadOnlyList<Layoutable> children, List<FlexLine> lines, FlexWrap wrap)
+        {
+            if (wrap == FlexWrap.WrapReverse)
+            {
+                lines.Reverse();
+            }
+            _children = children;
+            Lines = lines;
+        }
+
+        public IEnumerable<Layoutable> GetLineItems(FlexLine line)
+        {
+            for (var i = line.First; i <= line.Last; i++)
+                yield return _children[i];
+        }
+    }
+
+    private class FlexLine
+    {
+        public FlexLine(int first, int last, double u, double v, double shrink, double grow, int autoMargins)
+        {
+            First = first;
+            Last = last;
+            U = u;
+            V = v;
+            Shrink = shrink;
+            Grow = grow;
+            AutoMargins = autoMargins;
+        }
+
+        /// <summary>First item index.</summary>
+        public int First { get; }
+
+        /// <summary>Last item index.</summary>
+        public int Last { get; }
+
+        /// <summary>Sum of main sizes of items.</summary>
+        public double U { get; }
+
+        /// <summary>Max of cross sizes of items.</summary>
+        public double V { get; set; }
+
+        /// <summary>Sum of shrink factors of flexible items.</summary>
+        public double Shrink { get; }
+
+        /// <summary>Sum of grow factors of flexible items.</summary>
+        public double Grow { get; }
+
+        /// <summary>Number of "auto margins" along main axis.</summary>
+        public int AutoMargins { get; }
+
+        /// <summary>Number of items.</summary>
+        public int Count => Last - First + 1;
+    }
+}

src/BD.WTTS.Client.Avalonia/UI/Views/Controls/Flex/FlexWrap.cs

@@ -0,0 +1,8 @@
+namespace BD.WTTS.UI.Views.Controls;
+
+public enum FlexWrap
+{
+    NoWrap,
+    Wrap,
+    WrapReverse
+}

src/BD.WTTS.Client.Avalonia/UI/Views/Controls/Flex/JustifyContent.cs

@@ -0,0 +1,11 @@
+namespace BD.WTTS.UI.Views.Controls;
+
+public enum JustifyContent
+{
+    FlexStart,
+    FlexEnd,
+    Center,
+    SpaceBetween,
+    SpaceAround,
+    SpaceEvenly
+}

src/BD.WTTS.Client.Avalonia/UI/Views/Controls/Flex/Uv.cs

@@ -0,0 +1,29 @@
+namespace BD.WTTS.UI.Views.Controls;
+
+internal readonly struct Uv(double u, double v)
+{
+    public double U { get; } = u;
+
+    public double V { get; } = v;
+
+    public static Uv FromSize(double width, double height, bool swap) =>
+        new Uv(swap ? height : width, swap ? width : height);
+
+    public static Uv FromSize(Size size, bool swap) =>
+        FromSize(size.Width, size.Height, swap);
+
+    public static Point ToPoint(Uv uv, bool swap) =>
+        new Point(swap ? uv.V : uv.U, swap ? uv.U : uv.V);
+
+    public static Size ToSize(Uv uv, bool swap) =>
+        new Size(swap ? uv.V : uv.U, swap ? uv.U : uv.V);
+
+    public Uv WithU(double u) =>
+        new Uv(u, V);
+
+    public Uv WithV(double v) =>
+        new Uv(U, v);
+
+    public override string ToString() =>
+        $"U: {U}, V: {V}";
+}

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

@@ -1,12 +1,14 @@
+using Avalonia.Controls;
+
 namespace BD.WTTS.UI.Views.Controls;
 
 public class OptionsDisplayItem : TemplatedControl
 {
-    public static readonly StyledProperty<string> HeaderProperty =
-        AvaloniaProperty.Register<OptionsDisplayItem, string>(nameof(Header));
+    public static readonly StyledProperty<object?> HeaderProperty =
+        AvaloniaProperty.Register<OptionsDisplayItem, object?>(nameof(Header));
 
-    public static readonly StyledProperty<string> DescriptionProperty =
-        AvaloniaProperty.Register<OptionsDisplayItem, string>(nameof(Description));
+    public static readonly StyledProperty<object?> DescriptionProperty =
+        AvaloniaProperty.Register<OptionsDisplayItem, object?>(nameof(Description));
 
     public static readonly StyledProperty<object?> IconProperty =
         AvaloniaProperty.Register<OptionsDisplayItem, object?>(nameof(Icon));
@@ -29,13 +31,13 @@ public class OptionsDisplayItem : TemplatedControl
     public static readonly StyledProperty<ICommand> NavigationCommandProperty =
         AvaloniaProperty.Register<OptionsDisplayItem, ICommand>(nameof(NavigationCommand));
 
-    public string Header
+    public object? Header
     {
         get => GetValue(HeaderProperty);
         set => SetValue(HeaderProperty, value);
     }
 
-    public string Description
+    public object? Description
     {
         get => GetValue(DescriptionProperty);
         set => SetValue(DescriptionProperty, value);
@@ -112,7 +114,7 @@ public class OptionsDisplayItem : TemplatedControl
         }
         else if (change.Property == DescriptionProperty)
         {
-            PseudoClasses.Set(":desc", !string.IsNullOrEmpty(change.GetNewValue<string>()));
+            PseudoClasses.Set(":desc", change.GetNewValue<object?>() != null);
         }
         else if (change.Property == IsExpandedProperty)
             PseudoClasses.Set(":expanded", change.GetNewValue<bool>());

src/BD.WTTS.Client.Avalonia/UI/Views/Controls/Shapes/PureCircle.cs

@@ -0,0 +1,47 @@
+namespace BD.WTTS.UI.Views.Controls;
+
+public class PureCircle : Control
+{
+    public static readonly StyledProperty<double> DiameterProperty = AvaloniaProperty.Register<PureCircle, double>(
+        nameof(Diameter));
+
+    public double Diameter
+    {
+        get => GetValue(DiameterProperty);
+        set => SetValue(DiameterProperty, value);
+    }
+
+    public static readonly StyledProperty<IBrush?>
+        BackgroundProperty = Border.BackgroundProperty.AddOwner<PureCircle>();
+
+    public IBrush? Background
+    {
+        get => GetValue(BackgroundProperty);
+        set => SetValue(BackgroundProperty, value);
+    }
+
+    static PureCircle()
+    {
+        AffectsMeasure<PureCircle>(DiameterProperty);
+        AffectsArrange<PureCircle>(DiameterProperty);
+        AffectsRender<PureCircle>(BackgroundProperty, DiameterProperty);
+    }
+
+    protected override Size MeasureOverride(Size availableSize)
+    {
+        double diameter = Math.Max(0, Diameter);
+        return new Size(diameter, diameter);
+    }
+
+    protected override Size ArrangeOverride(Size finalSize)
+    {
+        double diameter = Math.Max(0, Diameter);
+        return new Size(diameter, diameter);
+    }
+
+    public override void Render(DrawingContext context)
+    {
+        double radius = Math.Max(0, Diameter) / 2;
+        context.DrawEllipse(Background, null, new(radius, radius), radius, radius);
+    }
+}

src/BD.WTTS.Client.Avalonia/UI/Views/Controls/Shapes/PureRectangle.cs

@@ -0,0 +1,27 @@
+namespace BD.WTTS.UI.Views.Controls;
+
+/// <summary>
+/// Provide the most simplified shape implementation. This is a rectangle with a background, without border and corner radius.
+/// </summary>
+public class PureRectangle : Control
+{
+    public static readonly StyledProperty<IBrush?> BackgroundProperty =
+        Border.BackgroundProperty.AddOwner<PureRectangle>();
+
+    public IBrush? Background
+    {
+        get => GetValue(BackgroundProperty);
+        set => SetValue(BackgroundProperty, value);
+    }
+
+    static PureRectangle()
+    {
+        AffectsRender<PureRectangle>(BackgroundProperty);
+    }
+
+    public override void Render(DrawingContext context)
+    {
+        base.Render(context);
+        context.DrawRectangle(Background, null, new Rect(Bounds.Size));
+    }
+}

src/BD.WTTS.Client.Avalonia/UI/Views/Controls/Shapes/PureRing.cs

@@ -0,0 +1,30 @@
+namespace BD.WTTS.UI.Views.Controls;
+
+public class PureRing : PureCircle
+{
+    public static readonly StyledProperty<double> InnerDiameterProperty = AvaloniaProperty.Register<PureRing, double>(
+        nameof(InnerDiameter));
+
+    public double InnerDiameter
+    {
+        get => GetValue(InnerDiameterProperty);
+        set => SetValue(InnerDiameterProperty, value);
+    }
+
+    static PureRing()
+    {
+        AffectsRender<PureCircle>(InnerDiameterProperty);
+    }
+
+    public override void Render(DrawingContext context)
+    {
+        double outer = Diameter / 2;
+        double inner = InnerDiameter / 2;
+        double thickness = outer - inner;
+        context.DrawEllipse(null,
+            new Pen(Background, outer - inner),
+            new Point(outer, outer),
+            outer - thickness / 2,
+            outer - thickness / 2);
+    }
+}

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

@@ -1,6 +1,5 @@
 <UserControl
     x:Class="BD.WTTS.UI.Views.Controls.SplashScreen"
-    xmlns:spp="https://steampp.net/ui"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

src/BD.WTTS.Client.Avalonia/UI/Views/Controls/Widgets/CarouselBanner.axaml

@@ -31,7 +31,7 @@
     </UserControl.Styles>
     <Border
         BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"
-        BorderThickness="1"
+        BorderThickness="0"
         ClipToBounds="True"
         CornerRadius="8">
         <Panel>

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

@@ -15,7 +15,7 @@ namespace BD.WTTS.UI.Views.Controls
         /// Defines the <see cref="AutoScrollInterval"/> property.
         /// </summary>
         public static readonly StyledProperty<int> AutoScrollIntervalProperty =
-            AvaloniaProperty.Register<CarouselBanner, int>(nameof(AutoScrollInterval), 8000);
+            AvaloniaProperty.Register<CarouselBanner, int>(nameof(AutoScrollInterval), 6000);
 
         /// <summary>
         /// Defines the Avalonia.Controls.ItemsControl.Items property.
@@ -29,6 +29,12 @@ namespace BD.WTTS.UI.Views.Controls
         public static readonly StyledProperty<IDataTemplate?> ItemTemplateProperty =
             Carousel.ItemTemplateProperty.AddOwner<CarouselBanner>();
 
+        ///// <summary>
+        ///// Defines the <see cref="GroupView"/> property.
+        ///// </summary>
+        //public static readonly StyledProperty<bool> GroupViewProperty =
+        //    AvaloniaProperty.Register<CarouselBanner, bool>(nameof(GroupView), true);
+
         /// <summary>
         ///  Gets or sets the items to display.
         /// </summary>
@@ -65,23 +71,32 @@ namespace BD.WTTS.UI.Views.Controls
             set => SetValue(AutoScrollIntervalProperty, value);
         }
 
+        ///// <summary>
+        ///// GroupView
+        ///// </summary>
+        //public bool GroupView
+        //{
+        //    get => GetValue(GroupViewProperty);
+        //    set => SetValue(GroupViewProperty, value);
+        //}
+
         private Timer? _timer;
 
         public CarouselBanner()
         {
             InitializeComponent();
-            Left.Click += (s, e) => SwiperPrevious();
-            Right.Click += (s, e) => SwiperNext();
+            Left.Command = ReactiveCommand.Create(SwiperPrevious);
+            Right.Command = ReactiveCommand.Create(SwiperNext);
 
             //CarouselControl[!Carousel.Items] = this[!Items];
             CarouselControl[!Carousel.ItemsSourceProperty] = this[!ItemsSourceProperty];
             CarouselControl[!Carousel.ItemTemplateProperty] = this[!ItemTemplateProperty];
 
-            this.GetObservable(ItemsSourceProperty)
+            CarouselControl.GetObservable(Carousel.ItemCountProperty)
                     .Subscribe(_ => SwipersLoad());
 
             CarouselControl.GetObservable(Carousel.SelectedIndexProperty)
-                    .Subscribe(x => SwipersLoad());
+                    .Subscribe(_ => SwipersLoad());
 
             this.GetObservable(AutoScrollProperty)
                 .Subscribe(x =>
@@ -107,6 +122,40 @@ namespace BD.WTTS.UI.Views.Controls
                 });
         }
 
+        //protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        //{
+        //    if (change.Property == ItemsSourceProperty)
+        //    {
+        //        SwipersLoad();
+        //    }
+        //    else if (change.Property == AutoScrollProperty)
+        //    {
+        //        if (change.NewValue is bool x)
+        //        {
+        //            if (x && _timer == null)
+        //            {
+        //                _timer = new Timer(_ =>
+        //                {
+        //                    if (!this.IsPointerOver)
+        //                    {
+        //                        Dispatcher.UIThread.Post(SwiperNext, DispatcherPriority.Background);
+        //                    }
+        //                }, nameof(AutoScroll), AutoScrollInterval, AutoScrollInterval);
+        //            }
+        //            else
+        //            {
+        //                if (_timer != null)
+        //                {
+        //                    _timer.Dispose();
+        //                    _timer = null;
+        //                }
+        //            }
+        //        }
+        //    }
+
+        //    base.OnPropertyChanged(change);
+        //}
+
         private void CarouselBannerIndexButton_Click(object? sender, RoutedEventArgs e)
         {
             if (sender is Button button && button.Tag is int index)

src/BD.WTTS.Client.Avalonia/UI/Views/Controls/Widgets/CarouselItems.cs

@@ -0,0 +1,234 @@
+using Avalonia.Controls;
+using Avalonia.Layout;
+using FluentAvalonia.Core;
+using System.Reactive;
+
+namespace BD.WTTS.UI.Views.Controls;
+
+public class CarouselItems : ItemsControl
+{
+    /// <summary>
+    /// Defines the <see cref="AutoScroll"/> property.
+    /// </summary>
+    public static readonly StyledProperty<bool> AutoScrollProperty =
+        AvaloniaProperty.Register<CarouselItems, bool>(nameof(AutoScroll), true);
+
+    /// <summary>
+    /// Defines the <see cref="AutoScrollInterval"/> property.
+    /// </summary>
+    public static readonly StyledProperty<int> AutoScrollIntervalProperty =
+        AvaloniaProperty.Register<CarouselItems, int>(nameof(AutoScrollInterval), 6000);
+
+    /// <summary>
+    /// Defines the <see cref="ItemsPerPage"/> property.
+    /// </summary>
+    public static readonly StyledProperty<int> ItemsPerPageProperty =
+        AvaloniaProperty.Register<CarouselItems, int>(nameof(ItemsPerPage), 4);
+
+    /// <summary>
+    /// AutoScroll
+    /// </summary>
+    public bool AutoScroll
+    {
+        get => GetValue(AutoScrollProperty);
+        set => SetValue(AutoScrollProperty, value);
+    }
+
+    /// <summary>
+    /// 自动播放间隔时间（单位毫秒）
+    /// </summary>
+    public int AutoScrollInterval
+    {
+        get => GetValue(AutoScrollIntervalProperty);
+        set => SetValue(AutoScrollIntervalProperty, value);
+    }
+
+    /// <summary>
+    /// ItemsPerPage
+    /// </summary>
+    public int ItemsPerPage
+    {
+        get => GetValue(ItemsPerPageProperty);
+        set => SetValue(ItemsPerPageProperty, value);
+    }
+
+    Carousel? _carouselControl;
+    Button? _leftButton;
+    Button? _rightButton;
+    ItemsRepeater? _swiper;
+    Timer? _timer;
+
+    public ICommand? CarouselBannerIndexCommand { get; }
+
+    public CarouselItems()
+    {
+        CarouselBannerIndexCommand = ReactiveCommand.Create<int>(CarouselBannerIndex);
+    }
+
+    protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+    {
+        base.OnApplyTemplate(e);
+
+        _carouselControl = e.NameScope.Find<Carousel>("CarouselControl");
+        _leftButton = e.NameScope.Find<Button>("Left");
+        _rightButton = e.NameScope.Find<Button>("Right");
+        _swiper = e.NameScope.Find<ItemsRepeater>("Swiper");
+
+        if (_leftButton != null)
+        {
+            _leftButton.Command = ReactiveCommand.Create(SwiperPrevious);
+        }
+        if (_rightButton != null)
+        {
+            _rightButton.Command = ReactiveCommand.Create(SwiperNext);
+        }
+
+        if (_carouselControl != null)
+        {
+            _carouselControl.GetObservable(Carousel.ItemCountProperty)
+               .Subscribe(_ => SwipersLoad());
+
+            _carouselControl.GetObservable(Carousel.SelectedIndexProperty)
+              .Subscribe(_ => SwipersLoad());
+
+            RefreshItemsSource();
+        }
+    }
+
+    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+    {
+        base.OnPropertyChanged(change);
+
+        if (change.Property == ItemCountProperty)
+        {
+            RefreshItemsSource();
+        }
+        else if (change.Property == ItemsPerPageProperty)
+        {
+            RefreshItemsSource();
+        }
+        else if (change.Property == AutoScrollProperty)
+        {
+            var x = change.GetNewValue<bool>();
+            if (x && _timer == null)
+            {
+                _timer = new Timer(_ =>
+                {
+                    if (!this.IsPointerOver)
+                    {
+                        Dispatcher.UIThread.Post(SwiperNext, DispatcherPriority.Background);
+                    }
+                }, nameof(AutoScroll), AutoScrollInterval, AutoScrollInterval);
+            }
+            else
+            {
+                if (_timer != null)
+                {
+                    _timer.Dispose();
+                    _timer = null;
+                }
+            }
+        }
+    }
+
+    protected override void OnPointerEntered(PointerEventArgs e)
+    {
+        base.OnPointerEntered(e);
+
+        if (_swiper == null || _leftButton == null || _rightButton == null)
+            return;
+
+        _leftButton.IsVisible = _rightButton.IsVisible = _swiper.IsVisible;
+    }
+
+    protected override void OnPointerExited(PointerEventArgs e)
+    {
+        base.OnPointerExited(e);
+
+        if (_swiper == null || _leftButton == null || _rightButton == null)
+            return;
+
+        _leftButton.IsVisible = _rightButton.IsVisible = false;
+    }
+
+    void RefreshItemsSource()
+    {
+        if (_carouselControl != null)
+        {
+            var items = ItemsSource?.Batch(ItemsPerPage);
+            _carouselControl.ItemsSource = items;
+        }
+    }
+
+    void CarouselBannerIndex(int index)
+    {
+        if (_carouselControl != null)
+            _carouselControl.SelectedIndex = index;
+    }
+
+    void SwipersLoad()
+    {
+        if (_carouselControl == null || _swiper == null || _leftButton == null || _rightButton == null)
+            return;
+
+        if (_carouselControl.ItemCount <= 0)
+        {
+            _swiper.ItemsSource = null;
+            return;
+        }
+        if (_carouselControl.ItemCount == 1)
+        {
+            _swiper.IsVisible = false;
+            return;
+        }
+        else
+        {
+            _swiper.IsVisible = true;
+            var arr = new Dictionary<int, string>();
+            for (var i = 0; i < _carouselControl.ItemCount; i++)
+            {
+                arr.Add(i, "#ADADAD");
+            }
+            var index = _carouselControl.SelectedIndex < 0 ? 0 : _carouselControl.SelectedIndex;
+            arr[index] = "#FFFFFF";
+
+            _swiper.ItemsSource = arr;
+        }
+    }
+
+    /// <summary>
+    /// 滑动到下一个
+    /// </summary>
+    public void SwiperNext()
+    {
+        if (_carouselControl == null || _carouselControl.ItemCount < 1)
+            return;
+
+        if (_carouselControl.SelectedIndex < _carouselControl.ItemCount - 1)
+        {
+            _carouselControl.Next();
+        }
+        else
+        {
+            _carouselControl.SelectedIndex = 0;
+        }
+    }
+
+    /// <summary>
+    /// 滑动到上一个
+    /// </summary>
+    public void SwiperPrevious()
+    {
+        if (_carouselControl == null || _carouselControl.ItemCount < 1)
+            return;
+
+        if (_carouselControl.SelectedIndex > 0)
+        {
+            _carouselControl.Previous();
+        }
+        else
+        {
+            _carouselControl.SelectedIndex = _carouselControl.ItemCount - 1;
+        }
+    }
+}

src/BD.WTTS.Client.Avalonia/UI/Views/Controls/Widgets/FixedWrapPanel.cs

@@ -2,25 +2,50 @@ using static System.Math;
 
 namespace BD.WTTS.UI.Views.Controls;
 
+/// <summary>
+/// 固定的 WrapPanel
+/// </summary>
 public class FixedWrapPanel : Panel, INavigableContainer
 {
+    /// <summary>
+    /// Defines the <see cref="ItemsPerLine"/> property.
+    /// </summary>
     public static readonly StyledProperty<int> ItemsPerLineProperty =
         AvaloniaProperty.Register<FixedWrapPanel, int>(nameof(ItemsPerLine), 3);
 
+    /// <summary>
+    /// Defines the <see cref="Spacing"/> property.
+    /// </summary>
+    public static readonly StyledProperty<double> SpacingProperty =
+    AvaloniaProperty.Register<FixedWrapPanel, double>(nameof(Spacing), 0);
+
     static FixedWrapPanel()
     {
         AffectsMeasure<FixedWrapPanel>(ItemsPerLineProperty);
     }
 
-    public double ItemsPerLine
+    /// <summary>
+    /// ItemsPerLine
+    /// </summary>
+    public int ItemsPerLine
     {
         get => GetValue(ItemsPerLineProperty);
         set => SetValue(ItemsPerLineProperty, value);
     }
 
+    /// <summary>
+    /// Spacing
+    /// </summary>
+    public double Spacing
+    {
+        get => GetValue(SpacingProperty);
+        set => SetValue(SpacingProperty, value);
+    }
+
+    /// <inheritdoc/>
     IInputElement INavigableContainer.GetControl(NavigationDirection direction, IInputElement? from, bool wrap)
     {
-        int index = from is not null ? Children.IndexOf((Control)from) : -1;
+        int index = from is Control control ? Children.IndexOf(control) : -1;
         switch (direction)
         {
             case NavigationDirection.First:
@@ -57,13 +82,14 @@ public class FixedWrapPanel : Panel, INavigableContainer
         return this;
     }
 
+    /// <inheritdoc/>
     protected override Size MeasureOverride(Size constraint)
     {
-        double itemWidth = constraint.Width / ItemsPerLine;
+        double itemWidth = (constraint.Width - (Spacing * (ItemsPerLine - 1))) / ItemsPerLine;
         MutableSize currentLineSize = default;
         MutableSize panelSize = default;
         Size lineConstraint = new(constraint.Width, constraint.Height);
-        Size childConstraint = new(itemWidth, constraint.Height);
+        Size childConstraint = new(itemWidth - Spacing, constraint.Height);
 
         for (int i = 0, count = Children.Count; i < count; i++)
         {
@@ -76,7 +102,7 @@ public class FixedWrapPanel : Panel, INavigableContainer
             child.Measure(childConstraint);
             Size childSize = new(itemWidth, child.DesiredSize.Height);
 
-            if (MathUtilities.GreaterThan(currentLineSize.Width + childSize.Width, lineConstraint.Width))
+            if (MathUtilities.GreaterThan(currentLineSize.Width + childSize.Width + Spacing, lineConstraint.Width))
             {
                 // Need to switch to another line
                 panelSize.Width = Max(currentLineSize.Width, panelSize.Width);
@@ -86,21 +112,25 @@ public class FixedWrapPanel : Panel, INavigableContainer
             else
             {
                 // Continue to accumulate a line
-                currentLineSize.Width += childSize.Width;
+                currentLineSize.Width += childSize.Width + Spacing;
                 currentLineSize.Height = Max(childSize.Height, currentLineSize.Height);
             }
         }
 
         // The last line size, if any should be added
         panelSize.Width = Max(currentLineSize.Width, panelSize.Width);
-        panelSize.Height += currentLineSize.Height;
+        panelSize.Height = currentLineSize.Height;
+
+        if (double.IsInfinity(panelSize.Width))
+            panelSize.Width = 0;
 
         return panelSize.ToSize();
     }
 
+    /// <inheritdoc/>
     protected override Size ArrangeOverride(Size finalSize)
     {
-        double itemWidth = finalSize.Width / ItemsPerLine;
+        double itemWidth = (finalSize.Width - (Spacing * (ItemsPerLine - 1))) / ItemsPerLine;
         int firstInLine = 0;
         double accumulatedHeight = 0;
         var currentLineSize = default(MutableSize);
@@ -139,7 +169,7 @@ public class FixedWrapPanel : Panel, INavigableContainer
         return finalSize;
     }
 
-    private void ArrangeLine(double y, double height, int start, int end, double width)
+    void ArrangeLine(double y, double height, int start, int end, double width)
     {
         double x = 0;
         for (int i = start; i < end; i++)
@@ -150,12 +180,20 @@ public class FixedWrapPanel : Panel, INavigableContainer
                 continue;
             }
 
-            child.Arrange(new Rect(x, y, width, height));
-            x += width;
+            if (i < end - 1)
+            {
+                child.Arrange(new Rect(x, y, width - Spacing, height));
+                x += width + Spacing;
+            }
+            else
+            {
+                child.Arrange(new Rect(x, y, width, height));
+                x += width;
+            }
         }
     }
 
-    private struct MutableSize
+    record struct MutableSize
     {
         internal MutableSize(double width, double height)
         {
@@ -172,7 +210,7 @@ public class FixedWrapPanel : Panel, INavigableContainer
         internal double Width;
         internal double Height;
 
-        internal Size ToSize()
+        internal readonly Size ToSize()
         {
             return new Size(Width, Height);
         }

src/BD.WTTS.Client.Avalonia/UI/Views/Controls/Widgets/Skeleton.cs

@@ -0,0 +1,22 @@
+namespace BD.WTTS.UI.Views.Controls;
+
+public class Skeleton : ContentControl
+{
+    public static readonly StyledProperty<bool> IsActiveProperty =
+        AvaloniaProperty.Register<Skeleton, bool>(nameof(IsActive));
+
+    public bool IsActive
+    {
+        get { return GetValue(IsActiveProperty); }
+        set { SetValue(IsActiveProperty, value); }
+    }
+
+    public static readonly StyledProperty<bool> IsLoadingProperty =
+        AvaloniaProperty.Register<Skeleton, bool>(nameof(IsLoading));
+
+    public bool IsLoading
+    {
+        get => GetValue(IsLoadingProperty);
+        set => SetValue(IsLoadingProperty, value);
+    }
+}

src/BD.WTTS.Client.Avalonia/UI/Views/Controls/Widgets/WaveProgress.axaml

@@ -0,0 +1,141 @@
+<UserControl
+    x:Class="BD.WTTS.UI.Views.Controls.WaveProgress"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:spp="https://steampp.net/ui"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <UserControl.Styles>
+        <Style Selector="spp|WaveProgress">
+            <Setter Property="Template">
+                <ControlTemplate>
+                    <Border
+                        Canvas.Left="20"
+                        Canvas.Top="20"
+                        Canvas.Right="20"
+                        Canvas.Bottom="20"
+                        Width="200"
+                        Height="200"
+                        Margin="20"
+                        Background="Transparent"
+                        BorderBrush="{DynamicResource ControlElevationBorderBrush}"
+                        BorderThickness="1.2"
+                        BoxShadow="{DynamicResource LowShadow}"
+                        ClipToBounds="False"
+                        CornerRadius="100">
+                        <Border.Resources>
+                            <spp:WaveProgressValueConverter x:Key="WValueConvert" />
+                            <spp:WaveProgressValueTextConverter x:Key="WValueTextConvert" />
+                            <spp:WaveProgressValueColorConverter x:Key="WValueColorConvert" />
+                            <spp:WaveProgressGradientOffsetConverter x:Key="WGradientConverter" />
+                        </Border.Resources>
+
+
+                        <Border
+                            Width="200"
+                            Height="200"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            ClipToBounds="True"
+                            CornerRadius="100">
+                            <Panel>
+                                <Canvas Width="200" Height="200">
+                                    <Path
+                                        Canvas.Top="{TemplateBinding Value,
+                                                                     Converter={StaticResource WValueConvert}}"
+                                        Classes="WaveAnimatedFast"
+                                        Data="M 0,50 H 700 V 350 H 0 M 0,50 C 25,55 75,45 100,50 S 175,55 200,50 S 275,45 300,50 S 375,55 400,50 S 475,45 500,50 S 575,55 600,50 S 675,45 700,50"
+                                        Fill="{TemplateBinding Value,
+                                                               Converter={StaticResource WGradientConverter}}"
+                                        Opacity="0.45"
+                                        StrokeThickness="0">
+
+                                        <Path.Transitions>
+                                            <Transitions>
+                                                <DoubleTransition Property="Canvas.Top" Duration="0:0:1.5">
+                                                    <DoubleTransition.Easing>
+                                                        <CircularEaseOut />
+                                                    </DoubleTransition.Easing>
+                                                </DoubleTransition>
+                                            </Transitions>
+                                        </Path.Transitions>
+                                    </Path>
+                                    <Path
+                                        Canvas.Top="{TemplateBinding Value,
+                                                                     Converter={StaticResource WValueConvert}}"
+                                        Classes="WaveAnimated"
+                                        Data="M 0,50 H 700 V 350 H 0 M 0,50 C 25,55 75,45 100,50 S 175,55 200,50 S 275,45 300,50 S 375,55 400,50 S 475,45 500,50 S 575,55 600,50 S 675,45 700,50"
+                                        Fill="{TemplateBinding Value,
+                                                               Converter={StaticResource WGradientConverter}}"
+                                        Opacity="0.8"
+                                        StrokeThickness="0">
+                                        <Path.Transitions>
+                                            <Transitions>
+                                                <DoubleTransition Property="Canvas.Top" Duration="0:0:2.5">
+                                                    <DoubleTransition.Easing>
+                                                        <CircularEaseOut />
+                                                    </DoubleTransition.Easing>
+                                                </DoubleTransition>
+                                            </Transitions>
+                                        </Path.Transitions>
+                                    </Path>
+                                </Canvas>
+                                <TextBlock
+                                    Name="PART_Text"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Foreground="{TemplateBinding Value,
+                                                                 Converter={StaticResource WValueColorConvert}}"
+                                    Text="{TemplateBinding Value,
+                                                           Converter={StaticResource WValueTextConvert}}"
+                                    Theme="{StaticResource TitleTextBlockStyle}">
+                                    <TextBlock.Transitions>
+                                        <Transitions>
+                                            <DoubleTransition Property="Opacity" Duration="0:0:0.3" />
+                                        </Transitions>
+                                    </TextBlock.Transitions>
+                                </TextBlock>
+                            </Panel>
+                        </Border>
+                    </Border>
+                </ControlTemplate>
+            </Setter>
+        </Style>
+
+        <Style Selector="spp|WaveProgress[IsTextVisible=True] /template/ TextBlock#PART_Text">
+            <Setter Property="Opacity" Value="1" />
+        </Style>
+
+        <Style Selector="spp|WaveProgress[IsTextVisible=False] /template/ TextBlock#PART_Text">
+            <Setter Property="Opacity" Value="0" />
+        </Style>
+
+        <Style Selector="Path.WaveAnimated">
+            <Style.Animations>
+                <Animation IterationCount="INFINITE" Duration="0:0:6">
+                    <KeyFrame Cue="0%">
+                        <Setter Property="Canvas.Left" Value="-100" />
+                    </KeyFrame>
+                    <KeyFrame Cue="100%">
+                        <Setter Property="Canvas.Left" Value="-500" />
+                    </KeyFrame>
+                </Animation>
+            </Style.Animations>
+        </Style>
+        <Style Selector="Path.WaveAnimatedFast">
+            <Style.Animations>
+                <Animation IterationCount="INFINITE" Duration="0:0:3">
+                    <KeyFrame Cue="0%">
+                        <Setter Property="Canvas.Left" Value="-100" />
+                    </KeyFrame>
+                    <KeyFrame Cue="100%">
+                        <Setter Property="Canvas.Left" Value="-500" />
+                    </KeyFrame>
+                </Animation>
+            </Style.Animations>
+        </Style>
+    </UserControl.Styles>
+</UserControl>

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

@@ -0,0 +1,63 @@
+namespace BD.WTTS.UI.Views.Controls;
+
+public sealed partial class WaveProgress : UserControl
+{
+    public static readonly DirectProperty<WaveProgress, double> ValueProperty =
+        AvaloniaProperty.RegisterDirect<WaveProgress, double>(
+            nameof(Value),
+            o => o.Value,
+            (o, v) => o.Value = v,
+            defaultBindingMode: BindingMode.TwoWay,
+            enableDataValidation: true);
+
+    public static readonly StyledProperty<bool> IsTextVisibleProperty =
+        AvaloniaProperty.Register<WaveProgress, bool>(nameof(IsTextVisible), defaultValue: true);
+
+    public WaveProgress()
+    {
+        InitializeComponent();
+        //var theme = App.Current.thm;
+        //theme.OnBaseThemeChanged += _ =>
+        //{
+        //    Value++;
+        //    Value--;
+        //};
+        //theme.OnColorThemeChanged += _ =>
+        //{
+        //    Value++;
+        //    Value--;
+        //};
+    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+
+    private double _value = 65;
+
+    public double Value
+    {
+        get => _value;
+        set
+        {
+            if (value is < 0 or > 100)
+                return;
+
+            SetAndRaise(ValueProperty, ref _value, value);
+        }
+    }
+
+    public bool IsTextVisible
+    {
+        get
+        {
+            return GetValue(IsTextVisibleProperty);
+        }
+
+        set
+        {
+            SetValue(IsTextVisibleProperty, value);
+        }
+    }
+}

src/BD.WTTS.Client.Avalonia/UI/Views/Pages/About/AboutPage.axaml

@@ -15,7 +15,7 @@
     <StackPanel Spacing="{StaticResource SettingsSpacing}">
         <TextBlock
             Margin="0,0,0,5"
-            Text="{Binding Path=Res.About, Mode=OneWay, Source={x:Static spp:Strings.About}}"
+            Text="{Binding Path=Res.About, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
             Theme="{StaticResource SubtitleTextBlockStyle}" />
 
         <spp:OptionsDisplayItem
@@ -138,7 +138,7 @@
                         Margin="12,4,0,0"
                         VerticalAlignment="Center"
                         Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                        Text="{Binding Path=Res.Link, Mode=OneWay, Source={x:Static spp:Strings.Link}}" />
+                        Text="{Binding Path=Res.Link, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
                     <ItemsRepeater Margin="0,0,6,6" ItemsSource="{Binding Hyperlinks, Mode=OneTime}">
                         <ItemsRepeater.Layout>
                             <UniformGridLayout MinItemWidth="166" />
@@ -161,7 +161,7 @@
                         Margin="12,4,0,0"
                         VerticalAlignment="Center"
                         Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                        Text="{Binding Path=Res.OpenSourceLibrary, Mode=OneWay, Source={x:Static spp:Strings.OpenSourceLibrary}}" />
+                        Text="{Binding Path=Res.OpenSourceLibrary, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
                     <ItemsRepeater Margin="0,0,6,6" ItemsSource="{Binding OSL, Mode=OneTime}">
                         <ItemsRepeater.Layout>
                             <UniformGridLayout MinItemWidth="290" />

src/BD.WTTS.Client.Avalonia/UI/Views/Pages/About/AboutPage.axaml.cs

@@ -8,7 +8,8 @@ public partial class AboutPage : ReactiveUserControl<AboutPageViewModel>
     public AboutPage()
     {
         InitializeComponent();
-        this.SetViewModel<AboutPageViewModel>(false);
+        DataContext = new AboutPageViewModel();
+        this.SetViewModel<AboutPageViewModel>();
     }
 
     /// <summary>

src/BD.WTTS.Client.Avalonia/UI/Views/Pages/DebugPage.axaml

@@ -21,6 +21,7 @@
     </spp:PageBase.PreviewImage>
     <spp:PageBase.TabContent>
         <TabStrip
+            Name="TabSelect"
             Margin="4"
             HorizontalAlignment="Right"
             VerticalAlignment="Top"
@@ -110,19 +111,91 @@
             </DropDownButton>
         </StackPanel>
     </spp:PageBase.ActionContent>
-    <Border Background="{DynamicResource CardBackgroundFillColorDefaultBrush}" CornerRadius="{DynamicResource ControlCornerRadius}">
-        <Grid RowDefinitions="*,Auto">
-            <TextBox
-                HorizontalContentAlignment="Stretch"
-                VerticalContentAlignment="Stretch"
-                Classes="readonlybox"
-                Text="{Binding DebugString}"
-                TextAlignment="Start"
-                TextWrapping="Wrap" />
-            <TextBox
-                Name="CommandTextBox"
-                Grid.Row="1"
-                Watermark="{Binding Path=Res.Debug_InstructionPlaceholder, Mode=OneWay, Source={x:Static spp:Strings.Debug_InstructionPlaceholder}}" />
-        </Grid>
-    </Border>
+
+    <Carousel SelectedIndex="{Binding #TabSelect.SelectedIndex}">
+        <Border Background="{DynamicResource CardBackgroundFillColorDefaultBrush}" CornerRadius="{DynamicResource ControlCornerRadius}">
+            <Grid RowDefinitions="*,Auto">
+                <TextBox
+                    HorizontalContentAlignment="Stretch"
+                    VerticalContentAlignment="Stretch"
+                    Classes="readonlybox"
+                    Text="{Binding DebugString}"
+                    TextAlignment="Start"
+                    TextWrapping="Wrap" />
+                <TextBox
+                    Name="CommandTextBox"
+                    Grid.Row="1"
+                    Watermark="{Binding Path=Res.Debug_InstructionPlaceholder, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
+            </Grid>
+        </Border>
+
+        <Panel>
+            <TextBlock Text="Test Control" />
+            <ItemsControl>
+                <ItemsControl.Items>
+                    <Border Height="30" Background="Red" />
+                    <Border Background="Blue" />
+                    <Border Background="Yellow" />
+                    <Border Height="30" Background="Yellow" />
+                    <Border Background="Red" />
+                    <Border Background="Blue" />
+                </ItemsControl.Items>
+                <ItemsControl.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <spp:FixedWrapPanel ItemsPerLine="3" Spacing="5" />
+                    </ItemsPanelTemplate>
+                </ItemsControl.ItemsPanel>
+            </ItemsControl>
+        </Panel>
+
+        <Panel>
+            <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>
+        </Panel>
+    </Carousel>
 </spp:PageBase>

src/BD.WTTS.Client.Avalonia/UI/Views/Pages/DebugPage.axaml.cs

@@ -7,7 +7,7 @@ public partial class DebugPage : PageBase<DebugPageViewModel>
     public DebugPage()
     {
         InitializeComponent();
-        this.SetViewModel<DebugPageViewModel>(false);
+        this.SetViewModel<DebugPageViewModel>();
 
         CommandTextBox.KeyUp += (s, e) =>
         {

src/BD.WTTS.Client.Avalonia/UI/Views/Pages/ErrorPage.axaml

@@ -1,6 +1,5 @@
 <UserControl
     x:Class="BD.WTTS.UI.Views.Pages.ErrorPage"
-    xmlns:spp="https://steampp.net/ui"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -10,18 +9,18 @@
     d:DesignWidth="800"
     mc:Ignorable="d">
     <Panel>
-        <Image Source="/UI/Assets/back.png" Stretch="UniformToFill" />
+        <!--<Image Source="/UI/Assets/back.png" Stretch="UniformToFill" />-->
         <!--<TextBlock
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
             FontSize="16"
             Foreground="White"
-            Text="{Binding Path=Res.Error_PageFault, Mode=OneWay, Source={x:Static spp:Strings.Error_PageFault}}" />-->
+            Text="{Binding Path=Res.Error_PageFault, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />-->
         <TextBlock
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
             FontSize="16"
             Foreground="White"
-            Text="{Binding Path=Res.NewFeatureDevelopment, Mode=OneWay, Source={x:Static spp:Strings.NewFeatureDevelopment}}" />
+            Text="{Binding Path=Res.NewFeatureDevelopment, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
     </Panel>
-</UserControl>
+</UserControl>

src/BD.WTTS.Client.Avalonia/UI/Views/Pages/HomePage.axaml

@@ -2,6 +2,7 @@
     x:Class="BD.WTTS.UI.Views.Pages.HomePage"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:col="using:System.Collections.Generic"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:s="https://steampp.net/services"
@@ -73,7 +74,7 @@
             MaxWidth="1080"
             Spacing="20">
             <spp:Snackbar
-                Title="{Binding Path=Res.Notice_Tray_Title, Mode=OneWay, Source={x:Static spp:Strings.Notice_Tray_Title}}"
+                Title="{Binding Path=Res.Notice_Tray_Title, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
                 VerticalAlignment="Top"
                 IsClosable="False"
                 IsOpen="True"
@@ -81,7 +82,7 @@
                 Message="当前使用的程序版本为测试版本，可能会有各种各样不可言明的 Bug，遇到问题请理性反馈，谢谢。"
                 Severity="Warning" />
             <spp:Snackbar
-                Title="{Binding Path=Res.Notice_Tray_Title, Mode=OneWay, Source={x:Static spp:Strings.Notice_Tray_Title}}"
+                Title="{Binding Path=Res.Notice_Tray_Title, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
                 VerticalAlignment="Top"
                 IsClosable="False"
                 IsOpen="True"
@@ -119,12 +120,13 @@
                         Theme="{StaticResource SubtitleTextBlockStyle}" />
                 </WrapPanel>
                 <TextBlock VerticalAlignment="Center" Theme="{StaticResource SubtitleTextBlockStyle}">
-                    <Run Text="{Binding Path=Res.Welcome_User_, Mode=OneWay, Source={x:Static spp:Strings.Welcome_User_}}" />
+                    <Run Text="{Binding Path=Res.Welcome_User_, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
                 </TextBlock>
             </WrapPanel>
 
             <Grid Margin="0,-10,0,0" RowDefinitions="Auto,*">
                 <spp:CarouselBanner
+                    MinHeight="350"
                     HorizontalContentAlignment="Stretch"
                     VerticalContentAlignment="Stretch"
                     ItemsSource="{Binding NavigationBanners}">
@@ -148,7 +150,7 @@
                                     </Border>
                                 </spp:AppItem.Status>
                                 <spp:AppItem.Image>
-                                    <spp:Image2 Source="{Binding ImageUrl}" />
+                                    <spp:Image2 EnableCancelToken="False" Source="{Binding ImageUrl}" />
                                 </spp:AppItem.Image>
                             </spp:AppItem>
                         </DataTemplate>
@@ -227,31 +229,34 @@
                         DataContext="{Binding Articles[2]}" />
                 </Grid>
 
-                <!--<ItemsControl ItemsSource="{Binding Articles}">
-                        <ItemsControl.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <Grid ColumnDefinitions="*,*,*" />
-                            </ItemsPanelTemplate>
-                        </ItemsControl.ItemsPanel>
-                        <ItemsControl.ItemTemplate>
-                            <DataTemplate DataType="spp:ArticleItemDTO">
-                                <spp:AppItem
-                                    Title="{Binding Title}"
-                                    Classes="Vertical Scale"
-                                    Description="{Binding Introduction}"
-                                    Tags="{Binding AuthorName}">
-                                    <spp:AppItem.Image>
-                                        <spp:Image2 RenderOptions.BitmapInterpolationMode="HighQuality" Source="{Binding CoverUrl}" />
-                                    </spp:AppItem.Image>
-                                    <spp:AppItem.Status>
-                                        <Border Classes="Status">
-                                            <TextBlock Text="{Binding CreationTime, StringFormat={}{yyyy-MM-dd}}" />
-                                        </Border>
-                                    </spp:AppItem.Status>
-                                </spp:AppItem>
-                            </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                    </ItemsControl>-->
+                <!--<spp:CarouselItems ItemsPerPage="3" ItemsSource="{Binding Articles}">
+                    <spp:CarouselItems.ItemTemplate>
+                        <DataTemplate x:DataType="spp:ArticleItemDTO">
+                            <spp:AppItem
+                                Title="{Binding Title}"
+                                Classes="Vertical Scale"
+                                ClickCommand="{Binding OpenBrowserCommand, Source={x:Static spp:App.Instance}}"
+                                Cursor="Hand"
+                                Description="{Binding Introduction}"
+                                Tags="{Binding AuthorName}">
+                                <spp:AppItem.ClickCommandParameter>
+                                    <MultiBinding Converter="{StaticResource StringFormatConverter}">
+                                        <CompiledBinding Path="." Source="{x:Static spp:HomePageViewModel.OfficialWebsite_Article_Detail_}" />
+                                        <CompiledBinding Path="Id" />
+                                    </MultiBinding>
+                                </spp:AppItem.ClickCommandParameter>
+                                <spp:AppItem.Image>
+                                    <spp:Image2 RenderOptions.BitmapInterpolationMode="HighQuality" Source="{Binding CoverUrl}" />
+                                </spp:AppItem.Image>
+                                <spp:AppItem.Status>
+                                    <Border Classes="Status">
+                                        <TextBlock Text="{Binding CreationTime, StringFormat={}{0:yyyy-MM-dd}}" />
+                                    </Border>
+                                </spp:AppItem.Status>
+                            </spp:AppItem>
+                        </DataTemplate>
+                    </spp:CarouselItems.ItemTemplate>
+                </spp:CarouselItems>-->
 
                 <DockPanel>
                     <TextBlock
@@ -268,7 +273,172 @@
                         Theme="{StaticResource HyperlinkButton}" />
                 </DockPanel>
 
-                <ScrollViewer
+                <spp:CarouselItems
+                    MinHeight="250"
+                    ItemsPerPage="4"
+                    ItemsSource="{Binding Shops}">
+                    <spp:CarouselItems.ItemTemplate>
+                        <DataTemplate x:DataType="spp:ShopRecommendGoodItem">
+                            <!--<Border spp:Animations.EnableAnimations="True">-->
+                            <spp:AppItem
+                                Title="{Binding Name}"
+                                MaxWidth="260"
+                                Classes="Vertical Scale"
+                                ClickCommand="{Binding OpenBrowserCommand, Source={x:Static spp:App.Instance}}"
+                                Cursor="Hand"
+                                Tags="{Binding GoodsAllCategorysText}"
+                                ToolTip.Tip="{Binding Brief}">
+                                <spp:AppItem.ClickCommandParameter>
+                                    <MultiBinding Converter="{StaticResource StringFormatConverter}">
+                                        <CompiledBinding Path="." Source="{x:Static spp:HomePageViewModel.WattGame_Goods_Detail_}" />
+                                        <CompiledBinding Path="Id" />
+                                    </MultiBinding>
+                                </spp:AppItem.ClickCommandParameter>
+                                <spp:AppItem.Image>
+                                    <spp:Image2
+                                        EnableCancelToken="False"
+                                        RenderOptions.BitmapInterpolationMode="HighQuality"
+                                        Source="{Binding Image}" />
+                                </spp:AppItem.Image>
+                                <spp:AppItem.Status>
+                                    <Border Classes="Status">
+                                        <StackPanel Orientation="Horizontal">
+                                            <TextBlock
+                                                VerticalAlignment="Center"
+                                                FontSize="12"
+                                                Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+                                                IsVisible="{Binding !!DiscountValue}"
+                                                Text="{Binding Mktprice, Converter={StaticResource StringFormatConverter}, ConverterParameter={x:Static spp:CurrencyCode.CNY}}"
+                                                TextDecorations="Strikethrough" />
+                                            <TextBlock
+                                                VerticalAlignment="Center"
+                                                FontSize="14"
+                                                Text="{Binding Price, Converter={StaticResource StringFormatConverter}, ConverterParameter={x:Static spp:CurrencyCode.CNY}}" />
+                                        </StackPanel>
+                                    </Border>
+                                </spp:AppItem.Status>
+                                <spp:AppItem.ActionButton>
+                                    <Border
+                                        Height="24"
+                                        Padding="8,0"
+                                        Background="#4c6b22"
+                                        ClipToBounds="True"
+                                        CornerRadius="4"
+                                        IsVisible="{Binding !!DiscountValue}">
+                                        <TextBlock
+                                            VerticalAlignment="Center"
+                                            Foreground="#beee11"
+                                            Text="{Binding DiscountValue, StringFormat={}-{0}%}" />
+                                    </Border>
+                                </spp:AppItem.ActionButton>
+                            </spp:AppItem>
+                            <!--</Border>-->
+                        </DataTemplate>
+                    </spp:CarouselItems.ItemTemplate>
+                </spp:CarouselItems>
+
+                <!--<spp:CarouselBanner
+                    MinHeight="250"
+                    HorizontalContentAlignment="Stretch"
+                    VerticalContentAlignment="Stretch"
+                    ItemsSource="{Binding Shops}">
+                    <spp:CarouselBanner.Resources>
+                        <DataTemplate x:Key="ShopItem" DataType="spp:ShopRecommendGoodItem">
+                            <Border spp:Animations.EnableAnimations="True">
+                                <spp:AppItem
+                                    Title="{Binding Name}"
+                                    MaxWidth="260"
+                                    Classes="Vertical Scale"
+                                    ClickCommand="{Binding OpenBrowserCommand, Source={x:Static spp:App.Instance}}"
+                                    Cursor="Hand"
+                                    Tags="{Binding GoodsAllCategorysText}"
+                                    ToolTip.Tip="{Binding Brief}">
+                                    <spp:AppItem.ClickCommandParameter>
+                                        <MultiBinding Converter="{StaticResource StringFormatConverter}">
+                                            <CompiledBinding Path="." Source="{x:Static spp:HomePageViewModel.WattGame_Goods_Detail_}" />
+                                            <CompiledBinding Path="Id" />
+                                        </MultiBinding>
+                                    </spp:AppItem.ClickCommandParameter>
+                                    <spp:AppItem.Image>
+                                        <spp:Image2 RenderOptions.BitmapInterpolationMode="HighQuality" Source="{Binding Image}" />
+                                    </spp:AppItem.Image>
+                                    <spp:AppItem.Status>
+                                        <Border Classes="Status">
+                                            <StackPanel Orientation="Horizontal">
+                                                <TextBlock
+                                                    VerticalAlignment="Center"
+                                                    FontSize="12"
+                                                    Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+                                                    IsVisible="{Binding !!DiscountValue}"
+                                                    Text="{Binding Mktprice, Converter={StaticResource StringFormatConverter}, ConverterParameter={x:Static spp:CurrencyCode.CNY}}"
+                                                    TextDecorations="Strikethrough" />
+                                                <TextBlock
+                                                    VerticalAlignment="Center"
+                                                    FontSize="14"
+                                                    Text="{Binding Price, Converter={StaticResource StringFormatConverter}, ConverterParameter={x:Static spp:CurrencyCode.CNY}}" />
+                                            </StackPanel>
+                                        </Border>
+                                    </spp:AppItem.Status>
+                                    <spp:AppItem.ActionButton>
+                                        <Border
+                                            Height="24"
+                                            Padding="8,0"
+                                            Background="#4c6b22"
+                                            ClipToBounds="True"
+                                            CornerRadius="4"
+                                            IsVisible="{Binding !!DiscountValue}">
+                                            <TextBlock
+                                                VerticalAlignment="Center"
+                                                Foreground="#beee11"
+                                                Text="{Binding DiscountValue, StringFormat={}-{0}%}" />
+                                        </Border>
+                                    </spp:AppItem.ActionButton>
+                                </spp:AppItem>
+                            </Border>
+                        </DataTemplate>
+                    </spp:CarouselBanner.Resources>
+                    <spp:CarouselBanner.ItemTemplate>
+                        <DataTemplate>
+                            <DataTemplate.DataType>
+                                <x:Type x:TypeArguments="spp:ShopRecommendGoodItem" TypeName="col:List" />
+                            </DataTemplate.DataType>
+                            <Grid ColumnDefinitions="*,10,*,10,*,10,*">
+                                <ContentPresenter
+                                    Grid.Column="0"
+                                    Content="{Binding [0]}"
+                                    ContentTemplate="{StaticResource ShopItem}" />
+                                <ContentPresenter
+                                    Grid.Column="2"
+                                    Content="{Binding [1]}"
+                                    ContentTemplate="{StaticResource ShopItem}" />
+                                <ContentPresenter
+                                    Grid.Column="4"
+                                    Content="{Binding [2]}"
+                                    ContentTemplate="{StaticResource ShopItem}" />
+                                <ContentPresenter
+                                    Grid.Column="6"
+                                    Content="{Binding [3]}"
+                                    ContentTemplate="{StaticResource ShopItem}" />
+                            </Grid>
+                        </DataTemplate>
+                -->
+                <!--<DataTemplate>
+                            <DataTemplate.DataType>
+                                <x:Type x:TypeArguments="spp:ShopRecommendGoodItem" TypeName="col:IEnumerable" />
+                            </DataTemplate.DataType>
+                            <ItemsControl ItemTemplate="{StaticResource ShopItem}" ItemsSource="{Binding}">
+                                <ItemsControl.ItemsPanel>
+                                    <ItemsPanelTemplate>
+                                        <Grid ColumnDefinitions="*,*,*,*" />
+                                    </ItemsPanelTemplate>
+                                </ItemsControl.ItemsPanel>
+                            </ItemsControl>
+                        </DataTemplate>-->
+                <!--
+                    </spp:CarouselBanner.ItemTemplate>
+                </spp:CarouselBanner>-->
+
+                <!--<ScrollViewer
                     Name="ShopsScrollViewer"
                     Margin="0,0,0,20"
                     Padding="0,0,0,15"
@@ -336,7 +506,7 @@
                             </DataTemplate>
                         </ItemsControl.ItemTemplate>
                     </ItemsControl>
-                </ScrollViewer>
+                </ScrollViewer>-->
 
                 <TextBlock
                     Margin="-3,0,0,0"