opt.: move logic of reorder to settings page

2023-08-20 20:14:02 +08:00
parent 46cc363413
commit f02cca1981
23 changed files with 324 additions and 113 deletions
--- a/lib/view/page/docker.dart
+++ b/lib/view/page/docker.dart
@@ -4,7 +4,7 @@ import 'package:provider/provider.dart';
 import 'package:toolbox/core/extension/navigator.dart';
 import 'package:toolbox/core/route.dart';
 import 'package:toolbox/data/model/docker/image.dart';
-import 'package:toolbox/view/page/ssh/term.dart';
+import 'package:toolbox/view/page/ssh_term.dart';
 import 'package:toolbox/view/widget/input_field.dart';

 import '../../core/utils/ui.dart';
--- a/lib/view/page/full_screen.dart
+++ b/lib/view/page/full_screen.dart
@@ -23,7 +23,7 @@ import '../../data/model/server/server_private_info.dart';
 import '../../data/model/server/server_status.dart';
 import '../../data/res/color.dart';
 import 'server/edit.dart';
-import 'setting.dart';
+import 'setting/entry.dart';

 class FullScreenPage extends StatefulWidget {
  const FullScreenPage({Key? key}) : super(key: key);
--- a/lib/view/page/home.dart
+++ b/lib/view/page/home.dart
@@ -26,7 +26,7 @@ import 'backup.dart';
 import 'convert.dart';
 import 'debug.dart';
 import 'private_key/list.dart';
-import 'setting.dart';
+import 'setting/entry.dart';
 import 'storage/local.dart';

 class HomePage extends StatefulWidget {
--- a/lib/view/page/server/detail.dart
+++ b/lib/view/page/server/detail.dart
@@ -94,35 +94,19 @@ class _ServerDetailPageState extends State<ServerDetailPage>
          )
        ],
      ),
-      body: ReorderableListView.builder(
+      bottomNavigationBar: _setting.moveOutServerTabFuncBtns.fetch()!
+          ? null
+          : ServerFuncBtns(spi: widget.spi, s: _s, iconSize: 19),
+      body: ListView.builder(
        padding: EdgeInsets.only(
          left: 13,
          right: 13,
          top: 13,
-          bottom: _media.padding.bottom,
+          bottom: _media.padding.bottom + 77,
        ),
-        onReorder: (int oldIndex, int newIndex) {
-          setState(() {
-            _cardsOrder.move(
-              oldIndex,
-              newIndex,
-              property: _setting.detailCardOrder,
-            );
-          });
-        },
-        footer: height13,
-        header: _setting.moveOutServerTabFuncBtns.fetch()!
-            ? null
-            : RoundRectCard(ServerFuncBtns(spi: widget.spi, s: _s)),
        itemCount: _cardsOrder.length,
-        buildDefaultDragHandles: false,
-        itemBuilder: (context, index) => ReorderableDelayedDragStartListener(
-          key: ValueKey(index),
-          index: index,
-          child: SizedBox(
-            child: _cardBuildMap[_cardsOrder[index]]?.call(si.status),
-          ),
-        ),
+        itemBuilder: (context, index) =>
+            _cardBuildMap[_cardsOrder[index]]?.call(si.status),
      ),
    );
  }
--- a/lib/view/page/server/tab.dart
+++ b/lib/view/page/server/tab.dart
@@ -5,7 +5,6 @@ import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:get_it/get_it.dart';
 import 'package:provider/provider.dart';
 import 'package:toolbox/core/extension/media_queryx.dart';
-import 'package:toolbox/core/extension/order.dart';
 import 'package:toolbox/data/model/app/net_view.dart';
 import 'package:toolbox/view/widget/server_func_btns.dart';
 import 'package:toolbox/view/widget/tag/switcher.dart';
@@ -72,6 +71,20 @@ class _ServerPageState extends State<ServerPage>
        heroTag: 'server',
        child: const Icon(Icons.add),
      ),
+      bottomNavigationBar: Padding(
+        padding: const EdgeInsets.fromLTRB(7, 17, 7, 3),
+        child: Consumer<ServerProvider>(builder: (_, pro, __) {
+          return TagSwitcher(
+            tags: pro.tags,
+            width: _media.size.width,
+            onTagChanged: (p0) => setState(() {
+              _tag = p0;
+            }),
+            initTag: _tag,
+            all: _s.all,
+          );
+        }),
+      ),
    );
  }

@@ -113,36 +126,15 @@ class _ServerPageState extends State<ServerPage>
          _tag == null || (pro.servers[e]?.spi.tags?.contains(_tag) ?? false))
      .toList();

-  Widget _buildBodySmall(
-      {required ServerProvider provider,
-      required List<String> filtered,
-      EdgeInsets? padding = const EdgeInsets.fromLTRB(7, 10, 7, 7)}) {
-    return ReorderableListView.builder(
-      header: TagSwitcher(
-        tags: provider.tags,
-        width: _media.size.width,
-        onTagChanged: (p0) => setState(() {
-          _tag = p0;
-        }),
-        initTag: _tag,
-        all: _s.all,
-      ),
-      footer: const SizedBox(height: 77),
+  Widget _buildBodySmall({
+    required ServerProvider provider,
+    required List<String> filtered,
+    EdgeInsets? padding = const EdgeInsets.fromLTRB(7, 10, 7, 7),
+  }) {
+    return ListView.builder(
      padding: padding,
-      onReorder: (oldIndex, newIndex) => setState(() {
-        provider.serverOrder.moveByItem(
-          filtered,
-          oldIndex,
-          newIndex,
-          property: _settingStore.serverOrder,
-        );
-      }),
-      buildDefaultDragHandles: false,
-      itemBuilder: (_, index) => ReorderableDelayedDragStartListener(
-        key: ValueKey('$_tag${filtered[index]}'),
-        index: index,
-        child: _buildEachServerCard(provider.servers[filtered[index]]),
-      ),
+      itemBuilder: (_, index) =>
+          _buildEachServerCard(provider.servers[filtered[index]]),
      itemCount: filtered.length,
    );
  }
@@ -176,17 +168,18 @@ class _ServerPageState extends State<ServerPage>
      return placeholder;
    }

-    return GestureDetector(
+    return RoundRectCard(
      key: Key(si.spi.id + (_tag ?? '')),
-      onTap: () {
-        if (si.state.canViewDetails) {
-          AppRoute.serverDetail(spi: si.spi).go(context);
-        } else if (si.status.failedInfo != null) {
-          _showFailReason(si.status);
-        }
-      },
-      child: RoundRectCard(
-        Padding(
+      InkWell(
+        onTap: () {
+          if (si.state.canViewDetails) {
+            AppRoute.serverDetail(spi: si.spi).go(context);
+          } else if (si.status.failedInfo != null) {
+            _showFailReason(si.status);
+          }
+        },
+        onLongPress: () => AppRoute.serverEdit(spi: si.spi).go(context),
+        child: Padding(
          padding: const EdgeInsets.all(13),
          child: _buildRealServerCard(si.status, si.state, si.spi),
        ),
--- a/lib/view/page/setting/entry.dart
+++ b/lib/view/page/setting/entry.dart
@@ -12,26 +12,26 @@ import 'package:toolbox/core/extension/navigator.dart';
 import 'package:toolbox/core/extension/stringx.dart';
 import 'package:toolbox/core/route.dart';
 import 'package:toolbox/data/model/app/net_view.dart';
-import 'package:toolbox/view/page/ssh/virt_key_setting.dart';
+import 'package:toolbox/view/page/setting/virt_key.dart';
 import 'package:toolbox/view/widget/input_field.dart';
 import 'package:toolbox/view/widget/value_notifier.dart';

-import '../../core/utils/misc.dart';
-import '../../core/utils/platform.dart';
-import '../../core/update.dart';
-import '../../core/utils/ui.dart';
-import '../../data/provider/app.dart';
-import '../../data/provider/server.dart';
-import '../../data/res/build_data.dart';
-import '../../data/res/color.dart';
-import '../../data/res/path.dart';
-import '../../data/res/ui.dart';
-import '../../data/store/server.dart';
-import '../../data/store/setting.dart';
-import '../../locator.dart';
-import '../widget/custom_appbar.dart';
-import '../widget/future_widget.dart';
-import '../widget/round_rect_card.dart';
+import '../../../core/utils/misc.dart';
+import '../../../core/utils/platform.dart';
+import '../../../core/update.dart';
+import '../../../core/utils/ui.dart';
+import '../../../data/provider/app.dart';
+import '../../../data/provider/server.dart';
+import '../../../data/res/build_data.dart';
+import '../../../data/res/color.dart';
+import '../../../data/res/path.dart';
+import '../../../data/res/ui.dart';
+import '../../../data/store/server.dart';
+import '../../../data/store/setting.dart';
+import '../../../locator.dart';
+import '../../widget/custom_appbar.dart';
+import '../../widget/future_widget.dart';
+import '../../widget/round_rect_card.dart';

 class SettingPage extends StatefulWidget {
  const SettingPage({Key? key}) : super(key: key);
@@ -170,6 +170,8 @@ class _SettingPageState extends State<SettingPage> {
    return Column(
      children: [
        _buildMoveOutServerFuncBtns(),
+        _buildServerOrder(),
+        _buildServerDetailOrder(),
        _buildNetViewType(),
        _buildUpdateInterval(),
        _buildMaxRetry(),
@@ -978,4 +980,20 @@ class _SettingPageState extends State<SettingPage> {
      trailing: buildSwitch(context, _setting.moveOutServerTabFuncBtns),
    );
  }
+
+  Widget _buildServerOrder() {
+    return ListTile(
+      title: Text(_s.serverOrder),
+      trailing: const Icon(Icons.keyboard_arrow_right),
+      onTap: () => AppRoute.serverOrder().go(context),
+    );
+  }
+
+  Widget _buildServerDetailOrder() {
+    return ListTile(
+      title: Text(_s.serverDetailOrder),
+      trailing: const Icon(Icons.keyboard_arrow_right),
+      onTap: () => AppRoute.serverDetailOrder().go(context),
+    );
+  }
 }
--- a/lib/view/page/setting/srv_detail_seq.dart
+++ b/lib/view/page/setting/srv_detail_seq.dart
@@ -0,0 +1,73 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+
+import '../../../core/extension/order.dart';
+import '../../../data/store/setting.dart';
+import '../../../locator.dart';
+import '../../widget/custom_appbar.dart';
+import '../../widget/round_rect_card.dart';
+
+class ServerDetailOrderPage extends StatefulWidget {
+  const ServerDetailOrderPage({super.key});
+
+  @override
+  State<ServerDetailOrderPage> createState() => _ServerDetailOrderPageState();
+}
+
+class _ServerDetailOrderPageState extends State<ServerDetailOrderPage> {
+  final _store = locator<SettingStore>();
+
+  final Order<String> _cardsOrder = [];
+
+  late S _s;
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    _s = S.of(context)!;
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    _cardsOrder.addAll(_store.detailCardOrder.fetch()!);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: CustomAppBar(
+        title: Text(_s.serverOrder),
+      ),
+      body: _buildBody(),
+    );
+  }
+
+  Widget _buildBody() {
+    return ReorderableListView.builder(
+      footer: const SizedBox(height: 77),
+      onReorder: (oldIndex, newIndex) => setState(() {
+        _cardsOrder.move(
+          oldIndex,
+          newIndex,
+          property: _store.serverOrder,
+        );
+      }),
+      padding: const EdgeInsets.symmetric(horizontal: 7, vertical: 3),
+      buildDefaultDragHandles: false,
+      itemBuilder: (_, index) => _buildItem(index, _cardsOrder[index]),
+      itemCount: _cardsOrder.length,
+    );
+  }
+
+  Widget _buildItem(int index, String id) {
+    return ReorderableDelayedDragStartListener(
+      key: ValueKey('$index'),
+      index: index,
+      child: RoundRectCard(ListTile(
+        title: Text(id),
+        trailing: const Icon(Icons.drag_handle),
+      )),
+    );
+  }
+}
--- a/lib/view/page/setting/srv_seq.dart
+++ b/lib/view/page/setting/srv_seq.dart
@@ -0,0 +1,76 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:toolbox/core/extension/order.dart';
+import 'package:toolbox/view/widget/round_rect_card.dart';
+
+import '../../../data/provider/server.dart';
+import '../../../data/store/setting.dart';
+import '../../../locator.dart';
+import '../../widget/custom_appbar.dart';
+
+class ServerOrderPage extends StatefulWidget {
+  const ServerOrderPage({Key? key}) : super(key: key);
+
+  @override
+  _ServerOrderPageState createState() => _ServerOrderPageState();
+}
+
+class _ServerOrderPageState extends State<ServerOrderPage> {
+  final _store = locator<SettingStore>();
+  final _provider = locator<ServerProvider>();
+
+  late S _s;
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    _s = S.of(context)!;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: CustomAppBar(
+        title: Text(_s.serverOrder),
+      ),
+      body: _buildBody(),
+    );
+  }
+
+  Widget _buildBody() {
+    return ReorderableListView.builder(
+      footer: const SizedBox(height: 77),
+      onReorder: (oldIndex, newIndex) => setState(() {
+        _provider.serverOrder.move(
+          oldIndex,
+          newIndex,
+          property: _store.serverOrder,
+        );
+      }),
+      padding: const EdgeInsets.symmetric(horizontal: 7, vertical: 3),
+      buildDefaultDragHandles: false,
+      itemBuilder: (_, index) =>
+          _buildItem(index, _provider.serverOrder[index]),
+      itemCount: _provider.serverOrder.length,
+    );
+  }
+
+  Widget _buildItem(int index, String id) {
+    final spi = _provider.servers[id]?.spi;
+    if (spi == null) {
+      return const SizedBox();
+    }
+    return ReorderableDelayedDragStartListener(
+      key: ValueKey('$index'),
+      index: index,
+      child: RoundRectCard(ListTile(
+        title: Text(spi.name),
+        subtitle: Text(spi.id),
+        leading: CircleAvatar(
+          child: Text(spi.name[0]),
+        ),
+        trailing: const Icon(Icons.drag_handle),
+      )),
+    );
+  }
+}
--- a/lib/view/page/ssh/virt_key_setting.dart
+++ b/lib/view/page/ssh/virt_key_setting.dart
--- a/lib/view/page/ssh_term.dart
+++ b/lib/view/page/ssh_term.dart
@@ -10,18 +10,18 @@ import 'package:provider/provider.dart';
 import 'package:toolbox/core/extension/navigator.dart';
 import 'package:xterm/xterm.dart';

-import '../../../core/route.dart';
-import '../../../core/utils/platform.dart';
-import '../../../core/utils/misc.dart';
-import '../../../core/utils/ui.dart';
-import '../../../core/utils/server.dart';
-import '../../../data/model/server/server_private_info.dart';
-import '../../../data/model/ssh/virtual_key.dart';
-import '../../../data/provider/virtual_keyboard.dart';
-import '../../../data/res/color.dart';
-import '../../../data/res/terminal.dart';
-import '../../../data/store/setting.dart';
-import '../../../locator.dart';
+import '../../core/route.dart';
+import '../../core/utils/platform.dart';
+import '../../core/utils/misc.dart';
+import '../../core/utils/ui.dart';
+import '../../core/utils/server.dart';
+import '../../data/model/server/server_private_info.dart';
+import '../../data/model/ssh/virtual_key.dart';
+import '../../data/provider/virtual_keyboard.dart';
+import '../../data/res/color.dart';
+import '../../data/res/terminal.dart';
+import '../../data/store/setting.dart';
+import '../../locator.dart';

 const echoPWD = 'echo \$PWD';