bump: v1201

Fixes #824

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: ['https://cdn.lpkt.cn/donate']

.github/workflows/release.yml

@@ -1,6 +1,7 @@
 name: Flutter Release
 
 on:
+  workflow_dispatch:
   push:
     tags:
       - "v*"
@@ -9,34 +10,72 @@ permissions:
   contents: write
 
 jobs:
-  releaseAL:
+  releaseAndroid:
-    name: Release android and linux
+    name: Release android
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: '0'
       - name: Install Flutter
         uses: subosito/flutter-action@v2
+        with:
+          channel: "stable"
+          flutter-version: "3.32.2"
       - uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
+          distribution: "zulu"
-          java-version: '17'
+          java-version: "17"
       - name: Fetch secrets
         run: |
           curl -u ${{ secrets.BASIC_AUTH }} -o android/app/app.key ${{ secrets.URL_PREFIX }}app.key
           curl -u ${{ secrets.BASIC_AUTH }} -o android/key.properties ${{ secrets.URL_PREFIX }}key.properties
       - name: Build
-        run: dart run fl_build -p android,linux
+        run: dart run fl_build -p android
+      - name: Rename for fdroid
+        run: |
+          mv build/app/outputs/flutter-apk/${{ env.APP_NAME }}_${{ env.BUILD_NUMBER }}_arm64.apk build/app/outputs/flutter-apk/${{ env.APP_NAME }}_v1.0.${{ env.BUILD_NUMBER }}_arm64.apk
+          mv build/app/outputs/flutter-apk/${{ env.APP_NAME }}_${{ env.BUILD_NUMBER }}_arm.apk build/app/outputs/flutter-apk/${{ env.APP_NAME }}_v1.0.${{ env.BUILD_NUMBER }}_arm.apk
+          mv build/app/outputs/flutter-apk/${{ env.APP_NAME }}_${{ env.BUILD_NUMBER }}_amd64.apk build/app/outputs/flutter-apk/${{ env.APP_NAME }}_v1.0.${{ env.BUILD_NUMBER }}_amd64.apk
       - name: Create Release
         uses: softprops/action-gh-release@v2
         with:
           files: |
-            build/app/outputs/flutter-apk/${{ env.APP_NAME }}_${{ env.BUILD_NUMBER }}_arm64.apk
+            build/app/outputs/flutter-apk/${{ env.APP_NAME }}_v1.0.${{ env.BUILD_NUMBER }}_arm64.apk
-            build/app/outputs/flutter-apk/${{ env.APP_NAME }}_${{ env.BUILD_NUMBER }}_arm.apk
+            build/app/outputs/flutter-apk/${{ env.APP_NAME }}_v1.0.${{ env.BUILD_NUMBER }}_arm.apk
-            build/app/outputs/flutter-apk/${{ env.APP_NAME }}_${{ env.BUILD_NUMBER }}_amd64.apk
+            build/app/outputs/flutter-apk/${{ env.APP_NAME }}_v1.0.${{ env.BUILD_NUMBER }}_amd64.apk
-            ${{ env.APP_NAME }}_${{ env.BUILD_NUMBER }}_amd64.AppImage
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  releaseLinux:
+    name: Release linux
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Install Flutter
+        uses: subosito/flutter-action@v2
+      - name: Install dependencies
+        run: |
+          sudo apt update
+          # Basic
+          sudo apt install -y clang cmake ninja-build pkg-config libgtk-3-dev libvulkan-dev desktop-file-utils wget
+          # App Specific
+          sudo apt install -y libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libunwind-dev
+          # Packaging
+          sudo wget https://github.com/AppImage/appimagetool/releases/download/1.9.0/appimagetool-x86_64.AppImage -O /bin/appimagetool
+          sudo chmod +x /bin/appimagetool
+      - name: Build
+        run: |
+          dart run fl_build -p linux
+      - name: Rename artifacts
+        run: |
+          appimage_name=$(ls dist/*/*.AppImage)
+          mv $appimage_name ${{ env.APP_NAME }}_${{ env.BUILD_NUMBER }}_amd64.appimage
+      - name: Create Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: |
+            ${{ env.APP_NAME }}_${{ env.BUILD_NUMBER }}_amd64.appimage
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -46,8 +85,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: '0'
       - name: Install Flutter
         uses: subosito/flutter-action@v2
       - name: Build
@@ -68,6 +105,9 @@ jobs:
   #       uses: actions/checkout@v4
   #     - name: Install Flutter
   #       uses: subosito/flutter-action@v2
+  # with:
+  #   channel: 'stable'
+  #   flutter-version: '3.32.1'
   #     - name: Build
   #       run: dart run fl_build -p ios,mac
   #     - name: Create Release

.gitignore

@@ -46,6 +46,7 @@ app.*.map.json
 /android/app/release
 
 /android/app/fjy.androidstudio.key
+/android/app/app.key
 /release
 test.dart
 
@@ -57,9 +58,11 @@ test.dart
 
 # Linux release
 linux.AppDir
-ServerBox-x86_64.AppImage
+**/*.AppImage
 
 untranlated.json
 
 .vscode/settings.json
 more_build_data.json
+trans.txt
+android/app/.cxx

.metadata

@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: "bae5e49bc2a867403c43b2aae2de8f8c33b037e4"
+  revision: "761747bfc538b5af34aa0d3fac380f1bc331ec49"
   channel: "stable"
 
 project_type: app
@@ -13,26 +13,26 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
-      base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
     - platform: android
-      create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
-      base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
     - platform: ios
-      create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
-      base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
     - platform: linux
-      create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
-      base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
     - platform: macos
-      create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
-      base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
     - platform: web
-      create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
-      base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
     - platform: windows
-      create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
-      base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
 
   # User provided section
 

.vscode/launch.json

@@ -8,6 +8,10 @@
             "name": "debug",
             "request": "launch",
             "type": "dart",
+            "env": {
+                // Comment this line to use the default display
+                "DISPLAY": ":1"
+            }
             // "args": [
             //     "-v"
             // ]

README.md

@@ -2,68 +2,85 @@ English | [简体中文](README_zh.md)
 
 <h2 align="center">Flutter Server Box</h2>
 
-<p align="center">
+<div align="center">
-  <img alt="lang" src="https://img.shields.io/badge/lang-dart-pink">
+  <a href="https://cdn.lpkt.cn/donate"><img alt="donate" src="https://img.shields.io/badge/donate-me-pink"></a>
-  <img alt="countly" src="https://img.shields.io/badge/analysis-countly-pink">
+  <img alt="lang" src="https://img.shields.io/badge/lang-dart-cyan">
-  <img alt="license" src="https://img.shields.io/badge/license-GPLv3-pink">
+  <img alt="license" src="https://img.shields.io/badge/license-GPLv3-yellow">
-</p>
+  <a href="https://deepwiki.com/lollipopkit/flutter_server_box"><img src="https://deepwiki.com/badge.svg" alt="Ask DeepWiki"></a>
+</div>
 
 <p align="center">
-A Flutter project which provide charts to display <a href="../../issues/43">Linux</a> server status and tools to manage server.
+A Flutter project which provide charts to display <a href="https://github.com/lollipopkit/flutter_server_box/issues/43">Linux</a> server status and tools to manage server.
 <br>
 Especially thanks to <a href="https://github.com/TerminalStudio/dartssh2">dartssh2</a> & <a href="https://github.com/TerminalStudio/xterm.dart">xterm.dart</a>.
 </p>
 
-## ⬇️ Download
+## 🏙️ Screenshots
-🎉 **The `Android / Linux / Windows` version are now built via GitHub Actions**
 
-[iOS & macOS](https://apps.apple.com/app/id6476033062) / [Android & Linux & Windows](https://github.com/lollipopkit/flutter_gpt_box/releases)
+<table>
+  <tr>
+    <td><img width="200px" src="https://cdn.lpkt.cn/serverbox/screenshot/1.jpg"></td>
+    <td><img width="200px" src="https://cdn.lpkt.cn/serverbox/screenshot/2.jpg"></td>
+    <td><img width="200px" src="https://cdn.lpkt.cn/serverbox/screenshot/3.jpg"></td>
+    <td><img width="200px" src="https://cdn.lpkt.cn/serverbox/screenshot/4.jpg"></td>
+  </tr>
+</table>
 
+## 📥 Install
+
+|Platform| From|
+|--|--|
+| iOS / macOS     | [AppStore](https://apps.apple.com/app/id1586449703)                                                                                                                                                                                                                               |
+| Android         | [GitHub](https://github.com/lollipopkit/flutter_server_box/releases) / [CDN](https://cdn.lpkt.cn/serverbox/pkg/?sort=time&order=desc&layout=grid) / [F-Droid](https://f-droid.org/packages/tech.lolli.toolbox) / [OpenAPK](https://www.openapk.net/serverbox/tech.lolli.toolbox/) |
+| Linux / Windows | [GitHub](https://github.com/lollipopkit/flutter_server_box/releases) / [CDN](https://cdn.lpkt.cn/serverbox/pkg/?sort=time&order=desc&layout=grid)                                                                                                                                 |
+
+Please only download pkgs from the source that **you trust**!  
 
 ## 🔖 Feature
-- `Status chart` (CPU, Sensors, GPU...), `SSH` Term, `SFTP`, `Docker & Pkg & Process`...
+
+- `Status chart` (CPU, Sensors, GPU...), `SSH` Term, `SFTP`, `Docker & Process & Systemd`, `S.M.A.R.T`...
 - Platform specific: `Bio auth`、`Msg push`、`Home widget`、`watchOS App`...
-- English, 简体中文; Deutsch [@its-tom](https://github.com/its-tom), 繁體中文 [@kalashnikov](https://github.com/kalashnikov), Indonesian [@azkadev](https://github.com/azkadev), Français [@FrancXPT](https://github.com/FrancXPT), Dutch [@QazCetelic](https://github.com/QazCetelic); Español, Русский язык, Português, 日本語 (Generated by GPT)
+- English, 简体中文; Deutsch [@its-tom](https://github.com/its-tom), 繁體中文 [@kalashnikov](https://github.com/kalashnikov), Indonesian [@azkadev](https://github.com/azkadev), Français [@FrancXPT](https://github.com/FrancXPT), Dutch [@QazCetelic](https://github.com/QazCetelic), Türkçe [@mikropsoft](https://github.com/mikropsoft), Українська мова [@CakesTwix](https://github.com/CakesTwix); Español, Русский язык, Português, 日本語 (Generated by GPT)
-
-
-## 🏙️ ScreenShots
-<table>
-  <tr>
-    <td><img width="277px" src="imgs/server.png"></td>
-    <td><img width="277px" src="imgs/detail.png"></td>
-    <td><img width="277px" src="imgs/sftp.png"></td>
-  </tr>
-</table>
-<table>
-  <tr>
-    <td><img width="277px" src="imgs/editor.png"> </td>
-    <td><img width="277px" src="imgs/ssh.png"></td>
-    <td><img width="277px" src="imgs/docker.png"></td>
-  </tr>
-</table>
-
 
 ## 🆘 Help
+
+<div align="center">
+  <a href="https://qm.qq.com/q/daCGa7eShG"><img alt="qq" src="https://img.shields.io/badge/QQ-Group-pink"></a>
+  <a href="https://t.me/lpktg"><img alt="donate" src="https://img.shields.io/badge/Telegram-lpktg-green"></a>
+  <a href="https://discord.gg/SsVNbRhK7w"><img alt="discord" src="https://img.shields.io/badge/Discord-lpkt-purple"></a>
+</div>
+
 - In order to push  server status to your portable device without opening ServerBox app (Such as **message push** and **home widget**), you need to install [ServerBoxMonitor](https://github.com/lollipopkit/server_box_monitor) on your servers, and config it correctly. See [wiki](https://github.com/lollipopkit/server_box_monitor/wiki) for more details.
 - **Common issues** can be found in [app wiki](https://github.com/lollipopkit/flutter_server_box/wiki).
 
 Before you open an issue, please read the following:
+
 1. Paste the **entire log** (click the top right of the home page) in the issue template.
 2. Make sure whether the issue is caused by ServerBox app.
 3. Welcome all valid and positive feedback, subjective feedback (such as you think other UI is better) may not be accepted.
 
 After you read the above, you can open an [issue](https://github.com/lollipopkit/flutter_server_box/issues/new).
 
-
 ## 🧱 Contribution
-- Any positive contribution is welcome.
-- [l10n guide](https://blog.lolli.tech/faq/) can be found in my blog.
 
+Any positive contribution is welcome.
+
+### Development
+
+1. Setup [Flutter](https://flutter.dev/docs/get-started/install) environment.
+2. Clone this repo, run `flutter run` to start the app.
+3. Run `dart run fl_build -p PLATFORM` to build the app.
+
+### Translation
+
+- [Guide](https://blog.lpkt.cn/posts/faq/) can be found in my blog.
+- We need your help! Just feel free to open a PR.
 
 ## 💡 My other apps
+
 - [GPT Box](https://github.com/lollipopkit/flutter_gpt_box) - A third-party GPT Client for OpenAI API on all platforms.
 - [More](https://github.com/lollipopkit) - Tools & etc.
 
-
 ## 📝 License
+
 `GPL v3 lollipopkit`

README_zh.md

@@ -2,74 +2,86 @@
 
 <h2 align="center">Flutter Server Box</h2>
 
-<p align="center">
+<div align="center">
-  <img alt="lang" src="https://img.shields.io/badge/lang-dart-pink">
+  <a href="https://cdn.lpkt.cn/donate"><img alt="donate" src="https://img.shields.io/badge/捐赠-我-pink"></a>
-  <img alt="countly" src="https://img.shields.io/badge/analysis-countly-pink">
+  <img alt="语言" src="https://img.shields.io/badge/语言-dart-cyan">
-  <img alt="license" src="https://img.shields.io/badge/license-GPLv3-pink">
+  <img alt="license" src="https://img.shields.io/badge/证书-GPLv3-yellow">
-</p>
+  <a href="https://deepwiki.com/lollipopkit/flutter_server_box"><img src="https://deepwiki.com/badge.svg" alt="Ask DeepWiki"></a>
+</div>
 
 <p align="center">
-使用 Flutter 开发的 <a href="../../issues/43">Linux</a> 服务器工具箱，提供服务器状态图表和管理工具。
+使用 Flutter 开发的 <a href="https://github.com/lollipopkit/flutter_server_box/issues/43">Linux</a> 服务器工具箱，提供服务器状态图表和管理工具。
 <br>
 特别感谢 <a href="https://github.com/TerminalStudio/dartssh2">dartssh2</a> & <a href="https://github.com/TerminalStudio/xterm.dart">xterm.dart</a>。
 </p>
 
+## 🏙️ 截屏
 
-## ⬇️ Download
+<table>
-🎉 **现在 `Android / Linux / Windows` 版本使用 GitHub Actions 构建**。
+  <tr>
+    <td><img width="200px" src="https://cdn.lpkt.cn/serverbox/screenshot/1.jpg"></td>
+    <td><img width="200px" src="https://cdn.lpkt.cn/serverbox/screenshot/2.jpg"></td>
+    <td><img width="200px" src="https://cdn.lpkt.cn/serverbox/screenshot/3.jpg"></td>
+    <td><img width="200px" src="https://cdn.lpkt.cn/serverbox/screenshot/4.jpg"></td>
+  </tr>
+</table>
 
-[iOS & macOS](https://apps.apple.com/app/id1586449703) / [Android & Linux & Windows](https://github.com/lollipopkit/flutter_gpt_box/releases)
+## 📥 安装
 
+平台|下载
+--|--
+iOS / macOS     | [AppStore](https://apps.apple.com/app/id1586449703)
+Android         | [GitHub](https://github.com/lollipopkit/flutter_server_box/releases) / [CDN](https://cdn.lpkt.cn/serverbox/pkg/?sort=time&order=desc&layout=grid) / [F-Droid](https://f-droid.org/packages/tech.lolli.toolbox) / [OpenAPK](https://www.openapk.net/serverbox/tech.lolli.toolbox/)
+Linux / Windows | [GitHub](https://github.com/lollipopkit/flutter_server_box/releases) / [CDN](https://cdn.lpkt.cn/serverbox/pkg/?sort=time&order=desc&layout=grid)
+
+请从 **信任** 的来源下载!
 
 ## 🔖 特点
-- `状态图表`（CPU、传感器、GPU 等）, `SSH` 终端, `SFTP`, `Docker & 包 & 进程` 管理器...
+
+- `状态图表`（CPU、传感器、GPU 等）, `SSH` 终端, `SFTP`, `Docker & 进程 & Systemd` 管理，`S.M.A.R.T`...
 - 特殊支持：`生物认证`、`推送`、`桌面小部件`、`watchOS App`、`跟随系统颜色`...
 - 本地化
   - English, 简体中文
   - Español, Русский язык, Português, 日本語 (Generated by GPT)
-  - Deutsch (@its-tom) / 繁體中文 (@kalashnikov) / Indonesian (@azkadev) / Français (@FrancXPT) / Dutch (@QazCetelic)
+  - Deutsch [@its-tom](https://github.com/its-tom), 繁體中文 [@kalashnikov](https://github.com/kalashnikov), Indonesian [@azkadev](https://github.com/azkadev), Français [@FrancXPT](https://github.com/FrancXPT), Dutch [@QazCetelic](https://github.com/QazCetelic), Türkçe [@mikropsoft](https://github.com/mikropsoft), Українська мова [@CakesTwix](https://github.com/CakesTwix);
-
+  - 感谢贡献者们！
-
-## 🏙️ 截屏
-<table>
-  <tr>
-    <td><img width="277px" src="imgs/server.png"></td>
-    <td><img width="277px" src="imgs/detail.png"></td>
-    <td><img width="277px" src="imgs/sftp.png"></td>
-  </tr>
-</table>
-<table>
-  <tr>
-    <td><img width="277px" src="imgs/editor.png"> </td>
-    <td><img width="277px" src="imgs/ssh.png"></td>
-    <td><img width="277px" src="imgs/docker.png"></td>
-  </tr>
-</table>
-
 
 ## 🆘 帮助
 
-- 吹水、参与开发、了解如何使用，QQ群 **762870488**
+<div align="center">
-- 为了可以在不使用 ServerBox app 时获取服务器状态（例如：桌面小部件、推送服务），你需要在你的服务器上安装 [ServerBoxMonitor](https://github.com/lollipopkit/server_box_monitor)，并且正确配置，详情可见 [wiki](https://github.com/lollipopkit/server_box_monitor/wiki/%E4%B8%BB%E9%A1%B5)。
+  <a href="https://qm.qq.com/q/daCGa7eShG"><img alt="qq" src="https://img.shields.io/badge/QQ-群-pink"></a>
-- **常见问题**可以在 [app wiki](https://github.com/lollipopkit/flutter_server_box/wiki/主页) 查看。
+  <a href="https://t.me/lpktg"><img alt="donate" src="https://img.shields.io/badge/Telegram-lpktg-green"></a>
+  <a href="https://discord.gg/SsVNbRhK7w"><img alt="discord" src="https://img.shields.io/badge/Discord-lpkt-purple"></a>
+</div>
+
+- 为了可以在不使用 ServerBox app 时获取服务器状态（例如：桌面小部件、推送服务），你需要在你的服务器上安装 [ServerBoxMonitor](https://github.com/lollipopkit/server_box_monitor)，详情见 [wiki](https://github.com/lollipopkit/server_box_monitor/wiki/%E4%B8%BB%E9%A1%B5)。  
+- **常见问题** 可以在 [app wiki](https://github.com/lollipopkit/flutter_server_box/wiki/主页) 查看。
 
 反馈前须知：
+
 1. 反馈问题请附带 log（点击首页右上角），并以 bug 模版提交。
 2. 反馈问题前请检查是否是 serverbox 的问题。
 3. 欢迎所有有效、正面的反馈，主观（比如你觉得其他UI更好看）的反馈不一定会接受
 
-确认了解上述内容后，请在 [问题](https://github.com/lollipopkit/flutter_server_box/issues/new) 中反馈。
-
-
 ## 🧱 贡献
-- 任何正面的贡献都欢迎。
-- [本地化翻译指南](https://blog.lolli.tech/faq/) 可在我的博客中找到。
 
+任何正面的贡献都欢迎。
+
+### 开发
+
+1. 安装 [Flutter](https://flutter.dev/docs/get-started/install)
+2. 克隆这个仓库, 运行 `flutter run` 启动应用
+3. 运行 `dart run fl_build -p PLATFORM` 构建应用
+
+### 翻译
+
+[指南](https://blog.lpkt.cn/faq/) 可在我的博客中找到。
 
 ## 💡 我的其它 Apps
+
 - [GPT Box](https://github.com/lollipopkit/flutter_gpt_box) - 支持 OpenAI API 的 第三方全平台客户端。
 - [更多](https://github.com/lollipopkit) - 工具 & etc.
 
-
 ## 📝 协议
+
 `GPL v3 lollipopkit`

analysis_options.yaml

@@ -11,11 +11,13 @@ include: package:flutter_lints/flutter.yaml
 
 analyzer:
   exclude:
-    - '**/*.g.dart'
+    - "**/*.g.dart"
   language:
     # strict-casts: true
     # strict-inference: true
     # strict-raw-types: true
+  errors:
+    invalid_annotation_target: ignore
 
 linter:
   # The lint rules applied to this project can be customized in the
@@ -30,14 +32,20 @@ linter:
   # `// ignore_for_file: name_of_lint` syntax on the line or in the file
   # producing the lint.
   rules:
-    library_private_types_in_public_api: false
+    library_private_types_in_public_api: true
     use_build_context_synchronously: false
     depend_on_referenced_packages: false
     prefer_final_locals: true
     unnecessary_parenthesis: true
     implicit_call_tearoffs: true
+    always_declare_return_types: true
+    always_use_package_imports: true
+    annotate_overrides: true
+    avoid_empty_else: true
     # avoid_print: false  # Uncomment to disable the `avoid_print` rule
-    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+    prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule
+    avoid_return_types_on_setters: true
+    directives_ordering: true # Enable sorting of imports
 
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options

android/app/build.gradle

@@ -53,7 +53,6 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "tech.lolli.toolbox"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
@@ -86,13 +85,20 @@ android {
         }
 
         debug {
-            applicationIdSuffix '.debug'
+            // No applicationIdSuffix or resValue here
         }
 
         profile {
-            applicationIdSuffix '.debug'
+            // No applicationIdSuffix or resValue here
         }
     }
+
+    dependenciesInfo {
+        // Disables dependency metadata when building APKs.
+        includeInApk = false
+        // Disables dependency metadata when building Android App Bundles.
+        includeInBundle = false
+    }
 }
 
 flutter {
@@ -100,3 +106,14 @@ flutter {
 }
 
 dependencies {}
+
+ext.abiCodes = ["x86_64": 1, "armeabi-v7a": 2, "arm64-v8a": 3]
+import com.android.build.OutputFile
+android.applicationVariants.all { variant ->
+  variant.outputs.each { output ->
+    def abiVersionCode = project.ext.abiCodes.get(output.getFilter(OutputFile.ABI))
+    if (abiVersionCode != null) {
+      output.versionCodeOverride = variant.versionCode * 10 + abiVersionCode
+    }
+  }
+}

android/app/proguard-rules.pro

@@ -1,7 +1 @@
--keep class io.flutter.app.** { *; }
--keep class io.flutter.plugin.**  { *; }
--keep class io.flutter.util.**  { *; }
--keep class io.flutter.view.**  { *; }
--keep class io.flutter.**  { *; }
--keep class io.flutter.plugins.**  { *; }
 -keep class com.jcraft.**  { *; }

android/app/src/main/AndroidManifest.xml

@@ -1,4 +1,5 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -10,18 +11,20 @@
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
-        android:label="ServerBox"
+        android:label="@string/app_name"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
-        android:allowBackup="true"
+        android:allowBackup="true" 
+        android:fullBackupContent="@xml/backup_rules"
         android:hasFragileUserData="true"
-        android:restoreAnyVersion="true">
+        android:restoreAnyVersion="true"
+        tools:targetApi="q">
         <activity
             android:name=".MainActivity"
             android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|locale|layoutDirection|fontScale|density|uiMode"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
@@ -29,12 +32,12 @@
                  while the Flutter UI initializes. After that, this theme continues
                  to determine the Window background behind the Flutter UI. -->
             <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
+                android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
+                android:resource="@style/NormalTheme"
-              />
+            />
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
@@ -43,11 +46,6 @@
             android:name="flutterEmbedding"
             android:value="2" />
 
-        <service
-            android:name="id.flutter.flutter_background_service.BackgroundService"
-            android:foregroundServiceType="dataSync"
-        />
-        
         <receiver
             android:name=".widget.HomeWidget"
             android:exported="false"
@@ -67,7 +65,12 @@
                 android:resource="@xml/home_widget" />
         </receiver>
 
-        <service android:name=".KeepAliveService"/>
+        <service
+            android:name=".ForegroundService"
+            android:enabled="true"
+            android:foregroundServiceType="dataSync"
+            android:exported="false" />
+
     </application>
     <!-- Required to query activities that can process text, see:
          https://developer.android.com/training/package-visibility?hl=en and
@@ -76,8 +79,8 @@
          In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
     <queries>
         <intent>
-            <action android:name="android.intent.action.PROCESS_TEXT"/>
+            <action android:name="android.intent.action.PROCESS_TEXT" />
-            <data android:mimeType="text/plain"/>
+            <data android:mimeType="text/plain" />
         </intent>
     </queries>
-</manifest>
+</manifest>

android/app/src/main/kotlin/tech/lolli/toolbox/ForegroundService.kt

@@ -0,0 +1,161 @@
+package tech.lolli.toolbox
+
+import android.app.*
+import android.content.Intent
+import android.os.Build
+import android.os.IBinder
+import android.util.Log
+import java.io.File
+import java.util.*
+
+class ForegroundService : Service() {
+    private val chanId = "ForegroundServiceChannel"
+
+    private fun logError(message: String, error: Throwable? = null) {
+        Log.e("ForegroundService", message, error)
+        try {
+            val logFile = File(getExternalFilesDir(null), "server_box.log")
+            val timestamp = java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US).format(Date())
+            val logMessage = "$timestamp [ForegroundService] ERROR: $message\n${error?.stackTraceToString() ?: ""}\n"
+            logFile.appendText(logMessage)
+        } catch (e: Exception) {
+            Log.e("ForegroundService", "Failed to write log", e)
+        }
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+        Log.d("ForegroundService", "Service onCreate")
+        createNotificationChannel()
+    }
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
+                androidx.core.content.ContextCompat.checkSelfPermission(
+                    this, android.Manifest.permission.POST_NOTIFICATIONS
+                ) != android.content.pm.PackageManager.PERMISSION_GRANTED
+            ) {
+                Log.w("ForegroundService", "Notification permission denied. Stopping service.")
+                stopForegroundService()
+                return START_NOT_STICKY
+            }
+
+            if (intent == null) {
+                Log.w("ForegroundService", "onStartCommand called with null intent")
+                stopForegroundService()
+                return START_NOT_STICKY
+            }
+
+            val action = intent.action
+            Log.d("ForegroundService", "onStartCommand action=$action")
+
+            // Create notification before starting foreground
+            val notification = createNotification()
+            
+            // Use try-catch for startForeground
+            try {
+                startForeground(1, notification)
+            } catch (e: Exception) {
+                logError("Failed to start foreground", e)
+                stopSelf()
+                return START_NOT_STICKY
+            }
+
+            return when (action) {
+                "ACTION_STOP_FOREGROUND" -> {
+                    stopForegroundService()
+                    START_NOT_STICKY
+                }
+                else -> {
+                    START_STICKY
+                }
+            }
+            
+        } catch (e: Exception) {
+            logError("Error in onStartCommand", e)
+            stopSelf()
+            return START_NOT_STICKY
+        }
+    }
+
+    override fun onBind(intent: Intent?): IBinder? {
+        return null
+    }
+
+    private fun createNotificationChannel() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val manager = getSystemService(NotificationManager::class.java)
+            if (manager == null) {
+                Log.e("ForegroundService", "Failed to get NotificationManager")
+                return
+            }
+            val serviceChannel = NotificationChannel(
+                chanId,
+                "ForegroundServiceChannel",
+                NotificationManager.IMPORTANCE_DEFAULT
+            ).apply {
+                description = "For foreground service"
+            }
+            manager.createNotificationChannel(serviceChannel)
+        }
+    }
+
+    private fun createNotification(): Notification {
+        try {
+            val notificationIntent = Intent(this, MainActivity::class.java)
+            val pendingIntent = PendingIntent.getActivity(
+                this,
+                0,
+                notificationIntent,
+                PendingIntent.FLAG_IMMUTABLE
+            )
+
+            val deleteIntent = Intent(this, ForegroundService::class.java).apply {
+                action = "ACTION_STOP_FOREGROUND"
+            }
+            val deletePendingIntent = PendingIntent.getService(
+                this,
+                0,
+                deleteIntent,
+                PendingIntent.FLAG_IMMUTABLE
+            )
+
+            val builder = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                Notification.Builder(this, chanId)
+            } else {
+                Notification.Builder(this)
+            }
+
+            return builder
+                .setContentTitle("Server Box")
+                .setContentText("Running in background")
+                .setSmallIcon(R.mipmap.ic_launcher)
+                .setContentIntent(pendingIntent)
+                .addAction(android.R.drawable.ic_delete, "Stop", deletePendingIntent)
+                .build()
+        } catch (e: Exception) {
+            logError("Error creating notification", e)
+            // Return a basic notification as fallback
+            return Notification.Builder(this)
+                .setContentTitle("Server Box")
+                .setSmallIcon(R.mipmap.ic_launcher)
+                .build()
+        }
+    }
+
+    private fun stopForegroundService() {
+        try {
+            stopForeground(true)
+        } catch (e: Exception) {
+            logError("Error stopping foreground", e)
+        }
+        stopSelf()
+        Log.d("ForegroundService", "ForegroundService stopped")
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        Log.d("ForegroundService", "Service onDestroy")
+    }
+}

android/app/src/main/kotlin/tech/lolli/toolbox/KeepAliveService.kt

@@ -1,18 +0,0 @@
-package tech.lolli.toolbox
-
-import android.app.Service
-import android.content.Intent
-
-import android.os.IBinder
-import org.jetbrains.annotations.Nullable
-
-class KeepAliveService : Service() {
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        return START_STICKY
-    }
-
-    @Nullable
-    override fun onBind(intent: Intent?): IBinder? {
-        return null
-    }
-}

android/app/src/main/kotlin/tech/lolli/toolbox/MainActivity.kt

@@ -1,16 +1,23 @@
 package tech.lolli.toolbox
 
 import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Build
+import android.Manifest
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
 import io.flutter.embedding.android.FlutterFragmentActivity
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugin.common.MethodChannel
+import android.appwidget.AppWidgetManager
+import tech.lolli.toolbox.widget.HomeWidget
 
 class MainActivity: FlutterFragmentActivity() {
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         super.configureFlutterEngine(flutterEngine)
         val binaryMessenger = flutterEngine.dartExecutor.binaryMessenger
 
-        MethodChannel(binaryMessenger, "tech.lolli.toolbox/app_retain").apply {
+        MethodChannel(binaryMessenger, "tech.lolli.toolbox/main_chan").apply {
             setMethodCallHandler { method, result ->
                 when (method.method) {
                     "sendToBackground" -> {
@@ -18,8 +25,31 @@ class MainActivity: FlutterFragmentActivity() {
                         result.success(null)
                     }
                     "startService" -> {
-                        val intent = Intent(this@MainActivity, KeepAliveService::class.java)
+                        try {
-                        startService(intent)
+                            reqPerm()
+                            val serviceIntent = Intent(this@MainActivity, ForegroundService::class.java)
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                                startForegroundService(serviceIntent)
+                            } else {
+                                startService(serviceIntent)
+                            }
+                            result.success(null)
+                        } catch (e: Exception) {
+                            // Log error but don't crash
+                            android.util.Log.e("MainActivity", "Failed to start service: ${e.message}")
+                            result.error("SERVICE_ERROR", e.message, null)
+                        }
+                    }
+                    "stopService" -> {
+                        val serviceIntent = Intent(this@MainActivity, ForegroundService::class.java)
+                        stopService(serviceIntent)
+                        result.success(null)
+                    }
+                    "updateHomeWidget" -> {
+                        val intent = Intent(this@MainActivity, HomeWidget::class.java)
+                        intent.action = AppWidgetManager.ACTION_APPWIDGET_UPDATE
+                        sendBroadcast(intent)
+                        result.success(null)
                     }
                     else -> {
                         result.notImplemented()
@@ -28,4 +58,24 @@ class MainActivity: FlutterFragmentActivity() {
             }
         }
     }
+
+    private fun reqPerm() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) return
+        
+        // Check if we already have the permission to avoid unnecessary prompts
+        if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS)
+            != PackageManager.PERMISSION_GRANTED) {
+            try {
+                ActivityCompat.requestPermissions(
+                    this,
+                    arrayOf(Manifest.permission.POST_NOTIFICATIONS),
+                    123,
+                )
+            } catch (e: Exception) {
+                // Log error but don't crash
+                android.util.Log.e("MainActivity", "Failed to request permissions: ${e.message}")
+            }
+        }
+    }
 }
+

android/app/src/main/kotlin/tech/lolli/toolbox/widget/HomeWidget.kt

@@ -6,15 +6,18 @@ import android.appwidget.AppWidgetProvider
 import android.content.Context
 import android.content.Intent
 import android.os.Build
+import android.util.Log
 import android.view.View
 import android.widget.RemoteViews
-import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.json.JSONObject
 import tech.lolli.toolbox.R
 import java.net.URL
+import java.net.HttpURLConnection
+import java.io.FileNotFoundException
 
 class HomeWidget : AppWidgetProvider() {
     override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) {
@@ -23,16 +26,22 @@ class HomeWidget : AppWidgetProvider() {
         }
     }
 
-    @OptIn(DelicateCoroutinesApi::class)
     private fun updateAppWidget(context: Context, appWidgetManager: AppWidgetManager, appWidgetId: Int) {
         val views = RemoteViews(context.packageName, R.layout.home_widget)
         val sp = context.getSharedPreferences("FlutterSharedPreferences", Context.MODE_PRIVATE)
-        var url = sp.getString("$appWidgetId", null)
+        var url = sp.getString("widget_$appWidgetId", null)
-        val gUrl = sp.getString("*", null)
         if (url.isNullOrEmpty()) {
+            url = sp.getString("$appWidgetId", null)
+        }
+        if (url.isNullOrEmpty()) {
+            val gUrl = sp.getString("widget_*", null)
             url = gUrl
         }
 
+        if (url.isNullOrEmpty()) {
+            Log.e("HomeWidget", "URL not found")
+        }
+
         val intentUpdate = Intent(context, HomeWidget::class.java)
         intentUpdate.action = AppWidgetManager.ACTION_APPWIDGET_UPDATE
         val ids = intArrayOf(appWidgetId)
@@ -51,11 +60,13 @@ class HomeWidget : AppWidgetProvider() {
         views.setOnClickPendingIntent(R.id.widget_container, pendingUpdate)
 
         if (url.isNullOrEmpty()) {
-            views.setViewVisibility(R.id.widget_cpu_label, View.INVISIBLE)
+            views.setTextViewText(R.id.widget_name, "No URL")
-            views.setViewVisibility(R.id.widget_mem_label, View.INVISIBLE)
+            // Update the widget to display a message for missing URL
-            views.setViewVisibility(R.id.widget_disk_label, View.INVISIBLE)
+            views.setViewVisibility(R.id.error_message, View.VISIBLE)
-            views.setViewVisibility(R.id.widget_net_label, View.INVISIBLE)
+            views.setTextViewText(R.id.error_message, "Please configure the widget URL.")
-            views.setTextViewText(R.id.widget_name, "ID: $appWidgetId")
+            views.setViewVisibility(R.id.widget_content, View.GONE)
+            views.setFloat(R.id.widget_name, "setAlpha", 1f)
+            views.setFloat(R.id.error_message, "setAlpha", 1f)
             appWidgetManager.updateAppWidget(appWidgetId, views)
             return
         } else {
@@ -65,44 +76,53 @@ class HomeWidget : AppWidgetProvider() {
             views.setViewVisibility(R.id.widget_net_label, View.VISIBLE)
         }
 
-        GlobalScope.launch(Dispatchers.IO) {
+        CoroutineScope(Dispatchers.IO).launch {
             try {
-                val jsonStr = URL(url).readText()
+                val connection = URL(url).openConnection() as HttpURLConnection
-                val jsonObject = JSONObject(jsonStr)
+                connection.requestMethod = "GET"
-                val data = jsonObject.getJSONObject("data")
+                val responseCode = connection.responseCode
-                val server = data.getString("name")
+                if (responseCode == HttpURLConnection.HTTP_OK) {
-                val cpu = data.getString("cpu")
+                    val jsonStr = connection.inputStream.bufferedReader().use { it.readText() }
-                val mem = data.getString("mem")
+                    val jsonObject = JSONObject(jsonStr)
-                val disk = data.getString("disk")
+                    val data = jsonObject.getJSONObject("data")
-                val net = data.getString("net")
+                    val server = data.getString("name")
-
+                    val cpu = data.getString("cpu")
-                GlobalScope.launch(Dispatchers.Main) main@ {
+                    val mem = data.getString("mem")
-                    // mem or disk is empty -> get status failed
+                    val disk = data.getString("disk")
-                    // (cpu | net) isEmpty -> data is not ready
+                    val net = data.getString("net")
-                    if (mem.isEmpty() || disk.isEmpty()) {
+                    withContext(Dispatchers.Main) {
-                        return@main
+                        if (mem.isEmpty() || disk.isEmpty()) {
+                            Log.e("HomeWidget", "Failed to retrieve status: Memory or disk information is empty")
+                            return@withContext
+                        }
+                        views.setTextViewText(R.id.widget_name, server)
+                        views.setTextViewText(R.id.widget_cpu, cpu)
+                        views.setTextViewText(R.id.widget_mem, mem)
+                        views.setTextViewText(R.id.widget_disk, disk)
+                        views.setTextViewText(R.id.widget_net, net)
+                        val timeStr = android.text.format.DateFormat.format("HH:mm", java.util.Date()).toString()
+                        views.setTextViewText(R.id.widget_time, timeStr)
+                        views.setFloat(R.id.widget_name, "setAlpha", 1f)
+                        views.setFloat(R.id.widget_cpu_label, "setAlpha", 1f)
+                        views.setFloat(R.id.widget_mem_label, "setAlpha", 1f)
+                        views.setFloat(R.id.widget_disk_label, "setAlpha", 1f)
+                        views.setFloat(R.id.widget_net_label, "setAlpha", 1f)
+                        views.setFloat(R.id.widget_time, "setAlpha", 1f)
+                        appWidgetManager.updateAppWidget(appWidgetId, views)
                     }
-                    views.setTextViewText(R.id.widget_name, server)
+                } else {
-
+                    throw FileNotFoundException("HTTP response code: $responseCode")
-                    views.setTextViewText(R.id.widget_cpu, cpu)
-                    views.setTextViewText(R.id.widget_mem, mem)
-                    views.setTextViewText(R.id.widget_disk, disk)
-                    views.setTextViewText(R.id.widget_net, net)
-
-                    val timeStr = android.text.format.DateFormat.format("HH:mm", java.util.Date()).toString()
-                    views.setTextViewText(R.id.widget_time, timeStr)
-
-                    appWidgetManager.updateAppWidget(appWidgetId, views)
                 }
             } catch (e: Exception) {
-                println("ServerBoxHomeWidget: ${e.localizedMessage}")
+                Log.e("HomeWidget", "Error updating widget: ${e.localizedMessage}", e)
-                GlobalScope.launch(Dispatchers.Main) main@ {
+                withContext(Dispatchers.Main) {
-                    views.setViewVisibility(R.id.widget_cpu_label, View.INVISIBLE)
+                    views.setTextViewText(R.id.widget_name, "Error")
-                    views.setViewVisibility(R.id.widget_mem_label, View.INVISIBLE)
+                    // Update the widget to display a message for data retrieval failure
-                    views.setViewVisibility(R.id.widget_disk_label, View.INVISIBLE)
+                    views.setViewVisibility(R.id.error_message, View.VISIBLE)
-                    views.setViewVisibility(R.id.widget_net_label, View.INVISIBLE)
+                    views.setTextViewText(R.id.error_message, "Failed to retrieve data.")
-                    views.setTextViewText(R.id.widget_name, "ID: $appWidgetId")
+                    views.setViewVisibility(R.id.widget_content, View.GONE)
-                    views.setTextViewText(R.id.widget_mem, e.localizedMessage)
+                    views.setFloat(R.id.widget_name, "setAlpha", 1f)
+                    views.setFloat(R.id.error_message, "setAlpha", 1f)
                     appWidgetManager.updateAppWidget(appWidgetId, views)
                 }
             }

android/app/src/main/res/layout/home_widget.xml

@@ -16,124 +16,151 @@
         android:textSize="23sp"
         android:textStyle="bold"
         android:maxLines="1"
+        android:alpha="0"
+        android:animateLayoutChanges="true"
         tools:text="Server Name" />
 
-    <RelativeLayout
+    <!-- Wrap the content in a LinearLayout for easy visibility management -->
-        android:id="@+id/widget_container_inner"
+    <LinearLayout
+        android:id="@+id/widget_content"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
+        android:orientation="vertical"
+        android:layout_below="@id/widget_name"
         android:paddingTop="13dp">
 
-        <LinearLayout
+        <RelativeLayout
-            android:id="@+id/widget_cpu_label"
+            android:id="@+id/widget_container_inner"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
-            android:paddingBottom="2.7dp"
             android:gravity="center_vertical"
-            android:orientation="horizontal">
+            android:paddingTop="13dp"
+            android:animateLayoutChanges="true">
 
-            <ImageView
+            <LinearLayout
-                android:layout_width="17dp"
+                android:id="@+id/widget_cpu_label"
-                android:layout_height="17dp"
+                android:layout_width="wrap_content"
-                android:src="@drawable/speed_24">
-            </ImageView>
-
-            <TextView
-                android:id="@+id/widget_cpu"
-                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="11dp"
+                android:paddingBottom="2.7dp"
-                android:singleLine="true"
+                android:gravity="center_vertical"
-                android:ellipsize = "marquee"
+                android:orientation="horizontal">
-                android:textColor="@color/widgetSummaryText"
+
-                android:textSize="12.7sp"
+                <ImageView
-                tools:text="CPU" />
+                    android:layout_width="17dp"
+                    android:layout_height="17dp"
+                    android:src="@drawable/speed_24">
+                </ImageView>
+
+                <TextView
+                    android:id="@+id/widget_cpu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="11dp"
+                    android:singleLine="true"
+                    android:ellipsize = "marquee"
+                    android:textColor="@color/widgetSummaryText"
+                    android:textSize="12.7sp"
+                    tools:text="CPU" />
 
 
-        </LinearLayout>
+            </LinearLayout>
 
-        <LinearLayout
+            <LinearLayout
-            android:id="@+id/widget_mem_label"
+                android:id="@+id/widget_mem_label"
-            android:layout_width="wrap_content"
+                android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingBottom="2.7dp"
-            android:layout_below="@id/widget_cpu_label"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="17dp"
-                android:layout_height="17dp"
-                android:src="@drawable/memory_24">
-            </ImageView>
-
-            <TextView
-                android:id="@+id/widget_mem"
-                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="11dp"
+                android:paddingBottom="2.7dp"
-                android:maxLines="1"
+                android:layout_below="@id/widget_cpu_label"
-                android:textColor="@color/widgetSummaryText"
+                android:gravity="center_vertical"
-                android:textSize="12.7sp"
+                android:orientation="horizontal">
-                tools:text="Mem" />
 
-        </LinearLayout>
+                <ImageView
+                    android:layout_width="17dp"
+                    android:layout_height="17dp"
+                    android:src="@drawable/memory_24">
+                </ImageView>
 
-        <LinearLayout
+                <TextView
-            android:id="@+id/widget_disk_label"
+                    android:id="@+id/widget_mem"
-            android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+                    android:layout_height="wrap_content"
-            android:paddingBottom="2.7dp"
+                    android:layout_marginStart="11dp"
-            android:layout_below="@id/widget_mem_label"
+                    android:maxLines="1"
-            android:gravity="center_vertical"
+                    android:textColor="@color/widgetSummaryText"
-            android:orientation="horizontal">
+                    android:textSize="12.7sp"
+                    tools:text="Mem" />
 
-            <ImageView
+            </LinearLayout>
-                android:layout_width="17dp"
-                android:layout_height="17dp"
-                android:src="@drawable/storage_24">
-            </ImageView>
 
-            <TextView
+            <LinearLayout
-                android:id="@+id/widget_disk"
+                android:id="@+id/widget_disk_label"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="11dp"
+                android:paddingBottom="2.7dp"
-                android:maxLines="1"
+                android:layout_below="@id/widget_mem_label"
-                android:textColor="@color/widgetSummaryText"
+                android:gravity="center_vertical"
-                android:textSize="12.7sp"
+                android:orientation="horizontal">
-                tools:text="Disk" />
 
-        </LinearLayout>
+                <ImageView
+                    android:layout_width="17dp"
+                    android:layout_height="17dp"
+                    android:src="@drawable/storage_24">
+                </ImageView>
 
-        <LinearLayout
+                <TextView
-            android:id="@+id/widget_net_label"
+                    android:id="@+id/widget_disk"
-            android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+                    android:layout_height="wrap_content"
-            android:layout_below="@id/widget_disk_label"
+                    android:layout_marginStart="11dp"
-            android:gravity="center_vertical"
+                    android:maxLines="1"
-            android:orientation="horizontal">
+                    android:textColor="@color/widgetSummaryText"
+                    android:textSize="12.7sp"
+                    tools:text="Disk" />
 
-            <ImageView
+            </LinearLayout>
-                android:layout_width="17dp"
-                android:layout_height="17dp"
-                android:src="@drawable/net_24">
-            </ImageView>
 
-            <TextView
+            <LinearLayout
-                android:id="@+id/widget_net"
+                android:id="@+id/widget_net_label"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="11dp"
+                android:layout_below="@id/widget_disk_label"
-                android:maxLines="1"
+                android:gravity="center_vertical"
-                android:textColor="@color/widgetSummaryText"
+                android:orientation="horizontal">
-                android:textSize="12.7sp"
-                tools:text="Net" />
 
-        </LinearLayout>
+                <ImageView
+                    android:layout_width="17dp"
+                    android:layout_height="17dp"
+                    android:src="@drawable/net_24">
+                </ImageView>
 
-    </RelativeLayout>
+                <TextView
+                    android:id="@+id/widget_net"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="11dp"
+                    android:maxLines="1"
+                    android:textColor="@color/widgetSummaryText"
+                    android:textSize="12.7sp"
+                    tools:text="Net" />
+
+            </LinearLayout>
+
+        </RelativeLayout>
+
+    </LinearLayout>
+
+    <!-- Add a TextView for error messages -->
+    <TextView
+        android:id="@+id/error_message"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/widget_name"
+        android:textColor="@color/widgetSummaryText"
+        android:textSize="12sp"
+        android:visibility="gone"
+        android:alpha="0"
+        android:animateLayoutChanges="true"
+        tools:text="Error message" />
 
     <TextView
         android:id="@+id/widget_time"
@@ -143,6 +170,8 @@
         android:maxLines="2"
         android:textColor="@color/widgetSummaryText"
         android:textSize="11sp"
+        android:alpha="0"
+        android:animateLayoutChanges="true"
         tools:text="UpdateTime" />
 
 </RelativeLayout>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <monochrome android:drawable="@mipmap/ic_launcher_monochrome" />
 </adaptive-icon>

android/app/src/main/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">ServerBox</string>
+</resources>

android/app/src/main/res/xml/backup_rules.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content>
+    <exclude domain="sharedpref" path="FlutterSecureStorage"/>
+</full-backup-content>

android/build.gradle

@@ -9,6 +9,23 @@ rootProject.buildDir = '../build'
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
+
+subprojects { subproject ->
+  // Only works on com.android.application(the main app module)
+  if (subproject.plugins.hasPlugin('com.android.application')) {
+    subproject.afterEvaluate {
+      android.buildTypes.matching { it.name == 'profile' }.all { buildType ->
+        buildType.applicationIdSuffix = ".profile"
+        buildTypes.profile.resValue 'string', 'app_name', 'SrvBxP'
+      }
+      android.buildTypes.matching { it.name == 'debug' }.all { buildType ->
+        buildType.applicationIdSuffix = ".debug"
+        buildTypes.debug.resValue 'string', 'app_name', 'SrvBxD'
+      }
+    }
+  }
+}
+
 subprojects {
     project.evaluationDependsOn(':app')
 }

android/gradle.properties

@@ -1,3 +1,6 @@
 org.gradle.jvmargs=-Xmx4G
 android.useAndroidX=true
 android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip

android/settings.gradle

@@ -19,8 +19,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.4.2" apply false
+    id "com.android.application" version '8.6.0' apply false
-    id "org.jetbrains.kotlin.android" version "1.8.10" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.21" apply false
 }
 
 include ":app"

distribute_options.yaml

@@ -0,0 +1,13 @@
+variables:
+output: dist/
+releases:
+  - name: linux
+    jobs:
+      - name: release-linux-deb
+        package:
+          platform: linux
+          target: deb
+      - name: release-linux-rpm
+        package:
+          platform: linux
+          target: rpm

fastlane/metadata/android/en-US/full_description.txt

@@ -0,0 +1,6 @@
+A Flutter project which provide charts to display Linux server status and tools to manage server.
+Especially thanks to dartssh2 & xterm.dart.
+
+* Status chart (CPU, Sensors, GPU...), SSH Term, SFTP, Docker & Pkg & Process...
+* Platform specific: Bio auth、Msg push、Home widget、watchOS App...
+* English, 简体中文; Deutsch, 繁體中文, Indonesian, Français, Dutch; Español, Русский язык, Português, 日本語

fastlane/metadata/android/en-US/short_description.txt

@@ -0,0 +1 @@
+A server status & toolbox app using Flutter

fastlane/metadata/android/en-US/title.txt

@@ -0,0 +1 @@
+ServerBox

fastlane/metadata/android/zh-CN/full_description.txt

@@ -0,0 +1,7 @@
+使用 Flutter 开发的 Linux 服务器工具箱，提供服务器状态图表和管理工具。
+特别感谢 dartssh2 & xterm.dart。
+
+特点：
+* 状态图表（CPU、传感器、GPU 等）, SSH 终端, SFTP, Docker & 包 & 进程管理器...
+* 特殊支持：生物认证、推送、桌面小部件、watchOS App、跟随系统颜色...
+* 本地化 (English, 简体中文, Español, Русский язык, Português, 日本語, Deutsch, 繁體中文, Indonesian, Français, Dutch

fastlane/metadata/android/zh-CN/short_description.txt

@@ -0,0 +1 @@
+使用 Flutter 开发的服务器状态和工具箱应用

fastlane/metadata/android/zh-CN/title.txt

@@ -0,0 +1 @@
+ServerBox

ios/Podfile.lock

@@ -1,26 +1,25 @@
 PODS:
-  - countly_flutter (24.4.1):
+  - app_links (0.0.2):
     - Flutter
-  - device_info_plus (0.0.1):
+  - camera_avfoundation (0.0.1):
     - Flutter
   - file_picker (0.0.1):
     - Flutter
   - Flutter (1.0.0)
-  - flutter_background_service_ios (0.0.3):
+  - flutter_native_splash (2.4.3):
     - Flutter
-  - flutter_native_splash (0.0.1):
+  - flutter_secure_storage (6.0.0):
     - Flutter
   - icloud_storage (0.0.1):
     - Flutter
   - local_auth_darwin (0.0.1):
     - Flutter
+    - FlutterMacOS
   - package_info_plus (0.4.5):
     - Flutter
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - permission_handler_apple (9.3.0):
-    - Flutter
   - plain_notification_token (0.0.1):
     - Flutter
   - share_plus (0.0.1):
@@ -36,17 +35,16 @@ PODS:
     - Flutter
 
 DEPENDENCIES:
-  - countly_flutter (from `.symlinks/plugins/countly_flutter/ios`)
+  - app_links (from `.symlinks/plugins/app_links/ios`)
-  - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
+  - camera_avfoundation (from `.symlinks/plugins/camera_avfoundation/ios`)
   - file_picker (from `.symlinks/plugins/file_picker/ios`)
   - Flutter (from `Flutter`)
-  - flutter_background_service_ios (from `.symlinks/plugins/flutter_background_service_ios/ios`)
   - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
+  - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
   - icloud_storage (from `.symlinks/plugins/icloud_storage/ios`)
   - local_auth_darwin (from `.symlinks/plugins/local_auth_darwin/darwin`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
-  - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
   - plain_notification_token (from `.symlinks/plugins/plain_notification_token/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
@@ -55,18 +53,18 @@ DEPENDENCIES:
   - watch_connectivity (from `.symlinks/plugins/watch_connectivity/ios`)
 
 EXTERNAL SOURCES:
-  countly_flutter:
+  app_links:
-    :path: ".symlinks/plugins/countly_flutter/ios"
+    :path: ".symlinks/plugins/app_links/ios"
-  device_info_plus:
+  camera_avfoundation:
-    :path: ".symlinks/plugins/device_info_plus/ios"
+    :path: ".symlinks/plugins/camera_avfoundation/ios"
   file_picker:
     :path: ".symlinks/plugins/file_picker/ios"
   Flutter:
     :path: Flutter
-  flutter_background_service_ios:
-    :path: ".symlinks/plugins/flutter_background_service_ios/ios"
   flutter_native_splash:
     :path: ".symlinks/plugins/flutter_native_splash/ios"
+  flutter_secure_storage:
+    :path: ".symlinks/plugins/flutter_secure_storage/ios"
   icloud_storage:
     :path: ".symlinks/plugins/icloud_storage/ios"
   local_auth_darwin:
@@ -75,8 +73,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider_foundation:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
-  permission_handler_apple:
-    :path: ".symlinks/plugins/permission_handler_apple/ios"
   plain_notification_token:
     :path: ".symlinks/plugins/plain_notification_token/ios"
   share_plus:
@@ -91,24 +87,23 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/watch_connectivity/ios"
 
 SPEC CHECKSUMS:
-  countly_flutter: 56233d921c6b4e0a720774a39b8ee8110d6f8d91
+  app_links: 76b66b60cc809390ca1ad69bfd66b998d2387ac7
-  device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d
+  camera_avfoundation: be3be85408cd4126f250386828e9b1dfa40ab436
-  file_picker: c79185e70b9b45728cde2a8d8da454e0cb43f287
+  file_picker: fb04e739ae6239a76ce1f571863a196a922c87d4
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_background_service_ios: e30e0d3ee69e4cee66272d0c78eacd48c2e94aac
+  flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
-  flutter_native_splash: edf599c81f74d093a4daf8e17bd7a018854bc778
+  flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
-  icloud_storage: d9ac7a33ced81df08ba7ea1bf3099cc0ee58f60a
+  icloud_storage: e55639f0c0d7cb2b0ba9c0b3d5968ccca9cd9aa2
-  local_auth_darwin: 4d56c90c2683319835a61274b57620df9c4520ab
+  local_auth_darwin: 553ce4f9b16d3fdfeafce9cf042e7c9f77c1c391
-  package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
+  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
-  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
+  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
-  permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
+  plain_notification_token: 047876b9d80a5b93565ddcc13a487a7e7b906f7d
-  plain_notification_token: b36467dc91939a7b6754267c701bbaca14996ee1
+  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
-  share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
+  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
-  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
+  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
-  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
+  wakelock_plus: e29112ab3ef0b318e58cfa5c32326458be66b556
-  wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1
+  watch_connectivity: 88e5bea25b473e66ef8d3f960954d154ed0356d6
-  watch_connectivity: 715eb484685e05846eab74795348a44bb2809b82
 
 PODFILE CHECKSUM: ec6ef69056f066e8b21a3391082f23b5ad2d37f8
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2

ios/Runner.xcodeproj/project.pbxproj

@@ -302,7 +302,6 @@
 				E33A3E4A2A626DD0009744AB /* Embed Foundation Extensions */,
 				E39515D52AB5AD64003602C1 /* Embed Watch Content */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				955896919A10AA2BEC131F36 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -452,23 +451,6 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
-		955896919A10AA2BEC131F36 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -690,7 +672,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 923;
+				CURRENT_PROJECT_VERSION = 1201;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -700,7 +682,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.923;
+				MARKETING_VERSION = 1.0.1201;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -826,7 +808,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 923;
+				CURRENT_PROJECT_VERSION = 1201;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -836,7 +818,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.923;
+				MARKETING_VERSION = 1.0.1201;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -854,7 +836,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 923;
+				CURRENT_PROJECT_VERSION = 1201;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -864,7 +846,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.923;
+				MARKETING_VERSION = 1.0.1201;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -885,7 +867,7 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 923;
+				CURRENT_PROJECT_VERSION = 1201;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -898,7 +880,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.923;
+				MARKETING_VERSION = 1.0.1201;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget;
@@ -924,7 +906,7 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 923;
+				CURRENT_PROJECT_VERSION = 1201;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -937,7 +919,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.923;
+				MARKETING_VERSION = 1.0.1201;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -960,7 +942,7 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 923;
+				CURRENT_PROJECT_VERSION = 1201;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -973,7 +955,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.923;
+				MARKETING_VERSION = 1.0.1201;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -996,7 +978,7 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 923;
+				CURRENT_PROJECT_VERSION = 1201;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_PREVIEWS = YES;
@@ -1008,7 +990,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.923;
+				MARKETING_VERSION = 1.0.1201;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd;
@@ -1037,7 +1019,7 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 923;
+				CURRENT_PROJECT_VERSION = 1201;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_PREVIEWS = YES;
@@ -1049,7 +1031,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.923;
+				MARKETING_VERSION = 1.0.1201;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd;
 				PRODUCT_NAME = ServerBox;
@@ -1075,7 +1057,7 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 923;
+				CURRENT_PROJECT_VERSION = 1201;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_PREVIEWS = YES;
@@ -1087,7 +1069,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.923;
+				MARKETING_VERSION = 1.0.1201;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd;
 				PRODUCT_NAME = ServerBox;

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -43,11 +44,13 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">

ios/Runner/AppDelegate.swift

@@ -2,7 +2,7 @@ import UIKit
 import WidgetKit
 import Flutter
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
     override func application(
         _ application: UIApplication,

ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1 +1,37 @@
-{"images":[{"scale":"3x","idiom":"universal","filename":"AppIcon-29.0x29.0@3x.png","size":"29x29","platform":"ios"},{"scale":"2x","idiom":"universal","filename":"AppIcon-29.0x29.0@2x.png","size":"29x29","platform":"ios"},{"scale":"3x","idiom":"universal","filename":"AppIcon-64.0x64.0@3x.png","size":"64x64","platform":"ios"},{"scale":"2x","idiom":"universal","filename":"AppIcon-20.0x20.0@2x.png","size":"20x20","platform":"ios"},{"scale":"2x","idiom":"universal","filename":"AppIcon-60.0x60.0@2x.png","size":"60x60","platform":"ios"},{"scale":"3x","idiom":"universal","filename":"AppIcon-40.0x40.0@3x.png","size":"40x40","platform":"ios"},{"scale":"2x","idiom":"universal","filename":"AppIcon-76.0x76.0@2x.png","size":"76x76","platform":"ios"},{"scale":"3x","idiom":"universal","filename":"AppIcon-38.0x38.0@3x.png","size":"38x38","platform":"ios"},{"scale":"2x","idiom":"universal","filename":"AppIcon-68.0x68.0@2x.png","size":"68x68","platform":"ios"},{"scale":"1x","idiom":"universal","filename":"AppIcon-1024.0x1024.0@1x.png","size":"1024x1024","platform":"ios"},{"scale":"2x","idiom":"universal","filename":"AppIcon-64.0x64.0@2x.png","size":"64x64","platform":"ios"},{"scale":"2x","idiom":"universal","filename":"AppIcon-40.0x40.0@2x.png","size":"40x40","platform":"ios"},{"scale":"2x","idiom":"universal","filename":"AppIcon-83.5x83.5@2x.png","size":"83.5x83.5","platform":"ios"},{"scale":"3x","idiom":"universal","filename":"AppIcon-20.0x20.0@3x.png","size":"20x20","platform":"ios"},{"scale":"2x","idiom":"universal","filename":"AppIcon-38.0x38.0@2x.png","size":"38x38","platform":"ios"},{"scale":"3x","idiom":"universal","filename":"AppIcon-60.0x60.0@3x.png","size":"60x60","platform":"ios"}],"info":{"version":1,"author":"appicon"}}
+{
+  "images" : [
+    {
+      "filename" : "Icon-1024.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "icon-1024 1.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/Runner/Info-Debug.plist

@@ -1,76 +1,81 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
+	<dict>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
+		<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
+		<true />
-	<key>CFBundleDevelopmentRegion</key>
+		<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
+		<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
+		<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
+		<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
+		<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
+		<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
+		<string>6.0</string>
-	<key>CFBundleLocalizations</key>
+		<key>CFBundleLocalizations</key>
-	<array>
+		<array>
-		<string>en</string>
+			<string>en</string>
-		<string>zh</string>
+			<string>zh</string>
-	</array>
+		</array>
-	<key>CFBundleName</key>
+		<key>CFBundleName</key>
-	<string>ServerBox</string>
+		<string>ServerBox</string>
-	<key>CFBundlePackageType</key>
+		<key>CFBundlePackageType</key>
-	<string>APPL</string>
+		<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
+		<key>CFBundleShortVersionString</key>
-	<string>$(MARKETING_VERSION)</string>
+		<string>$(MARKETING_VERSION)</string>
-	<key>CFBundleSignature</key>
+		<key>CFBundleSignature</key>
-	<string>????</string>
+		<string>????</string>
-	<key>CFBundleVersion</key>
+		<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
+		<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>ITSAppUsesNonExemptEncryption</key>
+		<key>ITSAppUsesNonExemptEncryption</key>
-	<false/>
+		<false />
-	<key>LSRequiresIPhoneOS</key>
+		<key>LSRequiresIPhoneOS</key>
-	<true/>
+		<true />
-	<key>LSSupportsOpeningDocumentsInPlace</key>
+		<key>LSSupportsOpeningDocumentsInPlace</key>
-	<true/>
+		<true />
-	<key>NSBonjourServices</key>
+		<key>NSBonjourServices</key>
-	<array>
+		<array>
-		<string>_dartobservatory._tcp</string>
+			<string>_dartobservatory._tcp</string>
-	</array>
+		</array>
-	<key>NSFaceIDUsageDescription</key>
+		<key>NSUserActivityTypes</key>
-	<string>Required for auth</string>
+		<array>
-	<key>NSLocalNetworkUsageDescription</key>
+			<string>ConfigurationIntent</string>
-	<string>ServerBox needs to access your local network to discover and connect to your server.</string>
+		</array>
-	<key>NSUserActivityTypes</key>
+		<key>UIApplicationSupportsIndirectInputEvents</key>
-	<array>
+		<true />
-		<string>ConfigurationIntent</string>
+		<key>UIBackgroundModes</key>
-	</array>
+		<array>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
+			<string>fetch</string>
-	<true/>
+		</array>
-	<key>UIBackgroundModes</key>
+		<key>UILaunchStoryboardName</key>
-	<array>
+		<string>LaunchScreen</string>
-		<string>fetch</string>
+		<key>UIMainStoryboardFile</key>
-	</array>
+		<string>Main</string>
-	<key>UILaunchStoryboardName</key>
+		<key>UIStatusBarHidden</key>
-	<string>LaunchScreen</string>
+		<false />
-	<key>UIMainStoryboardFile</key>
+		<key>UISupportedInterfaceOrientations</key>
-	<string>Main</string>
+		<array>
-	<key>UIStatusBarHidden</key>
+			<string>UIInterfaceOrientationPortrait</string>
-	<false/>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
-	<key>UISupportedInterfaceOrientations</key>
+			<string>UIInterfaceOrientationLandscapeRight</string>
-	<array>
+		</array>
-		<string>UIInterfaceOrientationPortrait</string>
+		<key>UISupportedInterfaceOrientations~ipad</key>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<array>
-		<string>UIInterfaceOrientationLandscapeRight</string>
+			<string>UIInterfaceOrientationPortrait</string>
-	</array>
+			<string>UIInterfaceOrientationPortraitUpsideDown</string>
-	<key>UISupportedInterfaceOrientations~ipad</key>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
-	<array>
+			<string>UIInterfaceOrientationLandscapeRight</string>
-		<string>UIInterfaceOrientationPortrait</string>
+		</array>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<key>UIViewControllerBasedStatusBarAppearance</key>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<false />
-		<string>UIInterfaceOrientationLandscapeRight</string>
+
-	</array>
+		<key>NSLocalNetworkUsageDescription</key>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
+		<string>Access your local network to discover and connect to your server.</string>
-	<false/>
+		<key>NSFaceIDUsageDescription</key>
-</dict>
+		<string>Required for auth</string>
-</plist>
+		<key>NSCameraUsageDescription</key>
+		<string>Scan QR codes and etc.</string>
+		<key>NSPhotoLibraryUsageDescription</key>
+		<string>Get QR code and etc.</string>
+	</dict>
+</plist>

ios/Runner/Info-Profile.plist

@@ -64,9 +64,14 @@
 		<array>
 			<string>_dartobservatory._tcp</string>
 		</array>
+
 		<key>NSLocalNetworkUsageDescription</key>
-		<string>ServerBox needs to access your local network to discover and connect to your server.</string>
+		<string>Access your local network to discover and connect to your server.</string>
 		<key>NSFaceIDUsageDescription</key>
 		<string>Required for auth</string>
+		<key>NSCameraUsageDescription</key>
+		<string>Scan QR codes and etc.</string>
+		<key>NSPhotoLibraryUsageDescription</key>
+		<string>Get QR code and etc.</string>
 	</dict>
 </plist>

ios/Runner/Info-Release.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 	<dict>
 		<key>CADisableMinimumFrameDurationOnPhone</key>
-		<true/>
+		<true />
 		<key>CFBundleDevelopmentRegion</key>
 		<string>$(DEVELOPMENT_LANGUAGE)</string>
 		<key>CFBundleExecutable</key>
@@ -28,13 +28,13 @@
 		<key>CFBundleVersion</key>
 		<string>$(CURRENT_PROJECT_VERSION)</string>
 		<key>ITSAppUsesNonExemptEncryption</key>
-		<false/>
+		<false />
 		<key>LSRequiresIPhoneOS</key>
-		<true/>
+		<true />
 		<key>LSSupportsOpeningDocumentsInPlace</key>
-		<true/>
+		<true />
 		<key>UIApplicationSupportsIndirectInputEvents</key>
-		<true/>
+		<true />
 		<key>UIBackgroundModes</key>
 		<array>
 			<string>fetch</string>
@@ -44,7 +44,7 @@
 		<key>UIMainStoryboardFile</key>
 		<string>Main</string>
 		<key>UIStatusBarHidden</key>
-		<false/>
+		<false />
 		<key>UISupportedInterfaceOrientations</key>
 		<array>
 			<string>UIInterfaceOrientationPortrait</string>
@@ -59,8 +59,13 @@
 			<string>UIInterfaceOrientationLandscapeRight</string>
 		</array>
 		<key>UIViewControllerBasedStatusBarAppearance</key>
-		<false/>
+		<false />
+
 		<key>NSFaceIDUsageDescription</key>
 		<string>Required for auth</string>
+		<key>NSCameraUsageDescription</key>
+		<string>Scan QR codes and etc.</string>
+		<key>NSPhotoLibraryUsageDescription</key>
+		<string>Get QR code and etc.</string>
 	</dict>
-</plist>
+</plist>

ios/WatchApp/PhoneConnMgr.swift

@@ -14,13 +14,20 @@ class PhoneConnMgr: NSObject, WCSessionDelegate, ObservableObject {
         set {
             Store.setCtx(newValue)
             updateUrls(newValue)
+
+            // Notify the view to update, but the [urls] are already published
+            // so the view will automatically update when [urls] changes.
+            // DispatchQueue.main.async {
+            //     self.objectWillChange.send()
+            // }
         }
         get {
             return _ctx
         }
     }
+    var userInfo: [String: Any] = [:]
     @Published var urls: [String] = []
-    
+
     override init() {
         super.init()
         if !WCSession.isSupported() {
@@ -29,24 +36,85 @@ class PhoneConnMgr: NSObject, WCSessionDelegate, ObservableObject {
         session = WCSession.default
         session?.delegate = self
         session?.activate()
-        
+
-        ctx = Store.getCtx()
+        _ctx = Store.getCtx()
+        updateUrls(_ctx)
     }
- 
+
     func updateUrls(_ val: [String: Any]) {
         if let urls = val["urls"] as? [String] {
-            self.urls = urls.filter { !$0.isEmpty }
+            DispatchQueue.main.async {
+                self.urls = urls.filter { !$0.isEmpty }
+            }
         }
     }
-    
+
-    func session(_ session: WCSession, activationDidCompleteWith activationState: WCSessionActivationState, error: Error?) {
+    func session(
-        
+        _ session: WCSession, activationDidCompleteWith activationState: WCSessionActivationState,
+        error: Error?
+    ) {
+        // Request latest data when the session is activated
+        if activationState == .activated {
+            requestLatestData()
+        }
     }
 
-    // implement session:didReceiveApplicationContext:
+    // Receive realtime msgs
-    func session(_ session: WCSession, didReceiveApplicationContext applicationContext: [String : Any]) {
+    func session(_ session: WCSession, didReceiveMessage message: [String: Any]) {
-        ctx = applicationContext
+        DispatchQueue.main.async {
+            self.ctx = message
+        }
+    }
+
+    // Receive UserInfo
+    func session(_ session: WCSession, didReceiveUserInfo userInfo: [String: Any]) {
+        DispatchQueue.main.async {
+            self.ctx = userInfo
+        }
+    }
+
+    // Receive Application Context
+    func session(
+        _ session: WCSession, didReceiveApplicationContext applicationContext: [String: Any]
+    ) {
+        DispatchQueue.main.async {
+            self.ctx = applicationContext
+        }
+    }
+
+    private func requestLatestData(timeout: TimeInterval = 5.0, maxRetries: Int = 1) {
+        guard let session = session, session.isReachable else { return }
+
+        var didReceiveResponse = false
+        var retries = 0
+
+        func sendRequest() {
+            session.sendMessage(["action": "requestData"]) { response in
+                didReceiveResponse = true
+                DispatchQueue.main.async {
+                    self.ctx = response
+                }
+            } errorHandler: { error in
+                print("Request data failed: \(error)")
+                // Optionally, handle error UI here
+            }
+
+            // Timeout handling
+            DispatchQueue.main.asyncAfter(deadline: .now() + timeout) { [weak self] in
+                guard let self = self else { return }
+                if !didReceiveResponse {
+                    if retries < maxRetries {
+                        retries += 1
+                        print("No response, retrying requestLatestData (\(retries))...")
+                        sendRequest()
+                    } else {
+                        print("Request data timed out after \(retries + 1) attempts.")
+                        // Optionally, update UI to indicate timeout
+                    }
+                }
+            }
+        }
+
+        sendRequest()
     }
 }
-
-

l10n.yaml

@@ -1,4 +1,6 @@
 arb-dir: lib/l10n
 template-arb-file: app_en.arb
 output-localization-file: l10n.dart
+output-dir: lib/generated/l10n
+synthetic-package: false
 untranslated-messages-file: untranlated.json

lib/app.dart

@@ -1,12 +1,16 @@
 import 'package:dynamic_color/dynamic_color.dart';
 import 'package:fl_lib/fl_lib.dart';
-import 'package:fl_lib/l10n/gen_l10n/lib_l10n.dart';
+import 'package:fl_lib/generated/l10n/lib_l10n.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:icons_plus/icons_plus.dart';
-import 'package:toolbox/data/res/build_data.dart';
+import 'package:responsive_framework/responsive_framework.dart';
-import 'package:toolbox/data/res/rebuild.dart';
+import 'package:server_box/core/extension/context/locale.dart';
-import 'package:toolbox/data/res/store.dart';
+import 'package:server_box/data/res/build_data.dart';
-import 'package:toolbox/view/page/home/home.dart';
+import 'package:server_box/data/res/store.dart';
+import 'package:server_box/generated/l10n/l10n.dart';
+import 'package:server_box/view/page/home.dart';
+
+part 'intro.dart';
 
 class MyApp extends StatelessWidget {
   const MyApp({super.key});
@@ -15,36 +19,70 @@ class MyApp extends StatelessWidget {
   Widget build(BuildContext context) {
     _setup(context);
     return ListenableBuilder(
-      listenable: RebuildNodes.app,
+      listenable: RNodes.app,
       builder: (context, _) {
         if (!Stores.setting.useSystemPrimaryColor.fetch()) {
-          UIs.colorSeed = Color(Stores.setting.primaryColor.fetch());
+          return _build(context);
-          return _buildApp(context);
         }
-        return DynamicColorBuilder(
+
-          builder: (light, dark) {
+        return _buildDynamicColor(context);
-            final lightTheme = ThemeData(
-              useMaterial3: true,
-              colorScheme: light,
-            );
-            final darkTheme = ThemeData(
-              useMaterial3: true,
-              brightness: Brightness.dark,
-              colorScheme: dark,
-            );
-            if (context.isDark && light != null) {
-              UIs.primaryColor = light.primary;
-            } else if (!context.isDark && dark != null) {
-              UIs.primaryColor = dark.primary;
-            }
-            return _buildApp(context, light: lightTheme, dark: darkTheme);
-          },
-        );
       },
     );
   }
 
-  Widget _buildApp(BuildContext ctx, {ThemeData? light, ThemeData? dark}) {
+  Widget _build(BuildContext context) {
+    final colorSeed = Color(Stores.setting.colorSeed.fetch());
+    UIs.colorSeed = colorSeed;
+    UIs.primaryColor = colorSeed;
+
+    return _buildApp(
+      context,
+      light: ThemeData(
+        useMaterial3: true,
+        colorSchemeSeed: UIs.colorSeed,
+        appBarTheme: AppBarTheme(
+          scrolledUnderElevation: 0.0,
+        ),
+      ),
+      dark: ThemeData(
+        useMaterial3: true,
+        brightness: Brightness.dark,
+        colorSchemeSeed: UIs.colorSeed,
+        appBarTheme: AppBarTheme(
+          scrolledUnderElevation: 0.0,
+        ),
+      ),
+    );
+  }
+
+  Widget _buildDynamicColor(BuildContext context) {
+    return DynamicColorBuilder(
+      builder: (light, dark) {
+        final lightTheme = ThemeData(
+          useMaterial3: true,
+          colorScheme: light,
+        );
+        final darkTheme = ThemeData(
+          useMaterial3: true,
+          brightness: Brightness.dark,
+          colorScheme: dark,
+        );
+        if (context.isDark && dark != null) {
+          UIs.primaryColor = dark.primary;
+        } else if (!context.isDark && light != null) {
+          UIs.primaryColor = light.primary;
+        }
+
+        return _buildApp(context, light: lightTheme, dark: darkTheme);
+      },
+    );
+  }
+
+  Widget _buildApp(
+    BuildContext ctx, {
+    required ThemeData light,
+    required ThemeData dark,
+  }) {
     final tMode = Stores.setting.themeMode.fetch();
     // Issue #57
     final themeMode = switch (tMode) {
@@ -54,34 +92,49 @@ class MyApp extends StatelessWidget {
     };
     final locale = Stores.setting.locale.fetch().toLocale;
 
-    light ??= ThemeData(
-      useMaterial3: true,
-      colorSchemeSeed: UIs.colorSeed,
-    );
-    dark ??= ThemeData(
-      useMaterial3: true,
-      brightness: Brightness.dark,
-      colorSchemeSeed: UIs.colorSeed,
-    );
-
     return MaterialApp(
+      key: ValueKey(locale),
+      builder: (context, child) => ResponsiveBreakpoints.builder(
+        child: child ?? UIs.placeholder,
+        breakpoints: const [
+          Breakpoint(start: 0, end: 450, name: MOBILE),
+          Breakpoint(start: 451, end: 800, name: TABLET),
+          Breakpoint(start: 801, end: 1920, name: DESKTOP),
+        ],
+      ),
       locale: locale,
       localizationsDelegates: const [
         LibLocalizations.delegate,
         ...AppLocalizations.localizationsDelegates,
       ],
       supportedLocales: AppLocalizations.supportedLocales,
+      localeListResolutionCallback: LocaleUtil.resolve,
+      navigatorObservers: [AppRouteObserver.instance],
       title: BuildData.name,
       themeMode: themeMode,
-      theme: light,
+      theme: light.fixWindowsFont,
-      darkTheme: tMode < 3 ? dark : dark.toAmoled,
+      darkTheme: (tMode < 3 ? dark : dark.toAmoled).fixWindowsFont,
-      home: _buildAppContent(ctx),
+      home: Builder(
-    );
+        builder: (context) {
-  }
+          context.setLibL10n();
+          final appL10n = AppLocalizations.of(context);
+          if (appL10n != null) l10n = appL10n;
 
-  Widget _buildAppContent(BuildContext ctx) {
+          Widget child;
-    //if (Pros.app.isWearOS) return const WearHome();
+          final intros = _IntroPage.builders;
-    return const HomePage();
+          if (intros.isNotEmpty) {
+            child = _IntroPage(intros);
+          }
+
+          child = const HomePage();
+
+          return VirtualWindowFrame(
+            title: BuildData.name,
+            child: child,
+          );
+        },
+      ),
+    );
   }
 }
 

lib/core/chan.dart

@@ -0,0 +1,30 @@
+import 'package:fl_lib/fl_lib.dart';
+import 'package:flutter/services.dart';
+import 'package:server_box/data/res/misc.dart';
+import 'package:server_box/data/res/store.dart';
+
+abstract final class MethodChans {
+  static const _channel = MethodChannel('${Miscs.pkgName}/main_chan');
+
+  static void moveToBg() {
+    _channel.invokeMethod('sendToBackground');
+  }
+
+  /// Issue #662
+  static void startService() {
+    // if (Stores.setting.fgService.fetch() != true) return;
+    // _channel.invokeMethod('startService');
+  }
+
+  /// Issue #662
+  static void stopService() {
+    // if (Stores.setting.fgService.fetch() != true) return;
+    // _channel.invokeMethod('stopService');
+  }
+
+  static void updateHomeWidget() async {
+    if (!isIOS || !isAndroid) return;
+    if (!Stores.setting.autoUpdateHomeWidget.fetch()) return;
+    await _channel.invokeMethod('updateHomeWidget');
+  }
+}

lib/core/channel/bg_run.dart

@@ -1,14 +0,0 @@
-import 'package:flutter/services.dart';
-import 'package:toolbox/data/res/misc.dart';
-
-abstract final class BgRunMC {
-  static const _channel = MethodChannel('${Miscs.pkgName}/app_retain');
-
-  static void moveToBg() {
-    _channel.invokeMethod('sendToBackground');
-  }
-
-  static void startService() {
-    _channel.invokeMethod('startService');
-  }
-}

lib/core/channel/home_widget.dart

@@ -1,12 +0,0 @@
-import 'package:flutter/services.dart';
-import 'package:toolbox/data/res/misc.dart';
-import 'package:toolbox/data/res/store.dart';
-
-abstract final class HomeWidgetMC {
-  static const _channel = MethodChannel('${Miscs.pkgName}/home_widget');
-
-  static void update() {
-    if (!Stores.setting.autoUpdateHomeWidget.fetch()) return;
-    _channel.invokeMethod('update');
-  }
-}

lib/core/extension/build.dart

@@ -1,5 +0,0 @@
-import 'package:toolbox/data/res/build_data.dart';
-
-extension BuildDataX on BuildData {
-  static const versionStr = 'v1.0.${BuildData.build}';
-}

lib/core/extension/context/locale.dart

@@ -1,4 +1,9 @@
-import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:flutter/widgets.dart';
-import 'package:flutter_gen/gen_l10n/l10n_en.dart';
+import 'package:server_box/generated/l10n/l10n.dart';
+import 'package:server_box/generated/l10n/l10n_en.dart';
 
 AppLocalizations l10n = AppLocalizationsEn();
+
+extension LocaleX on BuildContext {
+  AppLocalizations get l10n => AppLocalizations.of(this)!;
+}

lib/core/extension/sftpfile.dart

@@ -1,4 +1,5 @@
 import 'package:dartssh2/dartssh2.dart';
+import 'package:server_box/view/widget/unix_perm.dart';
 
 extension SftpFileX on SftpFileMode {
   String get str {
@@ -8,6 +9,26 @@ extension SftpFileX on SftpFileMode {
 
     return '$user$group$other';
   }
+
+  UnixPerm toUnixPerm() {
+    return UnixPerm(
+      user: UnixPermOp(
+        r: userRead,
+        w: userWrite,
+        x: userExecute,
+      ),
+      group: UnixPermOp(
+        r: groupRead,
+        w: groupWrite,
+        x: groupExecute,
+      ),
+      other: UnixPermOp(
+        r: otherRead,
+        w: otherWrite,
+        x: otherExecute,
+      ),
+    );
+  }
 }
 
 String _getRoleMode(bool r, bool w, bool x) {

lib/core/extension/ssh_client.dart

@@ -5,72 +5,74 @@ import 'package:dartssh2/dartssh2.dart';
 import 'package:fl_lib/fl_lib.dart';
 import 'package:flutter/widgets.dart';
 
-import '../../data/res/misc.dart';
+import 'package:server_box/data/res/misc.dart';
 
-typedef _OnStdout = void Function(String data, SSHSession session);
+typedef OnStdout = void Function(String data, SSHSession session);
-typedef _OnStdin = void Function(SSHSession session);
+typedef OnStdin = void Function(SSHSession session);
 
 typedef PwdRequestFunc = Future<String?> Function(String? user);
 
 extension SSHClientX on SSHClient {
-  Future<SSHSession> exec(
+  Future<(SSHSession, String)> exec(
-    String cmd, {
+    OnStdin onStdin, {
-    _OnStdout? onStderr,
+    String? entry,
-    _OnStdout? onStdout,
+    SSHPtyConfig? pty,
-    _OnStdin? stdin,
+    OnStdout? onStdout,
-    bool redirectToBash = false, // not working yet. do not use
+    OnStdout? onStderr,
+    bool stdout = true,
+    bool stderr = true,
+    Map<String, String>? env,
   }) async {
-    final session = await execute(redirectToBash ? "head -1 | bash" : cmd);
+    final session = await execute(
-
+      entry ?? 'cat | sh',
-    if (redirectToBash) {
+      pty: pty,
-      session.stdin.add("$cmd\n".uint8List);
+      environment: env,
-    }
+    );
 
+    final result = BytesBuilder(copy: false);
     final stdoutDone = Completer<void>();
     final stderrDone = Completer<void>();
 
-    if (onStdout != null) {
+    session.stdout.listen(
-      session.stdout.listen(
+      (e) {
-        (e) => onStdout(e.string, session),
+        onStdout?.call(e.string, session);
-        onDone: stdoutDone.complete,
+        if (stdout) result.add(e);
-      );
+      },
-    } else {
+      onDone: stdoutDone.complete,
-      stdoutDone.complete();
+      onError: stderrDone.completeError,
-    }
+    );
 
-    if (onStderr != null) {
+    session.stderr.listen(
-      session.stderr.listen(
+      (e) {
-        (e) => onStderr(e.string, session),
+        onStderr?.call(e.string, session);
-        onDone: stderrDone.complete,
+        if (stderr) result.add(e);
-      );
+      },
-    } else {
+      onDone: stderrDone.complete,
-      stderrDone.complete();
+      onError: stderrDone.completeError,
-    }
+    );
 
-    if (stdin != null) {
+    onStdin(session);
-      stdin(session);
-    }
 
     await stdoutDone.future;
     await stderrDone.future;
 
-    session.close();
+    return (session, result.takeBytes().string);
-    return session;
   }
 
   Future<int?> execWithPwd(
-    String cmd, {
+    String script, {
+    String? entry,
     BuildContext? context,
-    _OnStdout? onStdout,
+    OnStdout? onStdout,
-    _OnStdout? onStderr,
+    OnStdout? onStderr,
-    _OnStdin? stdin,
-    bool redirectToBash = false, // not working yet. do not use
     required String id,
   }) async {
     var isRequestingPwd = false;
-    final session = await exec(
+    final (session, _) = await exec(
-      cmd,
+      (sess) {
-      redirectToBash: redirectToBash,
+        sess.stdin.add('$script\n'.uint8List);
+        sess.stdin.close();
+      },
       onStderr: (data, session) async {
         onStderr?.call(data, session);
         if (isRequestingPwd) return;
@@ -83,56 +85,38 @@ extension SSHClientX on SSHClient {
               ? await context.showPwdDialog(title: user, id: id)
               : null;
           if (pwd == null || pwd.isEmpty) {
-            session.kill(SSHSignal.TERM);
+            session.stdin.close();
           } else {
             session.stdin.add('$pwd\n'.uint8List);
           }
           isRequestingPwd = false;
         }
       },
-      onStdout: (data, sink) async {
+      onStdout: onStdout,
-        onStdout?.call(data, sink);
+      entry: entry,
-      },
-      stdin: stdin,
     );
     return session.exitCode;
   }
 
-  Future<Uint8List> runForOutput(
+  Future<String> execForOutput(
-    String command, {
+    String script, {
-    bool runInPty = false,
+    SSHPtyConfig? pty,
     bool stdout = true,
     bool stderr = true,
-    Map<String, String>? environment,
+    String? entry,
-    Future<void> Function(SSHSession)? action,
+    Map<String, String>? env,
   }) async {
-    final session = await execute(
+    final ret = await exec(
-      command,
+      (session) {
-      pty: runInPty ? const SSHPtyConfig() : null,
+        session.stdin.add('$script\n'.uint8List);
-      environment: environment,
+        session.stdin.close();
+      },
+      pty: pty,
+      env: env,
+      stdout: stdout,
+      stderr: stderr,
+      entry: entry,
     );
-
+    return ret.$2;
-    final result = BytesBuilder(copy: false);
-    final stdoutDone = Completer<void>();
-    final stderrDone = Completer<void>();
-
-    session.stdout.listen(
-      stdout ? result.add : (_) {},
-      onDone: stdoutDone.complete,
-      onError: stderrDone.completeError,
-    );
-
-    session.stderr.listen(
-      stderr ? result.add : (_) {},
-      onDone: stderrDone.complete,
-      onError: stderrDone.completeError,
-    );
-
-    if (action != null) await action(session);
-
-    await stdoutDone.future;
-    await stderrDone.future;
-
-    return result.takeBytes();
   }
 }

lib/core/route.dart

@@ -1,253 +1,9 @@
-import 'package:fl_lib/fl_lib.dart';
+import 'package:server_box/data/model/server/server_private_info.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:toolbox/data/model/server/private_key_info.dart';
-import 'package:toolbox/data/model/server/server_private_info.dart';
-import 'package:toolbox/data/res/build_data.dart';
-import 'package:toolbox/data/res/provider.dart';
-import 'package:toolbox/data/res/store.dart';
-import 'package:toolbox/view/page/backup.dart';
-import 'package:toolbox/view/page/container.dart';
-import 'package:toolbox/view/page/home/home.dart';
-import 'package:toolbox/view/page/iperf.dart';
-import 'package:toolbox/view/page/ping.dart';
-import 'package:toolbox/view/page/private_key/edit.dart';
-import 'package:toolbox/view/page/private_key/list.dart';
-import 'package:toolbox/view/page/pve.dart';
-import 'package:toolbox/view/page/server/detail/view.dart';
-import 'package:toolbox/view/page/setting/platform/android.dart';
-import 'package:toolbox/view/page/setting/platform/ios.dart';
-import 'package:toolbox/view/page/setting/seq/srv_func_seq.dart';
-import 'package:toolbox/view/page/snippet/result.dart';
-import 'package:toolbox/view/page/ssh/page.dart';
-import 'package:toolbox/view/page/setting/seq/virt_key.dart';
-import 'package:toolbox/view/page/storage/local.dart';
 
-import '../data/model/server/snippet.dart';
+/// The args class for [AppRoute].
-import '../view/page/editor.dart';
+final class SpiRequiredArgs {
-import '../view/page/process.dart';
+  /// The only required argument for this class.
-import '../view/page/server/edit.dart';
+  final Spi spi;
-import '../view/page/server/tab.dart';
-import '../view/page/setting/entry.dart';
-import '../view/page/setting/seq/srv_detail_seq.dart';
-import '../view/page/setting/seq/srv_seq.dart';
-import '../view/page/snippet/edit.dart';
-import '../view/page/snippet/list.dart';
-import '../view/page/storage/sftp.dart';
-import '../view/page/storage/sftp_mission.dart';
 
-class AppRoutes {
+  const SpiRequiredArgs(this.spi);
-  final Widget page;
-  final String title;
-
-  AppRoutes(this.page, this.title);
-
-  Future<T?> go<T>(BuildContext context) {
-    return Navigator.push<T>(
-      context,
-      Stores.setting.cupertinoRoute.fetch()
-          ? CupertinoPageRoute(builder: (context) => page)
-          : MaterialPageRoute(builder: (context) => page),
-    );
-  }
-
-  Future<T?> checkGo<T>({
-    required BuildContext context,
-    required bool Function() check,
-  }) {
-    if (check()) {
-      return go(context);
-    }
-    return Future.value(null);
-  }
-
-  static AppRoutes serverDetail({Key? key, required ServerPrivateInfo spi}) {
-    return AppRoutes(ServerDetailPage(key: key, spi: spi), 'server_detail');
-  }
-
-  static AppRoutes serverTab({Key? key}) {
-    return AppRoutes(ServerPage(key: key), 'server_tab');
-  }
-
-  static AppRoutes serverEdit({Key? key, ServerPrivateInfo? spi}) {
-    return AppRoutes(
-      ServerEditPage(spi: spi),
-      'server_${spi == null ? 'add' : 'edit'}',
-    );
-  }
-
-  static AppRoutes keyEdit({Key? key, PrivateKeyInfo? pki}) {
-    return AppRoutes(
-      PrivateKeyEditPage(pki: pki),
-      'key_${pki == null ? 'add' : 'edit'}',
-    );
-  }
-
-  static AppRoutes keyList({Key? key}) {
-    return AppRoutes(PrivateKeysListPage(key: key), 'key_detail');
-  }
-
-  static AppRoutes snippetEdit({Key? key, Snippet? snippet}) {
-    return AppRoutes(
-      SnippetEditPage(snippet: snippet),
-      'snippet_${snippet == null ? 'add' : 'edit'}',
-    );
-  }
-
-  static AppRoutes snippetList({Key? key}) {
-    return AppRoutes(SnippetListPage(key: key), 'snippet_detail');
-  }
-
-  static AppRoutes ssh({
-    Key? key,
-    required ServerPrivateInfo spi,
-    String? initCmd,
-  }) {
-    return AppRoutes(
-      SSHPage(
-        key: key,
-        spi: spi,
-        initCmd: initCmd,
-      ),
-      'ssh_term',
-    );
-  }
-
-  static AppRoutes sshVirtKeySetting({Key? key}) {
-    return AppRoutes(SSHVirtKeySettingPage(key: key), 'ssh_virt_key_setting');
-  }
-
-  static AppRoutes localStorage(
-      {Key? key, bool isPickFile = false, String? initDir}) {
-    return AppRoutes(
-        LocalStoragePage(
-          key: key,
-          isPickFile: isPickFile,
-          initDir: initDir,
-        ),
-        'local_storage');
-  }
-
-  static AppRoutes sftpMission({Key? key}) {
-    return AppRoutes(SftpMissionPage(key: key), 'sftp_mission');
-  }
-
-  static AppRoutes sftp(
-      {Key? key,
-      required ServerPrivateInfo spi,
-      String? initPath,
-      bool isSelect = false}) {
-    return AppRoutes(
-        SftpPage(
-          key: key,
-          spi: spi,
-          initPath: initPath,
-          isSelect: isSelect,
-        ),
-        'sftp');
-  }
-
-  static AppRoutes backup({Key? key}) {
-    return AppRoutes(BackupPage(key: key), 'backup');
-  }
-
-  static AppRoutes debug({Key? key}) {
-    return AppRoutes(
-      DebugPage(
-        key: key,
-        args: DebugPageArgs(
-          notifier: Pros.debug.widgets,
-          onClear: Pros.debug.clear,
-          title: 'Logs(${BuildData.build})',
-        ),
-      ),
-      'debug',
-    );
-  }
-
-  static AppRoutes docker({Key? key, required ServerPrivateInfo spi}) {
-    return AppRoutes(ContainerPage(key: key, spi: spi), 'docker');
-  }
-
-  /// - Pop true if the text is changed & [path] is not null
-  /// - Pop text if [path] is null
-  static AppRoutes editor({
-    Key? key,
-    String? path,
-    String? text,
-    String? langCode,
-    String? title,
-  }) {
-    return AppRoutes(
-        EditorPage(
-          key: key,
-          path: path,
-          text: text,
-          langCode: langCode,
-          title: title,
-        ),
-        'editor');
-  }
-
-  // static AppRoutes fullscreen({Key? key}) {
-  //   return AppRoutes(FullScreenPage(key: key), 'fullscreen');
-  // }
-
-  static AppRoutes home({Key? key}) {
-    return AppRoutes(HomePage(key: key), 'home');
-  }
-
-  static AppRoutes ping({Key? key}) {
-    return AppRoutes(PingPage(key: key), 'ping');
-  }
-
-  static AppRoutes process({Key? key, required ServerPrivateInfo spi}) {
-    return AppRoutes(ProcessPage(key: key, spi: spi), 'process');
-  }
-
-  static AppRoutes settings({Key? key}) {
-    return AppRoutes(SettingPage(key: key), 'setting');
-  }
-
-  static AppRoutes serverOrder({Key? key}) {
-    return AppRoutes(ServerOrderPage(key: key), 'server_order');
-  }
-
-  static AppRoutes serverDetailOrder({Key? key}) {
-    return AppRoutes(ServerDetailOrderPage(key: key), 'server_detail_order');
-  }
-
-  static AppRoutes iosSettings({Key? key}) {
-    return AppRoutes(IOSSettingsPage(key: key), 'ios_setting');
-  }
-
-  static AppRoutes androidSettings({Key? key}) {
-    return AppRoutes(AndroidSettingsPage(key: key), 'android_setting');
-  }
-
-  static AppRoutes snippetResult(
-      {Key? key, required List<SnippetResult?> results}) {
-    return AppRoutes(
-        SnippetResultPage(
-          key: key,
-          results: results,
-        ),
-        'snippet_result');
-  }
-
-  static AppRoutes iperf({Key? key, required ServerPrivateInfo spi}) {
-    return AppRoutes(IPerfPage(key: key, spi: spi), 'iperf');
-  }
-
-  static AppRoutes serverFuncBtnsOrder({Key? key}) {
-    return AppRoutes(ServerFuncBtnsOrderPage(key: key), 'server_func_btns_seq');
-  }
-
-  static AppRoutes pve({Key? key, required ServerPrivateInfo spi}) {
-    return AppRoutes(PvePage(key: key, spi: spi), 'pve');
-  }
-
-  static AppRoutes kvEditor({Key? key, required Map<String, String> data}) {
-    return AppRoutes(KvEditor(key: key, data: data), 'kv_editor');
-  }
 }

lib/core/sync.dart

@@ -0,0 +1,33 @@
+import 'dart:io';
+
+import 'package:fl_lib/fl_lib.dart';
+import 'package:server_box/data/model/app/bak/backup2.dart';
+import 'package:server_box/data/model/app/bak/utils.dart';
+
+const bakSync = BakSyncer._();
+
+final icloud = ICloud(containerId: 'iCloud.tech.lolli.serverbox');
+
+final class BakSyncer extends SyncIface {
+  const BakSyncer._() : super();
+
+  @override
+  Future<void> saveToFile() => BackupV2.backup();
+
+  @override
+  Future<Mergeable> fromFile(String path) async {
+    final content = await File(path).readAsString();
+    return MergeableUtils.fromJsonString(content).$1;
+  }
+
+  @override
+  RemoteStorage? get remoteStorage {
+    final icloudEnabled = PrefProps.icloudSync.get();
+    if (icloudEnabled) return icloud;
+
+    final webdavEnabled = PrefProps.webdavSync.get();
+    if (webdavEnabled) return Webdav.shared;
+
+    return null;
+  }
+}

lib/core/utils/misc.dart

@@ -2,14 +2,9 @@ import 'package:fl_lib/fl_lib.dart';
 import 'package:plain_notification_token/plain_notification_token.dart';
 
 Future<String?> getToken() async {
-  if (isIOS) {
+  if (!isIOS) return null;
-    final plainNotificationToken = PlainNotificationToken();
+  final instance = ApnsToken()..requestPermission();
-    plainNotificationToken.requestPermission();
+  // Wait until Permission dialog closed
-
+  await instance.onIosSettingsRegistered.first;
-    // If you want to wait until Permission dialog close,
+  return await instance.getToken();
-    // you need wait changing setting registered.
-    await plainNotificationToken.onIosSettingsRegistered.first;
-    return await plainNotificationToken.getToken();
-  }
-  return null;
 }

lib/core/utils/server.dart

@@ -1,11 +1,11 @@
 import 'dart:async';
 
 import 'package:dartssh2/dartssh2.dart';
+import 'package:fl_lib/fl_lib.dart';
 import 'package:flutter/foundation.dart';
-import 'package:toolbox/data/model/app/error.dart';
+import 'package:server_box/data/model/app/error.dart';
-import 'package:toolbox/data/res/store.dart';
+import 'package:server_box/data/model/server/server_private_info.dart';
-
+import 'package:server_box/data/res/store.dart';
-import '../../data/model/server/server_private_info.dart';
 
 /// Must put this func out of any Class.
 ///
@@ -31,7 +31,7 @@ enum GenSSHClientStatus {
 }
 
 String getPrivateKey(String id) {
-  final pki = Stores.key.get(id);
+  final pki = Stores.key.fetchOne(id);
   if (pki == null) {
     throw SSHErr(
       type: SSHErrType.noPrivateKey,
@@ -42,7 +42,7 @@ String getPrivateKey(String id) {
 }
 
 Future<SSHClient> genClient(
-  ServerPrivateInfo spi, {
+  Spi spi, {
   void Function(GenSSHClientStatus)? onStatus,
 
   /// Only pass this param if using multi-threading and key login
@@ -52,16 +52,18 @@ Future<SSHClient> genClient(
   String? jumpPrivateKey,
   Duration timeout = const Duration(seconds: 5),
 
-  /// [ServerPrivateInfo] of the jump server
+  /// [Spi] of the jump server
   ///
   /// Must pass this param if using multi-threading and key login
-  ServerPrivateInfo? jumpSpi,
+  Spi? jumpSpi,
 
   /// Handle keyboard-interactive authentication
-  FutureOr<List<String>?> Function(SSHUserInfoRequest)? onKeyboardInteractive,
+  SSHUserInfoRequestHandler? onKeyboardInteractive,
 }) async {
   onStatus?.call(GenSSHClientStatus.socket);
 
+  String? alterUser;
+
   final socket = await () async {
     // Proxy
     final jumpSpi_ = () {
@@ -91,15 +93,18 @@ Future<SSHClient> genClient(
         timeout: timeout,
       );
     } catch (e) {
+      Loggers.app.warning('genClient', e);
       if (spi.alterUrl == null) rethrow;
       try {
-        final ipPort = spi.fromStringUrl();
+        final res = spi.fromStringUrl();
+        alterUser = res.$2;
         return await SSHSocket.connect(
-          ipPort.ip,
+          res.$1,
-          ipPort.port,
+          res.$3,
           timeout: timeout,
         );
       } catch (e) {
+        Loggers.app.warning('genClient alterUrl', e);
         rethrow;
       }
     }
@@ -110,7 +115,7 @@ Future<SSHClient> genClient(
     onStatus?.call(GenSSHClientStatus.pwd);
     return SSHClient(
       socket,
-      username: spi.user,
+      username: alterUser ?? spi.user,
       onPasswordRequest: () => spi.pwd,
       onUserInfoRequest: onKeyboardInteractive,
       // printDebug: debugPrint,

lib/core/utils/ssh_auth.dart

@@ -2,18 +2,17 @@ import 'dart:async';
 
 import 'package:fl_lib/fl_lib.dart';
 import 'package:flutter/material.dart';
-import 'package:toolbox/core/extension/context/locale.dart';
+import 'package:server_box/data/model/server/server_private_info.dart';
-import 'package:toolbox/data/model/server/server_private_info.dart';
+import 'package:server_box/data/provider/app.dart';
-import 'package:toolbox/data/res/provider.dart';
 
 abstract final class KeybordInteractive {
   static FutureOr<List<String>?> defaultHandle(
-    ServerPrivateInfo spi, {
+    Spi spi, {
     BuildContext? ctx,
   }) async {
     try {
-      final res = await (ctx ?? Pros.app.ctx)?.showPwdDialog(
+      final res = await (ctx ?? AppProvider.ctx)?.showPwdDialog(
-        title: '2FA ${l10n.pwd}',
+        title: libL10n.pwd,
         id: spi.id,
         label: spi.id,
       );

lib/core/utils/sync/icloud.dart

@@ -1,224 +0,0 @@
-import 'dart:async';
-import 'dart:io';
-
-import 'package:computer/computer.dart';
-import 'package:fl_lib/fl_lib.dart';
-import 'package:icloud_storage/icloud_storage.dart';
-import 'package:logging/logging.dart';
-import 'package:toolbox/data/model/app/backup.dart';
-import 'package:toolbox/data/model/app/sync.dart';
-import 'package:toolbox/data/res/misc.dart';
-
-import '../../../data/model/app/error.dart';
-
-abstract final class ICloud {
-  static const _containerId = 'iCloud.tech.lolli.serverbox';
-
-  static final _logger = Logger('iCloud');
-
-  /// Upload file to iCloud
-  ///
-  /// - [relativePath] is the path relative to [Paths.doc],
-  /// must not starts with `/`
-  /// - [localPath] has higher priority than [relativePath], but only apply
-  /// to the local path instead of iCloud path
-  ///
-  /// Return [null] if upload success, [ICloudErr] otherwise
-  static Future<ICloudErr?> upload({
-    required String relativePath,
-    String? localPath,
-  }) async {
-    final completer = Completer<ICloudErr?>();
-    try {
-      await ICloudStorage.upload(
-        containerId: _containerId,
-        filePath: localPath ?? '${Paths.doc}/$relativePath',
-        destinationRelativePath: relativePath,
-        onProgress: (stream) {
-          stream.listen(
-            null,
-            onDone: () => completer.complete(null),
-            onError: (e) => completer.complete(
-              ICloudErr(type: ICloudErrType.generic, message: '$e'),
-            ),
-          );
-        },
-      );
-    } catch (e, s) {
-      _logger.warning('Upload $relativePath failed', e, s);
-      completer.complete(ICloudErr(type: ICloudErrType.generic, message: '$e'));
-    }
-
-    return completer.future;
-  }
-
-  static Future<List<ICloudFile>> getAll() async {
-    return await ICloudStorage.gather(
-      containerId: _containerId,
-    );
-  }
-
-  static Future<void> delete(String relativePath) async {
-    try {
-      await ICloudStorage.delete(
-        containerId: _containerId,
-        relativePath: relativePath,
-      );
-    } catch (e, s) {
-      _logger.warning('Delete $relativePath failed', e, s);
-    }
-  }
-
-  /// Download file from iCloud
-  ///
-  /// - [relativePath] is the path relative to [Paths.doc],
-  /// must not starts with `/`
-  /// - [localPath] has higher priority than [relativePath], but only apply
-  /// to the local path instead of iCloud path
-  ///
-  /// Return `null` if upload success, [ICloudErr] otherwise
-  static Future<ICloudErr?> download({
-    required String relativePath,
-    String? localPath,
-  }) async {
-    final completer = Completer<ICloudErr?>();
-    try {
-      await ICloudStorage.download(
-        containerId: _containerId,
-        relativePath: relativePath,
-        destinationFilePath: localPath ?? '${Paths.doc}/$relativePath',
-        onProgress: (stream) {
-          stream.listen(
-            null,
-            onDone: () => completer.complete(null),
-            onError: (e) => completer.complete(
-              ICloudErr(type: ICloudErrType.generic, message: '$e'),
-            ),
-          );
-        },
-      );
-    } catch (e, s) {
-      _logger.warning('Download $relativePath failed', e, s);
-      completer.complete(ICloudErr(type: ICloudErrType.generic, message: '$e'));
-    }
-    return completer.future;
-  }
-
-  /// Sync file between iCloud and local
-  ///
-  /// - [relativePaths] is the path relative to [Paths.doc],
-  /// must not starts with `/`
-  /// - [bakPrefix] is the suffix of backup file, default to [null].
-  /// All files downloaded from cloud will be suffixed with [bakPrefix].
-  ///
-  /// Return `null` if upload success, [ICloudErr] otherwise
-  static Future<SyncResult<String, ICloudErr>> syncFiles({
-    required Iterable<String> relativePaths,
-    String? bakPrefix,
-  }) async {
-    final uploadFiles = <String>[];
-    final downloadFiles = <String>[];
-
-    try {
-      final errs = <String, ICloudErr>{};
-
-      final allFiles = await getAll();
-
-      /// remove files not in relativePaths
-      allFiles.removeWhere((e) => !relativePaths.contains(e.relativePath));
-
-      final missions = <Future<void>>[];
-
-      /// upload files not in iCloud
-      final missed = relativePaths.where((e) {
-        return !allFiles.any((f) => f.relativePath == e);
-      });
-      missions.addAll(missed.map((e) async {
-        final err = await upload(relativePath: e);
-        if (err != null) {
-          errs[e] = err;
-        }
-      }));
-
-      final docPath = Paths.doc;
-
-      /// compare files in iCloud and local
-      missions.addAll(allFiles.map((file) async {
-        final relativePath = file.relativePath;
-
-        /// Check date
-        final localFile = File('$docPath/$relativePath');
-        if (!localFile.existsSync()) {
-          /// Local file not found, download remote file
-          final err = await download(relativePath: relativePath);
-          if (err != null) {
-            errs[relativePath] = err;
-          }
-          return;
-        }
-        final localDate = await localFile.lastModified();
-        final remoteDate = file.contentChangeDate;
-
-        /// Same date, skip
-        if (remoteDate.difference(localDate) == Duration.zero) return;
-
-        /// Local is newer than remote, so upload local file
-        if (remoteDate.isBefore(localDate)) {
-          await delete(relativePath);
-          final err = await upload(relativePath: relativePath);
-          if (err != null) {
-            errs[relativePath] = err;
-          }
-          uploadFiles.add(relativePath);
-          return;
-        }
-
-        /// Remote is newer than local, so download remote
-        final localPath = '$docPath/${bakPrefix ?? ''}$relativePath';
-        final err = await download(
-          relativePath: relativePath,
-          localPath: localPath,
-        );
-        if (err != null) {
-          errs[relativePath] = err;
-        }
-        downloadFiles.add(relativePath);
-      }));
-
-      await Future.wait(missions);
-
-      return SyncResult(up: uploadFiles, down: downloadFiles, err: errs);
-    } catch (e, s) {
-      _logger.warning('Sync: $relativePaths failed', e, s);
-      return SyncResult(up: uploadFiles, down: downloadFiles, err: {
-        'Generic': ICloudErr(type: ICloudErrType.generic, message: '$e')
-      });
-    } finally {
-      _logger.info('Sync, up: $uploadFiles, down: $downloadFiles');
-    }
-  }
-
-  static Future<void> sync() async {
-    final result = await download(relativePath: Miscs.bakFileName);
-    if (result != null) {
-      await backup();
-      return;
-    }
-
-    final dlFile = await File(Paths.bak).readAsString();
-    final dlBak = await Computer.shared.start(Backup.fromJsonString, dlFile);
-    await dlBak.restore();
-
-    await backup();
-  }
-
-  static Future<void> backup() async {
-    await Backup.backup();
-    final uploadResult = await upload(relativePath: Miscs.bakFileName);
-    if (uploadResult != null) {
-      _logger.warning('Upload backup failed: $uploadResult');
-    } else {
-      _logger.info('Upload backup success');
-    }
-  }
-}

lib/core/utils/sync/webdav.dart

@@ -1,127 +0,0 @@
-import 'dart:io';
-
-import 'package:computer/computer.dart';
-import 'package:fl_lib/fl_lib.dart';
-import 'package:logging/logging.dart';
-import 'package:toolbox/data/model/app/backup.dart';
-import 'package:toolbox/data/model/app/error.dart';
-import 'package:toolbox/data/res/misc.dart';
-import 'package:toolbox/data/res/store.dart';
-import 'package:webdav_client/webdav_client.dart';
-
-abstract final class Webdav {
-  /// Some WebDAV provider only support non-root path
-  static const _prefix = 'srvbox/';
-
-  static var _client = WebdavClient(
-    url: Stores.setting.webdavUrl.fetch(),
-    user: Stores.setting.webdavUser.fetch(),
-    pwd: Stores.setting.webdavPwd.fetch(),
-  );
-
-  static final _logger = Logger('Webdav');
-
-  static Future<String?> test(String url, String user, String pwd) async {
-    final client = WebdavClient(url: url, user: user, pwd: pwd);
-    try {
-      await client.ping();
-      return null;
-    } catch (e, s) {
-      _logger.warning('Test failed', e, s);
-      return e.toString();
-    }
-  }
-
-  static Future<WebdavErr?> upload({
-    required String relativePath,
-    String? localPath,
-  }) async {
-    try {
-      await _client.writeFile(
-        localPath ?? '${Paths.doc}/$relativePath',
-        _prefix + relativePath,
-      );
-    } catch (e, s) {
-      _logger.warning('Upload $relativePath failed', e, s);
-      return WebdavErr(type: WebdavErrType.generic, message: '$e');
-    }
-    return null;
-  }
-
-  static Future<WebdavErr?> delete(String relativePath) async {
-    try {
-      await _client.remove(_prefix + relativePath);
-    } catch (e, s) {
-      _logger.warning('Delete $relativePath failed', e, s);
-      return WebdavErr(type: WebdavErrType.generic, message: '$e');
-    }
-    return null;
-  }
-
-  static Future<WebdavErr?> download({
-    required String relativePath,
-    String? localPath,
-  }) async {
-    try {
-      await _client.readFile(
-        _prefix + relativePath,
-        localPath ?? '${Paths.doc}/$relativePath',
-      );
-    } catch (e) {
-      _logger.warning('Download $relativePath failed');
-      return WebdavErr(type: WebdavErrType.generic, message: '$e');
-    }
-    return null;
-  }
-
-  static Future<List<String>> list() async {
-    try {
-      final list = await _client.readDir(_prefix);
-      final names = <String>[];
-      for (final item in list) {
-        if ((item.isDir ?? true) || item.name == null) continue;
-        names.add(item.name!);
-      }
-      return names;
-    } catch (e, s) {
-      _logger.warning('List failed', e, s);
-      return [];
-    }
-  }
-
-  static void changeClient(String url, String user, String pwd) {
-    _client = WebdavClient(url: url, user: user, pwd: pwd);
-    Stores.setting.webdavUrl.put(url);
-    Stores.setting.webdavUser.put(user);
-    Stores.setting.webdavPwd.put(pwd);
-  }
-
-  static Future<void> sync() async {
-    final result = await download(relativePath: Miscs.bakFileName);
-    if (result != null) {
-      await backup();
-      return;
-    }
-
-    try {
-      final dlFile = await File(Paths.bak).readAsString();
-      final dlBak = await Computer.shared.start(Backup.fromJsonString, dlFile);
-      await dlBak.restore();
-    } catch (e) {
-      _logger.warning('Restore failed: $e');
-    }
-
-    await backup();
-  }
-
-  /// Create a local backup and upload it to WebDAV
-  static Future<void> backup() async {
-    await Backup.backup();
-    final uploadResult = await upload(relativePath: Miscs.bakFileName);
-    if (uploadResult != null) {
-      _logger.warning('Upload failed: $uploadResult');
-    } else {
-      _logger.info('Upload success');
-    }
-  }
-}

lib/data/model/app/backup.dart

@@ -1,198 +0,0 @@
-import 'dart:convert';
-import 'dart:io';
-
-import 'package:fl_lib/fl_lib.dart';
-import 'package:logging/logging.dart';
-import 'package:toolbox/data/model/server/private_key_info.dart';
-import 'package:toolbox/data/model/server/server_private_info.dart';
-import 'package:toolbox/data/model/server/snippet.dart';
-import 'package:toolbox/data/res/misc.dart';
-import 'package:toolbox/data/res/provider.dart';
-import 'package:toolbox/data/res/rebuild.dart';
-import 'package:toolbox/data/res/store.dart';
-
-const backupFormatVersion = 1;
-
-final _logger = Logger('Backup');
-
-class Backup {
-  // backup format version
-  final int version;
-  final String date;
-  final List<ServerPrivateInfo> spis;
-  final List<Snippet> snippets;
-  final List<PrivateKeyInfo> keys;
-  final Map<String, dynamic> container;
-  final Map<String, dynamic> history;
-  final int? lastModTime;
-
-  const Backup({
-    required this.version,
-    required this.date,
-    required this.spis,
-    required this.snippets,
-    required this.keys,
-    required this.container,
-    required this.history,
-    this.lastModTime,
-  });
-
-  Backup.fromJson(Map<String, dynamic> json)
-      : version = json['version'] as int,
-        date = json['date'],
-        spis = (json['spis'] as List)
-            .map((e) => ServerPrivateInfo.fromJson(e))
-            .toList(),
-        snippets =
-            (json['snippets'] as List).map((e) => Snippet.fromJson(e)).toList(),
-        keys = (json['keys'] as List)
-            .map((e) => PrivateKeyInfo.fromJson(e))
-            .toList(),
-        container = json['container'] ?? {},
-        lastModTime = json['lastModTime'],
-        history = json['history'] ?? {};
-
-  Map<String, dynamic> toJson() => {
-        'version': version,
-        'date': date,
-        'spis': spis,
-        'snippets': snippets,
-        'keys': keys,
-        'container': container,
-        'lastModTime': lastModTime,
-        'history': history,
-      };
-
-  Backup.loadFromStore()
-      : version = backupFormatVersion,
-        date = DateTime.now().toString().split('.').firstOrNull ?? '',
-        spis = Stores.server.fetch(),
-        snippets = Stores.snippet.fetch(),
-        keys = Stores.key.fetch(),
-        container = Stores.container.box.toJson(),
-        lastModTime = Stores.lastModTime,
-        history = Stores.history.box.toJson();
-
-  static Future<String> backup([String? name]) async {
-    final result = _diyEncrypt(json.encode(Backup.loadFromStore().toJson()));
-    final path = '${Paths.doc}/${name ?? Miscs.bakFileName}';
-    await File(path).writeAsString(result);
-    return path;
-  }
-
-  Future<void> restore({bool force = false}) async {
-    final curTime = Stores.lastModTime ?? 0;
-    final bakTime = lastModTime ?? 0;
-    final shouldRestore = force || curTime < bakTime;
-    if (!shouldRestore) {
-      _logger.info('No need to restore, local is newer');
-      return;
-    }
-
-    // Snippets
-    final nowSnippets = Stores.snippet.box.keys.toSet();
-    final bakSnippets = snippets.map((e) => e.name).toSet();
-    final newSnippets = bakSnippets.difference(nowSnippets);
-    final delSnippets = nowSnippets.difference(bakSnippets);
-    final updateSnippets = nowSnippets.intersection(bakSnippets);
-    for (final s in newSnippets) {
-      Stores.snippet.box.put(s, snippets.firstWhere((e) => e.name == s));
-    }
-    for (final s in delSnippets) {
-      Stores.snippet.box.delete(s);
-    }
-    for (final s in updateSnippets) {
-      Stores.snippet.box.put(s, snippets.firstWhere((e) => e.name == s));
-    }
-
-    // ServerPrivateInfo
-    final nowSpis = Stores.server.box.keys.toSet();
-    final bakSpis = spis.map((e) => e.id).toSet();
-    final newSpis = bakSpis.difference(nowSpis);
-    final delSpis = nowSpis.difference(bakSpis);
-    final updateSpis = nowSpis.intersection(bakSpis);
-    for (final s in newSpis) {
-      Stores.server.box.put(s, spis.firstWhere((e) => e.id == s));
-    }
-    for (final s in delSpis) {
-      Stores.server.box.delete(s);
-    }
-    for (final s in updateSpis) {
-      Stores.server.box.put(s, spis.firstWhere((e) => e.id == s));
-    }
-
-    // PrivateKeyInfo
-    final nowKeys = Stores.key.box.keys.toSet();
-    final bakKeys = keys.map((e) => e.id).toSet();
-    final newKeys = bakKeys.difference(nowKeys);
-    final delKeys = nowKeys.difference(bakKeys);
-    final updateKeys = nowKeys.intersection(bakKeys);
-    for (final s in newKeys) {
-      Stores.key.box.put(s, keys.firstWhere((e) => e.id == s));
-    }
-    for (final s in delKeys) {
-      Stores.key.box.delete(s);
-    }
-    for (final s in updateKeys) {
-      Stores.key.box.put(s, keys.firstWhere((e) => e.id == s));
-    }
-
-    // History
-    final nowHistory = Stores.history.box.keys.toSet();
-    final bakHistory = history.keys.toSet();
-    final newHistory = bakHistory.difference(nowHistory);
-    final delHistory = nowHistory.difference(bakHistory);
-    final updateHistory = nowHistory.intersection(bakHistory);
-    for (final s in newHistory) {
-      Stores.history.box.put(s, history[s]);
-    }
-    for (final s in delHistory) {
-      Stores.history.box.delete(s);
-    }
-    for (final s in updateHistory) {
-      Stores.history.box.put(s, history[s]);
-    }
-
-    // Container
-    final nowContainer = Stores.container.box.keys.toSet();
-    final bakContainer = container.keys.toSet();
-    final newContainer = bakContainer.difference(nowContainer);
-    final delContainer = nowContainer.difference(bakContainer);
-    final updateContainer = nowContainer.intersection(bakContainer);
-    for (final s in newContainer) {
-      Stores.container.box.put(s, container[s]);
-    }
-    for (final s in delContainer) {
-      Stores.container.box.delete(s);
-    }
-    for (final s in updateContainer) {
-      Stores.container.box.put(s, container[s]);
-    }
-
-    Pros.reload();
-    RebuildNodes.app.rebuild();
-
-    _logger.info('Restore success');
-  }
-
-  Backup.fromJsonString(String raw)
-      : this.fromJson(json.decode(_diyDecrypt(raw)));
-}
-
-String _diyEncrypt(String raw) => json.encode(
-      raw.codeUnits.map((e) => e * 2 + 1).toList(growable: false),
-    );
-
-String _diyDecrypt(String raw) {
-  try {
-    final list = json.decode(raw);
-    final sb = StringBuffer();
-    for (final e in list) {
-      sb.writeCharCode((e - 1) ~/ 2);
-    }
-    return sb.toString();
-  } catch (e, trace) {
-    Loggers.app.warning('Backup decrypt failed', e, trace);
-    rethrow;
-  }
-}

lib/data/model/app/bak/backup.dart

@@ -0,0 +1,237 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:fl_lib/fl_lib.dart';
+import 'package:json_annotation/json_annotation.dart';
+import 'package:logging/logging.dart';
+import 'package:server_box/data/model/server/private_key_info.dart';
+import 'package:server_box/data/model/server/server_private_info.dart';
+import 'package:server_box/data/model/server/snippet.dart';
+import 'package:server_box/data/res/misc.dart';
+import 'package:server_box/data/res/store.dart';
+
+part 'backup.g.dart';
+
+const backupFormatVersion = 1;
+
+final _logger = Logger('Backup');
+
+@JsonSerializable()
+class Backup implements Mergeable {
+  // backup format version
+  final int version;
+  final String date;
+  final List<Spi> spis;
+  final List<Snippet> snippets;
+  final List<PrivateKeyInfo> keys;
+  final Map<String, dynamic> container;
+  final Map<String, dynamic> history;
+  final int? lastModTime;
+  final Map<String, dynamic>? settings;
+
+  const Backup({
+    required this.version,
+    required this.date,
+    required this.spis,
+    required this.snippets,
+    required this.keys,
+    required this.container,
+    required this.history,
+    required this.settings,
+    this.lastModTime,
+  });
+
+  factory Backup.fromJson(Map<String, dynamic> json) => _$BackupFromJson(json);
+
+  Map<String, dynamic> toJson() => _$BackupToJson(this);
+
+  static Future<Backup> loadFromStore() async {
+    final lastModTime = Stores.lastModTime;
+    return Backup(
+      version: backupFormatVersion,
+      date: DateTime.now().toString().split('.').firstOrNull ?? '',
+      spis: Stores.server.fetch(),
+      snippets: Stores.snippet.fetch(),
+      keys: Stores.key.fetch(),
+      container: Stores.container.getAllMap(),
+      lastModTime: lastModTime,
+      history: Stores.history.getAllMap(),
+      settings: Stores.setting.getAllMap(),
+    );
+  }
+
+  static Future<String> backup([String? name]) async {
+    final bak = await Backup.loadFromStore();
+    final result = _diyEncrypt(json.encode(bak.toJson()));
+    final path = Paths.doc.joinPath(name ?? Miscs.bakFileName);
+    await File(path).writeAsString(result);
+    return path;
+  }
+
+  @override
+  Future<void> merge({bool force = false}) async {
+    final curTime = Stores.lastModTime;
+    final bakTime = lastModTime ?? 0;
+    final shouldRestore = force || curTime < bakTime;
+    if (!shouldRestore) {
+      _logger.info('No need to restore, local is newer');
+      return;
+    }
+
+    // Snippets
+    if (force) {
+      for (final s in snippets) {
+        Stores.snippet.box.put(s.name, s);
+      }
+    } else {
+      final nowSnippets = Stores.snippet.box.keys.toSet();
+      final bakSnippets = snippets.map((e) => e.name).toSet();
+      final newSnippets = bakSnippets.difference(nowSnippets);
+      final delSnippets = nowSnippets.difference(bakSnippets);
+      final updateSnippets = nowSnippets.intersection(bakSnippets);
+      for (final s in newSnippets) {
+        Stores.snippet.box.put(s, snippets.firstWhere((e) => e.name == s));
+      }
+      for (final s in delSnippets) {
+        Stores.snippet.box.delete(s);
+      }
+      for (final s in updateSnippets) {
+        Stores.snippet.box.put(s, snippets.firstWhere((e) => e.name == s));
+      }
+    }
+
+    // ServerPrivateInfo
+    if (force) {
+      for (final s in spis) {
+        Stores.server.box.put(s.id, s);
+      }
+    } else {
+      final nowSpis = Stores.server.box.keys.toSet();
+      final bakSpis = spis.map((e) => e.id).toSet();
+      final newSpis = bakSpis.difference(nowSpis);
+      final delSpis = nowSpis.difference(bakSpis);
+      final updateSpis = nowSpis.intersection(bakSpis);
+      for (final s in newSpis) {
+        Stores.server.box.put(s, spis.firstWhere((e) => e.id == s));
+      }
+      for (final s in delSpis) {
+        Stores.server.box.delete(s);
+      }
+      for (final s in updateSpis) {
+        Stores.server.box.put(s, spis.firstWhere((e) => e.id == s));
+      }
+    }
+
+    // PrivateKeyInfo
+    if (force) {
+      for (final s in keys) {
+        Stores.key.box.put(s.id, s);
+      }
+    } else {
+      final nowKeys = Stores.key.box.keys.toSet();
+      final bakKeys = keys.map((e) => e.id).toSet();
+      final newKeys = bakKeys.difference(nowKeys);
+      final delKeys = nowKeys.difference(bakKeys);
+      final updateKeys = nowKeys.intersection(bakKeys);
+      for (final s in newKeys) {
+        Stores.key.box.put(s, keys.firstWhere((e) => e.id == s));
+      }
+      for (final s in delKeys) {
+        Stores.key.box.delete(s);
+      }
+      for (final s in updateKeys) {
+        Stores.key.box.put(s, keys.firstWhere((e) => e.id == s));
+      }
+    }
+
+    // History
+    if (force) {
+      Stores.history.box.putAll(history);
+    } else {
+      final nowHistory = Stores.history.box.keys.toSet();
+      final bakHistory = history.keys.toSet();
+      final newHistory = bakHistory.difference(nowHistory);
+      final delHistory = nowHistory.difference(bakHistory);
+      final updateHistory = nowHistory.intersection(bakHistory);
+      for (final s in newHistory) {
+        Stores.history.box.put(s, history[s]);
+      }
+      for (final s in delHistory) {
+        Stores.history.box.delete(s);
+      }
+      for (final s in updateHistory) {
+        Stores.history.box.put(s, history[s]);
+      }
+    }
+
+    // Container
+    if (force) {
+      Stores.container.box.putAll(container);
+    } else {
+      final nowContainer = Stores.container.box.keys.toSet();
+      final bakContainer = container.keys.toSet();
+      final newContainer = bakContainer.difference(nowContainer);
+      final delContainer = nowContainer.difference(bakContainer);
+      final updateContainer = nowContainer.intersection(bakContainer);
+      for (final s in newContainer) {
+        Stores.container.box.put(s, container[s]);
+      }
+      for (final s in delContainer) {
+        Stores.container.box.delete(s);
+      }
+      for (final s in updateContainer) {
+        Stores.container.box.put(s, container[s]);
+      }
+    }
+
+    // Settings
+    final settings_ = settings;
+    if (settings_ != null) {
+      if (force) {
+        Stores.setting.box.putAll(settings_);
+      } else {
+        final nowSettings = Stores.setting.box.keys.toSet();
+        final bakSettings = settings_.keys.toSet();
+        final newSettings = bakSettings.difference(nowSettings);
+        final delSettings = nowSettings.difference(bakSettings);
+        final updateSettings = nowSettings.intersection(bakSettings);
+        for (final s in newSettings) {
+          Stores.setting.box.put(s, settings_[s]);
+        }
+        for (final s in delSettings) {
+          Stores.setting.box.delete(s);
+        }
+        for (final s in updateSettings) {
+          Stores.setting.box.put(s, settings_[s]);
+        }
+      }
+    }
+
+    Provider.reload();
+    RNodes.app.notify();
+
+    _logger.info('Restore success');
+  }
+
+  factory Backup.fromJsonString(String raw) =>
+      Backup.fromJson(json.decode(_diyDecrypt(raw)));
+}
+
+String _diyEncrypt(String raw) => json.encode(
+      raw.codeUnits.map((e) => e * 2 + 1).toList(growable: false),
+    );
+
+String _diyDecrypt(String raw) {
+  try {
+    final list = json.decode(raw);
+    final sb = StringBuffer();
+    for (final e in list) {
+      sb.writeCharCode((e - 1) ~/ 2);
+    }
+    return sb.toString();
+  } catch (e, trace) {
+    Loggers.app.warning('Backup decrypt failed', e, trace);
+    rethrow;
+  }
+}
+

lib/data/model/app/bak/backup.g.dart

@@ -0,0 +1,37 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'backup.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+Backup _$BackupFromJson(Map<String, dynamic> json) => Backup(
+  version: (json['version'] as num).toInt(),
+  date: json['date'] as String,
+  spis: (json['spis'] as List<dynamic>)
+      .map((e) => Spi.fromJson(e as Map<String, dynamic>))
+      .toList(),
+  snippets: (json['snippets'] as List<dynamic>)
+      .map((e) => Snippet.fromJson(e as Map<String, dynamic>))
+      .toList(),
+  keys: (json['keys'] as List<dynamic>)
+      .map((e) => PrivateKeyInfo.fromJson(e as Map<String, dynamic>))
+      .toList(),
+  container: json['container'] as Map<String, dynamic>,
+  history: json['history'] as Map<String, dynamic>,
+  settings: json['settings'] as Map<String, dynamic>?,
+  lastModTime: (json['lastModTime'] as num?)?.toInt(),
+);
+
+Map<String, dynamic> _$BackupToJson(Backup instance) => <String, dynamic>{
+  'version': instance.version,
+  'date': instance.date,
+  'spis': instance.spis,
+  'snippets': instance.snippets,
+  'keys': instance.keys,
+  'container': instance.container,
+  'history': instance.history,
+  'lastModTime': instance.lastModTime,
+  'settings': instance.settings,
+};

lib/data/model/app/bak/backup2.dart

@@ -0,0 +1,101 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:fl_lib/fl_lib.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:logging/logging.dart';
+import 'package:server_box/data/res/misc.dart';
+import 'package:server_box/data/res/store.dart';
+
+part 'backup2.freezed.dart';
+part 'backup2.g.dart';
+
+final _loggerV2 = Logger('BackupV2');
+
+@freezed
+abstract class BackupV2 with _$BackupV2 implements Mergeable {
+  const BackupV2._();
+
+  /// Construct a backup with the latest format (v2).
+  ///
+  /// All `Map<String, dynamic>` are:
+  /// ```json
+  /// {
+  ///   "key1": Model{},
+  ///   "_lastModTime": {
+  ///     "key1": 1234567890,
+  ///   },
+  /// }
+  /// ```
+  const factory BackupV2({
+    required int version,
+    required int date,
+    required Map<String, Object?> spis,
+    required Map<String, Object?> snippets,
+    required Map<String, Object?> keys,
+    required Map<String, Object?> container,
+    required Map<String, Object?> history,
+    required Map<String, Object?> settings,
+  }) = _BackupV2;
+
+  factory BackupV2.fromJson(Map<String, dynamic> json) => _$BackupV2FromJson(json);
+
+  @override
+  Future<void> merge({bool force = false}) async {
+    _loggerV2.info('Merging...');
+
+    // Merge each store
+    await Mergeable.mergeStore(backupData: spis, store: Stores.server, force: force);
+    await Mergeable.mergeStore(backupData: snippets, store: Stores.snippet, force: force);
+    await Mergeable.mergeStore(backupData: keys, store: Stores.key, force: force);
+    await Mergeable.mergeStore(backupData: container, store: Stores.container, force: force);
+    await Mergeable.mergeStore(backupData: history, store: Stores.history, force: force);
+    await Mergeable.mergeStore(backupData: settings, store: Stores.setting, force: force);
+
+    // Reload providers and notify listeners
+    Provider.reload();
+    RNodes.app.notify();
+
+    _loggerV2.info('Merge completed');
+  }
+
+  static const formatVer = 2;
+
+  static Future<BackupV2> loadFromStore() async {
+    return BackupV2(
+      version: formatVer,
+      date: DateTimeX.timestamp,
+      spis: Stores.server.getAllMap(includeInternalKeys: true),
+      snippets: Stores.snippet.getAllMap(includeInternalKeys: true),
+      keys: Stores.key.getAllMap(includeInternalKeys: true),
+      container: Stores.container.getAllMap(includeInternalKeys: true),
+      history: Stores.history.getAllMap(includeInternalKeys: true),
+      settings: Stores.setting.getAllMap(includeInternalKeys: true),
+    );
+  }
+
+  static Future<String> backup([String? name, String? password]) async {
+    final bak = await BackupV2.loadFromStore();
+    var result = json.encode(bak.toJson());
+
+    if (password != null && password.isNotEmpty) {
+      result = Cryptor.encrypt(result, password);
+    }
+    
+    final path = Paths.doc.joinPath(name ?? Miscs.bakFileName);
+    await File(path).writeAsString(result);
+    return path;
+  }
+
+  factory BackupV2.fromJsonString(String jsonString, [String? password]) {
+    if (Cryptor.isEncrypted(jsonString)) {
+      if (password == null || password.isEmpty) {
+        throw Exception('Backup is encrypted but no password provided');
+      }
+      jsonString = Cryptor.decrypt(jsonString, password);
+    }
+    
+    final map = json.decode(jsonString) as Map<String, dynamic>;
+    return BackupV2.fromJson(map);
+  }
+}

lib/data/model/app/bak/backup2.freezed.dart

@@ -0,0 +1,205 @@
+// dart format width=80
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'backup2.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+
+/// @nodoc
+mixin _$BackupV2 {
+
+ int get version; int get date; Map<String, Object?> get spis; Map<String, Object?> get snippets; Map<String, Object?> get keys; Map<String, Object?> get container; Map<String, Object?> get history; Map<String, Object?> get settings;
+/// Create a copy of BackupV2
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$BackupV2CopyWith<BackupV2> get copyWith => _$BackupV2CopyWithImpl<BackupV2>(this as BackupV2, _$identity);
+
+  /// Serializes this BackupV2 to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is BackupV2&&(identical(other.version, version) || other.version == version)&&(identical(other.date, date) || other.date == date)&&const DeepCollectionEquality().equals(other.spis, spis)&&const DeepCollectionEquality().equals(other.snippets, snippets)&&const DeepCollectionEquality().equals(other.keys, keys)&&const DeepCollectionEquality().equals(other.container, container)&&const DeepCollectionEquality().equals(other.history, history)&&const DeepCollectionEquality().equals(other.settings, settings));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,version,date,const DeepCollectionEquality().hash(spis),const DeepCollectionEquality().hash(snippets),const DeepCollectionEquality().hash(keys),const DeepCollectionEquality().hash(container),const DeepCollectionEquality().hash(history),const DeepCollectionEquality().hash(settings));
+
+@override
+String toString() {
+  return 'BackupV2(version: $version, date: $date, spis: $spis, snippets: $snippets, keys: $keys, container: $container, history: $history, settings: $settings)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $BackupV2CopyWith<$Res>  {
+  factory $BackupV2CopyWith(BackupV2 value, $Res Function(BackupV2) _then) = _$BackupV2CopyWithImpl;
+@useResult
+$Res call({
+ int version, int date, Map<String, Object?> spis, Map<String, Object?> snippets, Map<String, Object?> keys, Map<String, Object?> container, Map<String, Object?> history, Map<String, Object?> settings
+});
+
+
+
+
+}
+/// @nodoc
+class _$BackupV2CopyWithImpl<$Res>
+    implements $BackupV2CopyWith<$Res> {
+  _$BackupV2CopyWithImpl(this._self, this._then);
+
+  final BackupV2 _self;
+  final $Res Function(BackupV2) _then;
+
+/// Create a copy of BackupV2
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? version = null,Object? date = null,Object? spis = null,Object? snippets = null,Object? keys = null,Object? container = null,Object? history = null,Object? settings = null,}) {
+  return _then(_self.copyWith(
+version: null == version ? _self.version : version // ignore: cast_nullable_to_non_nullable
+as int,date: null == date ? _self.date : date // ignore: cast_nullable_to_non_nullable
+as int,spis: null == spis ? _self.spis : spis // ignore: cast_nullable_to_non_nullable
+as Map<String, Object?>,snippets: null == snippets ? _self.snippets : snippets // ignore: cast_nullable_to_non_nullable
+as Map<String, Object?>,keys: null == keys ? _self.keys : keys // ignore: cast_nullable_to_non_nullable
+as Map<String, Object?>,container: null == container ? _self.container : container // ignore: cast_nullable_to_non_nullable
+as Map<String, Object?>,history: null == history ? _self.history : history // ignore: cast_nullable_to_non_nullable
+as Map<String, Object?>,settings: null == settings ? _self.settings : settings // ignore: cast_nullable_to_non_nullable
+as Map<String, Object?>,
+  ));
+}
+
+}
+
+
+/// @nodoc
+@JsonSerializable()
+
+class _BackupV2 extends BackupV2 {
+  const _BackupV2({required this.version, required this.date, required final  Map<String, Object?> spis, required final  Map<String, Object?> snippets, required final  Map<String, Object?> keys, required final  Map<String, Object?> container, required final  Map<String, Object?> history, required final  Map<String, Object?> settings}): _spis = spis,_snippets = snippets,_keys = keys,_container = container,_history = history,_settings = settings,super._();
+  factory _BackupV2.fromJson(Map<String, dynamic> json) => _$BackupV2FromJson(json);
+
+@override final  int version;
+@override final  int date;
+ final  Map<String, Object?> _spis;
+@override Map<String, Object?> get spis {
+  if (_spis is EqualUnmodifiableMapView) return _spis;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableMapView(_spis);
+}
+
+ final  Map<String, Object?> _snippets;
+@override Map<String, Object?> get snippets {
+  if (_snippets is EqualUnmodifiableMapView) return _snippets;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableMapView(_snippets);
+}
+
+ final  Map<String, Object?> _keys;
+@override Map<String, Object?> get keys {
+  if (_keys is EqualUnmodifiableMapView) return _keys;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableMapView(_keys);
+}
+
+ final  Map<String, Object?> _container;
+@override Map<String, Object?> get container {
+  if (_container is EqualUnmodifiableMapView) return _container;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableMapView(_container);
+}
+
+ final  Map<String, Object?> _history;
+@override Map<String, Object?> get history {
+  if (_history is EqualUnmodifiableMapView) return _history;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableMapView(_history);
+}
+
+ final  Map<String, Object?> _settings;
+@override Map<String, Object?> get settings {
+  if (_settings is EqualUnmodifiableMapView) return _settings;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableMapView(_settings);
+}
+
+
+/// Create a copy of BackupV2
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$BackupV2CopyWith<_BackupV2> get copyWith => __$BackupV2CopyWithImpl<_BackupV2>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$BackupV2ToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _BackupV2&&(identical(other.version, version) || other.version == version)&&(identical(other.date, date) || other.date == date)&&const DeepCollectionEquality().equals(other._spis, _spis)&&const DeepCollectionEquality().equals(other._snippets, _snippets)&&const DeepCollectionEquality().equals(other._keys, _keys)&&const DeepCollectionEquality().equals(other._container, _container)&&const DeepCollectionEquality().equals(other._history, _history)&&const DeepCollectionEquality().equals(other._settings, _settings));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,version,date,const DeepCollectionEquality().hash(_spis),const DeepCollectionEquality().hash(_snippets),const DeepCollectionEquality().hash(_keys),const DeepCollectionEquality().hash(_container),const DeepCollectionEquality().hash(_history),const DeepCollectionEquality().hash(_settings));
+
+@override
+String toString() {
+  return 'BackupV2(version: $version, date: $date, spis: $spis, snippets: $snippets, keys: $keys, container: $container, history: $history, settings: $settings)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$BackupV2CopyWith<$Res> implements $BackupV2CopyWith<$Res> {
+  factory _$BackupV2CopyWith(_BackupV2 value, $Res Function(_BackupV2) _then) = __$BackupV2CopyWithImpl;
+@override @useResult
+$Res call({
+ int version, int date, Map<String, Object?> spis, Map<String, Object?> snippets, Map<String, Object?> keys, Map<String, Object?> container, Map<String, Object?> history, Map<String, Object?> settings
+});
+
+
+
+
+}
+/// @nodoc
+class __$BackupV2CopyWithImpl<$Res>
+    implements _$BackupV2CopyWith<$Res> {
+  __$BackupV2CopyWithImpl(this._self, this._then);
+
+  final _BackupV2 _self;
+  final $Res Function(_BackupV2) _then;
+
+/// Create a copy of BackupV2
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? version = null,Object? date = null,Object? spis = null,Object? snippets = null,Object? keys = null,Object? container = null,Object? history = null,Object? settings = null,}) {
+  return _then(_BackupV2(
+version: null == version ? _self.version : version // ignore: cast_nullable_to_non_nullable
+as int,date: null == date ? _self.date : date // ignore: cast_nullable_to_non_nullable
+as int,spis: null == spis ? _self._spis : spis // ignore: cast_nullable_to_non_nullable
+as Map<String, Object?>,snippets: null == snippets ? _self._snippets : snippets // ignore: cast_nullable_to_non_nullable
+as Map<String, Object?>,keys: null == keys ? _self._keys : keys // ignore: cast_nullable_to_non_nullable
+as Map<String, Object?>,container: null == container ? _self._container : container // ignore: cast_nullable_to_non_nullable
+as Map<String, Object?>,history: null == history ? _self._history : history // ignore: cast_nullable_to_non_nullable
+as Map<String, Object?>,settings: null == settings ? _self._settings : settings // ignore: cast_nullable_to_non_nullable
+as Map<String, Object?>,
+  ));
+}
+
+
+}
+
+// dart format on

lib/data/model/app/bak/backup2.g.dart

@@ -0,0 +1,29 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'backup2.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_BackupV2 _$BackupV2FromJson(Map<String, dynamic> json) => _BackupV2(
+  version: (json['version'] as num).toInt(),
+  date: (json['date'] as num).toInt(),
+  spis: json['spis'] as Map<String, dynamic>,
+  snippets: json['snippets'] as Map<String, dynamic>,
+  keys: json['keys'] as Map<String, dynamic>,
+  container: json['container'] as Map<String, dynamic>,
+  history: json['history'] as Map<String, dynamic>,
+  settings: json['settings'] as Map<String, dynamic>,
+);
+
+Map<String, dynamic> _$BackupV2ToJson(_BackupV2 instance) => <String, dynamic>{
+  'version': instance.version,
+  'date': instance.date,
+  'spis': instance.spis,
+  'snippets': instance.snippets,
+  'keys': instance.keys,
+  'container': instance.container,
+  'history': instance.history,
+  'settings': instance.settings,
+};

lib/data/model/app/bak/backup_service.dart

@@ -0,0 +1,198 @@
+import 'package:computer/computer.dart';
+import 'package:fl_lib/fl_lib.dart';
+import 'package:flutter/material.dart';
+import 'package:server_box/core/extension/context/locale.dart';
+import 'package:server_box/data/model/app/bak/backup2.dart';
+import 'package:server_box/data/model/app/bak/backup_source.dart';
+import 'package:server_box/data/model/app/bak/utils.dart';
+import 'package:server_box/data/res/store.dart';
+
+/// Service class for handling backup operations
+class BackupService {
+  /// Perform backup operation with the given source
+  static Future<void> backup(BuildContext context, BackupSource source) async {
+    final password = await _getBackupPassword(context);
+    if (password == null) return;
+
+    try {
+      final path = await BackupV2.backup(null, password.isEmpty ? null : password);
+      await source.saveContent(path);
+
+      // Show success message for clipboard source
+      if (source is ClipboardBackupSource) {
+        context.showSnackBar(libL10n.success);
+      }
+    } catch (e, s) {
+      context.showErrDialog(e, s, libL10n.backup);
+    }
+  }
+
+  /// Perform restore operation with the given source
+  static Future<void> restore(BuildContext context, BackupSource source) async {
+    final text = await source.getContent();
+    if (text == null) {
+      // Show empty message for clipboard source
+      if (source is ClipboardBackupSource) {
+        context.showSnackBar(libL10n.empty);
+      }
+      return;
+    }
+
+    await restoreFromText(context, text);
+  }
+
+  /// Handle password dialog for backup operations
+  static Future<String?> _getBackupPassword(BuildContext context) async {
+    final savedPassword = await Stores.setting.backupasswd.read();
+    String? password;
+
+    if (savedPassword != null && savedPassword.isNotEmpty) {
+      // Use saved password or ask for custom password
+      final useCustom = await context.showRoundDialog<bool>(
+        title: l10n.backupPassword,
+        child: Text(l10n.backupPasswordTip),
+        actions: [
+          Btn.cancel(),
+          TextButton(onPressed: () => context.pop(false), child: Text(l10n.backupPasswordSet)),
+          TextButton(onPressed: () => context.pop(true), child: Text(libL10n.custom)),
+        ],
+      );
+
+      if (useCustom == null) return null;
+
+      if (useCustom) {
+        password = await _showPasswordDialog(context, initial: savedPassword);
+      } else {
+        password = savedPassword;
+      }
+    } else {
+      // No saved password, ask if user wants to set one
+      password = await _showPasswordDialog(context);
+    }
+
+    return password;
+  }
+
+  /// Handle restore from text with decryption support
+  static Future<void> restoreFromText(BuildContext context, String text) async {
+    // Check if backup is encrypted
+    final isEncrypted = Cryptor.isEncrypted(text);
+    String? password;
+
+    if (!isEncrypted) {
+      try {
+        final (backup, err) = await context.showLoadingDialog(
+          fn: () => Computer.shared.start(MergeableUtils.fromJsonString, text),
+        );
+        if (err != null || backup == null) return;
+
+        await _confirmAndRestore(context, backup);
+      } catch (e, s) {
+        Loggers.app.warning('Import backup failed', e, s);
+        context.showErrDialog(e, s, libL10n.restore);
+      }
+      return;
+    }
+
+    // Try with saved password first
+    final savedPassword = await Stores.setting.backupasswd.read();
+    if (savedPassword != null && savedPassword.isNotEmpty) {
+      try {
+        final (backup, err) = await context.showLoadingDialog(
+          fn: () => Computer.shared.start((args) => MergeableUtils.fromJsonString(args.$1, args.$2), (
+            text,
+            savedPassword,
+          )),
+        );
+        if (err == null && backup != null) {
+          await _confirmAndRestore(context, backup);
+          return;
+        }
+      } catch (e) {
+        // Saved password failed, will prompt for manual input
+      }
+    }
+
+    // Prompt for password with retry logic
+    while (true) {
+      password = await _showPasswordDialog(context, title: libL10n.pwd, hint: l10n.backupEncrypted);
+      if (password == null) return; // User cancelled
+
+      try {
+        final (backup, err) = await context.showLoadingDialog(
+          fn: () => Computer.shared.start((args) => MergeableUtils.fromJsonString(args.$1, args.$2), (
+            text,
+            password,
+          )),
+        );
+        if (err != null || backup == null) continue;
+
+        await _confirmAndRestore(context, backup);
+        return;
+      } catch (e) {
+        if (e.toString().contains('incorrect password') || e.toString().contains('Failed to decrypt')) {
+          final retry = await context.showRoundDialog<bool>(
+            title: l10n.backupPasswordWrong,
+            child: Text(l10n.backupPasswordWrong),
+            actions: [
+              TextButton(onPressed: () => context.pop(false), child: Text(libL10n.cancel)),
+              TextButton(onPressed: () => context.pop(true), child: Text(libL10n.retry)),
+            ],
+          );
+          if (retry != true) return;
+          continue; // Try again
+        } else {
+          // Other error, show and exit
+          context.showErrDialog(e, null, libL10n.restore);
+          return;
+        }
+      }
+    }
+  }
+
+  /// Confirm and execute restore operation
+  static Future<void> _confirmAndRestore(BuildContext context, (dynamic, String) backup) async {
+    await context.showRoundDialog(
+      title: libL10n.restore,
+      child: Text(libL10n.askContinue('${libL10n.restore} ${libL10n.backup}(${backup.$2})')),
+      actions: Btn.ok(
+        onTap: () async {
+          await backup.$1.merge(force: true);
+          context.pop();
+        },
+      ).toList,
+    );
+  }
+
+  /// Show password input dialog
+  static Future<String?> _showPasswordDialog(
+    BuildContext context, {
+    String? initial,
+    String? title,
+    String? hint,
+  }) async {
+    final controller = TextEditingController(text: initial ?? '');
+    final result = await context.showRoundDialog<String>(
+      title: title ?? libL10n.pwd,
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Text(hint ?? l10n.backupPasswordTip, style: UIs.textGrey),
+          UIs.height13,
+          Input(
+            label: l10n.backupPassword,
+            controller: controller,
+            obscureText: true,
+            onSubmitted: (_) => context.pop(controller.text),
+          ),
+        ],
+      ),
+      actions: [
+        Btn.cancel(),
+        TextButton(onPressed: () => context.pop(controller.text), child: Text(libL10n.ok)),
+      ],
+    );
+    controller.dispose();
+    return result;
+  }
+}