up 7.9.3

https://github.com/2dust/v2rayN/issues/6752

.github/workflows/build-all.yml

@@ -0,0 +1,69 @@
+name: release all platforms
+
+on:
+  workflow_dispatch:
+    inputs:
+      release_tag:
+        required: false
+        type: string
+
+jobs:
+  update:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Trigger build windows
+        if: github.event.inputs.release_tag != ''
+        run: |
+          curl -X POST \
+            -H "Accept: application/vnd.github.v3+json" \
+            -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+            https://api.github.com/repos/${{ github.repository }}/actions/workflows/build-windows.yml/dispatches \
+            -d "{
+              \"ref\": \"master\",
+              \"inputs\": {
+                \"release_tag\": \"${{ github.event.inputs.release_tag }}\"
+              }
+            }"
+
+      - name: Trigger build linux
+        if: github.event.inputs.release_tag != ''
+        run: |
+          curl -X POST \
+            -H "Accept: application/vnd.github.v3+json" \
+            -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+            https://api.github.com/repos/${{ github.repository }}/actions/workflows/build-linux.yml/dispatches \
+            -d "{
+              \"ref\": \"master\",
+              \"inputs\": {
+                \"release_tag\": \"${{ github.event.inputs.release_tag }}\"
+              }
+            }"
+
+      - name: Trigger build osx
+        if: github.event.inputs.release_tag != ''
+        run: |
+          curl -X POST \
+            -H "Accept: application/vnd.github.v3+json" \
+            -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+            https://api.github.com/repos/${{ github.repository }}/actions/workflows/build-osx.yml/dispatches \
+            -d "{
+              \"ref\": \"master\",
+              \"inputs\": {
+                \"release_tag\": \"${{ github.event.inputs.release_tag }}\"
+              }
+            }"
+
+      - name: Trigger build windows desktop
+        if: github.event.inputs.release_tag != ''
+        run: |
+          curl -X POST \
+            -H "Accept: application/vnd.github.v3+json" \
+            -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+            https://api.github.com/repos/${{ github.repository }}/actions/workflows/build-windows-desktop.yml/dispatches \
+            -d "{
+              \"ref\": \"master\",
+              \"inputs\": {
+                \"release_tag\": \"${{ github.event.inputs.release_tag }}\"
+              }
+            }"

.github/workflows/build-linux.yml

@@ -36,10 +36,10 @@ jobs:
     - name: Build
       run: |
         cd v2rayN 
-        dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r linux-x64   --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -o $OutputPath64
-        dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r linux-arm64 --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -o $OutputPathArm64
-        dotnet publish ./AmazTool/AmazTool.csproj -c Release -r linux-x64   --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:PublishTrimmed=true -o $OutputPath64
-        dotnet publish ./AmazTool/AmazTool.csproj -c Release -r linux-arm64 --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:PublishTrimmed=true -o $OutputPathArm64
+        dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r linux-x64   --self-contained=true -o $OutputPath64
+        dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r linux-arm64 --self-contained=true -o $OutputPathArm64
+        dotnet publish ./AmazTool/AmazTool.csproj             -c Release -r linux-x64   --self-contained=true -p:PublishTrimmed=true -o $OutputPath64
+        dotnet publish ./AmazTool/AmazTool.csproj             -c Release -r linux-arm64 --self-contained=true -p:PublishTrimmed=true -o $OutputPathArm64
 
     - name: Upload build artifacts
       uses: actions/upload-artifact@v4.6.0

.github/workflows/build-osx.yml

@@ -36,10 +36,10 @@ jobs:
     - name: Build
       run: |
         cd v2rayN 
-        dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r osx-x64   --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -o $OutputPath64
-        dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r osx-arm64 --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -o $OutputPathArm64
-        dotnet publish ./AmazTool/AmazTool.csproj -c Release -r osx-x64   --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:PublishTrimmed=true	-o $OutputPath64
-        dotnet publish ./AmazTool/AmazTool.csproj -c Release -r osx-arm64 --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:PublishTrimmed=true	-o $OutputPathArm64
+        dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r osx-x64   --self-contained=true -o $OutputPath64
+        dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r osx-arm64 --self-contained=true -o $OutputPathArm64
+        dotnet publish ./AmazTool/AmazTool.csproj             -c Release -r osx-x64   --self-contained=true -p:PublishTrimmed=true -o $OutputPath64
+        dotnet publish ./AmazTool/AmazTool.csproj             -c Release -r osx-arm64 --self-contained=true -p:PublishTrimmed=true -o $OutputPathArm64
 
     - name: Upload build artifacts
       uses: actions/upload-artifact@v4.6.0

.github/workflows/build-windows-desktop.yml

@@ -36,10 +36,10 @@ jobs:
     - name: Build
       run: |
         cd v2rayN 
-        dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r win-x64   --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:EnableWindowsTargeting=true -o $OutputPath64
-        dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r win-arm64 --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:EnableWindowsTargeting=true -o $OutputPathArm64
-        dotnet publish ./AmazTool/AmazTool.csproj -c Release -r win-x64   --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:PublishTrimmed=true -p:EnableWindowsTargeting=true -o $OutputPath64
-        dotnet publish ./AmazTool/AmazTool.csproj -c Release -r win-arm64 --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:PublishTrimmed=true -p:EnableWindowsTargeting=true -o $OutputPathArm64
+        dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r win-x64   --self-contained=true -p:EnableWindowsTargeting=true -o $OutputPath64
+        dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r win-arm64 --self-contained=true -p:EnableWindowsTargeting=true -o $OutputPathArm64
+        dotnet publish ./AmazTool/AmazTool.csproj             -c Release -r win-x64   --self-contained=true -p:EnableWindowsTargeting=true -p:PublishTrimmed=true -o $OutputPath64
+        dotnet publish ./AmazTool/AmazTool.csproj             -c Release -r win-arm64 --self-contained=true -p:EnableWindowsTargeting=true -p:PublishTrimmed=true -o $OutputPathArm64
 
     - name: Upload build artifacts
       uses: actions/upload-artifact@v4.6.0
@@ -47,4 +47,22 @@ jobs:
         name: v2rayN-windows-desktop
         path: |
           ${{ github.workspace }}/v2rayN/Release/windows*
-    
+
+    # release zip archive
+    - name: Package release zip archive
+      if: github.event.inputs.release_tag != ''
+      run: |
+        chmod 755 package-release-zip.sh
+        ./package-release-zip.sh $OutputArch $OutputPath64
+        mv "v2rayN-${OutputArch}.zip" "v2rayN-${OutputArch}-desktop.zip"
+        ./package-release-zip.sh $OutputArchArm $OutputPathArm64
+        mv "v2rayN-${OutputArchArm}.zip" "v2rayN-${OutputArchArm}-desktop.zip"
+
+    - name: Upload zip archive to release
+      uses: svenstaro/upload-release-action@v2
+      if: github.event.inputs.release_tag != ''
+      with:
+        file: ${{ github.workspace }}/v2rayN*.zip
+        tag: ${{ github.event.inputs.release_tag }}
+        file_glob: true
+        prerelease: true

.github/workflows/build-windows.yml

@@ -37,12 +37,12 @@ jobs:
     - name: Build
       run: |
         cd v2rayN 
-        dotnet publish ./v2rayN/v2rayN.csproj -c Release -r win-x64   --self-contained=false -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:EnableWindowsTargeting=true -o $OutputPath64
-        dotnet publish ./v2rayN/v2rayN.csproj -c Release -r win-arm64 --self-contained=false -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:EnableWindowsTargeting=true -o $OutputPathArm64
-        dotnet publish ./v2rayN/v2rayN.csproj -c Release -r win-x64   --self-contained=true  -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:EnableWindowsTargeting=true -o $OutputPath64Sc
-        dotnet publish ./AmazTool/AmazTool.csproj -c Release -r win-x64   --self-contained=false -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:EnableWindowsTargeting=true -o $OutputPath64
-        dotnet publish ./AmazTool/AmazTool.csproj -c Release -r win-arm64 --self-contained=false -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:EnableWindowsTargeting=true -o $OutputPathArm64
-        dotnet publish ./AmazTool/AmazTool.csproj -c Release -r win-x64   --self-contained=true  -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:PublishTrimmed=true  -p:EnableWindowsTargeting=true -o $OutputPath64Sc
+        dotnet publish ./v2rayN/v2rayN.csproj     -c Release -r win-x64   --self-contained=false -p:EnableWindowsTargeting=true -o $OutputPath64
+        dotnet publish ./v2rayN/v2rayN.csproj     -c Release -r win-arm64 --self-contained=false -p:EnableWindowsTargeting=true -o $OutputPathArm64
+        dotnet publish ./v2rayN/v2rayN.csproj     -c Release -r win-x64   --self-contained=true  -p:EnableWindowsTargeting=true -o $OutputPath64Sc
+        dotnet publish ./AmazTool/AmazTool.csproj -c Release -r win-x64   --self-contained=false -p:EnableWindowsTargeting=true -o $OutputPath64
+        dotnet publish ./AmazTool/AmazTool.csproj -c Release -r win-arm64 --self-contained=false -p:EnableWindowsTargeting=true -o $OutputPathArm64
+        dotnet publish ./AmazTool/AmazTool.csproj -c Release -r win-x64   --self-contained=true  -p:EnableWindowsTargeting=true -p:PublishTrimmed=true -o $OutputPath64Sc
 
   
     - name: Upload build artifacts

package-appimage.sh

@@ -17,11 +17,9 @@ echo "When this file exists, app will not store configs under this folder" >"${P
 if [ $Arch = "linux-64" ]; then
     Arch2="x86_64"
     Arch3="amd64"
-    Interpreter="ld-linux-x86-64.so.2"
 else
     Arch2="aarch64"
     Arch3="arm64"
-    Interpreter="ld-linux-aarch64.so.1"
 fi
 echo $Arch2
 
@@ -31,7 +29,6 @@ cat >"${PackagePath}/AppDir/AppRun" <<-EOF
 HERE="\$(dirname "\$(readlink -f "\${0}")")"
 export PATH="\${HERE}"/opt/v2rayN/:"\${PATH}"
 export LD_LIBRARY_PATH="\${HERE}"/opt/v2rayN/:"\${LD_LIBRARY_PATH}"
-cd "\${HERE}/opt/v2rayN"
 exec "\${HERE}/opt/v2rayN/v2rayN" \$@
 EOF
 
@@ -48,41 +45,9 @@ EOF
 
 sudo cp "${PackagePath}/AppDir/opt/v2rayN/v2rayN.png" "${PackagePath}/AppDir/v2rayN.png"
 sudo dpkg --add-architecture ${Arch3}
-sudo apt update
 mkdir deb_folder
 cd deb_folder
-apt download libstdc++6:${Arch3}
-apt download libc6:${Arch3}
-apt download libcrypt1:${Arch3}
-apt download libgcc-s1:${Arch3}
-apt download libidn2-0:${Arch3}
-apt download gcc-12-base:${Arch3}
-apt download zlib1g:${Arch3}
-apt download libfreetype6:${Arch3}
-apt download libexpat1:${Arch3}
-apt download libbrotli1:${Arch3}
-apt download libx11-6:${Arch3}
-apt download libx11-xcb1:${Arch3}
-apt download libxcb1:${Arch3}
-apt download libxau6:${Arch3}
-apt download libxdmcp6:${Arch3}
-apt download libbsd0:${Arch3}
-apt download libmd0:${Arch3}
-apt download libice6:${Arch3}
-apt download libsm6:${Arch3}
-apt download libuuid1:${Arch3}
-apt download libxrandr2:${Arch3}
-apt download libxext6:${Arch3}
-apt download libxrender1:${Arch3}
-apt download libxi6:${Arch3}
-apt download libsm6:${Arch3}
-apt download libxcursor1:${Arch3}
-apt download libxfixes3:${Arch3}
-apt download libpng16-16:${Arch3} || true
-apt download libpng16-16t64:${Arch3} || true
-apt download libicu66:${Arch3} || true
-apt download libicu70:${Arch3} || true
-apt download libicu74:${Arch3} || true
+apt download libicu74:${Arch3}
 apt download libfontconfig1:${Arch3} || true
 apt download libfontconfig:${Arch3} || true
 mkdir ../output_folder
@@ -97,12 +62,6 @@ rm -rf deb_folder output_folder
 sudo chmod 0755 "${PackagePath}/AppDir/opt/v2rayN/v2rayN"
 sudo chmod 0755 "${PackagePath}/AppDir/AppRun"
 
-sudo apt install -y patchelf
-
-pushd "${PackagePath}/AppDir/opt/v2rayN"
-patchelf --set-interpreter ${Interpreter} v2rayN
-popd
-
 # desktop && PATH
 
 wget "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"

v2rayN/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.9.0</Version>
+        <Version>7.9.3</Version>
     </PropertyGroup>
 
     <PropertyGroup>
@@ -25,6 +25,9 @@
         <MetadataUpdaterSupport>false</MetadataUpdaterSupport>
         <EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
         <EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
+
         <UseSystemResourceKeys>true</UseSystemResourceKeys>
+        <PublishSingleFile>true</PublishSingleFile>
+        <PublishReadyToRun>false</PublishReadyToRun>
     </PropertyGroup>
 </Project>

v2rayN/ServiceLib/Global.cs

@@ -507,6 +507,13 @@ namespace ServiceLib
             { ECoreType.v2rayN, "2dust/v2rayN" },
         };
 
+        public static readonly List<string> OtherGeoUrls =
+        [
+            @"https://raw.githubusercontent.com/Loyalsoldier/geoip/release/geoip-only-cn-private.dat",
+            @"https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb",
+            @"https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip.metadb"
+        ];
+
         #endregion const
     }
 }

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -294,7 +294,7 @@ namespace ServiceLib.Handler
         /// <param name="config"></param>
         /// <param name="indexes"></param>
         /// <returns></returns>
-        public static async Task<int> RemoveServer(Config config, List<ProfileItem> indexes)
+        public static async Task<int> RemoveServers(Config config, List<ProfileItem> indexes)
         {
             var subid = "TempRemoveSubId";
             foreach (var item in indexes)
@@ -303,7 +303,7 @@ namespace ServiceLib.Handler
             }
 
             await SQLiteHelper.Instance.UpdateAllAsync(indexes);
-            await RemoveServerViaSubid(config, subid, false);
+            await RemoveServersViaSubid(config, subid, false);
 
             return 0;
         }
@@ -886,7 +886,7 @@ namespace ServiceLib.Handler
                     lstRemove.Add(item);
                 }
             }
-            await RemoveServer(config, lstRemove);
+            await RemoveServers(config, lstRemove);
 
             return new Tuple<int, int>(lstProfile.Count, lstKeep.Count);
         }
@@ -1062,12 +1062,9 @@ namespace ServiceLib.Handler
             var lstProfile = (from t in lstModel
                               join t2 in lstProfileExs on t.IndexId equals t2.IndexId
                               where t2.Delay == -1
-                              select t.IndexId).ToList();
+                              select t).ToList();
 
-            foreach (var item in lstProfile)
-            {
-                await RemoveProfileItem(config, item);
-            }
+            await RemoveServers(config, JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(lstProfile)));
 
             return lstProfile.Count;
         }
@@ -1094,7 +1091,7 @@ namespace ServiceLib.Handler
             //remove sub items
             if (isSub && Utils.IsNotEmpty(subid))
             {
-                await RemoveServerViaSubid(config, subid, isSub);
+                await RemoveServersViaSubid(config, subid, isSub);
                 subFilter = (await AppHandler.Instance.GetSubItem(subid))?.Filter ?? "";
             }
 
@@ -1188,7 +1185,7 @@ namespace ServiceLib.Handler
             {
                 if (isSub && Utils.IsNotEmpty(subid))
                 {
-                    await RemoveServerViaSubid(config, subid, isSub);
+                    await RemoveServersViaSubid(config, subid, isSub);
                 }
                 int count = 0;
                 foreach (var it in lstProfiles)
@@ -1244,7 +1241,7 @@ namespace ServiceLib.Handler
 
             if (isSub && Utils.IsNotEmpty(subid))
             {
-                await RemoveServerViaSubid(config, subid, isSub);
+                await RemoveServersViaSubid(config, subid, isSub);
             }
 
             profileItem.Subid = subid;
@@ -1269,7 +1266,7 @@ namespace ServiceLib.Handler
 
             if (isSub && Utils.IsNotEmpty(subid))
             {
-                await RemoveServerViaSubid(config, subid, isSub);
+                await RemoveServersViaSubid(config, subid, isSub);
             }
 
             var lstSsServer = ShadowsocksFmt.ResolveSip008(strData);
@@ -1456,7 +1453,7 @@ namespace ServiceLib.Handler
         /// <param name="config"></param>
         /// <param name="subid"></param>
         /// <returns></returns>
-        public static async Task<int> RemoveServerViaSubid(Config config, string subid, bool isSub)
+        public static async Task<int> RemoveServersViaSubid(Config config, string subid, bool isSub)
         {
             if (Utils.IsNullOrEmpty(subid))
             {
@@ -1487,7 +1484,7 @@ namespace ServiceLib.Handler
                 return 0;
             }
             await SQLiteHelper.Instance.DeleteAsync(item);
-            await RemoveServerViaSubid(config, id, false);
+            await RemoveServersViaSubid(config, id, false);
 
             return 0;
         }

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

@@ -2879,7 +2879,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Install the font to the system and restart the settings 的本地化字符串。
+        ///   查找类似 Install the font to the system, select or fill in the font name, restart the settings 的本地化字符串。
         /// </summary>
         public static string TbSettingsCurrentFontFamilyLinuxTip {
             get {

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -1334,7 +1334,7 @@
     <value>Please do not use the insecure HTTP protocol subscription address</value>
   </data>
   <data name="TbSettingsCurrentFontFamilyLinuxTip" xml:space="preserve">
-    <value>Install the font to the system and restart the settings</value>
+    <value>Install the font to the system, select or fill in the font name, restart the settings</value>
   </data>
   <data name="menuExitTips" xml:space="preserve">
     <value>Are you sure to exit?</value>

v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx

@@ -1331,7 +1331,7 @@
     <value>请不要使用不安全的HTTP协议订阅地址</value>
   </data>
   <data name="TbSettingsCurrentFontFamilyLinuxTip" xml:space="preserve">
-    <value>安装字体到系统中，重启设置</value>
+    <value>安装字体到系统中，选择或填入字体名称，重启设置</value>
   </data>
   <data name="menuExitTips" xml:space="preserve">
     <value>是否确定退出？</value>

v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx

@@ -1212,7 +1212,7 @@
     <value>請不要使用不安全的HTTP協定訂閱位址</value>
   </data>
   <data name="TbSettingsCurrentFontFamilyLinuxTip" xml:space="preserve">
-    <value>安裝字型到系統中，重新啟動設定</value>
+    <value>安裝字體到系統中，選擇或填入字體名稱，重新啟動設定</value>
   </data>
   <data name="menuExitTips" xml:space="preserve">
     <value>是否確定退出？</value>

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs

@@ -1324,7 +1324,7 @@ namespace ServiceLib.Services.CoreConfig
                 singboxConfig.experimental.cache_file = new CacheFile4Sbox()
                 {
                     enabled = true,
-                    path = Utils.GetBinConfigPath("cache.db")
+                    path = Utils.GetBinPath("cache.db")
                 };
             }
 

v2rayN/ServiceLib/Services/SpeedtestService.cs

@@ -261,10 +261,17 @@ namespace ServiceLib.Services
                         if (pid > 0)
                         {
                             await Task.Delay(500);
-                            await DoRealPing(downloadHandle, it);
+                            var delay = await DoRealPing(downloadHandle, it);
                             if (blSpeedTest)
                             {
-                                await DoSpeedTest(downloadHandle, it);
+                                if (delay > 0)
+                                {
+                                    await DoSpeedTest(downloadHandle, it);
+                                }
+                                else
+                                {
+                                    UpdateFunc(it.IndexId, "", ResUI.SpeedtestingSkip);
+                                }
                             }
                         }
                         else
@@ -289,13 +296,14 @@ namespace ServiceLib.Services
             Task.WaitAll(tasks.ToArray());
         }
 
-        private async Task DoRealPing(DownloadService downloadHandle, ServerTestItem it)
+        private async Task<int> DoRealPing(DownloadService downloadHandle, ServerTestItem it)
         {
             var webProxy = new WebProxy($"socks5://{Global.Loopback}:{it.Port}");
             var responseTime = await downloadHandle.GetRealPingTime(_config.SpeedTestItem.SpeedPingTestUrl, webProxy, 10);
 
             ProfileExHandler.Instance.SetTestDelay(it.IndexId, responseTime);
             UpdateFunc(it.IndexId, responseTime.ToString());
+            return responseTime;
         }
 
         private async Task DoSpeedTest(DownloadService downloadHandle, ServerTestItem it)

v2rayN/ServiceLib/Services/UpdateService.cs

@@ -237,8 +237,8 @@ namespace ServiceLib.Services
 
         public async Task UpdateGeoFileAll(Config config, Action<bool, string> updateFunc)
         {
-            await UpdateGeoFile("geosite", config, updateFunc);
-            await UpdateGeoFile("geoip", config, updateFunc);
+            await UpdateGeoFiles(config, updateFunc);
+            await UpdateOtherFiles(config, updateFunc);
             await UpdateSrsFileAll(config, updateFunc);
             _updateFunc?.Invoke(true, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, "geo"));
         }
@@ -427,22 +427,32 @@ namespace ServiceLib.Services
         {
             if (Utils.IsWindows())
             {
-                //Check for standalone windows .Net version
-                if (coreInfo?.CoreType == ECoreType.v2rayN && RuntimeInformation.ProcessArchitecture == Architecture.X64)
-                {
-                    var runtimes = await Utils.GetCliWrapOutput("dotnet", "--list-runtimes");
-                    if (runtimes == null || runtimes.Contains("Microsoft.WindowsDesktop.App 8") == false)
-                    {
-                        return coreInfo?.DownloadUrlWin64?.Replace(".zip", "-SelfContained.zip");
-                    }
-                }
-
-                return RuntimeInformation.ProcessArchitecture switch
+                var url = RuntimeInformation.ProcessArchitecture switch
                 {
                     Architecture.Arm64 => coreInfo?.DownloadUrlWinArm64,
                     Architecture.X64 => coreInfo?.DownloadUrlWin64,
                     _ => null,
                 };
+
+                if (coreInfo?.CoreType != ECoreType.v2rayN)
+                {
+                    return url;
+                }
+
+                //Check for standalone windows .Net version
+                if (File.Exists(Path.Combine(Utils.GetBaseDirectory(), "wpfgfx_cor3.dll"))
+                    && File.Exists(Path.Combine(Utils.GetBaseDirectory(), "D3DCompiler_47_cor3.dll")))
+                {
+                    return url?.Replace(".zip", "-SelfContained.zip");
+                }
+
+                //Check for avalonia desktop windows version
+                if (File.Exists(Path.Combine(Utils.GetBaseDirectory(), "libHarfBuzzSharp.dll")))
+                {
+                    return url?.Replace(".zip", "-desktop.zip");
+                }
+
+                return url;
             }
             else if (Utils.IsLinux())
             {
@@ -462,14 +472,14 @@ namespace ServiceLib.Services
                     _ => null,
                 };
             }
-            return null;
+            return await Task.FromResult("");
         }
 
         #endregion CheckUpdate private
 
         #region Geo private
 
-        private async Task UpdateGeoFile(string geoName, Config config, Action<bool, string> updateFunc)
+        private async Task UpdateGeoFiles(Config config, Action<bool, string> updateFunc)
         {
             _updateFunc = updateFunc;
 
@@ -477,11 +487,28 @@ namespace ServiceLib.Services
                 ? Global.GeoUrl
                 : config.ConstItem.GeoSourceUrl;
 
-            var fileName = $"{geoName}.dat";
-            var targetPath = Utils.GetBinPath($"{fileName}");
-            var url = string.Format(geoUrl, geoName);
+            List<string> files = ["geosite", "geoip"];
+            foreach (var geoName in files)
+            {
+                var fileName = $"{geoName}.dat";
+                var targetPath = Utils.GetBinPath($"{fileName}");
+                var url = string.Format(geoUrl, geoName);
 
-            await DownloadGeoFile(url, fileName, targetPath, updateFunc);
+                await DownloadGeoFile(url, fileName, targetPath, updateFunc);
+            }
+        }
+
+        private async Task UpdateOtherFiles(Config config, Action<bool, string> updateFunc)
+        {
+            _updateFunc = updateFunc;
+
+            foreach (var url in Global.OtherGeoUrls)
+            {
+                var fileName = Path.GetFileName(url);
+                var targetPath = Utils.GetBinPath($"{fileName}");
+
+                await DownloadGeoFile(url, fileName, targetPath, updateFunc);
+            }
         }
 
         private async Task UpdateSrsFileAll(Config config, Action<bool, string> updateFunc)

v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs

@@ -520,7 +520,7 @@ namespace ServiceLib.ViewModels
             }
             var exists = lstSelecteds.Exists(t => t.IndexId == _config.IndexId);
 
-            await ConfigHandler.RemoveServer(_config, lstSelecteds);
+            await ConfigHandler.RemoveServers(_config, lstSelecteds);
             NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
             if (lstSelecteds.Count == _profileItems.Count)
             {

v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs

@@ -60,6 +60,9 @@ namespace ServiceLib.ViewModels
         [Reactive]
         public int SystemProxySelected { get; set; }
 
+        [Reactive]
+        public bool BlSystemProxyPacVisible { get; set; }
+
         #endregion System Proxy
 
         #region UI
@@ -96,6 +99,7 @@ namespace ServiceLib.ViewModels
             SelectedRouting = new();
             SelectedServer = new();
             RunningServerToolTipText = "-";
+            BlSystemProxyPacVisible = Utils.IsWindows();
 
             if (_config.TunModeItem.EnableTun && AllowEnableTun())
             {

v2rayN/v2rayN.Desktop/App.axaml

@@ -19,6 +19,7 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceInclude Source="Assets/GlobalResources.axaml" />
+                <ResourceInclude Source="Controls/AutoCompleteBox.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
@@ -46,6 +47,12 @@
                             Header="{x:Static resx:ResUI.menuSystemProxyNothing}"
                             IsChecked="{Binding BlSystemProxyNothing}"
                             ToggleType="Radio" />
+                        <NativeMenuItem
+                            Command="{Binding SystemProxyPacCmd}"
+                            Header="{x:Static resx:ResUI.menuSystemProxyPac}"
+                            IsChecked="{Binding BlSystemProxyPac}"
+                            IsVisible="{Binding BlSystemProxyPacVisible}"
+                            ToggleType="Radio" />
                         <NativeMenuItemSeparator />
                         <NativeMenuItem Click="MenuAddServerViaClipboardClick" Header="{x:Static resx:ResUI.menuAddServerViaClipboard}" />
                         <NativeMenuItem Header="{x:Static resx:ResUI.menuAddServerViaScan}" IsVisible="False" />
@@ -61,4 +68,4 @@
             </TrayIcon>
         </TrayIcons>
     </TrayIcon.Icons>
-</Application>
+</Application>

v2rayN/v2rayN.Desktop/Assets/GlobalResources.axaml

@@ -8,4 +8,13 @@
     <StreamGeometry x:Key="building_refresh">M849.652671 679.144788l111.007233-174.965917-50.615794 0C905.498584 274.107915 717.720873 88.965218 486.575446 88.965218c-233.998405 0-423.716304 189.698456-423.716304 423.707095 0 233.998405 189.716876 423.715281 423.716304 423.715281 113.936959 0 217.278605-45.079708 293.440216-118.235868l-62.46568-108.306728c-55.750745 65.205071-138.455375 106.709347-230.974535 106.709347-167.843706 0-303.882032-136.039349-303.882032-303.883055S318.732763 208.788234 486.575446 208.788234c164.951843 0 298.899554 131.522476 303.44508 295.389614l-51.357691 0L849.652671 679.144788z</StreamGeometry>
     <StreamGeometry x:Key="building_ping">M273.28 899.328c-6.4 6.4-16 9.6-25.6 9.6-6.4 0-12.8-3.2-18.56-6.4-102.4-85.76-162.56-209.92-162.56-343.68 0-245.12 200.32-445.44 445.44-445.44s445.44 200.32 445.44 445.44c0 133.76-56.96 257.92-162.56 343.68-12.16 12.8-34.56 9.6-44.16-3.2-12.8-12.8-9.6-35.2 3.2-44.8a377.152 377.152 0 0 0 136.96-292.48c0-209.92-172.16-382.08-382.08-382.08-206.72-3.2-378.88 168.96-378.88 378.88 0 114.56 51.2 222.72 140.16 295.68 12.8 12.8 16 32 3.2 44.8z m394.88-540.8c12.8-12.8 31.36-12.8 44.16 0 12.8 12.8 12.8 32 0 44.8l-138.88 138.88c1.28 5.12 2.56 10.88 2.56 16.64 0 35.2-28.8 64-64 64-5.76 0-11.52-1.28-16.64-2.56l-24.32 24.32c-6.4 6.4-12.8 9.6-22.4 9.6-9.6 0-16-3.2-22.4-9.6-12.8-12.8-12.8-31.36 0-44.16l24.32-24.96a69.76 69.76 0 0 1-1.92-16.64c0-35.2 28.16-63.36 63.36-63.36 5.76 0 11.52 0.64 16.64 1.92z</StreamGeometry>
 
+    <x:Double x:Key="IconButtonWidth">32</x:Double>
+    <x:Double x:Key="IconButtonHeight">32</x:Double>
+
+    <Thickness x:Key="Margin2">2</Thickness>
+    <Thickness x:Key="MarginLr4">4,0</Thickness>
+    <Thickness x:Key="Margin4">4</Thickness>
+    <Thickness x:Key="MarginLr8">8,0</Thickness>
+    <Thickness x:Key="MarginTb8">0,8</Thickness>
+    <Thickness x:Key="Margin8">8</Thickness>
 </ResourceDictionary>

v2rayN/v2rayN.Desktop/Assets/GlobalStyles.axaml

@@ -5,19 +5,12 @@
         </Border>
     </Design.PreviewWith>
 
-    <Style Selector="TextBlock.Margin8">
-        <Setter Property="Margin" Value="8" />
+    <Style Selector="DataGrid">
+        <Setter Property="RowHeight" Value="24" />
     </Style>
-    <Style Selector="StackPanel.Margin8">
-        <Setter Property="Margin" Value="8" />
+
+    <Style Selector="PathIcon">
+        <Setter Property="Width" Value="16" />
+        <Setter Property="Height" Value="16" />
     </Style>
-    <Style Selector="DockPanel.Margin8">
-        <Setter Property="Margin" Value="8" />
-    </Style>
-    <Style Selector="WrapPanel.Margin8">
-        <Setter Property="Margin" Value="8" />
-    </Style>
-    <Style Selector="Grid.Margin8">
-        <Setter Property="Margin" Value="8" />
-    </Style>
-</Styles>
+</Styles>

v2rayN/v2rayN.Desktop/Common/AppBuilderExtension.cs

@@ -1,4 +1,4 @@
-using Avalonia;
+using Avalonia;
 using Avalonia.Media;
 
 namespace v2rayN.Desktop.Common
@@ -10,9 +10,9 @@ namespace v2rayN.Desktop.Common
             var uri = Path.Combine(Global.AvaAssets, "Fonts#Noto Sans SC");
             return appBuilder.With(new FontManagerOptions()
             {
-                DefaultFamilyName = uri,
+                //DefaultFamilyName = uri,
                 FontFallbacks = new[] { new FontFallback { FontFamily = new FontFamily(uri) } }
             });
         }
     }
-}
+}

v2rayN/v2rayN.Desktop/Controls/AutoCompleteBox.axaml

@@ -0,0 +1,48 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:v2rayN.Desktop.Controls">
+    <!--  Add Resources Here  -->
+    <ControlTheme x:Key="{x:Type controls:AutoCompleteBox}" TargetType="controls:AutoCompleteBox">
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="MinHeight" Value="{DynamicResource AutoCompleteBoxDefaultHeight}" />
+        <Setter Property="MaxDropDownHeight" Value="{DynamicResource AutoCompleteMaxDropdownHeight}" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="AutoCompleteBox">
+                <Panel>
+                    <TextBox
+                        Name="PART_TextBox"
+                        MinHeight="{TemplateBinding MinHeight}"
+                        VerticalAlignment="Stretch"
+                        DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
+                        InnerLeftContent="{TemplateBinding InnerLeftContent}"
+                        InnerRightContent="{TemplateBinding InnerRightContent}"
+                        Watermark="{TemplateBinding Watermark}" />
+                    <Popup
+                        Name="PART_Popup"
+                        MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                        IsLightDismissEnabled="True"
+                        PlacementTarget="{TemplateBinding}">
+                        <Border
+                            MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
+                            Margin="{DynamicResource AutoCompleteBoxPopupMargin}"
+                            Padding="{DynamicResource AutoCompleteBoxPopupPadding}"
+                            HorizontalAlignment="Stretch"
+                            Background="{DynamicResource AutoCompleteBoxPopupBackground}"
+                            BorderBrush="{DynamicResource AutoCompleteBoxPopupBorderBrush}"
+                            BorderThickness="{DynamicResource AutoCompleteBoxPopupBorderThickness}"
+                            BoxShadow="{DynamicResource AutoCompleteBoxPopupBoxShadow}"
+                            CornerRadius="{DynamicResource AutoCompleteBoxPopupCornerRadius}">
+                            <ListBox
+                                Name="PART_SelectingItemsControl"
+                                Foreground="{TemplateBinding Foreground}"
+                                ItemTemplate="{TemplateBinding ItemTemplate}"
+                                ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                                ScrollViewer.VerticalScrollBarVisibility="Auto" />
+                        </Border>
+                    </Popup>
+                </Panel>
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+</ResourceDictionary>

v2rayN/v2rayN.Desktop/Controls/AutoCompleteBox.cs

@@ -0,0 +1,38 @@
+using Avalonia.Input;
+using Avalonia.Interactivity;
+
+namespace v2rayN.Desktop.Controls;
+
+public class AutoCompleteBox : Avalonia.Controls.AutoCompleteBox
+{
+    static AutoCompleteBox()
+    {
+        MinimumPrefixLengthProperty.OverrideDefaultValue<AutoCompleteBox>(0);
+    }
+
+    public AutoCompleteBox()
+    {
+        AddHandler(PointerPressedEvent, OnBoxPointerPressed, RoutingStrategies.Tunnel);
+    }
+
+    private void OnBoxPointerPressed(object? sender, PointerPressedEventArgs e)
+    {
+        if (Equals(sender, this) && e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
+        {
+            SetCurrentValue(IsDropDownOpenProperty, true);
+        }
+    }
+
+    protected override void OnGotFocus(GotFocusEventArgs e)
+    {
+        base.OnGotFocus(e);
+        if (IsDropDownOpen)
+            return;
+        SetCurrentValue(IsDropDownOpenProperty, true);
+    }
+
+    public void Clear()
+    {
+        SetCurrentValue(SelectedItemProperty, null);
+    }
+}

v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs

@@ -119,6 +119,17 @@ namespace v2rayN.Desktop.ViewModels
                 Value = size,
             });
             Application.Current?.Styles.Add(style);
+
+            ModifyFontSizeEx(size);
+        }
+
+        private void ModifyFontSizeEx(double size)
+        {
+            //DataGrid
+            var rowHeight = 20 + (size / 2);
+            var style = new Style(x => x.OfType<DataGrid>());
+            style.Add(new Setter(DataGrid.RowHeightProperty, rowHeight));
+            Application.Current?.Styles.Add(style);
         }
 
         private void ModifyFontFamily()

v2rayN/v2rayN.Desktop/Views/AddServer2Window.axaml

@@ -1,4 +1,4 @@
-<Window
+<Window
     x:Class="v2rayN.Desktop.Views.AddServer2Window"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -13,10 +13,10 @@
     ShowInTaskbar="False"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
-    <DockPanel Classes="Margin8">
+    <DockPanel Margin="{StaticResource Margin8}">
         <StackPanel
             HorizontalAlignment="Center"
-            Classes="Margin8"
+            Margin="{StaticResource Margin4}"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
             <Button
@@ -28,7 +28,7 @@
             <Button
                 x:Name="btnCancel"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="True" />
@@ -39,14 +39,14 @@
                 <TextBlock
                     Grid.Row="0"
                     Grid.Column="0"
-                    Classes="Margin8"
+                    Margin="{StaticResource Margin4}"
                     Text="{x:Static resx:ResUI.menuServers}" />
 
                 <TextBlock
                     Grid.Row="1"
                     Grid.Column="0"
                     VerticalAlignment="Center"
-                    Classes="Margin8"
+                    Margin="{StaticResource Margin4}"
                     Text="{x:Static resx:ResUI.TbRemarks}" />
 
                 <TextBox
@@ -56,13 +56,13 @@
                     Width="400"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
-                    Classes="Margin8" />
+                    Margin="{StaticResource Margin4}" />
 
                 <TextBlock
                     Grid.Row="2"
                     Grid.Column="0"
                     VerticalAlignment="Center"
-                    Classes="Margin8"
+                    Margin="{StaticResource Margin4}"
                     Text="{x:Static resx:ResUI.TbAddress}" />
                 <TextBox
                     x:Name="txtAddress"
@@ -71,7 +71,7 @@
                     Width="400"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
-                    Classes="Margin8"
+                    Margin="{StaticResource Margin4}"
                     IsReadOnly="True" />
                 <StackPanel
                     Grid.Row="2"
@@ -80,11 +80,11 @@
                     Orientation="Horizontal">
                     <Button
                         x:Name="btnBrowse"
-                        Margin="2,0"
+                        Margin="{StaticResource MarginLr4}"
                         Content="{x:Static resx:ResUI.TbBrowse}" />
                     <Button
                         x:Name="btnEdit"
-                        Margin="2,0"
+                        Margin="{StaticResource MarginLr4}"
                         Content="{x:Static resx:ResUI.TbEdit}" />
                 </StackPanel>
 
@@ -92,7 +92,7 @@
                     Grid.Row="3"
                     Grid.Column="0"
                     VerticalAlignment="Center"
-                    Classes="Margin8"
+                    Margin="{StaticResource Margin4}"
                     Text="{x:Static resx:ResUI.TbCoreType}" />
                 <ComboBox
                     x:Name="cmbCoreType"
@@ -100,27 +100,27 @@
                     Grid.Column="1"
                     Width="200"
                     HorizontalAlignment="Left"
-                    Classes="Margin8"
+                    Margin="{StaticResource Margin4}"
                     MaxDropDownHeight="1000" />
 
                 <TextBlock
                     Grid.Row="4"
                     Grid.Column="0"
                     VerticalAlignment="Center"
-                    Classes="Margin8"
+                    Margin="{StaticResource Margin4}"
                     Text="{x:Static resx:ResUI.TbDisplayLog}" />
                 <StackPanel
                     Grid.Row="4"
                     Grid.Column="1"
-                    Classes="Margin8"
+                    Margin="{StaticResource Margin4}"
                     Orientation="Horizontal">
                     <ToggleSwitch
                         x:Name="togDisplayLog"
                         HorizontalAlignment="Left"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}" />
                     <TextBlock
-                        Margin="8,0"
                         VerticalAlignment="Center"
+                        Margin="{StaticResource MarginLr8}"
                         Text="{x:Static resx:ResUI.TipDisplayLog}" />
                 </StackPanel>
 
@@ -128,7 +128,7 @@
                     Grid.Row="5"
                     Grid.Column="0"
                     VerticalAlignment="Center"
-                    Classes="Margin8"
+                    Margin="{StaticResource Margin4}"
                     Text="{x:Static resx:ResUI.TbPreSocksPort}" />
                 <TextBox
                     x:Name="txtPreSocksPort"
@@ -136,12 +136,12 @@
                     Grid.Column="1"
                     Width="200"
                     HorizontalAlignment="Left"
-                    Classes="Margin8" />
+                    Margin="{StaticResource Margin4}" />
                 <StackPanel
                     Grid.Row="6"
                     Grid.Column="1"
                     Grid.ColumnSpan="2"
-                    Classes="Margin8">
+                    Margin="{StaticResource Margin4}">
                     <TextBlock
                         Width="500"
                         VerticalAlignment="Center"
@@ -149,12 +149,12 @@
                         TextWrapping="Wrap" />
                     <TextBlock
                         Width="500"
-                        Margin="8,0"
                         VerticalAlignment="Center"
+                        Margin="{StaticResource MarginLr8}"
                         Text="{x:Static resx:ResUI.CustomServerTips}"
                         TextWrapping="Wrap" />
                 </StackPanel>
             </Grid>
         </ScrollViewer>
     </DockPanel>
-</Window>
+</Window>

v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml

@@ -1,4 +1,4 @@
-<Window
+<Window
     x:Class="v2rayN.Desktop.Views.AddServerWindow"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -13,10 +13,10 @@
     ShowInTaskbar="False"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
-    <DockPanel Classes="Margin8">
+    <DockPanel Margin="{StaticResource Margin8}">
         <StackPanel
+            Margin="{StaticResource Margin4}"
             HorizontalAlignment="Center"
-            Classes="Margin8"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
             <Button
@@ -28,7 +28,7 @@
             <Button
                 x:Name="btnCancel"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="True" />
@@ -44,7 +44,7 @@
                     <TextBlock
                         Grid.Row="0"
                         Grid.Column="0"
-                        Classes="Margin8"
+                        Margin="{StaticResource Margin4}"
                         Text="{x:Static resx:ResUI.menuServers}" />
                     <StackPanel
                         Grid.Row="0"
@@ -53,52 +53,52 @@
                         <ComboBox
                             x:Name="cmbCoreType"
                             Width="100"
-                            Classes="Margin8"
+                            Margin="{StaticResource Margin4}"
                             ToolTip.Tip="{x:Static resx:ResUI.TbCoreType}" />
                     </StackPanel>
 
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbRemarks}" />
                     <TextBox
                         x:Name="txtRemarks"
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbAddress}" />
                     <TextBox
                         x:Name="txtAddress"
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}" />
 
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbPort}" />
                     <TextBox
                         x:Name="txtPort"
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="200"
-                        HorizontalAlignment="Left"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left" />
                 </Grid>
 
-                <Separator Grid.Row="1" Margin="0,10" />
+                <Separator Grid.Row="1" Margin="{StaticResource MarginTb8}" />
 
                 <Grid
                     x:Name="gridVMess"
@@ -110,48 +110,48 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbId}" />
                     <TextBox
                         x:Name="txtId"
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}" />
                     <Button
                         x:Name="btnGUID"
                         Grid.Row="1"
                         Grid.Column="2"
-                        Margin="4,0"
+                        Margin="{StaticResource MarginLr4}"
                         Content="{x:Static resx:ResUI.TbGUID}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbAlterId}" />
                     <TextBox
                         x:Name="txtAlterId"
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="200"
-                        HorizontalAlignment="Left"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left" />
 
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbSecurity}" />
                     <ComboBox
                         x:Name="cmbSecurity"
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="200"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}" />
                 </Grid>
                 <Grid
                     x:Name="gridSs"
@@ -163,28 +163,28 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbId3}" />
                     <TextBox
                         x:Name="txtId3"
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbSecurity3}" />
                     <ComboBox
                         x:Name="cmbSecurity3"
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="300"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}" />
                 </Grid>
                 <Grid
                     x:Name="gridSocks"
@@ -196,28 +196,28 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbSecurity4}" />
                     <TextBox
                         x:Name="txtSecurity4"
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbId4}" />
                     <TextBox
                         x:Name="txtId4"
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}" />
                 </Grid>
                 <Grid
                     x:Name="gridVLESS"
@@ -229,48 +229,48 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbId5}" />
                     <TextBox
                         x:Name="txtId5"
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}" />
                     <Button
                         x:Name="btnGUID5"
                         Grid.Row="1"
                         Grid.Column="2"
-                        Margin="4,0"
+                        Margin="{StaticResource MarginLr4}"
                         Content="{x:Static resx:ResUI.TbGUID}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbFlow5}" />
                     <ComboBox
                         x:Name="cmbFlow5"
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="200"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}" />
 
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbSecurity5}" />
                     <TextBox
                         x:Name="txtSecurity5"
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="200"
-                        HorizontalAlignment="Left"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left" />
                 </Grid>
                 <Grid
                     x:Name="gridTrojan"
@@ -282,28 +282,28 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbId3}" />
                     <TextBox
                         x:Name="txtId6"
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbFlow5}" />
                     <ComboBox
                         x:Name="cmbFlow6"
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="200"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}" />
                 </Grid>
                 <Grid
                     x:Name="gridHysteria2"
@@ -315,28 +315,28 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbId3}" />
                     <TextBox
                         x:Name="txtId7"
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbPath7}" />
                     <TextBox
                         x:Name="txtPath7"
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}" />
                 </Grid>
                 <Grid
                     x:Name="gridTuic"
@@ -348,41 +348,41 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbId}" />
                     <TextBox
                         x:Name="txtId8"
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbId3}" />
                     <TextBox
                         x:Name="txtSecurity8"
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}" />
 
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbHeaderType8}" />
                     <ComboBox
                         x:Name="cmbHeaderType8"
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="200"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}" />
                 </Grid>
                 <Grid
                     x:Name="gridWireguard"
@@ -394,75 +394,75 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbPrivateKey}" />
                     <TextBox
                         x:Name="txtId9"
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbPublicKey}" />
                     <TextBox
                         x:Name="txtPublicKey9"
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="400"
-                        HorizontalAlignment="Left"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left" />
 
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbReserved}" />
                     <TextBox
                         x:Name="txtPath9"
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}" />
 
                     <TextBlock
                         Grid.Row="4"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbLocalAddress}" />
                     <TextBox
                         x:Name="txtRequestHost9"
                         Grid.Row="4"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}" />
 
                     <TextBlock
                         Grid.Row="5"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="Mtu" />
                     <TextBox
                         x:Name="txtShortId9"
                         Grid.Row="5"
                         Grid.Column="1"
                         Width="200"
-                        HorizontalAlignment="Left"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left" />
                 </Grid>
 
                 <Separator
                     x:Name="sepa2"
                     Grid.Row="3"
-                    Margin="0,10" />
+                    Margin="{StaticResource MarginTb8}" />
 
                 <Grid
                     x:Name="gridTransport"
@@ -473,34 +473,34 @@
                     <TextBlock
                         Grid.Row="0"
                         Grid.ColumnSpan="2"
-                        Classes="Margin8"
+                        Margin="{StaticResource Margin4}"
                         Text="{x:Static resx:ResUI.GbTransport}" />
 
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbNetwork}" />
                     <ComboBox
                         x:Name="cmbNetwork"
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="200"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}" />
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="2"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TipNetwork}" />
 
                     <TextBlock
                         x:Name="labHeaderType"
                         Grid.Row="2"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbHeaderType}" />
                     <StackPanel
                         Grid.Row="2"
@@ -510,35 +510,32 @@
                         <ComboBox
                             x:Name="cmbHeaderType"
                             Width="200"
-                            Classes="Margin8" />
+                            Margin="{StaticResource Margin4}" />
 
                         <Button
                             x:Name="btnExtra"
-                            Width="30"
-                            Height="30"
-                            Margin="10,0"
+                            Width="{StaticResource IconButtonWidth}"
+                            Height="{StaticResource IconButtonHeight}"
+                            Margin="{StaticResource MarginLr8}"
                             Theme="{DynamicResource BorderlessButton}">
                             <Button.Content>
-                                <PathIcon
-                                    Width="20"
-                                    Height="20"
-                                    Data="{StaticResource building_more}"
-                                    Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                                <PathIcon Data="{StaticResource building_more}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
                             </Button.Content>
                             <Button.Flyout>
                                 <Flyout>
                                     <StackPanel>
                                         <TextBlock
+                                            Margin="{StaticResource Margin4}"
                                             VerticalAlignment="Center"
-                                            Classes="Margin8"
                                             Text="{x:Static resx:ResUI.TransportExtraTip}" />
                                         <TextBox
                                             x:Name="txtExtra"
                                             Width="400"
                                             MinHeight="100"
+                                            Margin="{StaticResource Margin4}"
                                             HorizontalAlignment="Stretch"
                                             VerticalAlignment="Center"
-                                            Classes="TextArea Margin8"
+                                            Classes="TextArea"
                                             MinLines="6"
                                             TextWrapping="Wrap" />
                                     </StackPanel>
@@ -550,52 +547,52 @@
                         x:Name="tipHeaderType"
                         Grid.Row="2"
                         Grid.Column="2"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbHeaderType}" />
 
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbRequestHost}" />
                     <TextBox
                         x:Name="txtRequestHost"
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}" />
                     <TextBlock
                         x:Name="tipRequestHost"
                         Grid.Row="3"
                         Grid.Column="2"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbRequestHost}" />
 
                     <TextBlock
                         Grid.Row="4"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbPath}" />
                     <TextBox
                         x:Name="txtPath"
                         Grid.Row="4"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}" />
                     <TextBlock
                         x:Name="tipPath"
                         Grid.Row="4"
                         Grid.Column="2"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbPath}" />
                 </Grid>
 
-                <Separator Grid.Row="5" Margin="0,10" />
+                <Separator Grid.Row="5" Margin="{StaticResource MarginTb8}" />
 
                 <Grid
                     x:Name="gridTls"
@@ -606,15 +603,15 @@
                     <TextBlock
                         Grid.Row="0"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbStreamSecurity}" />
                     <ComboBox
                         x:Name="cmbStreamSecurity"
                         Grid.Row="0"
                         Grid.Column="1"
                         Width="200"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}" />
                 </Grid>
                 <Grid
                     x:Name="gridTlsMore"
@@ -626,55 +623,55 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbSNI}" />
                     <TextBox
                         x:Name="txtSNI"
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        HorizontalAlignment="Left"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbFingerprint}" />
                     <ComboBox
                         x:Name="cmbFingerprint"
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="200"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}" />
 
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbAlpn}" />
                     <ComboBox
                         x:Name="cmbAlpn"
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="200"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}" />
 
                     <TextBlock
                         Grid.Row="4"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbAllowInsecure}" />
                     <ComboBox
                         x:Name="cmbAllowInsecure"
                         Grid.Row="4"
                         Grid.Column="1"
                         Width="200"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}" />
                 </Grid>
                 <Grid
                     x:Name="gridRealityMore"
@@ -686,74 +683,74 @@
                     <TextBlock
                         Grid.Row="0"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbSNI}" />
                     <TextBox
                         x:Name="txtSNI2"
                         Grid.Row="0"
                         Grid.Column="1"
                         Width="400"
-                        HorizontalAlignment="Left"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left" />
 
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbFingerprint}" />
                     <ComboBox
                         x:Name="cmbFingerprint2"
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="200"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbPublicKey}" />
                     <TextBox
                         x:Name="txtPublicKey"
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="400"
-                        HorizontalAlignment="Left"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left" />
 
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbShortId}" />
                     <TextBox
                         x:Name="txtShortId"
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="200"
-                        HorizontalAlignment="Left"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left" />
 
                     <TextBlock
                         Grid.Row="4"
                         Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbSpiderX}" />
                     <TextBox
                         x:Name="txtSpiderX"
                         Grid.Row="4"
                         Grid.Column="1"
                         Width="400"
-                        HorizontalAlignment="Left"
-                        Classes="Margin8" />
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left" />
                 </Grid>
-                <Separator Grid.Row="8" Margin="0,10" />
+                <Separator Grid.Row="8" Margin="{StaticResource MarginTb8}" />
             </Grid>
         </ScrollViewer>
     </DockPanel>
-</Window>
+</Window>

v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml

@@ -1,4 +1,4 @@
-<UserControl
+<UserControl
     x:Class="v2rayN.Desktop.Views.BackupAndRestoreView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -14,90 +14,87 @@
         </Style>
     </UserControl.Styles>
 
-    <DockPanel Classes="Margin8">
-        <StackPanel Classes="Margin8" DockPanel.Dock="Bottom">
+    <DockPanel Margin="{StaticResource Margin8}">
+        <StackPanel Margin="{StaticResource Margin4}" DockPanel.Dock="Bottom">
             <TextBlock
                 Name="txtMsg"
                 HorizontalAlignment="Left"
-                Classes="Margin8" />
+                Margin="{StaticResource Margin4}" />
         </StackPanel>
 
         <StackPanel>
             <Border
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
                 Theme="{DynamicResource CardBorder}">
 
                 <Grid
-                    Classes="Margin8"
+                    Margin="{StaticResource Margin4}"
                     ColumnDefinitions="300,200"
                     RowDefinitions="Auto,Auto,Auto,Auto">
                     <TextBlock
                         Grid.Row="0"
                         Grid.Column="0"
-                        Classes="Margin8"
+                        Margin="{StaticResource Margin4}"
                         Text="{x:Static resx:ResUI.menuLocalBackupAndRestore}" />
 
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
+                        Margin="{StaticResource Margin4}"
                         Text="{x:Static resx:ResUI.menuLocalBackup}" />
                     <Button
                         Name="menuLocalBackup"
                         Grid.Row="1"
                         Grid.Column="1"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
+                        Margin="{StaticResource Margin4}"
                         Content="{x:Static resx:ResUI.menuLocalBackup}" />
 
                     <Separator
                         Grid.Row="2"
                         Grid.Column="0"
-                        Grid.ColumnSpan="2" />
+                        Grid.ColumnSpan="2"
+                        Margin="{StaticResource MarginTb8}" />
 
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
+                        Margin="{StaticResource Margin4}"
                         Text="{x:Static resx:ResUI.menuLocalRestore}" />
                     <Button
                         Name="menuLocalRestore"
                         Grid.Row="3"
                         Grid.Column="1"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
+                        Margin="{StaticResource Margin4}"
                         Content="{x:Static resx:ResUI.menuLocalRestore}" />
                 </Grid>
             </Border>
             <Border
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
                 Theme="{DynamicResource CardBorder}">
                 <Grid
-                    Classes="Margin8"
+                    Margin="{StaticResource Margin4}"
                     ColumnDefinitions="300,200"
                     RowDefinitions="Auto,Auto,Auto,Auto,Auto">
                     <StackPanel
                         Grid.Row="0"
                         Grid.Column="0"
                         Orientation="Horizontal">
-                        <TextBlock Classes="Margin8" Text="{x:Static resx:ResUI.menuRemoteBackupAndRestore}" />
+                        <TextBlock Margin="{StaticResource Margin4}" Text="{x:Static resx:ResUI.menuRemoteBackupAndRestore}" />
 
                         <Button
-                            Width="30"
-                            Height="30"
-                            MinWidth="30"
-                            Margin="10,0"
+                            Width="{StaticResource IconButtonWidth}"
+                            Height="{StaticResource IconButtonHeight}"
+                            MinWidth="{StaticResource IconButtonWidth}"
+                            Margin="{StaticResource MarginLr8}"
                             Theme="{DynamicResource BorderlessButton}">
                             <Button.Content>
-                                <PathIcon
-                                    Width="20"
-                                    Height="20"
-                                    Data="{StaticResource building_more}"
-                                    Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                                <PathIcon Data="{StaticResource building_more}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
                             </Button.Content>
                             <Button.Flyout>
                                 <Flyout>
@@ -107,7 +104,7 @@
                                                 Grid.Row="0"
                                                 Grid.Column="0"
                                                 VerticalAlignment="Center"
-                                                Classes="Margin8"
+                                                Margin="{StaticResource Margin4}"
                                                 Text="{x:Static resx:ResUI.LvWebDavUrl}" />
 
                                             <TextBox
@@ -115,14 +112,14 @@
                                                 Grid.Row="0"
                                                 Grid.Column="1"
                                                 VerticalAlignment="Center"
-                                                Classes="Margin8"
+                                                Margin="{StaticResource Margin4}"
                                                 TextWrapping="Wrap" />
 
                                             <TextBlock
                                                 Grid.Row="1"
                                                 Grid.Column="0"
                                                 VerticalAlignment="Center"
-                                                Classes="Margin8"
+                                                Margin="{StaticResource Margin4}"
                                                 Text="{x:Static resx:ResUI.LvWebDavUserName}" />
 
                                             <TextBox
@@ -130,13 +127,13 @@
                                                 Grid.Row="1"
                                                 Grid.Column="1"
                                                 VerticalAlignment="Center"
-                                                Classes="Margin8" />
+                                                Margin="{StaticResource Margin4}" />
 
                                             <TextBlock
                                                 Grid.Row="2"
                                                 Grid.Column="0"
                                                 VerticalAlignment="Center"
-                                                Classes="Margin8"
+                                                Margin="{StaticResource Margin4}"
                                                 Text="{x:Static resx:ResUI.LvWebDavPassword}" />
 
                                             <TextBox
@@ -144,13 +141,13 @@
                                                 Grid.Row="2"
                                                 Grid.Column="1"
                                                 VerticalAlignment="Center"
-                                                Classes="Margin8" />
+                                                Margin="{StaticResource Margin4}" />
 
                                             <TextBlock
                                                 Grid.Row="3"
                                                 Grid.Column="0"
                                                 VerticalAlignment="Center"
-                                                Classes="Margin8"
+                                                Margin="{StaticResource Margin4}"
                                                 Text="{x:Static resx:ResUI.LvWebDavDirName}" />
 
                                             <TextBox
@@ -158,7 +155,7 @@
                                                 Grid.Row="3"
                                                 Grid.Column="1"
                                                 VerticalAlignment="Center"
-                                                Classes="Margin8" />
+                                                Margin="{StaticResource Margin4}" />
 
                                             <Button
                                                 x:Name="menuWebDavCheck"
@@ -166,7 +163,7 @@
                                                 Grid.Column="1"
                                                 HorizontalAlignment="Right"
                                                 VerticalAlignment="Center"
-                                                Classes="Margin8"
+                                                Margin="{StaticResource Margin4}"
                                                 Content="{x:Static resx:ResUI.LvWebDavCheck}" />
                                         </Grid>
                                     </StackPanel>
@@ -180,35 +177,36 @@
                         Grid.Row="1"
                         Grid.Column="0"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
+                        Margin="{StaticResource Margin4}"
                         Text="{x:Static resx:ResUI.menuRemoteBackup}" />
                     <Button
                         Name="menuRemoteBackup"
                         Grid.Row="1"
                         Grid.Column="1"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
+                        Margin="{StaticResource Margin4}"
                         Content="{x:Static resx:ResUI.menuRemoteBackup}" />
 
                     <Separator
                         Grid.Row="2"
                         Grid.Column="0"
-                        Grid.ColumnSpan="2" />
+                        Grid.ColumnSpan="2"
+                        Margin="{StaticResource MarginTb8}" />
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
+                        Margin="{StaticResource Margin4}"
                         Text="{x:Static resx:ResUI.menuRemoteRestore}" />
                     <Button
                         Name="menuRemoteRestore"
                         Grid.Row="3"
                         Grid.Column="1"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
+                        Margin="{StaticResource Margin4}"
                         Content="{x:Static resx:ResUI.menuRemoteRestore}" />
                 </Grid>
             </Border>
         </StackPanel>
     </DockPanel>
-</UserControl>
+</UserControl>

v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml

@@ -1,4 +1,4 @@
-<UserControl
+<UserControl
     x:Class="v2rayN.Desktop.Views.CheckUpdateView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -11,40 +11,45 @@
     x:DataType="vms:CheckUpdateViewModel"
     mc:Ignorable="d">
 
-    <DockPanel Classes="Margin8">
-        <StackPanel
-            HorizontalAlignment="Center"
-            Classes="Margin8"
+    <DockPanel Margin="{StaticResource Margin8}">
+        <Border
+            Margin="{StaticResource Margin4}"
+            VerticalAlignment="Center"
             DockPanel.Dock="Bottom"
-            Orientation="Horizontal">
+            Theme="{DynamicResource CardBorder}">
 
-            <TextBlock
-                HorizontalAlignment="Left"
-                VerticalAlignment="Center"
-                Classes="Margin8"
-                Text="{x:Static resx:ResUI.TbSettingsEnableCheckPreReleaseUpdate}" />
-            <ToggleSwitch
-                x:Name="togEnableCheckPreReleaseUpdate"
-                HorizontalAlignment="Left"
-                Classes="Margin8" />
+            <StackPanel
+                Margin="{StaticResource Margin4}"
+                HorizontalAlignment="Center"
+                Orientation="Horizontal">
 
-            <Button
-                x:Name="btnCheckUpdate"
-                Width="100"
-                Classes="Margin8"
-                Content="{x:Static resx:ResUI.menuCheckUpdate}" />
-        </StackPanel>
+                <TextBlock
+                    Margin="{StaticResource Margin4}"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    Text="{x:Static resx:ResUI.TbSettingsEnableCheckPreReleaseUpdate}" />
+                <ToggleSwitch
+                    x:Name="togEnableCheckPreReleaseUpdate"
+                    Margin="{StaticResource Margin4}"
+                    HorizontalAlignment="Left" />
+
+                <Button
+                    x:Name="btnCheckUpdate"
+                    Width="100"
+                    Margin="{StaticResource Margin4}"
+                    Content="{x:Static resx:ResUI.menuCheckUpdate}" />
+            </StackPanel>
+        </Border>
 
         <Border
-            Margin="4"
+            Margin="{StaticResource Margin4}"
             VerticalAlignment="Center"
             Theme="{DynamicResource CardBorder}">
 
             <ListBox
                 x:Name="lstCheckUpdates"
                 BorderThickness="1"
-                ItemsSource="{Binding CheckUpdateModels}"
-                Theme="{StaticResource ButtonRadioGroupListBox}">
+                ItemsSource="{Binding CheckUpdateModels}">
                 <ItemsControl.ItemsPanel>
                     <ItemsPanelTemplate>
                         <StackPanel Orientation="Vertical" />
@@ -57,7 +62,7 @@
                                 <ToggleSwitch
                                     x:Name="togAutoRefresh"
                                     Grid.Column="0"
-                                    Margin="8"
+                                    Margin="{StaticResource Margin4}"
                                     HorizontalAlignment="Left"
                                     VerticalAlignment="Center"
                                     IsChecked="{Binding IsSelected}" />
@@ -79,4 +84,4 @@
             </ListBox>
         </Border>
     </DockPanel>
-</UserControl>
+</UserControl>

v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml

@@ -14,59 +14,51 @@
     <DockPanel Margin="2">
         <WrapPanel
             VerticalAlignment="Center"
-            Classes="Margin8"
+            Margin="{StaticResource Margin4}"
             DockPanel.Dock="Top"
             Orientation="Horizontal">
 
             <TextBox
                 x:Name="txtHostFilter"
                 Width="200"
-                Margin="8,0"
                 VerticalContentAlignment="Center"
+                Margin="{StaticResource MarginLr8}"
                 Watermark="{x:Static resx:ResUI.ConnectionsHostFilterTitle}" />
 
             <Button
                 x:Name="btnConnectionCloseAll"
-                Width="30"
-                Height="30"
-                Margin="8,0"
+                Width="{StaticResource IconButtonWidth}"
+                Height="{StaticResource IconButtonHeight}"
                 Classes="Success"
+                Margin="{StaticResource MarginLr8}"
                 Theme="{DynamicResource BorderlessButton}"
                 ToolTip.Tip="{x:Static resx:ResUI.menuConnectionCloseAll}">
                 <Button.Content>
-                    <PathIcon
-                        Width="20"
-                        Height="20"
-                        Data="{StaticResource building_delete}"
-                        Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                    <PathIcon Data="{StaticResource building_delete}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
                 </Button.Content>
             </Button>
 
             <Button
                 x:Name="btnAutofitColumnWidth"
-                Width="30"
-                Height="30"
-                Margin="8,0"
+                Width="{StaticResource IconButtonWidth}"
+                Height="{StaticResource IconButtonHeight}"
                 Classes="Success"
+                Margin="{StaticResource MarginLr8}"
                 Theme="{DynamicResource BorderlessButton}"
                 ToolTip.Tip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
                 <Button.Content>
-                    <PathIcon
-                        Width="20"
-                        Height="20"
-                        Data="{StaticResource building_fit}"
-                        Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                    <PathIcon Data="{StaticResource building_fit}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
                 </Button.Content>
             </Button>
 
             <TextBlock
-                Margin="8,0"
                 VerticalAlignment="Center"
+                Margin="{StaticResource MarginLr8}"
                 Text="{x:Static resx:ResUI.TbAutoRefresh}" />
             <ToggleSwitch
                 x:Name="togAutoRefresh"
-                Margin="8,0"
-                HorizontalAlignment="Left" />
+                HorizontalAlignment="Left"
+                Margin="{StaticResource MarginLr8}" />
         </WrapPanel>
 
         <DataGrid
@@ -108,4 +100,4 @@
             </DataGrid.Columns>
         </DataGrid>
     </DockPanel>
-</UserControl>
+</UserControl>

v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml

@@ -17,32 +17,32 @@
 
     <DockPanel Margin="2">
         <WrapPanel
+            Margin="{StaticResource Margin4}"
             VerticalAlignment="Center"
-            Classes="Margin8"
             DockPanel.Dock="Top"
             Orientation="Horizontal">
 
             <TextBlock
-                Margin="8,0"
+                Margin="{StaticResource MarginLr8}"
                 VerticalAlignment="Center"
                 Text="{x:Static resx:ResUI.menuRulemode}" />
             <ComboBox
                 x:Name="cmbRulemode"
                 Width="100"
-                Margin="8,0">
+                Margin="{StaticResource MarginLr8}">
                 <ComboBoxItem Content="{x:Static resx:ResUI.menuModeRule}" />
                 <ComboBoxItem Content="{x:Static resx:ResUI.menuModeGlobal}" />
                 <ComboBoxItem Content="{x:Static resx:ResUI.menuModeDirect}" />
             </ComboBox>
 
             <TextBlock
-                Margin="8,0"
+                Margin="{StaticResource MarginLr8}"
                 VerticalAlignment="Center"
                 Text="{x:Static resx:ResUI.TbSorting}" />
             <ComboBox
                 x:Name="cmbSorting"
                 Width="100"
-                Margin="8,0">
+                Margin="{StaticResource MarginLr8}">
                 <ComboBoxItem Content="{x:Static resx:ResUI.TbSortingDelay}" />
                 <ComboBoxItem Content="{x:Static resx:ResUI.TbSortingName}" />
                 <ComboBoxItem Content="{x:Static resx:ResUI.TbSortingDefault}" />
@@ -50,53 +50,44 @@
 
             <Button
                 x:Name="menuProxiesReload"
-                Width="30"
-                Height="30"
-                Margin="8,0"
+                Width="{StaticResource IconButtonWidth}"
+                Height="{StaticResource IconButtonHeight}"
+                Margin="{StaticResource MarginLr8}"
                 Classes="Success"
                 Theme="{DynamicResource BorderlessButton}"
                 ToolTip.Tip="{x:Static resx:ResUI.menuProxiesReload}">
                 <Button.Content>
-                    <PathIcon
-                        Width="20"
-                        Height="20"
-                        Data="{StaticResource building_refresh}"
-                        Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                    <PathIcon Data="{StaticResource building_refresh}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
                 </Button.Content>
             </Button>
 
             <Button
                 x:Name="menuProxiesDelaytest"
-                Width="30"
-                Height="30"
-                Margin="8,0"
+                Width="{StaticResource IconButtonWidth}"
+                Height="{StaticResource IconButtonHeight}"
+                Margin="{StaticResource MarginLr8}"
                 Classes="Success"
                 Theme="{DynamicResource BorderlessButton}"
                 ToolTip.Tip="{x:Static resx:ResUI.menuProxiesDelaytest}">
                 <Button.Content>
-                    <PathIcon
-                        Width="20"
-                        Height="20"
-                        Data="{StaticResource building_ping}"
-                        Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                    <PathIcon Data="{StaticResource building_ping}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
                 </Button.Content>
             </Button>
 
             <TextBlock
-                Margin="8,0"
+                Margin="{StaticResource MarginLr8}"
                 VerticalAlignment="Center"
                 Text="{x:Static resx:ResUI.TbAutoRefresh}" />
             <ToggleSwitch
                 x:Name="togAutoRefresh"
-                Margin="8,0"
+                Margin="{StaticResource MarginLr8}"
                 HorizontalAlignment="Left" />
         </WrapPanel>
         <DockPanel>
             <ListBox
                 x:Name="lstProxyGroups"
                 DockPanel.Dock="Left"
-                ItemsSource="{Binding ProxyGroups}"
-                Theme="{StaticResource ButtonRadioGroupListBox}">
+                ItemsSource="{Binding ProxyGroups}">
                 <ItemsControl.ItemsPanel>
                     <ItemsPanelTemplate>
                         <StackPanel Orientation="Vertical" />
@@ -104,27 +95,24 @@
                 </ItemsControl.ItemsPanel>
                 <ItemsControl.ItemTemplate>
                     <DataTemplate>
-                        <Border
+                        <Label
                             Width="160"
-                            Margin="-8,-4"
+                            Margin="-4,-6"
                             Padding="0"
-                            Theme="{StaticResource CardBorder}">
-                            <Grid Classes="Margin8" RowDefinitions="1*,8,1*">
+                            Theme="{DynamicResource TagLabel}">
+                            <Grid Margin="{StaticResource Margin4}" RowDefinitions="1*,8,1*">
                                 <DockPanel Grid.Row="0">
                                     <TextBlock DockPanel.Dock="Right" Text="{Binding Type}" />
                                     <TextBlock Text="{Binding Name}" />
                                 </DockPanel>
                                 <TextBlock Grid.Row="2" Text="{Binding Now}" />
                             </Grid>
-                        </Border>
+                        </Label>
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
             </ListBox>
 
-            <ListBox
-                x:Name="lstProxyDetails"
-                ItemsSource="{Binding ProxyDetails}"
-                Theme="{StaticResource ButtonRadioGroupListBox}">
+            <ListBox x:Name="lstProxyDetails" ItemsSource="{Binding ProxyDetails}">
                 <ItemsControl.ContextMenu>
                     <ContextMenu>
                         <MenuItem x:Name="menuProxiesDelaytestPart" Header="{x:Static resx:ResUI.menuProxiesDelaytestPart}" />
@@ -138,11 +126,11 @@
                 </ItemsControl.ItemsPanel>
                 <ItemsControl.ItemTemplate>
                     <DataTemplate>
-                        <Border
+                        <Label
                             Width="160"
-                            Margin="-12,-4"
+                            Margin="-10,-6"
                             Padding="0"
-                            Theme="{StaticResource CardBorder}">
+                            Theme="{DynamicResource TagLabel}">
                             <DockPanel>
                                 <Border
                                     Width="5"
@@ -151,7 +139,7 @@
                                     CornerRadius="4"
                                     DockPanel.Dock="Left"
                                     IsVisible="{Binding IsActive}" />
-                                <Grid Classes="Margin8" RowDefinitions="1*,8,1*">
+                                <Grid Margin="{StaticResource Margin4}" RowDefinitions="1*,8,1*">
                                     <TextBlock Grid.Row="0" Text="{Binding Name}" />
                                     <DockPanel Grid.Row="2">
                                         <TextBlock
@@ -162,10 +150,10 @@
                                     </DockPanel>
                                 </Grid>
                             </DockPanel>
-                        </Border>
+                        </Label>
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
             </ListBox>
         </DockPanel>
     </DockPanel>
-</UserControl>
+</UserControl>

v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml

@@ -1,4 +1,4 @@
-<Window
+<Window
     x:Class="v2rayN.Desktop.Views.DNSSettingWindow"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -13,10 +13,10 @@
     ShowInTaskbar="False"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
-    <DockPanel Classes="Margin8">
+    <DockPanel Margin="{StaticResource Margin8}">
         <StackPanel
+            Margin="{StaticResource Margin4}"
             HorizontalAlignment="Center"
-            Classes="Margin8"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
             <Button
@@ -28,7 +28,7 @@
             <Button
                 x:Name="btnCancel"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="True" />
@@ -36,21 +36,21 @@
 
         <TabControl HorizontalContentAlignment="Left">
             <TabItem Header="{x:Static resx:ResUI.TbSettingsCoreDns}">
-                <DockPanel Classes="Margin8">
+                <DockPanel Margin="{StaticResource Margin8}">
                     <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
                         <TextBlock
+                            Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
-                            Classes="Margin8"
                             Text="{x:Static resx:ResUI.TbSettingsRemoteDNS}" />
 
-                        <TextBlock VerticalAlignment="Center" Classes="Margin8">
+                        <TextBlock Margin="{StaticResource Margin4}" VerticalAlignment="Center">
                             <HyperlinkButton Classes="WithIcon" Click="linkDnsObjectDoc_Click">
                                 <TextBlock Text="{x:Static resx:ResUI.TbDnsObjectDoc}" />
                             </HyperlinkButton>
                         </TextBlock>
                         <Button
                             x:Name="btnImportDefConfig4V2ray"
-                            Classes="Margin8"
+                            Margin="{StaticResource Margin4}"
                             Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
                             Cursor="Hand" />
                     </StackPanel>
@@ -58,44 +58,45 @@
                     <WrapPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
+                                Margin="{StaticResource Margin4}"
                                 VerticalAlignment="Center"
-                                Classes="Margin8"
                                 Text="{x:Static resx:ResUI.TbSettingsUseSystemHosts}" />
                             <ToggleSwitch
                                 x:Name="togUseSystemHosts"
-                                HorizontalAlignment="Left"
-                                Classes="Margin8" />
+                                Margin="{StaticResource Margin4}"
+                                HorizontalAlignment="Left" />
                         </StackPanel>
 
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
+                                Margin="{StaticResource Margin4}"
                                 VerticalAlignment="Center"
-                                Classes="Margin8"
                                 Text="{x:Static resx:ResUI.TbSettingsDomainStrategy4Freedom}" />
                             <ComboBox
                                 x:Name="cmbdomainStrategy4Freedom"
                                 Width="150"
-                                Classes="Margin8" />
+                                Margin="{StaticResource Margin4}" />
                         </StackPanel>
 
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
+                                Margin="{StaticResource Margin4}"
                                 VerticalAlignment="Center"
-                                Classes="Margin8"
                                 Text="{x:Static resx:ResUI.TbSettingsDomainDNSAddress}" />
                             <ComboBox
                                 x:Name="cmbdomainDNSAddress"
                                 Width="150"
-                                Classes="Margin8" />
+                                Margin="{StaticResource Margin4}" />
                         </StackPanel>
                     </WrapPanel>
 
-                    <Grid Classes="Margin8">
+                    <Grid Margin="{StaticResource Margin4}">
                         <TextBox
                             x:Name="txtnormalDNS"
+                            Margin="{StaticResource Margin4}"
                             VerticalAlignment="Stretch"
                             BorderThickness="1"
-                            Classes="TextArea Margin8"
+                            Classes="TextArea"
                             TextWrapping="Wrap"
                             Watermark="HTTP/SOCKS" />
                     </Grid>
@@ -103,16 +104,16 @@
             </TabItem>
 
             <TabItem Header="{x:Static resx:ResUI.TbSettingsCoreDnsSingbox}">
-                <DockPanel Classes="Margin8">
+                <DockPanel Margin="{StaticResource Margin8}">
                     <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
-                        <TextBlock VerticalAlignment="Center" Classes="Margin8">
+                        <TextBlock Margin="{StaticResource Margin4}" VerticalAlignment="Center">
                             <HyperlinkButton Classes="WithIcon" Click="linkDnsSingboxObjectDoc_Click">
                                 <TextBlock Text="{x:Static resx:ResUI.TbDnsSingboxObjectDoc}" />
                             </HyperlinkButton>
                         </TextBlock>
                         <Button
                             x:Name="btnImportDefConfig4Singbox"
-                            Classes="Margin8"
+                            Margin="{StaticResource Margin4}"
                             Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
                             Cursor="Hand" />
                     </StackPanel>
@@ -120,28 +121,28 @@
                     <WrapPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
+                                Margin="{StaticResource Margin4}"
                                 VerticalAlignment="Center"
-                                Classes="Margin8"
                                 Text="{x:Static resx:ResUI.TbSettingsDomainStrategy4Out}" />
                             <ComboBox
                                 x:Name="cmbdomainStrategy4Out"
                                 Width="150"
-                                Classes="Margin8" />
+                                Margin="{StaticResource Margin4}" />
                         </StackPanel>
 
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
+                                Margin="{StaticResource Margin4}"
                                 VerticalAlignment="Center"
-                                Classes="Margin8"
                                 Text="{x:Static resx:ResUI.TbSettingsDomainDNSAddress}" />
                             <ComboBox
                                 x:Name="cmbdomainDNSAddress2"
                                 Width="150"
-                                Classes="Margin8" />
+                                Margin="{StaticResource Margin4}" />
                         </StackPanel>
                     </WrapPanel>
 
-                    <Grid Classes="Margin8" ColumnDefinitions="*,10,*">
+                    <Grid Margin="{StaticResource Margin4}" ColumnDefinitions="*,10,*">
 
                         <TextBox
                             x:Name="txtnormalDNS2"
@@ -150,7 +151,8 @@
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
                             BorderThickness="1"
-                            Classes="TextArea Margin8"
+                            Classes="TextArea"
+                            Margin="{StaticResource Margin4}"
                             TextWrapping="Wrap"
                             Watermark="HTTP/SOCKS" />
 
@@ -163,7 +165,8 @@
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
                             BorderThickness="1"
-                            Classes="TextArea Margin8"
+                            Classes="TextArea"
+                            Margin="{StaticResource Margin4}"
                             TextWrapping="Wrap"
                             Watermark="{x:Static resx:ResUI.TbSettingsTunMode}" />
                     </Grid>
@@ -171,4 +174,4 @@
             </TabItem>
         </TabControl>
     </DockPanel>
-</Window>
+</Window>

v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml

@@ -1,4 +1,4 @@
-<Window
+<Window
     x:Class="v2rayN.Desktop.Views.GlobalHotkeySettingWindow"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -13,16 +13,16 @@
     ShowInTaskbar="False"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
-    <DockPanel Classes="Margin8">
+    <DockPanel Margin="{StaticResource Margin8}">
         <StackPanel
             HorizontalAlignment="Center"
-            Classes="Margin8"
+            Margin="{StaticResource Margin4}"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
             <Button
                 x:Name="btnReset"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbReset}" />
             <Button
                 x:Name="btnSave"
@@ -33,7 +33,7 @@
             <Button
                 x:Name="btnCancel"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="True" />
@@ -49,14 +49,14 @@
                     <TextBlock
                         Grid.Row="0"
                         Grid.Column="0"
-                        Classes="Margin8"
+                        Margin="{StaticResource Margin4}"
                         Text="{x:Static resx:ResUI.TbGlobalHotkeySetting}" />
 
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
+                        Margin="{StaticResource Margin4}"
                         Text="{x:Static resx:ResUI.TbDisplayGUI}" />
 
                     <TextBox
@@ -64,70 +64,70 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
+                        Margin="{StaticResource Margin4}"
                         IsReadOnly="True" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
+                        Margin="{StaticResource Margin4}"
                         Text="{x:Static resx:ResUI.TbClearSystemProxy}" />
                     <TextBox
                         x:Name="txtGlobalHotkey1"
                         Grid.Row="2"
                         Grid.Column="1"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
+                        Margin="{StaticResource Margin4}"
                         IsReadOnly="True" />
 
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
+                        Margin="{StaticResource Margin4}"
                         Text="{x:Static resx:ResUI.TbSetSystemProxy}" />
                     <TextBox
                         x:Name="txtGlobalHotkey2"
                         Grid.Row="3"
                         Grid.Column="1"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
+                        Margin="{StaticResource Margin4}"
                         IsReadOnly="True" />
                     <TextBlock
                         Grid.Row="4"
                         Grid.Column="0"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
+                        Margin="{StaticResource Margin4}"
                         Text="{x:Static resx:ResUI.TbNotChangeSystemProxy}" />
                     <TextBox
                         x:Name="txtGlobalHotkey3"
                         Grid.Row="4"
                         Grid.Column="1"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
+                        Margin="{StaticResource Margin4}"
                         IsReadOnly="True" />
                     <TextBlock
                         Grid.Row="5"
                         Grid.Column="0"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
+                        Margin="{StaticResource Margin4}"
                         Text="{x:Static resx:ResUI.TbSystemProxyPac}" />
                     <TextBox
                         x:Name="txtGlobalHotkey4"
                         Grid.Row="5"
                         Grid.Column="1"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
+                        Margin="{StaticResource Margin4}"
                         IsReadOnly="True" />
                 </Grid>
 
                 <TextBlock
                     Grid.Row="1"
                     VerticalAlignment="Center"
-                    Classes="Margin8"
+                    Margin="{StaticResource Margin4}"
                     Text="{x:Static resx:ResUI.TbGlobalHotkeySettingTip}" />
             </Grid>
         </ScrollViewer>
     </DockPanel>
-</Window>
+</Window>

v2rayN/v2rayN.Desktop/Views/MainWindow.axaml

@@ -22,7 +22,7 @@
         CloseOnClickAway="True"
         DisableOpeningAnimation="True">
         <DockPanel>
-            <DockPanel Classes="Margin8" DockPanel.Dock="Top">
+            <DockPanel Margin="{StaticResource Margin8}" DockPanel.Dock="Top">
                 <ContentControl x:Name="conTheme" DockPanel.Dock="Right" />
                 <Menu Margin="0,1">
                     <MenuItem Padding="8,0">

v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs

@@ -414,18 +414,17 @@ namespace v2rayN.Desktop.Views
             }
             else
             {
-                if (Utils.IsOSX() || _config.UiItem.Hide2TrayWhenClose)
-                {
-                    foreach (var ownedWindow in this.OwnedWindows)
-                    {
-                        ownedWindow.Close();
-                    }
-                    this.Hide();
-                }
-                else
+                if (Utils.IsLinux() && _config.UiItem.Hide2TrayWhenClose == false)
                 {
                     this.WindowState = WindowState.Minimized;
+                    return;
                 }
+
+                foreach (var ownedWindow in this.OwnedWindows)
+                {
+                    ownedWindow.Close();
+                }
+                this.Hide();
             }
 
             _config.UiItem.ShowInTaskbar = bl;

v2rayN/v2rayN.Desktop/Views/MsgView.axaml

@@ -11,79 +11,69 @@
     <DockPanel Margin="2">
         <WrapPanel
             VerticalAlignment="Center"
-            Classes="Margin8"
+            Margin="{StaticResource Margin4}"
             DockPanel.Dock="Top"
             Orientation="Horizontal">
 
             <TextBox
                 x:Name="cmbMsgFilter"
                 Width="200"
-                Margin="8,0"
+                Margin="{StaticResource MarginLr8}"
                 VerticalContentAlignment="Center"
                 Watermark="{x:Static resx:ResUI.MsgFilterTitle}" />
 
             <Button
                 x:Name="btnCopy"
-                Width="30"
-                Height="30"
-                Margin="8,0"
+                Width="{StaticResource IconButtonWidth}"
+                Height="{StaticResource IconButtonHeight}"
+                Margin="{StaticResource MarginLr8}"
                 Classes="Success"
                 Click="menuMsgViewCopyAll_Click"
                 Theme="{DynamicResource BorderlessButton}"
                 ToolTip.Tip="{x:Static resx:ResUI.menuMsgViewCopyAll}">
                 <Button.Content>
-                    <PathIcon
-                        Width="20"
-                        Height="20"
-                        Data="{StaticResource building_copy}"
-                        Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                    <PathIcon Data="{StaticResource building_copy}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
                 </Button.Content>
             </Button>
             <Button
                 x:Name="btnClear"
-                Width="30"
-                Height="30"
-                Margin="8,0"
+                Margin="{StaticResource MarginLr8}"
                 Classes="Success"
                 Click="menuMsgViewClear_Click"
                 Theme="{DynamicResource BorderlessButton}"
                 ToolTip.Tip="{x:Static resx:ResUI.menuMsgViewClear}">
                 <Button.Content>
-                    <PathIcon
-                        Width="20"
-                        Height="20"
-                        Data="{StaticResource building_delete}"
-                        Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                    <PathIcon Data="{StaticResource building_delete}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
                 </Button.Content>
             </Button>
             <TextBlock
-                Margin="8,0"
+                Margin="{StaticResource MarginLr8}"
                 VerticalAlignment="Center"
                 Text="{x:Static resx:ResUI.TbAutoRefresh}" />
             <ToggleSwitch
                 x:Name="togAutoRefresh"
-                Margin="8,0"
+                Margin="{StaticResource MarginLr8}"
                 HorizontalAlignment="Left"
                 IsChecked="True"
                 Theme="{DynamicResource SimpleToggleSwitch}" />
             <TextBlock
-                Margin="8,0"
+                Margin="{StaticResource MarginLr8}"
                 VerticalAlignment="Center"
                 Text="{x:Static resx:ResUI.TbAutoScrollToEnd}" />
             <ToggleSwitch
                 x:Name="togScrollToEnd"
-                Margin="8,0"
+                Margin="{StaticResource MarginLr8}"
                 HorizontalAlignment="Left"
                 IsChecked="True"
                 Theme="{DynamicResource SimpleToggleSwitch}" />
         </WrapPanel>
         <TextBox
             Name="txtMsg"
+            VerticalAlignment="Stretch"
             BorderThickness="0"
             Classes="TextArea"
             IsReadOnly="True"
             TextAlignment="Left"
-            VerticalAlignment="Stretch"
             TextWrapping="Wrap">
             <TextBox.ContextMenu>
                 <ContextMenu>
@@ -107,4 +97,4 @@
             </TextBox.ContextMenu>
         </TextBox>
     </DockPanel>
-</UserControl>
+</UserControl>

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs

@@ -74,18 +74,11 @@ namespace v2rayN.Desktop.Views
             {
                 cmbSpeedTestTimeout.Items.Add(i * 5);
             }
-            Global.SpeedTestUrls.ForEach(it =>
-            {
-                cmbSpeedTestUrl.Items.Add(it);
-            });
-            Global.SpeedPingTestUrls.ForEach(it =>
-            {
-                cmbSpeedPingTestUrl.Items.Add(it);
-            });
-            Global.SubConvertUrls.ForEach(it =>
-            {
-                cmbSubConvertUrl.Items.Add(it);
-            });
+
+            cmbSpeedTestUrl.ItemsSource = Global.SpeedTestUrls;
+            cmbSpeedPingTestUrl.ItemsSource = Global.SpeedPingTestUrls;
+            cmbSubConvertUrl.ItemsSource = Global.SubConvertUrls;
+
             Global.GeoFilesSources.ForEach(it =>
             {
                 cmbGetFilesSourceUrl.Items.Add(it);
@@ -139,12 +132,12 @@ namespace v2rayN.Desktop.Views
                 this.Bind(ViewModel, vm => vm.Hide2TrayWhenClose, v => v.togHide2TrayWhenClose.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.DoubleClick2Activate, v => v.togDoubleClick2Activate.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.AutoUpdateInterval, v => v.txtautoUpdateInterval.Text).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.CurrentFontFamily, v => v.cmbcurrentFontFamily.SelectedValue).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.CurrentFontFamily, v => v.cmbcurrentFontFamily.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SpeedTestTimeout, v => v.cmbSpeedTestTimeout.SelectedValue).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.SpeedTestUrl, v => v.cmbSpeedTestUrl.SelectedValue).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.SpeedPingTestUrl, v => v.cmbSpeedPingTestUrl.SelectedValue).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.SpeedTestUrl, v => v.cmbSpeedTestUrl.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.SpeedPingTestUrl, v => v.cmbSpeedPingTestUrl.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.MixedConcurrencyCount, v => v.cmbMixedConcurrencyCount.SelectedValue).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.SubConvertUrl, v => v.cmbSubConvertUrl.SelectedValue).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.SubConvertUrl, v => v.cmbSubConvertUrl.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.MainGirdOrientation, v => v.cmbMainGirdOrientation.SelectedIndex).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.GeoFileSourceUrl, v => v.cmbGetFilesSourceUrl.SelectedValue).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SrsFileSourceUrl, v => v.cmbSrsFilesSourceUrl.SelectedValue).DisposeWith(disposables);
@@ -174,12 +167,27 @@ namespace v2rayN.Desktop.Views
             if (Utils.IsWindows())
             {
                 txbSettingsExceptionTip2.IsVisible = false;
+
+                txtLinuxSudoPassword.IsVisible = false;
+                labLinuxSudoPassword.IsVisible = false;
+                labLinuxSudoPasswordTip.IsVisible = false;
+
+                labHide2TrayWhenClose.IsVisible = false;
+                togHide2TrayWhenClose.IsVisible = false;
             }
-            else
+            else if (Utils.IsLinux())
             {
                 txbSettingsExceptionTip.IsVisible = false;
                 panSystemProxyAdvanced.IsVisible = false;
             }
+            else if (Utils.IsOSX())
+            {
+                txbSettingsExceptionTip.IsVisible = false;
+                panSystemProxyAdvanced.IsVisible = false;
+
+                labHide2TrayWhenClose.IsVisible = false;
+                togHide2TrayWhenClose.IsVisible = false;
+            }
         }
 
         private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
@@ -200,8 +208,9 @@ namespace v2rayN.Desktop.Views
         private async Task InitSettingFont()
         {
             var lstFonts = await GetFonts();
-            lstFonts.ForEach(it => { cmbcurrentFontFamily.Items.Add(it); });
-            cmbcurrentFontFamily.Items.Add(string.Empty);
+
+            lstFonts.Add(string.Empty);
+            cmbcurrentFontFamily.ItemsSource = lstFonts;
         }
 
         private async Task<List<string>> GetFonts()

v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml

@@ -19,65 +19,59 @@
             <WrapPanel Margin="2" DockPanel.Dock="Top">
                 <ListBox
                     x:Name="lstGroup"
-                    MaxHeight="200"
+                    Margin="{StaticResource MarginLr4}"
                     DisplayMemberBinding="{Binding Remarks}"
                     ItemsSource="{Binding SubItems}"
-                    Theme="{DynamicResource PureCardRadioGroupListBox}" />
+                    Theme="{DynamicResource PureCardRadioGroupListBox}">
+                    <ListBox.ItemsPanel>
+                        <ItemsPanelTemplate>
+                            <WrapPanel />
+                        </ItemsPanelTemplate>
+                    </ListBox.ItemsPanel>
+                </ListBox>
 
                 <Button
                     x:Name="btnEditSub"
-                    Width="30"
-                    Height="30"
-                    Margin="4,0"
+                    Width="{StaticResource IconButtonWidth}"
+                    Height="{StaticResource IconButtonHeight}"
+                    Margin="{StaticResource MarginLr4}"
                     Classes="Success"
                     Theme="{DynamicResource BorderlessButton}"
                     ToolTip.Tip="{x:Static resx:ResUI.menuSubEdit}">
                     <Button.Content>
-                        <PathIcon
-                            Width="24"
-                            Height="24"
-                            Data="{StaticResource building_edit}"
-                            Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                        <PathIcon Data="{StaticResource building_edit}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
                     </Button.Content>
                 </Button>
                 <Button
                     x:Name="btnAddSub"
-                    Width="30"
-                    Height="30"
-                    Margin="4,0"
+                    Width="{StaticResource IconButtonWidth}"
+                    Height="{StaticResource IconButtonHeight}"
+                    Margin="{StaticResource MarginLr4}"
                     Classes="Success"
                     Theme="{DynamicResource BorderlessButton}"
                     ToolTip.Tip="{x:Static resx:ResUI.menuSubAdd}">
                     <Button.Content>
-                        <PathIcon
-                            Width="24"
-                            Height="24"
-                            Data="{StaticResource building_add}"
-                            Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                        <PathIcon Data="{StaticResource building_add}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
                     </Button.Content>
                 </Button>
 
                 <Button
                     x:Name="btnAutofitColumnWidth"
-                    Width="30"
-                    Height="30"
-                    Margin="4,0"
+                    Width="{StaticResource IconButtonWidth}"
+                    Height="{StaticResource IconButtonHeight}"
+                    Margin="{StaticResource MarginLr4}"
                     Classes="Success"
                     Theme="{DynamicResource BorderlessButton}"
                     ToolTip.Tip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
                     <Button.Content>
-                        <PathIcon
-                            Width="24"
-                            Height="24"
-                            Data="{StaticResource building_fit}"
-                            Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                        <PathIcon Data="{StaticResource building_fit}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
                     </Button.Content>
                 </Button>
 
                 <TextBox
                     x:Name="txtServerFilter"
                     Width="200"
-                    Margin="4,0"
+                    Margin="{StaticResource MarginLr4}"
                     VerticalContentAlignment="Center"
                     Watermark="{x:Static resx:ResUI.MsgServerTitle}" />
             </WrapPanel>
@@ -85,11 +79,13 @@
                 x:Name="lstProfiles"
                 AutoGenerateColumns="False"
                 BorderThickness="1"
+                CanUserReorderColumns="True"
                 CanUserResizeColumns="True"
                 GridLinesVisibility="All"
                 HeadersVisibility="All"
                 IsReadOnly="True"
-                ItemsSource="{Binding ProfileItems}">
+                ItemsSource="{Binding ProfileItems}"
+                ScrollViewer.AllowAutoHide="False">
                 <DataGrid.KeyBindings>
                     <KeyBinding Command="{Binding Export2ShareUrlCmd}" Gesture="Ctrl+C" />
                     <KeyBinding Command="{Binding SetDefaultServerCmd}" Gesture="Enter" />
@@ -161,9 +157,9 @@
                         </DataGridTemplateColumn.Header>
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate>
-                                <StackPanel Margin="8,0" Orientation="Horizontal">
+                                <StackPanel Margin="{StaticResource MarginLr8}" Orientation="Horizontal">
                                     <Label
-                                        Margin="0,0,8,0"
+                                        Margin="{StaticResource MarginLr4}"
                                         Classes="Solid Red"
                                         Content="{x:Static resx:ResUI.TipActiveServer}"
                                         IsVisible="{Binding IsActive}"
@@ -209,7 +205,7 @@
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate>
                                 <TextBlock
-                                    Margin="8,0"
+                                    Margin="{StaticResource MarginLr8}"
                                     HorizontalAlignment="Right"
                                     VerticalAlignment="Center"
                                     Foreground="{Binding Delay, Converter={StaticResource DelayColorConverter}}"

v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs

@@ -372,9 +372,8 @@ namespace v2rayN.Desktop.Views
         private void StorageUI(string? n = null)
         {
             List<ColumnItem> lvColumnItem = new();
-            for (int k = 0; k < lstProfiles.Columns.Count; k++)
+            foreach (var item2 in lstProfiles.Columns)
             {
-                var item2 = lstProfiles.Columns[k];
                 if (item2.Tag == null)
                 {
                     continue;

v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml

@@ -1,4 +1,4 @@
-<UserControl
+<UserControl
     x:Class="v2rayN.Desktop.Views.QrcodeView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -7,7 +7,7 @@
     d:DesignHeight="480"
     d:DesignWidth="400"
     mc:Ignorable="d">
-    <Grid Margin="30" RowDefinitions="Auto,Auto">
+    <Grid Margin="32" RowDefinitions="Auto,Auto">
         <Image
             Name="imgQrcode"
             Width="300"
@@ -17,10 +17,10 @@
             x:Name="txtContent"
             Grid.Row="1"
             Width="300"
-            Margin="0,8"
+            Margin="{StaticResource MarginTb8}"
             VerticalAlignment="Center"
             IsReadOnly="True"
             MaxLines="1" />
 
     </Grid>
-</UserControl>
+</UserControl>

v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml

@@ -1,4 +1,4 @@
-<Window
+<Window
     x:Class="v2rayN.Desktop.Views.RoutingRuleDetailsWindow"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -15,7 +15,7 @@
     mc:Ignorable="d">
     <DockPanel>
         <Grid
-            Classes="Margin8"
+            Margin="{StaticResource Margin4}"
             ColumnDefinitions="Auto,Auto,Auto"
             DockPanel.Dock="Top"
             RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">
@@ -23,7 +23,7 @@
                 Grid.Row="0"
                 Grid.Column="0"
                 VerticalAlignment="Center"
-                Classes="Margin8"
+                Margin="{StaticResource Margin4}"
                 Text="{x:Static resx:ResUI.LvRemarks}" />
             <TextBox
                 x:Name="txtRemarks"
@@ -31,39 +31,39 @@
                 Grid.Column="1"
                 Width="200"
                 HorizontalAlignment="Left"
-                Classes="Margin8" />
+                Margin="{StaticResource Margin4}" />
             <ToggleSwitch
                 x:Name="togEnabled"
                 Grid.Row="0"
                 Grid.Column="2"
                 HorizontalAlignment="Left"
-                Classes="Margin8" />
+                Margin="{StaticResource Margin4}" />
 
             <TextBlock
                 Grid.Row="1"
                 Grid.Column="0"
                 VerticalAlignment="Center"
-                Classes="Margin8"
+                Margin="{StaticResource Margin4}"
                 Text="outboundTag" />
             <ComboBox
                 x:Name="cmbOutboundTag"
                 Grid.Row="1"
                 Grid.Column="1"
                 Width="200"
-                Classes="Margin8"
+                Margin="{StaticResource Margin4}"
                 MaxDropDownHeight="1000" />
             <TextBlock
                 Grid.Row="1"
                 Grid.Column="2"
                 HorizontalAlignment="Left"
-                Classes="Margin8"
+                Margin="{StaticResource Margin4}"
                 Text="{x:Static resx:ResUI.TbRuleMatchingTips}" />
 
             <TextBlock
                 Grid.Row="2"
                 Grid.Column="0"
                 VerticalAlignment="Center"
-                Classes="Margin8"
+                Margin="{StaticResource Margin4}"
                 Text="port" />
             <TextBox
                 x:Name="txtPort"
@@ -71,12 +71,12 @@
                 Grid.Column="1"
                 Width="200"
                 HorizontalAlignment="Left"
-                Classes="Margin8" />
+                Margin="{StaticResource Margin4}" />
             <TextBlock
                 Grid.Row="2"
                 Grid.Column="2"
                 VerticalAlignment="Center"
-                Classes="Margin8">
+                Margin="{StaticResource Margin4}">
                 <HyperlinkButton Classes="WithIcon" Click="linkRuleobjectDoc_Click">
                     <TextBlock Text="{x:Static resx:ResUI.TbRuleobjectDoc}" />
                 </HyperlinkButton>
@@ -86,14 +86,14 @@
                 Grid.Row="3"
                 Grid.Column="0"
                 VerticalAlignment="Center"
-                Classes="Margin8"
+                Margin="{StaticResource Margin4}"
                 Text="protocol" />
             <ListBox
                 x:Name="clbProtocol"
                 Grid.Row="3"
                 Grid.Column="1"
                 HorizontalAlignment="Left"
-                Classes="Margin8"
+                Margin="{StaticResource Margin4}"
                 SelectionMode="Multiple,Toggle"
                 Theme="{DynamicResource CardCheckGroupListBox}" />
 
@@ -101,20 +101,20 @@
                 Grid.Row="4"
                 Grid.Column="0"
                 VerticalAlignment="Center"
-                Classes="Margin8"
+                Margin="{StaticResource Margin4}"
                 Text="inboundTag" />
             <ListBox
                 x:Name="clbInboundTag"
                 Grid.Row="4"
                 Grid.Column="1"
-                Classes="Margin8"
+                Margin="{StaticResource Margin4}"
                 SelectionMode="Multiple,Toggle"
                 Theme="{DynamicResource CardCheckGroupListBox}" />
             <TextBlock
                 Grid.Row="4"
                 Grid.Column="2"
                 HorizontalAlignment="Left"
-                Classes="Margin8"
+                Margin="{StaticResource Margin4}"
                 Text="{x:Static resx:ResUI.TbRoutingInboundTagTips}" />
 
 
@@ -122,26 +122,26 @@
                 Grid.Row="5"
                 Grid.Column="0"
                 VerticalAlignment="Center"
-                Classes="Margin8"
+                Margin="{StaticResource Margin4}"
                 Text="network" />
             <ComboBox
                 x:Name="cmbNetwork"
                 Grid.Row="5"
                 Grid.Column="1"
                 Width="200"
-                Classes="Margin8"
+                Margin="{StaticResource Margin4}"
                 MaxDropDownHeight="1000" />
             <TextBlock
                 Grid.Row="5"
                 Grid.Column="2"
                 HorizontalAlignment="Left"
-                Classes="Margin8"
+                Margin="{StaticResource Margin4}"
                 Text="{x:Static resx:ResUI.TbRoutingTips}" />
         </Grid>
 
         <StackPanel
             HorizontalAlignment="Right"
-            Classes="Margin8"
+            Margin="{StaticResource Margin4}"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
             <StackPanel
@@ -161,13 +161,13 @@
             <Button
                 x:Name="btnCancel"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
 
-        <Grid Classes="Margin8" ColumnDefinitions="1*,10,1*,10,1*">
+        <Grid Margin="{StaticResource Margin4}" ColumnDefinitions="1*,10,1*,10,1*">
             <HeaderedContentControl
                 Grid.Column="0"
                 BorderBrush="Gray"
@@ -208,4 +208,4 @@
             </HeaderedContentControl>
         </Grid>
     </DockPanel>
-</Window>
+</Window>

v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml

@@ -1,4 +1,4 @@
-<Window
+<Window
     x:Class="v2rayN.Desktop.Views.RoutingRuleSettingWindow"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -15,7 +15,7 @@
     mc:Ignorable="d">
     <DockPanel>
         <StackPanel
-            Classes="Margin8"
+            Margin="{StaticResource Margin4}"
             DockPanel.Dock="Top"
             Orientation="Horizontal">
             <Menu>
@@ -28,7 +28,7 @@
 
         <StackPanel
             HorizontalAlignment="Right"
-            Classes="Margin8"
+            Margin="{StaticResource Margin4}"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
             <Button
@@ -40,14 +40,14 @@
             <Button
                 x:Name="btnCancel"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
 
         <Grid
-            Classes="Margin8"
+            Margin="{StaticResource Margin4}"
             ColumnDefinitions="Auto,Auto,Auto"
             DockPanel.Dock="Top"
             RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">
@@ -55,7 +55,7 @@
                 Grid.Row="0"
                 Grid.Column="0"
                 VerticalAlignment="Center"
-                Classes="Margin8"
+                Margin="{StaticResource Margin4}"
                 Text="{x:Static resx:ResUI.LvRemarks}" />
             <StackPanel
                 Grid.Row="0"
@@ -69,25 +69,25 @@
                     Width="300"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
-                    Classes="Margin8"
+                    Margin="{StaticResource Margin4}"
                     TextWrapping="Wrap" />
 
                 <TextBlock
                     VerticalAlignment="Center"
-                    Classes="Margin8"
+                    Margin="{StaticResource Margin4}"
                     Text="{x:Static resx:ResUI.LvSort}" />
                 <TextBox
                     x:Name="txtSort"
                     Width="100"
                     HorizontalAlignment="Left"
-                    Classes="Margin8" />
+                    Margin="{StaticResource Margin4}" />
             </StackPanel>
 
             <TextBlock
                 Grid.Row="1"
                 Grid.Column="0"
                 VerticalAlignment="Center"
-                Classes="Margin8"
+                Margin="{StaticResource Margin4}"
                 Text="{x:Static resx:ResUI.TbdomainStrategy}" />
             <StackPanel
                 Grid.Row="1"
@@ -96,22 +96,22 @@
                 <ComboBox
                     x:Name="cmbdomainStrategy"
                     Width="200"
-                    Classes="Margin8" />
+                    Margin="{StaticResource Margin4}" />
                 <TextBlock
                     VerticalAlignment="Center"
-                    Classes="Margin8"
+                    Margin="{StaticResource Margin4}"
                     Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" />
                 <ComboBox
                     x:Name="cmbdomainStrategy4Singbox"
                     Width="200"
-                    Classes="Margin8" />
+                    Margin="{StaticResource Margin4}" />
             </StackPanel>
 
             <TextBlock
                 Grid.Row="2"
                 Grid.Column="0"
                 VerticalAlignment="Center"
-                Classes="Margin8"
+                Margin="{StaticResource Margin4}"
                 Text="{x:Static resx:ResUI.LvUrl}" />
             <TextBox
                 x:Name="txtUrl"
@@ -120,7 +120,7 @@
                 Width="600"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
-                Classes="Margin8"
+                Margin="{StaticResource Margin4}"
                 TextWrapping="Wrap" />
 
             <!--
@@ -128,7 +128,7 @@
                 Grid.Row="3"
                 Grid.Column="0"
                 VerticalAlignment="Center"
-                Classes="Margin8"
+                Margin="{StaticResource Margin4}"
                 Text="{x:Static resx:ResUI.LvCustomIcon}" />
             <TextBox
                 x:Name="txtCustomIcon"
@@ -137,13 +137,13 @@
                 Width="600"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
-                Classes="Margin8"
+                Margin="{StaticResource Margin4}"
                 TextWrapping="Wrap" />
             <Button
                 x:Name="btnBrowseCustomIcon"
                 Grid.Row="3"
                 Grid.Column="2"
-                Classes="Margin8"
+                Margin="{StaticResource Margin4}"
                 Content="{x:Static resx:ResUI.TbBrowse}" />
             -->
 
@@ -151,7 +151,7 @@
                 Grid.Row="4"
                 Grid.Column="0"
                 VerticalAlignment="Center"
-                Classes="Margin8">
+                Margin="{StaticResource Margin4}">
                 <HyperlinkButton Classes="WithIcon" Click="linkCustomRulesetPath4Singbox">
                     <TextBlock Text="{x:Static resx:ResUI.LvCustomRulesetPath4Singbox}" />
                 </HyperlinkButton>
@@ -163,13 +163,13 @@
                 Width="600"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
-                Classes="Margin8"
+                Margin="{StaticResource Margin4}"
                 TextWrapping="Wrap" />
             <Button
                 x:Name="btnBrowseCustomRulesetPath4Singbox"
                 Grid.Row="4"
                 Grid.Column="2"
-                Classes="Margin8"
+                Margin="{StaticResource Margin4}"
                 Content="{x:Static resx:ResUI.TbBrowse}" />
         </Grid>
 
@@ -242,4 +242,4 @@
             </TabItem>
         </TabControl>
     </DockPanel>
-</Window>
+</Window>

v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml

@@ -1,4 +1,4 @@
-<Window
+<Window
     x:Class="v2rayN.Desktop.Views.RoutingSettingWindow"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -16,7 +16,7 @@
 
     <DockPanel>
         <StackPanel
-            Classes="Margin8"
+            Margin="{StaticResource Margin4}"
             DockPanel.Dock="Top"
             Orientation="Horizontal"
             Spacing="4">
@@ -45,7 +45,7 @@
 
         <StackPanel
             HorizontalAlignment="Right"
-            Classes="Margin8"
+            Margin="{StaticResource Margin4}"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
             <StackPanel
@@ -63,7 +63,7 @@
             <Button
                 x:Name="btnCancel"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="True" />
@@ -123,4 +123,4 @@
             </TabControl>
         </DockPanel>
     </DockPanel>
-</Window>
+</Window>

v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml

@@ -11,10 +11,10 @@
     x:DataType="vms:StatusBarViewModel"
     mc:Ignorable="d">
     <Grid>
-        <DockPanel Margin="4">
+        <DockPanel Margin="{StaticResource Margin8}">
             <StackPanel
-                Margin="8,0"
                 VerticalAlignment="Center"
+                Margin="{StaticResource MarginLr8}"
                 DockPanel.Dock="Right">
                 <TextBlock x:Name="txtSpeedProxyDisplay" HorizontalAlignment="Right" />
                 <Border Margin="1" />
@@ -22,8 +22,8 @@
             </StackPanel>
 
             <StackPanel
-                Margin="8,0"
                 VerticalAlignment="Center"
+                Margin="{StaticResource MarginLr8}"
                 DockPanel.Dock="Left">
                 <TextBlock x:Name="txtInboundDisplay" />
                 <Border Margin="1" />
@@ -32,50 +32,51 @@
 
             <StackPanel
                 x:Name="spEnableTun"
-                Margin="8,0"
                 VerticalAlignment="Center"
+                Margin="{StaticResource MarginLr8}"
                 DockPanel.Dock="Left"
                 Orientation="Horizontal">
                 <TextBlock
-                    Margin="8,0"
                     VerticalAlignment="Center"
+                    Margin="{StaticResource MarginLr8}"
                     Text="{x:Static resx:ResUI.TbEnableTunAs}" />
                 <ToggleSwitch
                     x:Name="togEnableTun"
                     HorizontalAlignment="Center"
-                    Classes="Margin8"
+                    Margin="{StaticResource Margin4}"
                     Theme="{DynamicResource SimpleToggleSwitch}" />
             </StackPanel>
 
             <StackPanel
-                Margin="8,0"
                 VerticalAlignment="Center"
+                Margin="{StaticResource MarginLr8}"
                 DockPanel.Dock="Left"
                 Orientation="Horizontal">
                 <ComboBox
                     x:Name="cmbSystemProxy"
                     Width="160"
-                    Margin="8,0"
+                    Margin="{StaticResource MarginLr8}"
                     ToolTip.Tip="{x:Static resx:ResUI.menuSystemproxy}">
                     <ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxyClear}" />
                     <ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxySet}" />
                     <ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxyNothing}" />
+                    <ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxyPac}" />
                 </ComboBox>
 
                 <ComboBox
                     x:Name="cmbRoutings2"
                     Width="160"
-                    Margin="8,0"
+                    Margin="{StaticResource MarginLr8}"
                     DisplayMemberBinding="{Binding Remarks}"
                     ItemsSource="{Binding RoutingItems}"
                     ToolTip.Tip="{x:Static resx:ResUI.menuRouting}" />
             </StackPanel>
 
-            <StackPanel Margin="8,0" VerticalAlignment="Center">
+            <StackPanel VerticalAlignment="Center" Margin="{StaticResource MarginLr8}">
                 <TextBlock x:Name="txtRunningServerDisplay" />
                 <Border Margin="1" />
                 <TextBlock x:Name="txtRunningInfoDisplay" />
             </StackPanel>
         </DockPanel>
     </Grid>
-</UserControl>
+</UserControl>

v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs

@@ -43,6 +43,11 @@ namespace v2rayN.Desktop.Views
             });
 
             //spEnableTun.IsVisible = (Utils.IsWindows() || AppHandler.Instance.IsAdministrator);
+
+            if (Utils.IsNonWindows() && cmbSystemProxy.Items.IsReadOnly == false)
+            {
+                cmbSystemProxy.Items.RemoveAt(cmbSystemProxy.Items.Count - 1);
+            }
         }
 
         private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)

v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml

@@ -12,10 +12,10 @@
     ShowInTaskbar="False"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
-    <DockPanel Classes="Margin8">
+    <DockPanel Margin="{StaticResource Margin8}">
         <StackPanel
+            Margin="{StaticResource Margin4}"
             HorizontalAlignment="Center"
-            Classes="Margin8"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
             <Button
@@ -27,7 +27,7 @@
             <Button
                 x:Name="btnCancel"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="True" />
@@ -39,66 +39,63 @@
                 <TextBlock
                     Grid.Row="0"
                     Grid.Column="0"
-                    Classes="Margin8"
+                    Margin="{StaticResource Margin4}"
                     Text="{x:Static resx:ResUI.menuSubscription}" />
 
                 <TextBlock
                     Grid.Row="1"
                     Grid.Column="0"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
-                    Classes="Margin8"
                     Text="{x:Static resx:ResUI.LvRemarks}" />
 
                 <TextBox
                     x:Name="txtRemarks"
                     Grid.Row="1"
                     Grid.Column="1"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
-                    Classes="Margin8"
                     TextWrapping="Wrap" />
 
                 <TextBlock
                     Grid.Row="2"
                     Grid.Column="0"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
-                    Classes="Margin8"
                     Text="{x:Static resx:ResUI.LvUrl}" />
                 <TextBox
                     x:Name="txtUrl"
                     Grid.Row="2"
                     Grid.Column="1"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
-                    Classes="Margin8"
                     TextWrapping="Wrap"
                     Watermark="{x:Static resx:ResUI.SubUrlTips}" />
                 <Button
                     Grid.Row="2"
                     Grid.Column="2"
-                    Width="30"
-                    Height="30"
-                    Margin="10,0"
+                    Width="{StaticResource IconButtonWidth}"
+                    Height="{StaticResource IconButtonHeight}"
+                    Margin="{StaticResource MarginLr8}"
                     Theme="{DynamicResource BorderlessButton}">
                     <Button.Content>
-                        <PathIcon
-                            Width="20"
-                            Height="20"
-                            Data="{StaticResource building_more}"
-                            Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                        <PathIcon Data="{StaticResource building_more}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
                     </Button.Content>
                     <Button.Flyout>
                         <Flyout>
                             <StackPanel>
                                 <TextBlock
+                                    Margin="{StaticResource Margin4}"
                                     VerticalAlignment="Center"
-                                    Classes="Margin8"
                                     Text="{x:Static resx:ResUI.LvMoreUrl}" />
                                 <TextBox
                                     x:Name="txtMoreUrl"
                                     Width="400"
                                     MinHeight="100"
+                                    Margin="{StaticResource Margin4}"
                                     HorizontalAlignment="Stretch"
                                     VerticalAlignment="Center"
-                                    Classes="TextArea Margin8"
+                                    Classes="TextArea"
                                     MinLines="4"
                                     TextWrapping="Wrap"
                                     Watermark="{x:Static resx:ResUI.SubUrlTips}" />
@@ -110,150 +107,148 @@
                 <TextBlock
                     Grid.Row="3"
                     Grid.Column="0"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
-                    Classes="Margin8"
                     Text="{x:Static resx:ResUI.LvEnabled}" />
 
                 <DockPanel
                     Grid.Row="3"
                     Grid.Column="1"
-                    Classes="Margin8">
+                    Margin="{StaticResource Margin4}">
                     <ToggleSwitch
                         x:Name="togEnable"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Center"
-                        Classes="Margin8"
                         DockPanel.Dock="Left" />
 
                     <TextBox
                         x:Name="txtAutoUpdateInterval"
                         Width="100"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         DockPanel.Dock="Right"
                         Watermark="{x:Static resx:ResUI.SubUrlTips}" />
 
                     <TextBlock
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
-                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.LvAutoUpdateInterval}" />
                 </DockPanel>
 
                 <TextBlock
                     Grid.Row="5"
                     Grid.Column="0"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
-                    Classes="Margin8"
                     Text="{x:Static resx:ResUI.LvFilter}" />
                 <TextBox
                     x:Name="txtFilter"
                     Grid.Row="5"
                     Grid.Column="1"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
-                    Classes="Margin8"
                     Watermark="{x:Static resx:ResUI.SubUrlTips}" />
 
                 <TextBlock
                     Grid.Row="6"
                     Grid.Column="0"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
-                    Classes="Margin8"
                     Text="{x:Static resx:ResUI.LvConvertTarget}" />
                 <ComboBox
                     x:Name="cmbConvertTarget"
                     Grid.Row="6"
                     Grid.Column="1"
                     Width="200"
-                    Classes="Margin8"
+                    Margin="{StaticResource Margin4}"
                     ToolTip.Tip="{x:Static resx:ResUI.LvConvertTargetTip}" />
 
                 <TextBlock
                     Grid.Row="7"
                     Grid.Column="0"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
-                    Classes="Margin8"
                     Text="{x:Static resx:ResUI.LvUserAgent}" />
                 <TextBox
                     x:Name="txtUserAgent"
                     Grid.Row="7"
                     Grid.Column="1"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
-                    Classes="Margin8"
                     TextWrapping="Wrap"
                     Watermark="{x:Static resx:ResUI.SubUrlTips}" />
 
                 <TextBlock
                     Grid.Row="8"
                     Grid.Column="0"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
-                    Classes="Margin8"
                     Text="{x:Static resx:ResUI.LvSort}" />
                 <TextBox
                     x:Name="txtSort"
                     Grid.Row="8"
                     Grid.Column="1"
                     Width="100"
-                    HorizontalAlignment="Left"
-                    Classes="Margin8" />
+                    Margin="{StaticResource Margin4}"
+                    HorizontalAlignment="Left" />
 
                 <TextBlock
                     Grid.Row="9"
                     Grid.Column="0"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
-                    Classes="Margin8"
                     Text="{x:Static resx:ResUI.LvPrevProfile}" />
                 <TextBox
                     x:Name="txtPrevProfile"
                     Grid.Row="9"
                     Grid.Column="1"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
-                    Classes="Margin8"
                     Watermark="{x:Static resx:ResUI.LvPrevProfileTip}" />
 
                 <TextBlock
                     Grid.Row="10"
                     Grid.Column="0"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
-                    Classes="Margin8"
                     Text="{x:Static resx:ResUI.LvNextProfile}" />
                 <TextBox
                     x:Name="txtNextProfile"
                     Grid.Row="10"
                     Grid.Column="1"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
-                    Classes="Margin8"
                     Watermark="{x:Static resx:ResUI.LvPrevProfileTip}" />
 
                 <TextBlock
                     Grid.Row="11"
                     Grid.Column="0"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
-                    Classes="Margin8"
                     Text="{x:Static resx:ResUI.TbPreSocksPort4Sub}" />
                 <TextBox
                     x:Name="txtPreSocksPort"
                     Grid.Row="11"
                     Grid.Column="1"
                     Width="200"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     HorizontalAlignment="Left"
-                    Classes="Margin8"
                     ToolTip.Tip="{x:Static resx:ResUI.TipPreSocksPort}"
                     Watermark="{x:Static resx:ResUI.TipPreSocksPort}" />
 
                 <TextBlock
                     Grid.Row="12"
                     Grid.Column="0"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
-                    Classes="Margin8"
                     Text="{x:Static resx:ResUI.LvMemo}" />
                 <TextBox
                     x:Name="txtMemo"
                     Grid.Row="12"
                     Grid.Column="1"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
-                    Classes="Margin8"
                     TextWrapping="Wrap" />
 
             </Grid>

v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml

@@ -1,4 +1,4 @@
-<Window
+<Window
     x:Class="v2rayN.Desktop.Views.SubSettingWindow"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -19,9 +19,9 @@
         CloseOnClickAway="True"
         DisableOpeningAnimation="True"
         Identifier="dialogHostSub">
-        <DockPanel Classes="Margin8">
+        <DockPanel Margin="{StaticResource Margin8}">
             <StackPanel
-                Classes="Margin8"
+                Margin="{StaticResource Margin4}"
                 DockPanel.Dock="Top"
                 Orientation="Horizontal">
                 <Menu>

v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml

@@ -1,4 +1,4 @@
-<UserControl
+<UserControl
     x:Class="v2rayN.Desktop.Views.ThemeSettingView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -20,52 +20,48 @@
     </UserControl.Styles>
 
     <Button
-        Width="30"
-        Height="30"
-        Margin="10,0"
+        Width="{StaticResource IconButtonWidth}"
+        Height="{StaticResource IconButtonHeight}"
+        Margin="{StaticResource MarginLr8}"
         Theme="{DynamicResource BorderlessButton}">
         <Button.Content>
-            <PathIcon
-                Width="20"
-                Height="20"
-                Data="{StaticResource building_more}"
-                Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+            <PathIcon Data="{StaticResource building_more}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
         </Button.Content>
         <Button.Flyout>
             <Flyout>
-                <StackPanel Margin="0,12">
+                <StackPanel Margin="{StaticResource MarginTb8}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
+                            Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
-                            Classes="Margin8"
                             Text="{x:Static resx:ResUI.TbSettingsTheme}" />
                         <ComboBox
                             x:Name="cmbCurrentTheme"
-                            HorizontalAlignment="Center"
-                            Classes="Margin8" />
+                            Margin="{StaticResource Margin4}"
+                            HorizontalAlignment="Center" />
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
+                            Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
-                            Classes="Margin8"
                             Text="{x:Static resx:ResUI.TbSettingsFontSize}" />
                         <ComboBox
                             x:Name="cmbCurrentFontSize"
-                            HorizontalAlignment="Center"
-                            Classes="Margin8" />
+                            Margin="{StaticResource Margin4}"
+                            HorizontalAlignment="Center" />
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
+                            Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
-                            Classes="Margin8"
                             Text="{x:Static resx:ResUI.TbSettingsLanguage}" />
                         <ComboBox
                             x:Name="cmbCurrentLanguage"
-                            HorizontalAlignment="Center"
-                            Classes="Margin8" />
+                            Margin="{StaticResource Margin4}"
+                            HorizontalAlignment="Center" />
                     </StackPanel>
                 </StackPanel>
             </Flyout>
         </Button.Flyout>
     </Button>
-</UserControl>
+</UserControl>

v2rayN/v2rayN/Views/OptionSettingWindow.xaml

@@ -764,7 +764,7 @@
                             x:Name="cmbcurrentFontFamily"
                             Grid.Row="15"
                             Grid.Column="1"
-                            Width="200"
+                            Width="300"
                             Margin="{StaticResource Margin8}"
                             MaxDropDownHeight="1000"
                             Style="{StaticResource DefComboBox}" />
@@ -867,7 +867,7 @@
                             x:Name="cmbMainGirdOrientation"
                             Grid.Row="21"
                             Grid.Column="1"
-                            Width="300"
+                            Width="200"
                             Margin="{StaticResource Margin8}"
                             Style="{StaticResource DefComboBox}" />
 

v2rayN/v2rayN/Views/ProfilesView.xaml.cs

@@ -353,9 +353,9 @@ namespace v2rayN.Views
         private void StorageUI(string? n = null)
         {
             List<ColumnItem> lvColumnItem = new();
-            for (int k = 0; k < lstProfiles.Columns.Count; k++)
+            foreach (var t in lstProfiles.Columns)
             {
-                var item2 = (MyDGTextColumn)lstProfiles.Columns[k];
+                var item2 = (MyDGTextColumn)t;
                 lvColumnItem.Add(new()
                 {
                     Name = item2.ExName,

v2rayN/v2rayN/Views/StatusBarView.xaml.cs

@@ -32,8 +32,8 @@ namespace v2rayN.Views
                 this.OneWayBind(ViewModel, vm => vm.BlSystemProxyPac, v => v.menuSystemProxyPac2.Visibility, conversionHint: BooleanToVisibilityHint.UseHidden, vmToViewConverterOverride: new BooleanToVisibilityTypeConverter()).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.SystemProxyClearCmd, v => v.menuSystemProxyClear).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.SystemProxySetCmd, v => v.menuSystemProxySet).DisposeWith(disposables);
-                this.BindCommand(ViewModel, vm => vm.SystemProxyPacCmd, v => v.menuSystemProxyPac).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.SystemProxyNothingCmd, v => v.menuSystemProxyNothing).DisposeWith(disposables);
+                this.BindCommand(ViewModel, vm => vm.SystemProxyPacCmd, v => v.menuSystemProxyPac).DisposeWith(disposables);
 
                 //routings and servers
                 this.OneWayBind(ViewModel, vm => vm.RoutingItems, v => v.cmbRoutings.ItemsSource).DisposeWith(disposables);