opt. & fix

opt.: upload file
fix: surplus server order
opt.: sftp view

.dart_tool/flutter_gen/gen_l10n/l10n.dart

@@ -126,6 +126,12 @@ abstract class S {
   /// **'Add private key'**
   String get addPrivateKey;
 
+  /// No description provided for @added2List.
+  ///
+  /// In en, this message translates to:
+  /// **'Added to task list'**
+  String get added2List;
+
   /// No description provided for @all.
   ///
   /// In en, this message translates to:
@@ -138,12 +144,6 @@ abstract class S {
   /// **'Already in last directory.'**
   String get alreadyLastDir;
 
-  /// No description provided for @appPrimaryColor.
-  ///
-  /// In en, this message translates to:
-  /// **'App primary color'**
-  String get appPrimaryColor;
-
   /// No description provided for @attention.
   ///
   /// In en, this message translates to:
@@ -864,6 +864,12 @@ abstract class S {
   /// **'Preview'**
   String get preview;
 
+  /// No description provided for @primaryColor.
+  ///
+  /// In en, this message translates to:
+  /// **'Primary color'**
+  String get primaryColor;
+
   /// No description provided for @privateKey.
   ///
   /// In en, this message translates to:

.dart_tool/flutter_gen/gen_l10n/l10n_de.dart

@@ -19,15 +19,15 @@ class SDe extends S {
   @override
   String get addPrivateKey => 'Private key hinzufügen';
 
+  @override
+  String get added2List => 'Zur Aufgabenliste hinzugefügt';
+
   @override
   String get all => 'Alle';
 
   @override
   String get alreadyLastDir => 'Bereits im letzten Verzeichnis.';
 
-  @override
-  String get appPrimaryColor => 'Farbschema';
-
   @override
   String get attention => 'Achtung';
 
@@ -410,6 +410,9 @@ class SDe extends S {
   @override
   String get preview => 'Vorschau';
 
+  @override
+  String get primaryColor => 'Farbschema';
+
   @override
   String get privateKey => 'Private Key';
 

.dart_tool/flutter_gen/gen_l10n/l10n_en.dart

@@ -19,15 +19,15 @@ class SEn extends S {
   @override
   String get addPrivateKey => 'Add private key';
 
+  @override
+  String get added2List => 'Added to task list';
+
   @override
   String get all => 'All';
 
   @override
   String get alreadyLastDir => 'Already in last directory.';
 
-  @override
-  String get appPrimaryColor => 'App primary color';
-
   @override
   String get attention => 'Attention';
 
@@ -410,6 +410,9 @@ class SEn extends S {
   @override
   String get preview => 'Preview';
 
+  @override
+  String get primaryColor => 'Primary color';
+
   @override
   String get privateKey => 'Private Key';
 

.dart_tool/flutter_gen/gen_l10n/l10n_zh.dart

@@ -19,15 +19,15 @@ class SZh extends S {
   @override
   String get addPrivateKey => '添加一个私钥';
 
+  @override
+  String get added2List => '已添加至任务列表';
+
   @override
   String get all => '所有';
 
   @override
   String get alreadyLastDir => '已经是最上层目录了';
 
-  @override
-  String get appPrimaryColor => 'App主要色';
-
   @override
   String get attention => '注意';
 
@@ -410,6 +410,9 @@ class SZh extends S {
   @override
   String get preview => '预览';
 
+  @override
+  String get primaryColor => '主题色';
+
   @override
   String get privateKey => '私钥';
 
@@ -647,15 +650,15 @@ class SZhTw extends SZh {
   @override
   String get addPrivateKey => '新增一個私鑰';
 
+  @override
+  String get added2List => '已添加至任務列表';
+
   @override
   String get all => '所有';
 
   @override
   String get alreadyLastDir => '已經是最上層目錄了';
 
-  @override
-  String get appPrimaryColor => '主要色調';
-
   @override
   String get attention => '注意';
 
@@ -1029,6 +1032,9 @@ class SZhTw extends SZh {
   @override
   String get preview => '預覽';
 
+  @override
+  String get primaryColor => '主要色調';
+
   @override
   String get privateKey => '私鑰';
 

lib/app.dart

@@ -24,10 +24,10 @@ class MyApp extends StatelessWidget {
     return ValueListenableBuilder<int>(
       valueListenable: _setting.themeMode.listenable(),
       builder: (_, tMode, __) {
-        final ok = tMode >= 0 && tMode <= ThemeMode.values.length - 1;
+        final isAMOLED = tMode >= 0 && tMode <= ThemeMode.values.length - 1;
         // Issue #57
         // if not [ok] -> [AMOLED] mode, use [ThemeMode.dark]
-        final themeMode = ok ? ThemeMode.values[tMode] : ThemeMode.dark;
+        final themeMode = isAMOLED ? ThemeMode.values[tMode] : ThemeMode.dark;
         final localeStr = _setting.locale.fetch();
         final locale = localeStr?.toLocale;
         final darkTheme = ThemeData(
@@ -47,7 +47,7 @@ class MyApp extends StatelessWidget {
             useMaterial3: true,
             colorSchemeSeed: primaryColor,
           ),
-          darkTheme: ok
+          darkTheme: isAMOLED
               ? darkTheme
               : darkTheme.copyWith(
                   scaffoldBackgroundColor: Colors.black,

lib/data/provider/server.dart

@@ -57,6 +57,10 @@ class ServerProvider extends BusyProvider {
     } else {
       _serverOrder.addAll(_servers.keys);
     }
+    final surplus = _serverOrder.where(
+      (e) => !_servers.containsKey(e),
+    );
+    _serverOrder.removeWhere((element) => surplus.contains(element));
     _settingStore.serverOrder.put(_serverOrder);
     _updateTags();
     setBusyState(false);

lib/l10n/app_de.arb

@@ -5,9 +5,9 @@
   "add": "Neu",
   "addAServer": "Server hinzufügen",
   "addPrivateKey": "Private key hinzufügen",
+  "added2List": "Zur Aufgabenliste hinzugefügt",
   "all": "Alle",
   "alreadyLastDir": "Bereits im letzten Verzeichnis.",
-  "appPrimaryColor": "Farbschema",
   "attention": "Achtung",
   "auto": "System folgen",
   "backup": "Backup",
@@ -125,6 +125,7 @@
   "plzSelectKey": "Wähle einen Key.",
   "port": "Port",
   "preview": "Vorschau",
+  "primaryColor": "Farbschema",
   "privateKey": "Private Key",
   "process": "Prozess",
   "pushToken": "Push Token",

lib/l10n/app_en.arb

@@ -5,9 +5,9 @@
   "add": "Add",
   "addAServer": "add a server",
   "addPrivateKey": "Add private key",
+  "added2List": "Added to task list",
   "all": "All",
   "alreadyLastDir": "Already in last directory.",
-  "appPrimaryColor": "App primary color",
   "attention": "Attention",
   "auto": "Auto",
   "backup": "Backup",
@@ -128,6 +128,7 @@
   "plzSelectKey": "Please select a key.",
   "port": "Port",
   "preview": "Preview",
+  "primaryColor": "Primary color",
   "privateKey": "Private Key",
   "process": "Process",
   "pushToken": "Push token",

lib/l10n/app_zh.arb

@@ -5,9 +5,9 @@
   "add": "新增",
   "addAServer": "添加服务器",
   "addPrivateKey": "添加一个私钥",
+  "added2List": "已添加至任务列表",
   "all": "所有",
   "alreadyLastDir": "已经是最上层目录了",
-  "appPrimaryColor": "App主要色",
   "attention": "注意",
   "auto": "自动",
   "backup": "备份",
@@ -128,6 +128,7 @@
   "plzSelectKey": "请选择私钥",
   "port": "端口",
   "preview": "预览",
+  "primaryColor": "主题色",
   "privateKey": "私钥",
   "process": "进程",
   "pushToken": "消息推送 Token",

lib/l10n/app_zh_tw.arb

@@ -5,9 +5,9 @@
   "add": "新增",
   "addAServer": "新增服務器",
   "addPrivateKey": "新增一個私鑰",
+  "added2List": "已添加至任務列表",
   "all": "所有",
   "alreadyLastDir": "已經是最上層目錄了",
-  "appPrimaryColor": "主要色調",
   "attention": "注意",
   "auto": "自動",
   "backup": "備份",
@@ -125,6 +125,7 @@
   "plzSelectKey": "請選擇私鑰",
   "port": "端口",
   "preview": "預覽",
+  "primaryColor": "主要色調",
   "privateKey": "私鑰",
   "process": "進程",
   "pushToken": "消息推送 Token",

lib/view/page/ping.dart

@@ -106,10 +106,7 @@ class _PingPageState extends State<PingPage>
       return Center(
         child: Text(
           _s.noResult,
-          style: TextStyle(
+          style: const TextStyle(fontSize: 18),
-            fontSize: 18,
-            color: primaryColor,
-          ),
         ),
       );
     }

lib/view/page/setting.dart

@@ -247,12 +247,12 @@ class _SettingPageState extends State<SettingPage> {
         ),
       ),
       title: Text(
-        _s.appPrimaryColor,
+        _s.primaryColor,
       ),
       onTap: () async {
         await showRoundDialog(
           context: context,
-          title: Text(_s.appPrimaryColor),
+          title: Text(_s.primaryColor),
           child: MaterialColorPicker(
             shrinkWrap: true,
             allowShades: true,
@@ -640,7 +640,7 @@ class _SettingPageState extends State<SettingPage> {
       },
     ).toList();
     return ListTile(
-      title: Text("${_s.editor} ${_s.theme}"),
+      title: Text(_s.theme),
       trailing: ValueBuilder(
         listenable: _editorTheme,
         build: () => PopupMenuButton(

lib/view/page/sftp/local.dart

@@ -9,8 +9,10 @@ import 'package:toolbox/data/provider/sftp.dart';
 import 'package:toolbox/data/res/misc.dart';
 import 'package:toolbox/locator.dart';
 import 'package:toolbox/view/page/editor.dart';
+import 'package:toolbox/view/page/sftp/remote.dart';
 import 'package:toolbox/view/widget/input_field.dart';
 import 'package:toolbox/view/widget/picker.dart';
+import 'package:toolbox/view/widget/round_rect_card.dart';
 
 import '../../../core/extension/numx.dart';
 import '../../../core/extension/stringx.dart';
@@ -112,13 +114,14 @@ class _SFTPDownloadedPageState extends State<SFTPDownloadedPage> {
     final files = dir.listSync();
     return ListView.builder(
       itemCount: files.length,
+      padding: const EdgeInsets.symmetric(vertical: 3, horizontal: 7),
       itemBuilder: (context, index) {
         var file = files[index];
         var fileName = file.path.split('/').last;
         var stat = file.statSync();
         var isDir = stat.type == FileSystemEntityType.directory;
 
-        return ListTile(
+        return RoundRectCard(ListTile(
           leading: isDir
               ? const Icon(Icons.folder)
               : const Icon(Icons.insert_drive_file),
@@ -138,7 +141,7 @@ class _SFTPDownloadedPageState extends State<SFTPDownloadedPage> {
             _path!.update(fileName);
             setState(() {});
           },
-        );
+        ));
       },
     );
   }
@@ -243,19 +246,6 @@ class _SFTPDownloadedPageState extends State<SFTPDownloadedPage> {
             title: Text(_s.upload),
             onTap: () async {
               context.pop();
-              final remotePath = await showRoundDialog(
-                  context: context,
-                  title: Text(_s.remotePath),
-                  child: Input(
-                    controller: TextEditingController(text: '/'),
-                    onSubmitted: (p0) {
-                      context.pop(p0);
-                    },
-                  ));
-              if (remotePath == null) {
-                showSnackBar(context, Text(_s.fieldMustNotEmpty));
-                return;
-              }
               final serverProvider = locator<ServerProvider>();
               final ids = serverProvider.serverOrder;
               var idx = 0;
@@ -277,10 +267,22 @@ class _SFTPDownloadedPageState extends State<SFTPDownloadedPage> {
                 showSnackBar(context, Text(_s.noResult));
                 return;
               }
+              final remotePath = await AppRoute(
+                SFTPPage(
+                  spi,
+                  selectPath: true,
+                ),
+                'SFTP page (select)',
+              ).go<String>(context);
+              if (remotePath == null) {
+                showSnackBar(context, Text(_s.fieldMustNotEmpty));
+                return;
+              }
               locator<SftpProvider>().add(
                 SftpReqItem(spi, remotePath, file.absolute.path),
                 SftpReqType.upload,
               );
+              showSnackBar(context, Text(_s.added2List));
             },
           ),
           ListTile(

lib/view/page/sftp/remote.dart

@@ -9,6 +9,7 @@ import 'package:toolbox/core/extension/sftpfile.dart';
 import 'package:toolbox/data/res/misc.dart';
 import 'package:toolbox/view/page/editor.dart';
 import 'package:toolbox/view/page/sftp/local.dart';
+import 'package:toolbox/view/widget/round_rect_card.dart';
 
 import '../../../core/extension/numx.dart';
 import '../../../core/extension/stringx.dart';
@@ -33,7 +34,14 @@ import 'mission.dart';
 class SFTPPage extends StatefulWidget {
   final ServerPrivateInfo spi;
   final String? initPath;
-  const SFTPPage(this.spi, {Key? key, this.initPath}) : super(key: key);
+  final bool selectPath;
+
+  const SFTPPage(
+    this.spi, {
+    Key? key,
+    this.initPath,
+    this.selectPath = false,
+  }) : super(key: key);
 
   @override
   _SFTPPageState createState() => _SFTPPageState();
@@ -86,6 +94,24 @@ class _SFTPPageState extends State<SFTPPage> {
   }
 
   Widget _buildBottom() {
+    final children = widget.selectPath
+        ? [
+            IconButton(
+                onPressed: () => context.pop(_status.path?.path),
+                icon: const Icon(Icons.done))
+          ]
+        : [
+            IconButton(
+              padding: const EdgeInsets.all(0),
+              onPressed: () async {
+                await _backward();
+              },
+              icon: const Icon(Icons.arrow_back),
+            ),
+            _buildAddBtn(),
+            _buildGotoBtn(),
+            _buildUploadBtn(),
+          ];
     return SafeArea(
       child: Container(
         padding: const EdgeInsets.fromLTRB(11, 7, 11, 11),
@@ -96,18 +122,7 @@ class _SFTPPageState extends State<SFTPPage> {
             (_status.path?.path ?? _s.loadingFiles).omitStartStr(),
             Row(
               mainAxisAlignment: MainAxisAlignment.spaceAround,
-              children: [
+              children: children,
-                IconButton(
-                  padding: const EdgeInsets.all(0),
-                  onPressed: () async {
-                    await _backward();
-                  },
-                  icon: const Icon(Icons.arrow_back),
-                ),
-                _buildAddBtn(),
-                _buildGotoBtn(),
-                _buildUploadBtn(),
-              ],
             )
           ],
         ),
@@ -250,10 +265,11 @@ class _SFTPPageState extends State<SFTPPage> {
           child: ListView.builder(
             itemCount: _status.files!.length,
             controller: _scrollController,
+            padding: const EdgeInsets.symmetric(horizontal: 7, vertical: 3),
             itemBuilder: (context, index) {
               final file = _status.files![index];
               final isDir = file.attr.isDirectory;
-              return ListTile(
+              return RoundRectCard(ListTile(
                 leading: Icon(isDir ? Icons.folder : Icons.insert_drive_file),
                 title: Text(file.filename),
                 trailing: Text(
@@ -272,7 +288,7 @@ class _SFTPPageState extends State<SFTPPage> {
                   }
                 },
                 onLongPress: () => _onItemPress(context, file, !isDir),
-              );
+              ));
             },
           ),
         ),
@@ -335,7 +351,9 @@ class _SFTPPageState extends State<SFTPPage> {
     final completer = Completer();
     final req = SftpReqItem(widget.spi, remotePath, localPath);
     _sftp.add(req, SftpReqType.download, completer: completer);
+    showRoundDialog(context: context, child: centerSizedLoading);
     await completer.future;
+    context.pop();
 
     final result = await AppRoute(
       EditorPage(path: localPath),