fix: ci

* opt: window title bar

* rm: `VirtualWindowFrame` on `SettingsPage`

.github/FUNDING.yml

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

.github/workflows/release.yml

@@ -9,19 +9,17 @@ 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.22.2'
+          flutter-version: '3.27.3'
       - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
@@ -31,7 +29,7 @@ jobs:
           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
@@ -44,7 +42,42 @@ jobs:
             build/app/outputs/flutter-apk/${{ env.APP_NAME }}_v1.0.${{ env.BUILD_NUMBER }}_arm64.apk
             build/app/outputs/flutter-apk/${{ env.APP_NAME }}_v1.0.${{ env.BUILD_NUMBER }}_arm.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
+          # App Specific
+          sudo apt install -y libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libunwind-dev
+          # Packaging
+          sudo apt install -y rpm patchelf
+      - name: Build
+        run: |
+          dart run fl_build
+          dart run flutter_distributor:main release --name linux --skip-clean
+      - name: Rename artifacts
+        run: |
+          deb_name=$(ls dist/*/*.deb)
+          mv $deb_name ${{ env.APP_NAME }}_${{ env.BUILD_NUMBER }}_amd64.deb
+          rpm_name=$(ls dist/*/*.rpm)
+          mv $rpm_name ${{ env.APP_NAME }}_${{ env.BUILD_NUMBER }}_amd64.rpm
+      - name: Create Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: |
+            ${{ env.APP_NAME }}_${{ env.BUILD_NUMBER }}_amd64.deb
+            ${{ env.APP_NAME }}_${{ env.BUILD_NUMBER }}_amd64.rpm
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -54,8 +87,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: '0'
       - name: Install Flutter
         uses: subosito/flutter-action@v2
       - name: Build

.gitignore

@@ -46,6 +46,7 @@ app.*.map.json
 /android/app/release
 
 /android/app/fjy.androidstudio.key
+/android/app/app.key
 /release
 test.dart
 

.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,51 +2,54 @@ 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="license" src="https://img.shields.io/badge/license-GPLv3-pink">
+  <img alt="lang" src="https://img.shields.io/badge/lang-dart-cyan">
-</p>
+  <img alt="license" src="https://img.shields.io/badge/license-GPLv3-yellow">
+</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**
+<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>
 
-[iOS & macOS](https://apps.apple.com/app/id1586449703) / [Android & Linux & Windows](https://github.com/lollipopkit/flutter_server_box/releases)
 
-- All deprecated versions before `v930` can be found in [here](https://cdn.lolli.tech/serverbox/?sort=time&order=desc&layout=grid).
+## 📥 Install
-- To prevent injection attacks and etc., please don't download from untrusted sources. eg: Gitee release is not related to this project.
+
+| 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`...
 - 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://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).
 
@@ -59,8 +62,16 @@ After you read the above, you can open an [issue](https://github.com/lollipopkit
 
 
 ## 🧱 Contribution
-- Any positive contribution is welcome.
+Any positive contribution is welcome.
-- [l10n guide](https://blog.lolli.tech/faq/) can be found in my blog.
+
+### 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

README_zh.md

@@ -2,71 +2,77 @@
 
 <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="license" src="https://img.shields.io/badge/license-GPLv3-pink">
+  <img alt="语言" src="https://img.shields.io/badge/语言-dart-cyan">
-</p>
+  <img alt="license" src="https://img.shields.io/badge/证书-GPLv3-yellow">
+</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
+## 🏙️ 截屏
-🎉 **现在 `Android / Linux / Windows` 版本使用 GitHub Actions 构建**。
+<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>
 
-[iOS & macOS](https://apps.apple.com/app/id1586449703) / [Android & Linux & Windows](https://github.com/lollipopkit/flutter_server_box/releases)
 
-- 所有 `v930` 之前的版本可以在 [这里](https://cdn.lolli.tech/serverbox/?sort=time&order=desc&layout=grid) 找到。
+## 📥 安装
-- 为了防止注入攻击等，请不要从不受信任的来源下载。例如：Gitee 的发行包与该项目无关。
+
+平台            | 下载
+----------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+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` 管理...
 - 特殊支持：`生物认证`、`推送`、`桌面小部件`、`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://t.me/lpktg"><img alt="donate" src="https://img.shields.io/badge/Telegram-lpktg-green"></a>
-- **常见问题**可以在 [app wiki](https://github.com/lollipopkit/flutter_server_box/wiki/主页) 查看。
+  <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 的 第三方全平台客户端。

analysis_options.yaml

@@ -30,14 +30,19 @@ 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
 
 # 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.
@@ -87,10 +86,12 @@ android {
 
         debug {
             applicationIdSuffix '.debug'
+            resValue "string", "app_name", "SrvBxD"
         }
 
         profile {
             applicationIdSuffix '.debug'
+            resValue "string", "app_name", "SrvBxP"
         }
     }
 }

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,12 +11,13 @@
     <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:hasFragileUserData="true"
-        android:restoreAnyVersion="true">
+        android:restoreAnyVersion="true"
+        tools:targetApi="q">
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -29,12 +31,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 +45,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 +64,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 +78,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/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,5 +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
-distributionSha256Sum=6001aba9b2204d26fa25a5800bb9382cf3ee01ccb78fe77317b2872336eb2f80

android/settings.gradle

@@ -19,7 +19,7 @@ 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
 }
 

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

ios/Podfile.lock

@@ -1,24 +1,31 @@
 PODS:
-  - device_info_plus (0.0.1):
+  - app_links (0.0.2):
+    - Flutter
+  - camera_avfoundation (0.0.1):
     - Flutter
   - file_picker (0.0.1):
     - Flutter
   - Flutter (1.0.0)
-  - flutter_background_service_ios (0.0.3):
+  - flutter_inappwebview_ios (0.0.1):
     - Flutter
-  - flutter_native_splash (0.0.1):
+    - flutter_inappwebview_ios/Core (= 0.0.1)
+    - OrderedSet (~> 6.0.3)
+  - flutter_inappwebview_ios/Core (0.0.1):
+    - Flutter
+    - OrderedSet (~> 6.0.3)
+  - flutter_native_splash (2.4.3):
     - Flutter
   - icloud_storage (0.0.1):
     - Flutter
   - local_auth_darwin (0.0.1):
     - Flutter
+    - FlutterMacOS
+  - OrderedSet (6.0.3)
   - 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):
@@ -34,16 +41,16 @@ PODS:
     - Flutter
 
 DEPENDENCIES:
-  - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
+  - app_links (from `.symlinks/plugins/app_links/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_inappwebview_ios (from `.symlinks/plugins/flutter_inappwebview_ios/ios`)
   - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/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`)
@@ -51,15 +58,21 @@ DEPENDENCIES:
   - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
   - watch_connectivity (from `.symlinks/plugins/watch_connectivity/ios`)
 
+SPEC REPOS:
+  trunk:
+    - OrderedSet
+
 EXTERNAL SOURCES:
-  device_info_plus:
+  app_links:
-    :path: ".symlinks/plugins/device_info_plus/ios"
+    :path: ".symlinks/plugins/app_links/ios"
+  camera_avfoundation:
+    :path: ".symlinks/plugins/camera_avfoundation/ios"
   file_picker:
     :path: ".symlinks/plugins/file_picker/ios"
   Flutter:
     :path: Flutter
-  flutter_background_service_ios:
+  flutter_inappwebview_ios:
-    :path: ".symlinks/plugins/flutter_background_service_ios/ios"
+    :path: ".symlinks/plugins/flutter_inappwebview_ios/ios"
   flutter_native_splash:
     :path: ".symlinks/plugins/flutter_native_splash/ios"
   icloud_storage:
@@ -70,8 +83,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:
@@ -86,18 +97,19 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/watch_connectivity/ios"
 
 SPEC CHECKSUMS:
-  device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d
+  app_links: e7a6750a915a9e161c58d91bc610e8cd1d4d0ad0
+  camera_avfoundation: dd002b0330f4981e1bbcb46ae9b62829237459a4
   file_picker: c79185e70b9b45728cde2a8d8da454e0cb43f287
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_background_service_ios: e30e0d3ee69e4cee66272d0c78eacd48c2e94aac
+  flutter_inappwebview_ios: 6f63631e2c62a7c350263b13fa5427aedefe81d4
-  flutter_native_splash: edf599c81f74d093a4daf8e17bd7a018854bc778
+  flutter_native_splash: e8a1e01082d97a8099d973f919f57904c925008a
   icloud_storage: d9ac7a33ced81df08ba7ea1bf3099cc0ee58f60a
-  local_auth_darwin: 4d56c90c2683319835a61274b57620df9c4520ab
+  local_auth_darwin: 66e40372f1c29f383a314c738c7446e2f7fdadc3
-  package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
+  OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
+  package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
-  permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
   plain_notification_token: b36467dc91939a7b6754267c701bbaca14996ee1
-  share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
+  share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
   url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
   wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1
@@ -105,4 +117,4 @@ SPEC CHECKSUMS:
 
 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 = 992;
+				CURRENT_PROJECT_VERSION = 1128;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -700,7 +682,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.992;
+				MARKETING_VERSION = 1.0.1128;
 				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 = 992;
+				CURRENT_PROJECT_VERSION = 1128;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -836,7 +818,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.992;
+				MARKETING_VERSION = 1.0.1128;
 				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 = 992;
+				CURRENT_PROJECT_VERSION = 1128;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -864,7 +846,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.992;
+				MARKETING_VERSION = 1.0.1128;
 				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 = 992;
+				CURRENT_PROJECT_VERSION = 1128;
 				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.992;
+				MARKETING_VERSION = 1.0.1128;
 				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 = 992;
+				CURRENT_PROJECT_VERSION = 1128;
 				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.992;
+				MARKETING_VERSION = 1.0.1128;
 				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 = 992;
+				CURRENT_PROJECT_VERSION = 1128;
 				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.992;
+				MARKETING_VERSION = 1.0.1128;
 				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 = 992;
+				CURRENT_PROJECT_VERSION = 1128;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_PREVIEWS = YES;
@@ -1008,7 +990,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.992;
+				MARKETING_VERSION = 1.0.1128;
 				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 = 992;
+				CURRENT_PROJECT_VERSION = 1128;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_PREVIEWS = YES;
@@ -1049,7 +1031,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.992;
+				MARKETING_VERSION = 1.0.1128;
 				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 = 992;
+				CURRENT_PROJECT_VERSION = 1128;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_PREVIEWS = YES;
@@ -1087,7 +1069,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.992;
+				MARKETING_VERSION = 1.0.1128;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd;
 				PRODUCT_NAME = ServerBox;

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>

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,13 @@
 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:server_box/core/extension/context/locale.dart';
 import 'package:server_box/data/res/build_data.dart';
 import 'package:server_box/data/res/rebuild.dart';
 import 'package:server_box/data/res/store.dart';
+import 'package:server_box/generated/l10n/l10n.dart';
 import 'package:server_box/view/page/home/home.dart';
 import 'package:icons_plus/icons_plus.dart';
 
@@ -22,8 +23,22 @@ class MyApp extends StatelessWidget {
       listenable: RNodes.app,
       builder: (context, _) {
         if (!Stores.setting.useSystemPrimaryColor.fetch()) {
-          UIs.colorSeed = Color(Stores.setting.primaryColor.fetch());
+          final colorSeed = Color(Stores.setting.colorSeed.fetch());
-          return _buildApp(context);
+          UIs.colorSeed = colorSeed;
+          // Past code uses [UIs.primaryColor] as the primary color
+          UIs.primaryColor = colorSeed;
+          return _buildApp(
+            context,
+            light: ThemeData(
+              useMaterial3: true,
+              colorSchemeSeed: UIs.colorSeed,
+            ),
+            dark: ThemeData(
+              useMaterial3: true,
+              brightness: Brightness.dark,
+              colorSchemeSeed: UIs.colorSeed,
+            ),
+          );
         }
         return DynamicColorBuilder(
           builder: (light, dark) {
@@ -36,10 +51,10 @@ class MyApp extends StatelessWidget {
               brightness: Brightness.dark,
               colorScheme: dark,
             );
-            if (context.isDark && light != null) {
+            if (context.isDark && dark != null) {
-              UIs.primaryColor = light.primary;
-            } else 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);
           },
@@ -48,7 +63,8 @@ class MyApp extends StatelessWidget {
     );
   }
 
-  Widget _buildApp(BuildContext ctx, {ThemeData? light, ThemeData? dark}) {
+  Widget _buildApp(BuildContext ctx,
+      {required ThemeData light, required ThemeData dark}) {
     final tMode = Stores.setting.themeMode.fetch();
     // Issue #57
     final themeMode = switch (tMode) {
@@ -58,17 +74,8 @@ 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),
       locale: locale,
       localizationsDelegates: const [
         LibLocalizations.delegate,
@@ -76,41 +83,29 @@ class MyApp extends StatelessWidget {
       ],
       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: VirtualWindowFrame(
+        child: Builder(
+          builder: (context) {
+            context.setLibL10n();
+            final appL10n = AppLocalizations.of(context);
+            if (appL10n != null) l10n = appL10n;
+
+            final intros = _IntroPage.builders;
+            if (intros.isNotEmpty) {
+              return _IntroPage(intros);
+            }
+
+            return const HomePage();
+          },
+        ),
+      ),
     );
   }
-
-  Widget _buildAppContent(BuildContext ctx) {
-    //if (Pros.app.isWearOS) return const WearHome();
-    return const _AppContent(
-      intro: _IntroPage(),
-      child: HomePage(),
-    );
-  }
-}
-
-/// It's used for init settings related to [BuildContext]
-final class _AppContent extends StatelessWidget {
-  final Widget child;
-  final Widget intro;
-
-  const _AppContent({required this.child, required this.intro});
-
-  @override
-  Widget build(BuildContext context) {
-    context.setLibL10n();
-    final appL10n = AppLocalizations.of(context);
-    if (appL10n != null) l10n = appL10n;
-
-    final showIntro = Stores.setting.showIntro.fetch();
-    if (showIntro) return intro;
-
-    return child;
-  }
 }
 
 void _setup(BuildContext context) async {

lib/core/chan.dart

@@ -0,0 +1,27 @@
+import 'package:flutter/services.dart';
+import 'package:server_box/data/res/misc.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 (!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:server_box/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:server_box/data/res/misc.dart';
-import 'package:server_box/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:server_box/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,4 @@
-import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:server_box/generated/l10n/l10n.dart';
-import 'package:flutter_gen/gen_l10n/l10n_en.dart';
+import 'package:server_box/generated/l10n/l10n_en.dart';
 
 AppLocalizations l10n = AppLocalizationsEn();

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: RWX(
+        r: userRead,
+        w: userWrite,
+        x: userExecute,
+      ),
+      group: RWX(
+        r: groupRead,
+        w: groupWrite,
+        x: groupExecute,
+      ),
+      other: RWX(
+        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,18 +1,13 @@
-import 'package:fl_lib/fl_lib.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.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/res/build_data.dart';
-import 'package:server_box/data/res/provider.dart';
 import 'package:server_box/data/res/store.dart';
-import 'package:server_box/view/page/backup.dart';
 import 'package:server_box/view/page/container.dart';
 import 'package:server_box/view/page/home/home.dart';
 import 'package:server_box/view/page/iperf.dart';
 import 'package:server_box/view/page/ping.dart';
 import 'package:server_box/view/page/private_key/edit.dart';
-import 'package:server_box/view/page/private_key/list.dart';
 import 'package:server_box/view/page/pve.dart';
 import 'package:server_box/view/page/server/detail/view.dart';
 import 'package:server_box/view/page/setting/platform/android.dart';
@@ -21,20 +16,14 @@ import 'package:server_box/view/page/setting/seq/srv_func_seq.dart';
 import 'package:server_box/view/page/snippet/result.dart';
 import 'package:server_box/view/page/ssh/page.dart';
 import 'package:server_box/view/page/setting/seq/virt_key.dart';
-import 'package:server_box/view/page/storage/local.dart';
+import 'package:server_box/data/model/server/snippet.dart';
-
+import 'package:server_box/view/page/process.dart';
-import '../data/model/server/snippet.dart';
+import 'package:server_box/view/page/server/tab.dart';
-import '../view/page/editor.dart';
+import 'package:server_box/view/page/setting/seq/srv_detail_seq.dart';
-import '../view/page/process.dart';
+import 'package:server_box/view/page/setting/seq/srv_seq.dart';
-import '../view/page/server/edit.dart';
+import 'package:server_box/view/page/snippet/edit.dart';
-import '../view/page/server/tab.dart';
+import 'package:server_box/view/page/storage/sftp.dart';
-import '../view/page/setting/entry.dart';
+import 'package:server_box/view/page/storage/sftp_mission.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 {
   final Widget page;
@@ -61,7 +50,7 @@ class AppRoutes {
     return Future.value(null);
   }
 
-  static AppRoutes serverDetail({Key? key, required ServerPrivateInfo spi}) {
+  static AppRoutes serverDetail({Key? key, required Spi spi}) {
     return AppRoutes(ServerDetailPage(key: key, spi: spi), 'server_detail');
   }
 
@@ -69,13 +58,6 @@ class AppRoutes {
     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),
@@ -83,10 +65,6 @@ class AppRoutes {
     );
   }
 
-  static AppRoutes keyList({Key? key}) {
-    return AppRoutes(PrivateKeysListPage(key: key), 'key_detail');
-  }
-
   static AppRoutes snippetEdit({Key? key, Snippet? snippet}) {
     return AppRoutes(
       SnippetEditPage(snippet: snippet),
@@ -94,13 +72,9 @@ class AppRoutes {
     );
   }
 
-  static AppRoutes snippetList({Key? key}) {
-    return AppRoutes(SnippetListPage(key: key), 'snippet_detail');
-  }
-
   static AppRoutes ssh({
     Key? key,
-    required ServerPrivateInfo spi,
+    required Spi spi,
     String? initCmd,
     Snippet? initSnippet,
   }) {
@@ -119,26 +93,12 @@ class AppRoutes {
     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,
+      {Key? key, required Spi spi, String? initPath, bool isSelect = false}) {
-      required ServerPrivateInfo spi,
-      String? initPath,
-      bool isSelect = false}) {
     return AppRoutes(
         SftpPage(
           key: key,
@@ -149,48 +109,10 @@ class AppRoutes {
         'sftp');
   }
 
-  static AppRoutes backup({Key? key}) {
+  static AppRoutes docker({Key? key, required Spi spi}) {
-    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');
   // }
@@ -203,14 +125,10 @@ class AppRoutes {
     return AppRoutes(PingPage(key: key), 'ping');
   }
 
-  static AppRoutes process({Key? key, required ServerPrivateInfo spi}) {
+  static AppRoutes process({Key? key, required Spi 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');
   }
@@ -237,7 +155,7 @@ class AppRoutes {
         'snippet_result');
   }
 
-  static AppRoutes iperf({Key? key, required ServerPrivateInfo spi}) {
+  static AppRoutes iperf({Key? key, required Spi spi}) {
     return AppRoutes(IPerfPage(key: key, spi: spi), 'iperf');
   }
 
@@ -245,11 +163,7 @@ class AppRoutes {
     return AppRoutes(ServerFuncBtnsOrderPage(key: key), 'server_func_btns_seq');
   }
 
-  static AppRoutes pve({Key? key, required ServerPrivateInfo spi}) {
+  static AppRoutes pve({Key? key, required Spi 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,37 @@
+import 'dart:io';
+
+import 'package:fl_lib/fl_lib.dart';
+import 'package:server_box/data/model/app/backup.dart';
+
+const bakSync = BakSyncer._();
+
+final icloud = ICloud(containerId: 'iCloud.tech.lolli.serverbox');
+
+final class BakSyncer extends SyncIface<Backup> {
+  const BakSyncer._() : super();
+
+  @override
+  void init() {
+    Webdav.shared.prefix = 'serverbox/';
+  }
+
+  @override
+  Future<void> saveToFile() => Backup.backup();
+
+  @override
+  Future<Backup> fromFile(String path) async {
+    final content = await File(path).readAsString();
+    return Backup.fromJsonString(content);
+  }
+
+  @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/server.dart

@@ -1,11 +1,12 @@
 import 'dart:async';
 
 import 'package:dartssh2/dartssh2.dart';
+import 'package:fl_lib/fl_lib.dart';
 import 'package:flutter/foundation.dart';
 import 'package:server_box/data/model/app/error.dart';
 import 'package:server_box/data/res/store.dart';
 
-import '../../data/model/server/server_private_info.dart';
+import 'package:server_box/data/model/server/server_private_info.dart';
 
 /// Must put this func out of any Class.
 ///
@@ -31,7 +32,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 +43,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 +53,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,
 }) async {
   onStatus?.call(GenSSHClientStatus.socket);
 
+  String? alterUser;
+
   final socket = await () async {
     // Proxy
     final jumpSpi_ = () {
@@ -91,15 +94,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 +116,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

@@ -4,16 +4,16 @@ 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/server/server_private_info.dart';
-import 'package:server_box/data/res/provider.dart';
+import 'package:server_box/data/provider/app.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: l10n.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:server_box/data/model/app/backup.dart';
-import 'package:server_box/data/model/app/sync.dart';
-import 'package:server_box/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:server_box/data/model/app/backup.dart';
-import 'package:server_box/data/model/app/error.dart';
-import 'package:server_box/data/res/misc.dart';
-import 'package:server_box/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

@@ -2,29 +2,33 @@ 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/provider.dart';
 import 'package:server_box/data/res/rebuild.dart';
 import 'package:server_box/data/res/store.dart';
 
+part 'backup.g.dart';
+
 const backupFormatVersion = 1;
 
 final _logger = Logger('Backup');
 
-class Backup {
+@JsonSerializable()
+class Backup implements Mergeable {
   // backup format version
   final int version;
   final String date;
-  final List<ServerPrivateInfo> spis;
+  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,
@@ -34,54 +38,40 @@ class Backup {
     required this.keys,
     required this.container,
     required this.history,
+    required this.settings,
     this.lastModTime,
   });
 
-  Backup.fromJson(Map<String, dynamic> json)
+  factory Backup.fromJson(Map<String, dynamic> json) => _$BackupFromJson(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() => {
+  Map<String, dynamic> toJson() => _$BackupToJson(this);
-        'version': version,
-        'date': date,
-        'spis': spis,
-        'snippets': snippets,
-        'keys': keys,
-        'container': container,
-        'lastModTime': lastModTime,
-        'history': history,
-      };
 
-  Backup.loadFromStore()
+  static Future<Backup> loadFromStore() async {
-      : version = backupFormatVersion,
+    final lastModTime = Stores.lastModTime?.millisecondsSinceEpoch;
-        date = DateTime.now().toString().split('.').firstOrNull ?? '',
+    return Backup(
-        spis = Stores.server.fetch(),
+      version: backupFormatVersion,
-        snippets = Stores.snippet.fetch(),
+      date: DateTime.now().toString().split('.').firstOrNull ?? '',
-        keys = Stores.key.fetch(),
+      spis: Stores.server.fetch(),
-        container = Stores.container.box.toJson(),
+      snippets: Stores.snippet.fetch(),
-        lastModTime = Stores.lastModTime,
+      keys: Stores.key.fetch(),
-        history = Stores.history.box.toJson();
+      container: await Stores.container.getAllMap(),
+      lastModTime: lastModTime,
+      history: await Stores.history.getAllMap(),
+      settings: await Stores.setting.getAllMap(),
+    );
+  }
 
   static Future<String> backup([String? name]) async {
-    final result = _diyEncrypt(json.encode(Backup.loadFromStore().toJson()));
+    final bak = await Backup.loadFromStore();
-    final path = '${Paths.doc}/${name ?? Miscs.bakFileName}';
+    final result = _diyEncrypt(json.encode(bak.toJson()));
+    final path = Paths.doc.joinPath(name ?? Miscs.bakFileName);
     await File(path).writeAsString(result);
     return path;
   }
 
-  Future<void> restore({bool force = false}) async {
+  @override
-    final curTime = Stores.lastModTime ?? 0;
+  Future<void> merge({bool force = false}) async {
+    final curTime = Stores.lastModTime?.millisecondsSinceEpoch ?? 0;
     final bakTime = lastModTime ?? 0;
     final shouldRestore = force || curTime < bakTime;
     if (!shouldRestore) {
@@ -90,93 +80,142 @@ class Backup {
     }
 
     // Snippets
-    final nowSnippets = Stores.snippet.box.keys.toSet();
+    if (force) {
-    final bakSnippets = snippets.map((e) => e.name).toSet();
+      for (final s in snippets) {
-    final newSnippets = bakSnippets.difference(nowSnippets);
+        Stores.snippet.box.put(s.name, s);
-    final delSnippets = nowSnippets.difference(bakSnippets);
+      }
-    final updateSnippets = nowSnippets.intersection(bakSnippets);
+    } else {
-    for (final s in newSnippets) {
+      final nowSnippets = Stores.snippet.box.keys.toSet();
-      Stores.snippet.box.put(s, snippets.firstWhere((e) => e.name == s));
+      final bakSnippets = snippets.map((e) => e.name).toSet();
-    }
+      final newSnippets = bakSnippets.difference(nowSnippets);
-    for (final s in delSnippets) {
+      final delSnippets = nowSnippets.difference(bakSnippets);
-      Stores.snippet.box.delete(s);
+      final updateSnippets = nowSnippets.intersection(bakSnippets);
-    }
+      for (final s in newSnippets) {
-    for (final s in updateSnippets) {
+        Stores.snippet.box.put(s, snippets.firstWhere((e) => e.name == s));
-      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();
+    if (force) {
-    final bakSpis = spis.map((e) => e.id).toSet();
+      for (final s in spis) {
-    final newSpis = bakSpis.difference(nowSpis);
+        Stores.server.box.put(s.id, s);
-    final delSpis = nowSpis.difference(bakSpis);
+      }
-    final updateSpis = nowSpis.intersection(bakSpis);
+    } else {
-    for (final s in newSpis) {
+      final nowSpis = Stores.server.box.keys.toSet();
-      Stores.server.box.put(s, spis.firstWhere((e) => e.id == s));
+      final bakSpis = spis.map((e) => e.id).toSet();
-    }
+      final newSpis = bakSpis.difference(nowSpis);
-    for (final s in delSpis) {
+      final delSpis = nowSpis.difference(bakSpis);
-      Stores.server.box.delete(s);
+      final updateSpis = nowSpis.intersection(bakSpis);
-    }
+      for (final s in newSpis) {
-    for (final s in updateSpis) {
+        Stores.server.box.put(s, spis.firstWhere((e) => e.id == s));
-      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();
+    if (force) {
-    final bakKeys = keys.map((e) => e.id).toSet();
+      for (final s in keys) {
-    final newKeys = bakKeys.difference(nowKeys);
+        Stores.key.box.put(s.id, s);
-    final delKeys = nowKeys.difference(bakKeys);
+      }
-    final updateKeys = nowKeys.intersection(bakKeys);
+    } else {
-    for (final s in newKeys) {
+      final nowKeys = Stores.key.box.keys.toSet();
-      Stores.key.box.put(s, keys.firstWhere((e) => e.id == s));
+      final bakKeys = keys.map((e) => e.id).toSet();
-    }
+      final newKeys = bakKeys.difference(nowKeys);
-    for (final s in delKeys) {
+      final delKeys = nowKeys.difference(bakKeys);
-      Stores.key.box.delete(s);
+      final updateKeys = nowKeys.intersection(bakKeys);
-    }
+      for (final s in newKeys) {
-    for (final s in updateKeys) {
+        Stores.key.box.put(s, keys.firstWhere((e) => e.id == s));
-      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();
+    if (force) {
-    final bakHistory = history.keys.toSet();
+      Stores.history.box.putAll(history);
-    final newHistory = bakHistory.difference(nowHistory);
+    } else {
-    final delHistory = nowHistory.difference(bakHistory);
+      final nowHistory = Stores.history.box.keys.toSet();
-    final updateHistory = nowHistory.intersection(bakHistory);
+      final bakHistory = history.keys.toSet();
-    for (final s in newHistory) {
+      final newHistory = bakHistory.difference(nowHistory);
-      Stores.history.box.put(s, history[s]);
+      final delHistory = nowHistory.difference(bakHistory);
-    }
+      final updateHistory = nowHistory.intersection(bakHistory);
-    for (final s in delHistory) {
+      for (final s in newHistory) {
-      Stores.history.box.delete(s);
+        Stores.history.box.put(s, history[s]);
-    }
+      }
-    for (final s in updateHistory) {
+      for (final s in delHistory) {
-      Stores.history.box.put(s, history[s]);
+        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();
+    if (force) {
-    final bakContainer = container.keys.toSet();
+      Stores.container.box.putAll(container);
-    final newContainer = bakContainer.difference(nowContainer);
+    } else {
-    final delContainer = nowContainer.difference(bakContainer);
+      final nowContainer = Stores.container.box.keys.toSet();
-    final updateContainer = nowContainer.intersection(bakContainer);
+      final bakContainer = container.keys.toSet();
-    for (final s in newContainer) {
+      final newContainer = bakContainer.difference(nowContainer);
-      Stores.container.box.put(s, container[s]);
+      final delContainer = nowContainer.difference(bakContainer);
-    }
+      final updateContainer = nowContainer.intersection(bakContainer);
-    for (final s in delContainer) {
+      for (final s in newContainer) {
-      Stores.container.box.delete(s);
+        Stores.container.box.put(s, container[s]);
-    }
+      }
-    for (final s in updateContainer) {
+      for (final s in delContainer) {
-      Stores.container.box.put(s, container[s]);
+        Stores.container.box.delete(s);
+      }
+      for (final s in updateContainer) {
+        Stores.container.box.put(s, container[s]);
+      }
     }
 
-    Pros.reload();
+    // Settings
-    RNodes.app.build();
+    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');
   }
 
-  Backup.fromJsonString(String raw)
+  factory Backup.fromJsonString(String raw) =>
-      : this.fromJson(json.decode(_diyDecrypt(raw)));
+      Backup.fromJson(json.decode(_diyDecrypt(raw)));
 }
 
 String _diyEncrypt(String raw) => json.encode(

lib/data/model/app/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/menu/container.dart

@@ -1,3 +1,4 @@
+import 'package:fl_lib/fl_lib.dart';
 import 'package:flutter/material.dart';
 import 'package:server_box/core/extension/context/locale.dart';
 
@@ -21,46 +22,27 @@ enum ContainerMenu {
         terminal,
         //stats,
       ];
-    } else {
-      return [start, rm, logs];
     }
+    return [start, rm, logs];
   }
 
-  IconData get icon {
+  IconData get icon => switch (this) {
-    switch (this) {
+        ContainerMenu.start => Icons.play_arrow,
-      case ContainerMenu.start:
+        ContainerMenu.stop => Icons.stop,
-        return Icons.play_arrow;
+        ContainerMenu.restart => Icons.restart_alt,
-      case ContainerMenu.stop:
+        ContainerMenu.rm => Icons.delete,
-        return Icons.stop;
+        ContainerMenu.logs => Icons.logo_dev,
-      case ContainerMenu.restart:
+        ContainerMenu.terminal => Icons.terminal,
-        return Icons.restart_alt;
+        // DockerMenuType.stats => Icons.bar_chart,
-      case ContainerMenu.rm:
+      };
-        return Icons.delete;
-      case ContainerMenu.logs:
-        return Icons.logo_dev;
-      case ContainerMenu.terminal:
-        return Icons.terminal;
-      // case DockerMenuType.stats:
-      //   return Icons.bar_chart;
-    }
-  }
 
-  String get toStr {
+  String get toStr => switch (this) {
-    switch (this) {
+        ContainerMenu.start => l10n.start,
-      case ContainerMenu.start:
+        ContainerMenu.stop => l10n.stop,
-        return l10n.start;
+        ContainerMenu.restart => l10n.restart,
-      case ContainerMenu.stop:
+        ContainerMenu.rm => libL10n.delete,
-        return l10n.stop;
+        ContainerMenu.logs => libL10n.log,
-      case ContainerMenu.restart:
+        ContainerMenu.terminal => l10n.terminal,
-        return l10n.restart;
+        // DockerMenuType.stats => s.stats,
-      case ContainerMenu.rm:
+      };
-        return l10n.delete;
-      case ContainerMenu.logs:
-        return l10n.log;
-      case ContainerMenu.terminal:
-        return l10n.terminal;
-      // case DockerMenuType.stats:
-      //   return s.stats;
-    }
-  }
 }

lib/data/model/app/menu/server_func.dart

@@ -2,55 +2,76 @@ import 'package:flutter/material.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:icons_plus/icons_plus.dart';
 import 'package:server_box/core/extension/context/locale.dart';
+import 'package:server_box/data/res/store.dart';
 
 part 'server_func.g.dart';
 
 @HiveType(typeId: 6)
 enum ServerFuncBtn {
   @HiveField(0)
-  terminal,
+  terminal._(),
   @HiveField(1)
-  sftp,
+  sftp._(),
   @HiveField(2)
-  container,
+  container._(),
   @HiveField(3)
-  process,
+  process._(),
-  @HiveField(4)
+  //@HiveField(4)
-  pkg,
+  //pkg,
   @HiveField(5)
-  snippet,
+  snippet._(),
   @HiveField(6)
-  iperf,
+  iperf._(),
   // @HiveField(7)
   // pve,
+  @HiveField(8)
+  systemd._(1058),
   ;
 
+  final int? addedVersion;
+
+  const ServerFuncBtn._([this.addedVersion]);
+
+  static void autoAddNewFuncs(int cur) {
+    if (cur >= systemd.addedVersion!) {
+      final prop = Stores.setting.serverFuncBtns;
+      final list = prop.fetch();
+      if (!list.contains(systemd.index)) {
+        list.add(systemd.index);
+        prop.put(list);
+      }
+    }
+  }
+
   static final defaultIdxs = [
     terminal,
     sftp,
     container,
     process,
-    pkg,
+    //pkg,
     snippet,
+    systemd,
   ].map((e) => e.index).toList();
 
   IconData get icon => switch (this) {
         sftp => Icons.insert_drive_file,
         snippet => Icons.code,
-        pkg => Icons.system_security_update,
+        //pkg => Icons.system_security_update,
         container => FontAwesome.docker_brand,
         process => Icons.list_alt_outlined,
         terminal => Icons.terminal,
         iperf => Icons.speed,
+        systemd => MingCute.plugin_2_fill,
       };
 
   String get toStr => switch (this) {
         sftp => 'SFTP',
         snippet => l10n.snippet,
-        pkg => l10n.pkg,
+        //pkg => l10n.pkg,
         container => l10n.container,
         process => l10n.process,
         terminal => l10n.terminal,
         iperf => 'iperf',
+        systemd => 'Systemd',
       };
 }

lib/data/model/app/menu/server_func.g.dart

@@ -21,12 +21,12 @@ class ServerFuncBtnAdapter extends TypeAdapter<ServerFuncBtn> {
         return ServerFuncBtn.container;
       case 3:
         return ServerFuncBtn.process;
-      case 4:
-        return ServerFuncBtn.pkg;
       case 5:
         return ServerFuncBtn.snippet;
       case 6:
         return ServerFuncBtn.iperf;
+      case 8:
+        return ServerFuncBtn.systemd;
       default:
         return ServerFuncBtn.terminal;
     }
@@ -47,15 +47,15 @@ class ServerFuncBtnAdapter extends TypeAdapter<ServerFuncBtn> {
       case ServerFuncBtn.process:
         writer.writeByte(3);
         break;
-      case ServerFuncBtn.pkg:
-        writer.writeByte(4);
-        break;
       case ServerFuncBtn.snippet:
         writer.writeByte(5);
         break;
       case ServerFuncBtn.iperf:
         writer.writeByte(6);
         break;
+      case ServerFuncBtn.systemd:
+        writer.writeByte(8);
+        break;
     }
   }
 

lib/data/model/app/net_view.dart

@@ -1,7 +1,7 @@
+import 'package:fl_lib/fl_lib.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:server_box/core/extension/context/locale.dart';
 import 'package:server_box/data/model/server/server.dart';
-import 'package:server_box/data/res/store.dart';
 
 part 'net_view.g.dart';
 
@@ -14,80 +14,67 @@ enum NetViewType {
   @HiveField(2)
   traffic;
 
-  NetViewType get next {
+  NetViewType get next => switch (this) {
-    switch (this) {
+        conn => speed,
-      case conn:
+        speed => traffic,
-        return speed;
+        traffic => conn,
-      case speed:
+      };
-        return traffic;
-      case traffic:
-        return conn;
-    }
-  }
 
-  String get toStr {
+  String get toStr => switch (this) {
-    switch (this) {
+        NetViewType.conn => l10n.conn,
-      case NetViewType.conn:
+        NetViewType.traffic => l10n.traffic,
-        return l10n.conn;
+        NetViewType.speed => l10n.speed,
-      case NetViewType.traffic:
+      };
-        return l10n.traffic;
-      case NetViewType.speed:
-        return l10n.speed;
-    }
-  }
 
-  (String, String) build(ServerStatus ss) {
+  /// If no device is specified, return the cached value (only real devices,
-    final ignoreLocal = Stores.setting.ignoreLocalNet.fetch();
+  /// such as ethX, wlanX...).
-    switch (this) {
+  (String, String) build(ServerStatus ss, {String? dev}) {
-      case NetViewType.conn:
+    final notSepcifyDev = dev == null || dev.isEmpty;
-        return (
+    try {
-          '${l10n.conn}:\n${ss.tcp.maxConn}',
+      switch (this) {
-          '${l10n.failed}:\n${ss.tcp.fail}',
+        case NetViewType.conn:
-        );
-      case NetViewType.speed:
-        if (ignoreLocal) {
           return (
-            '↓:\n${ss.netSpeed.cachedRealVals.speedIn}',
+            '${l10n.conn}:\n${ss.tcp.maxConn}',
-            '↑:\n${ss.netSpeed.cachedRealVals.speedOut}',
+            '${libL10n.fail}:\n${ss.tcp.fail}',
           );
-        }
+        case NetViewType.speed:
-        return (
+          if (notSepcifyDev) {
-          '↓:\n${ss.netSpeed.speedIn()}',
+            return (
-          '↑:\n${ss.netSpeed.speedOut()}',
+              '↓:\n${ss.netSpeed.cachedVals.speedIn}',
-        );
+              '↑:\n${ss.netSpeed.cachedVals.speedOut}',
-      case NetViewType.traffic:
+            );
-        if (ignoreLocal) {
+          }
           return (
-            '↓:\n${ss.netSpeed.cachedRealVals.sizeIn}',
+            '↓:\n${ss.netSpeed.speedIn(device: dev)}',
-            '↑:\n${ss.netSpeed.cachedRealVals.sizeOut}',
+            '↑:\n${ss.netSpeed.speedOut(device: dev)}',
           );
-        }
+        case NetViewType.traffic:
-        return (
+          if (notSepcifyDev) {
-          '↓:\n${ss.netSpeed.sizeIn()}',
+            return (
-          '↑:\n${ss.netSpeed.sizeOut()}',
+              '↓:\n${ss.netSpeed.cachedVals.sizeIn}',
-        );
+              '↑:\n${ss.netSpeed.cachedVals.sizeOut}',
+            );
+          }
+          return (
+            '↓:\n${ss.netSpeed.sizeIn(device: dev)}',
+            '↑:\n${ss.netSpeed.sizeOut(device: dev)}',
+          );
+      }
+    } catch (e, s) {
+      Loggers.app.warning('NetViewType.build', e, s);
+      return ('N/A', 'N/A');
     }
   }
 
-  int toJson() {
+  int toJson() => switch (this) {
-    switch (this) {
+        NetViewType.conn => 0,
-      case NetViewType.conn:
+        NetViewType.speed => 1,
-        return 0;
+        NetViewType.traffic => 2,
-      case NetViewType.speed:
+      };
-        return 1;
-      case NetViewType.traffic:
-        return 2;
-    }
-  }
 
-  static NetViewType fromJson(int json) {
+  static NetViewType fromJson(int json) => switch (json) {
-    switch (json) {
+        0 => NetViewType.conn,
-      case 0:
+        1 => NetViewType.speed,
-        return NetViewType.conn;
+        _ => NetViewType.traffic,
-      case 2:
+      };
-        return NetViewType.traffic;
-      default:
-        return NetViewType.speed;
-    }
-  }
 }

lib/data/model/app/path_with_prefix.dart

@@ -1,10 +1,12 @@
 import 'package:fl_lib/fl_lib.dart';
 
+final _seperator = Pfs.seperator;
+
 /// It's used on platform's file system.
 /// So use [Platform.pathSeparator] to join path.
 class LocalPath {
   final String _prefixPath;
-  String _path = '/';
+  String _path = _seperator;
   String? _prePath;
   String get path => _prefixPath + _path;
 
@@ -13,20 +15,20 @@ class LocalPath {
   void update(String newPath) {
     _prePath = _path;
     if (newPath == '..') {
-      _path = _path.substring(0, _path.lastIndexOf('/'));
+      _path = _path.substring(0, _path.lastIndexOf(_seperator));
       if (_path == '') {
-        _path = '/';
+        _path = _seperator;
       }
       return;
     }
-    if (newPath == '/') {
+    if (newPath == _seperator) {
-      _path = '/';
+      _path = _seperator;
       return;
     }
     _path = _path.joinPath(newPath);
   }
 
-  bool get canBack => path != '$_prefixPath/';
+  bool get canBack => path != '$_prefixPath$_seperator';
 
   bool undo() {
     if (_prePath == null || _path == _prePath) {
@@ -38,7 +40,7 @@ class LocalPath {
 }
 
 String _trimSuffix(String prefixPath) {
-  if (prefixPath.endsWith('/')) {
+  if (prefixPath.endsWith(_seperator)) {
     return prefixPath.substring(0, prefixPath.length - 1);
   }
   return prefixPath;

lib/data/model/app/server_detail_card.dart

@@ -31,7 +31,7 @@ enum ServerDetailCards {
   static final names = values.map((e) => e.name).toList();
 
   String get toStr => switch (this) {
-        about => l10n.about,
+        about => libL10n.about,
         cpu => 'CPU',
         mem => 'RAM',
         swap => 'Swap',

lib/data/model/app/shell_func.dart

@@ -1,7 +1,8 @@
 import 'package:server_box/core/extension/context/locale.dart';
+import 'package:server_box/data/provider/server.dart';
 
-import '../../res/build_data.dart';
+import 'package:server_box/data/res/build_data.dart';
-import '../server/system.dart';
+import 'package:server_box/data/model/server/system.dart';
 
 enum ShellFunc {
   status,
@@ -12,52 +13,61 @@ enum ShellFunc {
   suspend,
   ;
 
-  static const _homeVar = '\$HOME';
   static const seperator = 'SrvBoxSep';
 
   /// The suffix `\t` is for formatting
   static const cmdDivider = '\necho $seperator\n\t';
-  static const _srvBoxDir = '.config/server_box';
-  static const scriptFile = 'mobile_v${BuildData.script}.sh';
 
-  /// Issue #159
+  /// srvboxm -> ServerBox Mobile
+  static const scriptFile = 'srvboxm_v${BuildData.script}.sh';
+  static const scriptDirHome = '~/.config/server_box';
+  static const scriptDirTmp = '/tmp/server_box';
+
+  static final _scriptDirMap = <String, String>{};
+
+  /// Get the script directory for the given [id].
   ///
-  /// Use script commit count as version of shell script.
+  /// Default is [scriptDirTmp]/[scriptFile], if this path is not accessible,
-  ///
+  /// it will be changed to [scriptDirHome]/[scriptFile].
-  /// So different version of app can run at the same time.
+  static String getScriptDir(String id) {
-  ///
+    final customScriptDir =
-  /// **Can't** use it in SFTP, because SFTP can't recognize `$HOME`
+        ServerProvider.pick(id: id)?.value.spi.custom?.scriptDir;
-  static String getShellPath(String home) => '$home/$_srvBoxDir/$scriptFile';
+    if (customScriptDir != null) return customScriptDir;
-
+    return _scriptDirMap.putIfAbsent(id, () {
-  static const srvBoxDir = '$_homeVar/$_srvBoxDir';
+      return scriptDirTmp;
-  static const _installShellPath = '$_homeVar/$_srvBoxDir/$scriptFile';
+    });
-
-  // Issue #299, chmod ~/.config to avoid permission issue
-  static const installShellCmd = """
-chmod +x ~/.config &> /dev/null
-mkdir -p $_homeVar/$_srvBoxDir
-cat > $_installShellPath
-chmod +x $_installShellPath
-""";
-
-  String get flag {
-    switch (this) {
-      case ShellFunc.status:
-        return 's';
-      // case ShellFunc.docker:
-      //   return 'd';
-      case ShellFunc.process:
-        return 'p';
-      case ShellFunc.shutdown:
-        return 'sd';
-      case ShellFunc.reboot:
-        return 'r';
-      case ShellFunc.suspend:
-        return 'sp';
-    }
   }
 
-  String get exec => 'sh $_installShellPath -$flag';
+  static void switchScriptDir(String id) => switch (_scriptDirMap[id]) {
+        scriptDirTmp => _scriptDirMap[id] = scriptDirHome,
+        scriptDirHome => _scriptDirMap[id] = scriptDirTmp,
+        _ => _scriptDirMap[id] = scriptDirHome,
+      };
+
+  static String getScriptPath(String id) {
+    return '${getScriptDir(id)}/$scriptFile';
+  }
+
+  static String getInstallShellCmd(String id) {
+    final scriptDir = getScriptDir(id);
+    final scriptPath = '$scriptDir/$scriptFile';
+    return '''
+mkdir -p $scriptDir
+cat > $scriptPath
+chmod 755 $scriptPath
+''';
+  }
+
+  String get flag => switch (this) {
+        ShellFunc.process => 'p',
+        ShellFunc.shutdown => 'sd',
+        ShellFunc.reboot => 'r',
+        ShellFunc.suspend => 'sp',
+        ShellFunc.status => 's',
+        // ShellFunc.docker=> 'd',
+      };
+
+  String exec(String id) => 'sh ${getScriptPath(id)} -$flag';
 
   String get name {
     switch (this) {
@@ -213,6 +223,7 @@ enum StatusCmdType {
       'for f in /sys/class/power_supply/*/uevent; do cat "\$f"; echo; done'),
   nvidia._('nvidia-smi -q -x'),
   sensors._('sensors'),
+  cpuBrand._('cat /proc/cpuinfo | grep "model name"'),
   ;
 
   final String cmd;
@@ -231,6 +242,7 @@ enum BSDStatusCmdType {
   mem._('top -l 1 | grep PhysMem'),
   //temp,
   host._('hostname'),
+  cpuBrand._('sysctl -n machdep.cpu.brand_string'),
   ;
 
   final String cmd;

lib/data/model/app/tab.dart

@@ -1,26 +1,62 @@
+import 'package:fl_lib/fl_lib.dart';
 import 'package:flutter/material.dart';
-import 'package:server_box/view/page/ping.dart';
+import 'package:server_box/core/extension/context/locale.dart';
 import 'package:server_box/view/page/server/tab.dart';
+// import 'package:server_box/view/page/setting/entry.dart';
 import 'package:server_box/view/page/snippet/list.dart';
 import 'package:server_box/view/page/ssh/tab.dart';
+import 'package:icons_plus/icons_plus.dart';
+import 'package:server_box/view/page/storage/local.dart';
 
 enum AppTab {
   server,
   ssh,
+  file,
   snippet,
-  ping,
+  //settings,
   ;
 
   Widget get page {
-    switch (this) {
+    return switch (this) {
-      case server:
+      server => const ServerPage(),
-        return const ServerPage();
+      //settings => const SettingsPage(),
-      case snippet:
+      ssh => const SSHTabPage(),
-        return const SnippetListPage();
+      file => const LocalFilePage(),
-      case ssh:
+      snippet => const SnippetListPage(),
-        return const SSHTabPage();
+    };
-      case ping:
+  }
-        return const PingPage();
+
-    }
+  NavigationDestination get navDestination {
+    return switch (this) {
+      server => NavigationDestination(
+          icon: const Icon(BoxIcons.bx_server),
+          label: l10n.server,
+          selectedIcon: const Icon(BoxIcons.bxs_server),
+        ),
+      // settings => NavigationDestination(
+      //     icon: const Icon(Icons.settings),
+      //     label: libL10n.setting,
+      //     selectedIcon: const Icon(Icons.settings),
+      //   ),
+      ssh => const NavigationDestination(
+          icon: Icon(Icons.terminal_outlined),
+          label: 'SSH',
+          selectedIcon: Icon(Icons.terminal),
+        ),
+      snippet => NavigationDestination(
+          icon: const Icon(Icons.code),
+          label: l10n.snippet,
+          selectedIcon: const Icon(Icons.code),
+        ),
+      file => NavigationDestination(
+          icon: const Icon(Icons.folder_open),
+          label: libL10n.file,
+          selectedIcon: const Icon(Icons.folder),
+        ),
+    };
+  }
+
+  static List<NavigationDestination> get navDestinations {
+    return AppTab.values.map((e) => e.navDestination).toList();
   }
 }

lib/data/model/app/tag_pickable.dart

@@ -1,5 +0,0 @@
-abstract class TagPickable {
-  bool containsTag(String tag);
-
-  String get tagName;
-}

lib/data/model/container/image.dart

@@ -45,21 +45,21 @@ final class PodmanImg implements ContainerImg {
   String toRawJson() => json.encode(toJson());
 
   factory PodmanImg.fromJson(Map<String, dynamic> json) => PodmanImg(
-        repository: json["repository"],
+        repository: json['repository'],
-        tag: json["tag"],
+        tag: json['tag'],
-        id: json["Id"],
+        id: json['Id'],
-        created: json["Created"],
+        created: json['Created'],
-        size: json["Size"],
+        size: json['Size'],
-        containers: json["Containers"],
+        containers: json['Containers'],
       );
 
   Map<String, dynamic> toJson() => {
-        "repository": repository,
+        'repository': repository,
-        "tag": tag,
+        'tag': tag,
-        "Id": id,
+        'Id': id,
-        "Created": created,
+        'Created': created,
-        "Size": size,
+        'Size': size,
-        "Containers": containers,
+        'Containers': containers,
       };
 }
 
@@ -96,36 +96,36 @@ final class DockerImg implements ContainerImg {
   String toRawJson() => json.encode(toJson());
 
   factory DockerImg.fromJson(Map<String, dynamic> json) {
-    final containers = switch (json["Containers"]) {
+    final containers = switch (json['Containers']) {
       final String a => a,
       final Object? a => a.toString(),
     };
-    final repo = switch (json["Repository"] ?? json["Names"]) {
+    final repo = switch (json['Repository'] ?? json['Names']) {
       final String a => a,
       final List a => a.firstOrNull.toString(),
       final Object? a => a.toString(),
     };
-    final size = switch (json["Size"]) {
+    final size = switch (json['Size']) {
       final String a => a,
       final int a => a.bytes2Str,
       final Object? a => a.toString(),
     };
     return DockerImg(
       containers: containers,
-      createdAt: json["CreatedAt"],
+      createdAt: json['CreatedAt'],
-      id: json["ID"] ?? json["Id"] ?? '',
+      id: json['ID'] ?? json['Id'] ?? '',
       repository: repo,
       size: size,
-      tag: json["Tag"],
+      tag: json['Tag'],
     );
   }
 
   Map<String, dynamic> toJson() => {
-        "Containers": containers,
+        'Containers': containers,
-        "CreatedAt": createdAt,
+        'CreatedAt': createdAt,
-        "ID": id,
+        'ID': id,
-        "Repository": repository,
+        'Repository': repository,
-        "Size": size,
+        'Size': size,
-        "Tag": tag,
+        'Tag': tag,
       };
 }

lib/data/model/container/ps.dart

@@ -84,29 +84,29 @@ final class PodmanPs implements ContainerPs {
   String toRawJson() => json.encode(toJson());
 
   factory PodmanPs.fromJson(Map<String, dynamic> json) => PodmanPs(
-        command: json["Command"] == null
+        command: json['Command'] == null
             ? []
-            : List<String>.from(json["Command"]!.map((x) => x)),
+            : List<String>.from(json['Command']!.map((x) => x)),
         created:
-            json["Created"] == null ? null : DateTime.parse(json["Created"]),
+            json['Created'] == null ? null : DateTime.parse(json['Created']),
-        exited: json["Exited"],
+        exited: json['Exited'],
-        id: json["Id"],
+        id: json['Id'],
-        image: json["Image"],
+        image: json['Image'],
-        names: json["Names"] == null
+        names: json['Names'] == null
             ? []
-            : List<String>.from(json["Names"]!.map((x) => x)),
+            : List<String>.from(json['Names']!.map((x) => x)),
-        startedAt: json["StartedAt"],
+        startedAt: json['StartedAt'],
       );
 
   Map<String, dynamic> toJson() => {
-        "Command":
+        'Command':
             command == null ? [] : List<dynamic>.from(command!.map((x) => x)),
-        "Created": created?.toIso8601String(),
+        'Created': created?.toIso8601String(),
-        "Exited": exited,
+        'Exited': exited,
-        "Id": id,
+        'Id': id,
-        "Image": image,
+        'Image': image,
-        "Names": names == null ? [] : List<dynamic>.from(names!.map((x) => x)),
+        'Names': names == null ? [] : List<dynamic>.from(names!.map((x) => x)),
-        "StartedAt": startedAt,
+        'StartedAt': startedAt,
       };
 }
 

lib/data/model/pkg/manager.dart

@@ -22,8 +22,6 @@ enum PkgManager {
         return 'opkg list-upgradable';
       case PkgManager.apk:
         return 'apk list --upgradable';
-      default:
-        return null;
     }
   }
 
@@ -56,8 +54,6 @@ enum PkgManager {
         return 'opkg upgrade $args';
       case PkgManager.apk:
         return 'apk upgrade';
-      default:
-        return null;
     }
   }
 

lib/data/model/pkg/upgrade_info.dart

@@ -34,9 +34,9 @@ class UpgradePkgInfo {
   }
 
   void _parseApt(String raw) {
-    final split1 = raw.split("/");
+    final split1 = raw.split('/');
     package = split1[0];
-    final split2 = split1[1].split(" ");
+    final split2 = split1[1].split(' ');
     newVersion = split2[1];
     arch = split2[2];
     nowVersion = split2[5].replaceFirst(']', '');
@@ -53,7 +53,7 @@ class UpgradePkgInfo {
   }
 
   void _parseZypper(String raw) {
-    final cols = raw.split("|");
+    final cols = raw.split('|');
     package = cols[2].trim();
     nowVersion = cols[3].trim();
     newVersion = cols[4].trim();

lib/data/model/server/conn.dart

@@ -1,4 +1,4 @@
-import '../../res/misc.dart';
+import 'package:server_box/data/res/misc.dart';
 
 class Conn {
   final int maxConn;

lib/data/model/server/cpu.dart

@@ -1,14 +1,16 @@
-import 'dart:collection';
-
 import 'package:fl_chart/fl_chart.dart';
+import 'package:fl_lib/fl_lib.dart';
 import 'package:server_box/data/model/server/time_seq.dart';
 import 'package:server_box/data/res/status.dart';
 
+/// Capacity of the FIFO queue
 const _kCap = 30;
 
 class Cpus extends TimeSeq<List<SingleCpuCore>> {
   Cpus(super.init1, super.init2);
 
+  final Map<String, int> brand = {};
+
   @override
   void onUpdate() {
     _coresCount = now.length;
@@ -23,10 +25,16 @@ class Cpus extends TimeSeq<List<SingleCpuCore>> {
 
   double usedPercent({int coreIdx = 0}) {
     if (now.length != pre.length) return 0;
-    final idleDelta = now[coreIdx].idle - pre[coreIdx].idle;
+    if (now.isEmpty) return 0;
-    final totalDelta = now[coreIdx].total - pre[coreIdx].total;
+    try {
-    final used = idleDelta / totalDelta;
+      final idleDelta = now[coreIdx].idle - pre[coreIdx].idle;
-    return used.isNaN ? 0 : 100 - used * 100;
+      final totalDelta = now[coreIdx].total - pre[coreIdx].total;
+      final used = idleDelta / totalDelta;
+      return used.isNaN ? 0 : 100 - used * 100;
+    } catch (e, s) {
+      Loggers.app.warning('Cpus.usedPercent()', e, s);
+      return 0;
+    }
   }
 
   int _coresCount = 0;
@@ -175,6 +183,22 @@ class SingleCpuCore extends TimeSeqIface<SingleCpuCore> {
   }
 }
 
+final class CpuBrand {
+  static Map<String, int> parse(String raw) {
+    final lines = raw.split('\n');
+    // {brand: count}
+    final brands = <String, int>{};
+    for (var line in lines) {
+      if (line.contains('model name')) {
+        final model = line.split(':').last.trim();
+        final count = brands[model] ?? 0;
+        brands[model] = count + 1;
+      }
+    }
+    return brands;
+  }
+}
+
 final _bsdCpuPercentReg = RegExp(r'(\d+\.\d+)%');
 
 /// TODO: Change this implementation to parse cpu status on BSD system

lib/data/model/server/custom.dart

@@ -1,7 +1,9 @@
 import 'package:hive_flutter/adapters.dart';
+import 'package:json_annotation/json_annotation.dart';
 
 part 'custom.g.dart';
 
+@JsonSerializable()
 @HiveType(typeId: 7)
 final class ServerCustom {
   // @HiveField(0)
@@ -19,6 +21,14 @@ final class ServerCustom {
   @HiveField(5)
   final String? logoUrl;
 
+  /// The device name of the network interface displayed in the home server card.
+  @HiveField(6)
+  final String? netDev;
+
+  /// The directory where the script is stored.
+  @HiveField(7)
+  final String? scriptDir;
+
   const ServerCustom({
     //this.temperature,
     this.pveAddr,
@@ -26,51 +36,14 @@ final class ServerCustom {
     this.cmds,
     this.preferTempDev,
     this.logoUrl,
+    this.netDev,
+    this.scriptDir,
   });
 
-  static ServerCustom fromJson(Map<String, dynamic> json) {
+  factory ServerCustom.fromJson(Map<String, dynamic> json) =>
-    //final temperature = json["temperature"] as String?;
+      _$ServerCustomFromJson(json);
-    final pveAddr = json["pveAddr"] as String?;
-    final pveIgnoreCert = json["pveIgnoreCert"] as bool;
-    final cmds = json["cmds"] as Map<String, dynamic>?;
-    final preferTempDev = json["preferTempDev"] as String?;
-    final logoUrl = json["logoUrl"] as String?;
-    return ServerCustom(
-      //temperature: temperature,
-      pveAddr: pveAddr,
-      pveIgnoreCert: pveIgnoreCert,
-      cmds: cmds?.cast<String, String>(),
-      preferTempDev: preferTempDev,
-      logoUrl: logoUrl,
-    );
-  }
 
-  Map<String, dynamic> toJson() {
+  Map<String, dynamic> toJson() => _$ServerCustomToJson(this);
-    final json = <String, dynamic>{};
-    // if (temperature != null) {
-    //   json["temperature"] = temperature;
-    // }
-    if (pveAddr != null) {
-      json["pveAddr"] = pveAddr;
-    }
-    json["pveIgnoreCert"] = pveIgnoreCert;
-
-    if (cmds != null) {
-      json["cmds"] = cmds;
-    }
-    if (preferTempDev != null) {
-      json["preferTempDev"] = preferTempDev;
-    }
-    if (logoUrl != null) {
-      json["logoUrl"] = logoUrl;
-    }
-    return json;
-  }
-
-  @override
-  String toString() {
-    return toJson().toString();
-  }
 
   @override
   bool operator ==(Object other) {
@@ -80,7 +53,9 @@ final class ServerCustom {
         other.pveIgnoreCert == pveIgnoreCert &&
         other.cmds == cmds &&
         other.preferTempDev == preferTempDev &&
-        other.logoUrl == logoUrl;
+        other.logoUrl == logoUrl &&
+        other.netDev == netDev &&
+        other.scriptDir == scriptDir;
   }
 
   @override
@@ -90,5 +65,7 @@ final class ServerCustom {
       pveIgnoreCert.hashCode ^
       cmds.hashCode ^
       preferTempDev.hashCode ^
-      logoUrl.hashCode;
+      logoUrl.hashCode ^
+      netDev.hashCode ^
+      scriptDir.hashCode;
 }

lib/data/model/server/custom.g.dart

@@ -22,13 +22,15 @@ class ServerCustomAdapter extends TypeAdapter<ServerCustom> {
       cmds: (fields[3] as Map?)?.cast<String, String>(),
       preferTempDev: fields[4] as String?,
       logoUrl: fields[5] as String?,
+      netDev: fields[6] as String?,
+      scriptDir: fields[7] as String?,
     );
   }
 
   @override
   void write(BinaryWriter writer, ServerCustom obj) {
     writer
-      ..writeByte(5)
+      ..writeByte(7)
       ..writeByte(1)
       ..write(obj.pveAddr)
       ..writeByte(2)
@@ -38,7 +40,11 @@ class ServerCustomAdapter extends TypeAdapter<ServerCustom> {
       ..writeByte(4)
       ..write(obj.preferTempDev)
       ..writeByte(5)
-      ..write(obj.logoUrl);
+      ..write(obj.logoUrl)
+      ..writeByte(6)
+      ..write(obj.netDev)
+      ..writeByte(7)
+      ..write(obj.scriptDir);
   }
 
   @override
@@ -51,3 +57,30 @@ class ServerCustomAdapter extends TypeAdapter<ServerCustom> {
           runtimeType == other.runtimeType &&
           typeId == other.typeId;
 }
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+ServerCustom _$ServerCustomFromJson(Map<String, dynamic> json) => ServerCustom(
+      pveAddr: json['pveAddr'] as String?,
+      pveIgnoreCert: json['pveIgnoreCert'] as bool? ?? false,
+      cmds: (json['cmds'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, e as String),
+      ),
+      preferTempDev: json['preferTempDev'] as String?,
+      logoUrl: json['logoUrl'] as String?,
+      netDev: json['netDev'] as String?,
+      scriptDir: json['scriptDir'] as String?,
+    );
+
+Map<String, dynamic> _$ServerCustomToJson(ServerCustom instance) =>
+    <String, dynamic>{
+      'pveAddr': instance.pveAddr,
+      'pveIgnoreCert': instance.pveIgnoreCert,
+      'cmds': instance.cmds,
+      'preferTempDev': instance.preferTempDev,
+      'logoUrl': instance.logoUrl,
+      'netDev': instance.netDev,
+      'scriptDir': instance.scriptDir,
+    };

lib/data/model/server/disk.dart

@@ -1,7 +1,7 @@
 import 'package:fl_lib/fl_lib.dart';
 import 'package:server_box/data/model/server/time_seq.dart';
 
-import '../../res/misc.dart';
+import 'package:server_box/data/res/misc.dart';
 
 class Disk {
   final String fs;
@@ -104,7 +104,9 @@ class DiskIO extends TimeSeq<List<DiskIOPiece>> {
           !item.dev.startsWith('vd') &&
           !item.dev.startsWith('hd') &&
           !item.dev.startsWith('mmcblk') &&
-          !item.dev.startsWith('sr')) continue;
+          !item.dev.startsWith('sr')) {
+        continue;
+      }
       final (read_, write_) = _getSpeed(item.dev);
       read += read_ ?? 0;
       write += write_ ?? 0;

lib/data/model/server/net_speed.dart

@@ -1,6 +1,6 @@
 import 'package:fl_lib/fl_lib.dart';
 
-import 'time_seq.dart';
+import 'package:server_box/data/model/server/time_seq.dart';
 
 class NetSpeedPart extends TimeSeqIface<NetSpeedPart> {
   final String device;
@@ -14,6 +14,13 @@ class NetSpeedPart extends TimeSeqIface<NetSpeedPart> {
   bool same(NetSpeedPart other) => device == other.device;
 }
 
+typedef CachedNetVals = ({
+  String sizeIn,
+  String sizeOut,
+  String speedIn,
+  String speedOut,
+});
+
 class NetSpeed extends TimeSeq<List<NetSpeedPart>> {
   NetSpeed(super.init1, super.init2);
 
@@ -24,14 +31,14 @@ class NetSpeed extends TimeSeq<List<NetSpeedPart>> {
 
     realIfaces.clear();
     realIfaces.addAll(devices
-        .where((e) => realIfacePrefixs.any((prefix) => e.startsWith(prefix)))
+        .where((e) => realIfacePrefixs.any((prefix) => e.startsWith(prefix))));
-        .toList());
 
     final sizeIn = this.sizeIn();
     final sizeOut = this.sizeOut();
     final speedIn = this.speedIn();
     final speedOut = this.speedOut();
-    cachedRealVals = (
+
+    cachedVals = (
       sizeIn: sizeIn,
       sizeOut: sizeOut,
       speedIn: speedIn,
@@ -49,12 +56,7 @@ class NetSpeed extends TimeSeq<List<NetSpeedPart>> {
   /// Cached non-virtual network device prefix
   final realIfaces = <String>[];
 
-  ({
+  CachedNetVals cachedVals =
-    String sizeIn,
-    String sizeOut,
-    String speedIn,
-    String speedOut,
-  }) cachedRealVals =
       (sizeIn: '0kb', sizeOut: '0kb', speedIn: '0kb/s', speedOut: '0kb/s');
 
   /// Time diff between [pre] and [now]
@@ -67,7 +69,8 @@ class NetSpeed extends TimeSeq<List<NetSpeedPart>> {
   BigInt sizeOutBytes(int i) => now[i].bytesOut;
 
   String speedIn({String? device}) {
-    if (pre[0].device == '' || now[0].device == '') return '0kb/s';
+    if (pre.isEmpty || now.isEmpty) return 'N/A';
+    if (pre.length != now.length) return 'N/A';
     if (device == null) {
       var speed = 0.0;
       for (final device in devices) {
@@ -84,7 +87,8 @@ class NetSpeed extends TimeSeq<List<NetSpeedPart>> {
   }
 
   String sizeIn({String? device}) {
-    if (pre[0].device == '' || now[0].device == '') return '0kb';
+    if (pre.isEmpty || now.isEmpty) return 'N/A';
+    if (pre.length != now.length) return 'N/A';
     if (device == null) {
       var size = BigInt.from(0);
       for (final device in devices) {
@@ -101,7 +105,8 @@ class NetSpeed extends TimeSeq<List<NetSpeedPart>> {
   }
 
   String speedOut({String? device}) {
-    if (pre[0].device == '' || now[0].device == '') return '0kb/s';
+    if (pre.isEmpty || now.isEmpty) return 'N/A';
+    if (pre.length != now.length) return 'N/A';
     if (device == null) {
       var speed = 0.0;
       for (final device in devices) {
@@ -118,7 +123,8 @@ class NetSpeed extends TimeSeq<List<NetSpeedPart>> {
   }
 
   String sizeOut({String? device}) {
-    if (pre[0].device == '' || now[0].device == '') return '0kb';
+    if (pre.isEmpty || now.isEmpty) return 'N/A';
+    if (pre.length != now.length) return 'N/A';
     if (device == null) {
       var size = BigInt.from(0);
       for (final device in devices) {

lib/data/model/server/private_key_info.dart

@@ -1,11 +1,14 @@
 import 'package:hive_flutter/hive_flutter.dart';
+import 'package:json_annotation/json_annotation.dart';
 
 part 'private_key_info.g.dart';
 
+@JsonSerializable()
 @HiveType(typeId: 1)
 class PrivateKeyInfo {
   @HiveField(0)
   final String id;
+  @JsonKey(name: 'private_key')
   @HiveField(1)
   final String key;
 
@@ -14,6 +17,11 @@ class PrivateKeyInfo {
     required this.key,
   });
 
+  factory PrivateKeyInfo.fromJson(Map<String, dynamic> json) =>
+      _$PrivateKeyInfoFromJson(json);
+
+  Map<String, dynamic> toJson() => _$PrivateKeyInfoToJson(this);
+
   String? get type {
     final lines = key.split('\n');
     if (lines.length < 2) {
@@ -26,15 +34,4 @@ class PrivateKeyInfo {
     }
     return splited[1];
   }
-
-  PrivateKeyInfo.fromJson(Map<String, dynamic> json)
-      : id = json["id"].toString(),
-        key = json["private_key"].toString();
-
-  Map<String, dynamic> toJson() {
-    final data = <String, String>{};
-    data["id"] = id;
-    data["private_key"] = key;
-    return data;
-  }
 }

lib/data/model/server/private_key_info.g.dart

@@ -42,3 +42,19 @@ class PrivateKeyInfoAdapter extends TypeAdapter<PrivateKeyInfo> {
           runtimeType == other.runtimeType &&
           typeId == other.typeId;
 }
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+PrivateKeyInfo _$PrivateKeyInfoFromJson(Map<String, dynamic> json) =>
+    PrivateKeyInfo(
+      id: json['id'] as String,
+      key: json['private_key'] as String,
+    );
+
+Map<String, dynamic> _$PrivateKeyInfoToJson(PrivateKeyInfo instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'private_key': instance.key,
+    };

lib/data/model/server/proc.dart

@@ -1,6 +1,6 @@
 import 'package:fl_lib/fl_lib.dart';
 
-import '../../../data/res/misc.dart';
+import 'package:server_box/data/res/misc.dart';
 
 class _ProcValIdxMap {
   final int pid;
@@ -58,7 +58,7 @@ class Proc {
     required this.command,
   });
 
-  factory Proc.parse(String raw, _ProcValIdxMap map) {
+  factory Proc._parse(String raw, _ProcValIdxMap map) {
     final parts = raw.split(RegExp(r'\s+'));
     return Proc(
       user: map.user == null ? null : parts[map.user!],
@@ -139,7 +139,7 @@ class PsResult {
       final line = lines[i];
       if (line.isEmpty) continue;
       try {
-        procs.add(Proc.parse(line, map));
+        procs.add(Proc._parse(line, map));
       } catch (e, trace) {
         errs.add('$line: $e');
         Loggers.app.warning('Process failed', e, trace);

lib/data/model/server/sensors.dart

@@ -1,5 +1,4 @@
 import 'package:fl_lib/fl_lib.dart';
-import 'package:server_box/core/extension/context/locale.dart';
 
 final class SensorAdaptor {
   final String raw;
@@ -37,7 +36,7 @@ final class SensorItem {
 
   String get toMarkdown {
     final sb = StringBuffer();
-    sb.writeln('| ${l10n.name} | ${l10n.content} |');
+    sb.writeln('| ${libL10n.name} | ${libL10n.content} |');
     sb.writeln('| --- | --- |');
     for (final entry in details.entries) {
       sb.writeln('| ${entry.key} | ${entry.value} |');
@@ -80,9 +79,7 @@ final class SensorItem {
       for (var idx = 2; idx < len; idx++) {
         final part = sensorLines[idx];
         final detailParts = part.split(':');
-        if (detailParts.length < 2) {
+        if (detailParts.length < 2) continue;
-          continue;
-        }
         final key = detailParts[0].trim();
         final value = detailParts[1].trim();
         details[key] = value;

lib/data/model/server/server.dart

@@ -1,6 +1,4 @@
 import 'package:dartssh2/dartssh2.dart';
-import 'package:fl_lib/fl_lib.dart';
-import 'package:server_box/core/extension/context/locale.dart';
 import 'package:server_box/data/model/app/error.dart';
 import 'package:server_box/data/model/app/shell_func.dart';
 import 'package:server_box/data/model/server/battery.dart';
@@ -15,12 +13,8 @@ import 'package:server_box/data/model/server/server_private_info.dart';
 import 'package:server_box/data/model/server/system.dart';
 import 'package:server_box/data/model/server/temp.dart';
 
-import '../app/tag_pickable.dart';
+class Server {
-
+  Spi spi;
-part 'server.ext.dart';
-
-class Server implements TagPickable {
-  ServerPrivateInfo spi;
   ServerStatus status;
   SSHClient? client;
   ServerConn conn;
@@ -32,14 +26,6 @@ class Server implements TagPickable {
     this.client,
   });
 
-  @override
-  bool containsTag(String tag) {
-    return spi.tags?.contains(tag) ?? false;
-  }
-
-  @override
-  String get tagName => spi.id;
-
   bool get needGenClient => conn < ServerConn.connecting;
 
   bool get canViewDetails => conn == ServerConn.finished;
@@ -95,5 +81,5 @@ enum ServerConn {
   /// Status parsing finished
   finished;
 
-  operator <(ServerConn other) => index < other.index;
+  bool operator <(ServerConn other) => index < other.index;
 }

lib/data/model/server/server.ext.dart

@@ -1,58 +0,0 @@
-part of 'server.dart';
-
-extension ServerX on Server {
-  String getTopRightStr(ServerPrivateInfo spi) {
-    switch (conn) {
-      case ServerConn.disconnected:
-        return l10n.disconnected;
-      case ServerConn.finished:
-        // Highest priority of temperature display
-        final cmdTemp = () {
-          final val = status.customCmds['server_card_top_right'];
-          if (val == null) return null;
-          // This returned value is used on server card top right, so it should
-          // be a single line string.
-          return val.split('\n').lastOrNull;
-        }();
-        final temperatureVal = () {
-          // Second priority
-          final preferTempDev = spi.custom?.preferTempDev;
-          if (preferTempDev != null) {
-            final preferTemp = status.sensors
-                .firstWhereOrNull((e) => e.device == preferTempDev)
-                ?.summary
-                ?.split(' ')
-                .firstOrNull;
-            if (preferTemp != null) {
-              return double.tryParse(preferTemp.replaceFirst('°C', ''));
-            }
-          }
-          // Last priority
-          final temp = status.temps.first;
-          if (temp != null) {
-            return temp;
-          }
-          return null;
-        }();
-        final upTime = status.more[StatusCmdType.uptime];
-        final items = [
-          cmdTemp ??
-              (temperatureVal != null
-                  ? '${temperatureVal.toStringAsFixed(1)}°C'
-                  : null),
-          upTime
-        ];
-        final str = items.where((e) => e != null && e.isNotEmpty).join(' | ');
-        if (str.isEmpty) return l10n.noResult;
-        return str;
-      case ServerConn.loading:
-        return l10n.serverTabLoading;
-      case ServerConn.connected:
-        return l10n.connected;
-      case ServerConn.connecting:
-        return l10n.serverTabConnecting;
-      case ServerConn.failed:
-        return status.err != null ? l10n.viewErr : l10n.serverTabFailed;
-    }
-  }
-}