new: control server detail page cards

lib/core/analysis.dart

@@ -5,8 +5,8 @@ import 'package:toolbox/core/build_mode.dart';
 import 'package:toolbox/core/utils/platform/base.dart';
 
 class Analysis {
-  static const _url = 'https://countly.xuty.cc';
+  static const _url = 'https://countly.lolli.tech';
-  static const _key = '80372a2a66424b32d0ac8991bfa1ef058bd36b1f';
+  static const _key = '0772e65c696709f879d87db77ae1a811259e3eb9';
 
   static bool enabled = false;
 

lib/data/res/default.dart

@@ -5,7 +5,7 @@ import 'package:toolbox/data/model/ssh/virtual_key.dart';
 abstract final class Defaults {
   // default server details page cards order
   static const detailCardOrder = [
-    'sys',
+    'about',
     'cpu',
     'mem',
     'swap',

lib/data/res/github_id.dart

@@ -46,5 +46,11 @@ abstract final class GithubIds {
     'xushuojie',
     'AniberMokie',
     'LucaLin233',
+    'lalasou',
+    'ohyoxo',
+    'lovechang1986',
+    'luckyreny',
+    'aliuzzz',
+    '58fly',
   };
 }

lib/data/store/setting.dart

@@ -93,7 +93,7 @@ class SettingStore extends PersistentStore {
 
   // Server details page cards order
   late final detailCardOrder =
-      listProperty('detailCardPrder', Defaults.detailCardOrder);
+      listProperty('detailCardOrder', Defaults.detailCardOrder);
 
   // SSH term font size
   late final termFontSize = property('termFontSize', 13.0);

lib/view/page/home.dart

@@ -3,6 +3,7 @@ import 'dart:convert';
 import 'package:after_layout/after_layout.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:get_it/get_it.dart';
 import 'package:toolbox/core/channel/bg_run.dart';
 import 'package:toolbox/core/channel/home_widget.dart';
@@ -11,6 +12,7 @@ import 'package:toolbox/core/extension/context/locale.dart';
 import 'package:toolbox/core/persistant_store.dart';
 import 'package:toolbox/core/utils/platform/auth.dart';
 import 'package:toolbox/core/utils/platform/base.dart';
+import 'package:toolbox/data/res/color.dart';
 import 'package:toolbox/data/res/github_id.dart';
 import 'package:toolbox/data/res/logger.dart';
 import 'package:toolbox/data/res/provider.dart';
@@ -26,7 +28,6 @@ import '../../data/res/ui.dart';
 import '../../data/res/url.dart';
 import '../widget/appbar.dart';
 import '../widget/cardx.dart';
-import '../widget/url_text.dart';
 
 class HomePage extends StatefulWidget {
   const HomePage({super.key});
@@ -267,40 +268,28 @@ class _HomePageState extends State<HomePage>
 
   Widget _buildAboutContent() {
     return SingleChildScrollView(
-      child: Column(
+      child: SizedBox(
-        mainAxisSize: MainAxisSize.min,
+        width: MediaQuery.of(context).size.width * 0.8,
-        crossAxisAlignment: CrossAxisAlignment.start,
+        child: MarkdownBody(
-        children: [
+          styleSheet: MarkdownStyleSheet(a: TextStyle(color: primaryColor)),
-          UrlText(
+          onTapLink: (text, href, title) {
-            text: l10n.madeWithLove(Urls.myGithub),
+            if (href != null) {
-            replace: 'lollipopkit',
+              openUrl(href);
+            }
+          },
+          data: '''
+${l10n.madeWithLove('[lollipopkit](${Urls.myGithub})')}
+
+#### Contributors
+${GithubIds.contributors.map((e) => '[$e](${e.url})').join(' ')}
+
+#### Participants
+${GithubIds.participants.map((e) => '[$e](${e.url})').join(' ')}
+
+#### My apps
+- [GPT Box](https://github.com/lollipopkit/flutter_gpt_box)
+''',
         ),
-          UIs.height13,
-          const Text('My apps:'),
-          const UrlText(
-            text: 'https://github.com/lollipopkit/flutter_gpt_box',
-            replace: 'GPT Box',
-          ),
-          UIs.height13,
-          // Use [UrlText] for same text style
-          Text(l10n.aboutThanks),
-          UIs.height13,
-          const Text('Contributors:'),
-          ...GithubIds.contributors.map(
-            (name) => UrlText(
-              text: name.url,
-              replace: name,
-            ),
-          ),
-          UIs.height13,
-          const Text('Participants:'),
-          ...GithubIds.participants.map(
-            (name) => UrlText(
-              text: name.url,
-              replace: name,
-            ),
-          )
-        ],
       ),
     );
   }

lib/view/page/server/detail.dart

@@ -41,7 +41,7 @@ class _ServerDetailPageState extends State<ServerDetailPage>
   late final _cardBuildMap = Map.fromIterables(
     Defaults.detailCardOrder,
     [
-      _buildUpTimeAndSys,
+      _buildAbout,
       _buildCPUView,
       _buildMemView,
       _buildSwapView,
@@ -69,8 +69,9 @@ class _ServerDetailPageState extends State<ServerDetailPage>
   @override
   void initState() {
     super.initState();
-    //_cardsOrder.addAll(Stores.setting.detailCardOrder.fetch());
+    final order = Stores.setting.detailCardOrder.fetch();
-    _cardsOrder.addAll(_cardBuildMap.keys);
+    order.removeWhere((element) => !_cardBuildMap.containsKey(element));
+    _cardsOrder.addAll(order);
   }
 
   @override
@@ -123,7 +124,7 @@ class _ServerDetailPageState extends State<ServerDetailPage>
     );
   }
 
-  Widget _buildUpTimeAndSys(ServerStatus ss) {
+  Widget _buildAbout(ServerStatus ss) {
     return CardX(
       child: ExpandTile(
         leading: const Icon(Icons.computer),

lib/view/page/setting/entry.dart

@@ -18,6 +18,7 @@ import 'package:toolbox/core/utils/platform/base.dart';
 import 'package:toolbox/data/res/provider.dart';
 import 'package:toolbox/data/res/rebuild.dart';
 import 'package:toolbox/data/res/store.dart';
+import 'package:toolbox/view/widget/expand_tile.dart';
 
 import '../../../core/persistant_store.dart';
 import '../../../core/route.dart';
@@ -991,26 +992,25 @@ class _SettingPageState extends State<SettingPage> {
   }
 
   Widget _buildSequence() {
-    return ListTile(
+    return ExpandTile(
+      title: Text(l10n.sequence),
+      subtitle: Text(
+        '${l10n.serverOrder} / ${l10n.serverDetailOrder} ...',
+        style: UIs.textGrey,
+      ),
+      children: [
+        ListTile(
           title: Text(l10n.serverOrder),
           trailing: const Icon(Icons.keyboard_arrow_right),
           onTap: () => AppRoute.serverOrder().go(context),
+        ),
+        ListTile(
+          title: Text(l10n.serverDetailOrder),
+          trailing: const Icon(Icons.keyboard_arrow_right),
+          onTap: () => AppRoute.serverDetailOrder().go(context),
+        ),
+      ],
     );
-    // return ExpandTile(
-    //   title: Text(l10n.sequence),
-    //   subtitle: Text(
-    //     '${l10n.serverOrder} / ${l10n.serverDetailOrder} ...',
-    //     style: UIs.textGrey,
-    //   ),
-    //   children: [
-    //     ,
-    //     ListTile(
-    //       title: Text(l10n.serverDetailOrder),
-    //       trailing: const Icon(Icons.keyboard_arrow_right),
-    //       onTap: () => AppRoute.serverDetailOrder().go(context),
-    //     ),
-    //   ],
-    // );
   }
 
   Widget _buildEditorFontSize() {

lib/view/page/setting/srv_detail_seq.dart

@@ -1,5 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:toolbox/core/extension/context/locale.dart';
+import 'package:toolbox/core/extension/context/snackbar.dart';
+import 'package:toolbox/core/utils/platform/base.dart';
+import 'package:toolbox/data/res/default.dart';
 import 'package:toolbox/data/res/store.dart';
 
 import '../../../core/extension/order.dart';
@@ -14,14 +17,6 @@ class ServerDetailOrderPage extends StatefulWidget {
 }
 
 class _ServerDetailOrderPageState extends State<ServerDetailOrderPage> {
-  final Order<String> _cardsOrder = [];
-
-  @override
-  void initState() {
-    super.initState();
-    _cardsOrder.addAll(Stores.setting.detailCardOrder.fetch());
-  }
-
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -33,32 +28,55 @@ class _ServerDetailOrderPageState extends State<ServerDetailOrderPage> {
   }
 
   Widget _buildBody() {
+    final keys_ = Stores.setting.detailCardOrder.fetch();
+    final keys = <String>[];
+    for (final key in keys_) {
+      keys.add(key);
+    }
+    final disabled = Defaults.detailCardOrder.where((e) => !keys.contains(e)).toList();
+    final allKeys = [...keys, ...disabled];
     return ReorderableListView.builder(
-      footer: const SizedBox(height: 77),
+      padding: const EdgeInsets.all(7),
-      onReorder: (oldIndex, newIndex) => setState(() {
+      itemBuilder: (_, idx) {
-        _cardsOrder.move(
+        final key = allKeys[idx];
-          oldIndex,
+        return CardX(
-          newIndex,
+          key: ValueKey(idx),
-          property: Stores.setting.detailCardOrder,
+          child: ListTile(
+            title: Text(key),
+            leading: _buildCheckBox(keys, key, idx, idx < keys.length),
+            trailing: isDesktop ? null : const Icon(Icons.drag_handle),
+          ),
         );
-      }),
+      },
-      padding: const EdgeInsets.all(17),
+      itemCount: allKeys.length,
-      buildDefaultDragHandles: false,
+      onReorder: (o, n) {
-      itemBuilder: (_, index) => _buildItem(index, _cardsOrder[index]),
+        if (o >= keys.length || n >= keys.length) {
-      itemCount: _cardsOrder.length,
+          context.showSnackBar(l10n.disabled);
+          return;
+        }
+        keys.moveByItem(keys, o, n, property: Stores.setting.detailCardOrder);
+        setState(() {});
+      },
     );
   }
 
-  Widget _buildItem(int index, String id) {
+  Widget _buildCheckBox(List<String> keys, String key, int idx, bool value) {
-    return ReorderableDelayedDragStartListener(
+    return Checkbox(
-      key: ValueKey('$index'),
+      value: value,
-      index: index,
+      onChanged: (val) {
-      child: CardX(
+        if (val == null) return;
-        child: ListTile(
+        if (val) {
-          title: Text(id),
+          if (idx >= keys.length) {
-          trailing: const Icon(Icons.drag_handle),
+            keys.add(key);
-        ),
+          } else {
-      ),
+            keys.insert(idx - 1, key);
+          }
+        } else {
+          keys.remove(key);
+        }
+        Stores.setting.detailCardOrder.put(keys);
+        setState(() {});
+      },
     );
   }
 }

pubspec.lock

@@ -364,6 +364,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_markdown:
+    dependency: "direct main"
+    description:
+      name: flutter_markdown
+      sha256: "30088ce826b5b9cfbf9e8bece34c716c8a59fa54461dcae1e4ac01a94639e762"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.18+3"
   flutter_native_splash:
     dependency: "direct dev"
     description:
@@ -590,6 +598,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.0"
+  markdown:
+    dependency: transitive
+    description:
+      name: markdown
+      sha256: "4e304b422905967f1f7e35a03cd2a3f8f34306b3e1b0cc7a8677d7a306471a0e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.2.0"
   matcher:
     dependency: transitive
     description:

pubspec.yaml

@@ -66,6 +66,7 @@ dependencies:
       url: https://github.com/lollipopkit/webdav_client
   window_manager: ^0.3.7
   flutter_displaymode: ^0.6.0
+  flutter_markdown: ^0.6.18+2
 
 dev_dependencies:
   flutter_native_splash: ^2.1.6