opt: bar set (#862)

* opt: bar set

* opt: navbar

* fix: type

lib/pages/setting/navigation_bar_set.dart

@@ -1,98 +0,0 @@
-import 'package:PiliPlus/models/common/nav_bar_config.dart';
-import 'package:PiliPlus/utils/storage.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
-
-class NavigationBarSetPage extends StatefulWidget {
-  const NavigationBarSetPage({super.key});
-
-  @override
-  State<NavigationBarSetPage> createState() => _NavigationbarSetPageState();
-}
-
-class _NavigationbarSetPageState extends State<NavigationBarSetPage> {
-  late List defaultNavTabs;
-  late List<int> navBarSort;
-
-  @override
-  void initState() {
-    super.initState();
-    defaultNavTabs = defaultNavigationBars;
-    navBarSort = List<int>.from(GStorage.setting
-        .get(SettingBoxKey.navBarSort, defaultValue: [0, 1, 2]));
-    // 对 tabData 进行排序
-    defaultNavTabs.sort((a, b) {
-      int indexA = navBarSort.indexOf(a['id']);
-      int indexB = navBarSort.indexOf(b['id']);
-
-      // 如果类型在 sortOrder 中不存在，则放在末尾
-      if (indexA == -1) indexA = navBarSort.length;
-      if (indexB == -1) indexB = navBarSort.length;
-
-      return indexA.compareTo(indexB);
-    });
-  }
-
-  void saveEdit() {
-    List<int> sortedTabbar = defaultNavTabs
-        .where((i) => navBarSort.contains(i['id']))
-        .map<int>((i) => i['id'])
-        .toList();
-    if (sortedTabbar.isEmpty) {
-      sortedTabbar = [0, 1, 2];
-    }
-    GStorage.setting.put(SettingBoxKey.navBarSort, sortedTabbar);
-    SmartDialog.showToast('保存成功，下次启动时生效');
-  }
-
-  void onReorder(int oldIndex, int newIndex) {
-    setState(() {
-      if (newIndex > oldIndex) {
-        newIndex -= 1;
-      }
-      final tabsItem = defaultNavTabs.removeAt(oldIndex);
-      defaultNavTabs.insert(newIndex, tabsItem);
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: const Text('Navbar编辑'),
-        actions: [
-          TextButton(
-            onPressed: saveEdit,
-            child: const Text('保存'),
-          ),
-          const SizedBox(width: 12)
-        ],
-      ),
-      body: ReorderableListView(
-        onReorder: onReorder,
-        footer: SizedBox(
-          height: MediaQuery.of(context).padding.bottom + 30,
-        ),
-        children: defaultNavTabs
-            .map(
-              (item) => CheckboxListTile(
-                key: Key(item['label']),
-                value: navBarSort.contains(item['id']),
-                onChanged: (bool? newValue) {
-                  int tabTypeId = item['id'];
-                  if (!newValue!) {
-                    navBarSort.remove(tabTypeId);
-                  } else {
-                    navBarSort.add(tabTypeId);
-                  }
-                  setState(() {});
-                },
-                title: Text(item['label']),
-                secondary: const Icon(Icons.drag_indicator_rounded),
-              ),
-            )
-            .toList(),
-      ),
-    );
-  }
-}

lib/pages/setting/pages/bar_set.dart

@@ -0,0 +1,94 @@
+import 'package:PiliPlus/models/common/enum_with_label.dart';
+import 'package:PiliPlus/utils/storage.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:get/get.dart';
+
+class BarSetPage extends StatefulWidget {
+  const BarSetPage({super.key});
+
+  @override
+  State<BarSetPage> createState() => _BarSetPageState();
+}
+
+class _BarSetPageState extends State<BarSetPage> {
+  late final List<EnumWithLabel> defaultBars;
+  late final Map<int, int> barIndex;
+  late final String key;
+  late final String title;
+
+  @override
+  void initState() {
+    super.initState();
+    Map<String, dynamic> args = Get.arguments;
+    key = args['key'];
+    title = args['title'] ?? '';
+    defaultBars = List<EnumWithLabel>.from(args['defaultBars']);
+    List<int>? bars = (GStorage.setting.get(key) as List?)?.cast();
+    if (bars != null) {
+      barIndex = {for (var (k, v) in bars.indexed) v: k};
+
+      // 对 tabData 进行排序
+      defaultBars.sort((a, b) {
+        final indexA = barIndex[a.index] ?? barIndex.length;
+        final indexB = barIndex[b.index] ?? barIndex.length;
+        return indexA.compareTo(indexB);
+      });
+    } else {
+      barIndex = {for (var (k, v) in defaultBars.indexed) v.index: k};
+    }
+  }
+
+  void saveEdit() {
+    List<int> sortedBar = defaultBars
+        .where((i) => barIndex.containsKey(i.index))
+        .map((i) => i.index)
+        .toList();
+    GStorage.setting.put(key, sortedBar);
+    SmartDialog.showToast('保存成功，下次启动时生效');
+  }
+
+  void onReorder(int oldIndex, int newIndex) {
+    setState(() {
+      if (newIndex > oldIndex) newIndex -= 1;
+      defaultBars.insert(newIndex, defaultBars.removeAt(oldIndex));
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text('$title编辑'),
+        actions: [
+          TextButton(onPressed: saveEdit, child: const Text('保存')),
+          const SizedBox(width: 12)
+        ],
+      ),
+      body: ReorderableListView(
+        onReorder: onReorder,
+        footer: SizedBox(
+          height: MediaQuery.of(context).padding.bottom + 30,
+          child: const Align(
+              alignment: Alignment.centerRight, child: Text('*长按拖动排序        ')),
+        ),
+        children: defaultBars
+            .map((i) => CheckboxListTile(
+                  key: Key(i.label),
+                  value: barIndex.containsKey(i.index),
+                  onChanged: (bool? value) {
+                    if (value!) {
+                      barIndex[i.index] = -1;
+                    } else {
+                      barIndex.remove(i.index);
+                    }
+                    setState(() {});
+                  },
+                  title: Text(i.label),
+                  secondary: const Icon(Icons.drag_indicator_rounded),
+                ))
+            .toList(),
+      ),
+    );
+  }
+}

lib/pages/setting/pages/color_select.dart

@@ -257,11 +257,11 @@ class _ColorSelectPageState extends State<ColorSelectPage> {
               ),
               IgnorePointer(
                 child: NavigationBar(
-                  destinations: defaultNavigationBars
+                  destinations: NavigationBarType.values
                       .map(
                         (item) => NavigationDestination(
-                          icon: item['icon'],
-                          label: item['label'],
+                          icon: item.icon,
+                          label: item.label,
                         ),
                       )
                       .toList(),

lib/pages/setting/pages/home_tabbar_set.dart

@@ -1,96 +0,0 @@
-import 'package:PiliPlus/models/common/home_tab_type.dart';
-import 'package:PiliPlus/utils/storage.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
-
-class TabbarSetPage extends StatefulWidget {
-  const TabbarSetPage({super.key});
-
-  @override
-  State<TabbarSetPage> createState() => _TabbarSetPageState();
-}
-
-class _TabbarSetPageState extends State<TabbarSetPage> {
-  late List defaultTabs;
-  late List<String> tabbarSort;
-
-  @override
-  void initState() {
-    super.initState();
-    defaultTabs = homeTabsConfig;
-    tabbarSort = GStorage.tabbarSort;
-    // 对 tabData 进行排序
-    defaultTabs.sort((a, b) {
-      int indexA = tabbarSort.indexOf((a['type'] as HomeTabType).name);
-      int indexB = tabbarSort.indexOf((b['type'] as HomeTabType).name);
-
-      // 如果类型在 sortOrder 中不存在，则放在末尾
-      if (indexA == -1) indexA = tabbarSort.length;
-      if (indexB == -1) indexB = tabbarSort.length;
-
-      return indexA.compareTo(indexB);
-    });
-  }
-
-  void saveEdit() {
-    List<String> sortedTabbar = defaultTabs
-        .where((i) => tabbarSort.contains((i['type'] as HomeTabType).name))
-        .map<String>((i) => (i['type'] as HomeTabType).name)
-        .toList();
-    GStorage.setting.put(SettingBoxKey.tabbarSort, sortedTabbar);
-    SmartDialog.showToast('保存成功，下次启动时生效');
-  }
-
-  void onReorder(int oldIndex, int newIndex) {
-    setState(() {
-      if (newIndex > oldIndex) {
-        newIndex -= 1;
-      }
-      final tabsItem = defaultTabs.removeAt(oldIndex);
-      defaultTabs.insert(newIndex, tabsItem);
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final listTiles = [
-      for (int i = 0; i < defaultTabs.length; i++) ...[
-        CheckboxListTile(
-          key: Key(defaultTabs[i]['label']),
-          value:
-              tabbarSort.contains((defaultTabs[i]['type'] as HomeTabType).name),
-          onChanged: (bool? newValue) {
-            String tabTypeId = (defaultTabs[i]['type'] as HomeTabType).name;
-            if (!newValue!) {
-              tabbarSort.remove(tabTypeId);
-            } else {
-              tabbarSort.add(tabTypeId);
-            }
-            setState(() {});
-          },
-          title: Text(defaultTabs[i]['label']),
-          secondary: const Icon(Icons.drag_indicator_rounded),
-        )
-      ]
-    ];
-
-    return Scaffold(
-      appBar: AppBar(
-        title: const Text('Tabbar编辑'),
-        actions: [
-          TextButton(onPressed: () => saveEdit(), child: const Text('保存')),
-          const SizedBox(width: 12)
-        ],
-      ),
-      body: ReorderableListView(
-        onReorder: onReorder,
-        footer: SizedBox(
-          height: MediaQuery.of(context).padding.bottom + 30,
-          child: const Align(
-              alignment: Alignment.centerRight, child: Text('*长按拖动排序        ')),
-        ),
-        children: listTiles,
-      ),
-    );
-  }
-}

lib/pages/setting/widgets/model.dart

@@ -14,6 +14,7 @@ import 'package:PiliPlus/models/common/audio_normalization.dart';
 import 'package:PiliPlus/models/common/dynamic/dynamic_badge_mode.dart';
 import 'package:PiliPlus/models/common/dynamic/dynamics_type.dart';
 import 'package:PiliPlus/models/common/dynamic/up_panel_position.dart';
+import 'package:PiliPlus/models/common/home_tab_type.dart';
 import 'package:PiliPlus/models/common/member/tab_type.dart';
 import 'package:PiliPlus/models/common/msg/msg_unread_type.dart';
 import 'package:PiliPlus/models/common/nav_bar_config.dart';
@@ -591,8 +592,8 @@ List<SettingsModel> get styleSettings => [
               return SelectDialog<int>(
                 title: '首页启动页',
                 value: GStorage.defaultHomePage,
-                values: defaultNavigationBars.map((e) {
-                  return (e['id'] as int, e['label'] as String);
+                values: NavigationBarType.values.map((e) {
+                  return (e.index, e.label);
                 }).toList(),
               );
             },
@@ -606,7 +607,7 @@ List<SettingsModel> get styleSettings => [
         leading: const Icon(Icons.home_outlined),
         title: '默认启动页',
         getSubtitle: () =>
-            '当前启动页：${defaultNavigationBars.firstWhere((e) => e['id'] == GStorage.defaultHomePage)['label']}',
+            '当前启动页：${NavigationBarType.values.firstWhere((e) => e.index == GStorage.defaultHomePage).label}',
       ),
       SettingsModel(
         settingsType: SettingsType.normal,
@@ -699,15 +700,24 @@ List<SettingsModel> get styleSettings => [
       ),
       SettingsModel(
         settingsType: SettingsType.normal,
-        onTap: (setState) => Get.toNamed('/tabbarSetting'),
+        onTap: (setState) => Get.toNamed('/barSetting', arguments: {
+          'key': SettingBoxKey.tabBarSort,
+          'defaultBars': HomeTabType.values,
+          'title': '首页标签页'
+        }),
         title: '首页标签页',
         subtitle: '删除或调换首页标签页',
         leading: const Icon(Icons.toc_outlined),
       ),
       SettingsModel(
         settingsType: SettingsType.normal,
-        onTap: (setState) => Get.toNamed('/navbarSetting'),
+        onTap: (setState) => Get.toNamed('/barSetting', arguments: {
+          'key': SettingBoxKey.navBarSort,
+          'defaultBars': NavigationBarType.values,
+          'title': 'Navbar'
+        }),
         title: 'Navbar编辑',
+        subtitle: '删除或调换Navbar',
         leading: const Icon(Icons.toc_outlined),
       ),
       if (Platform.isAndroid)

lib/pages/setting/widgets/select_item.dart

@@ -1,121 +0,0 @@
-import 'package:PiliPlus/models/common/video/audio_quality.dart';
-import 'package:PiliPlus/models/common/video/video_decode_type.dart';
-import 'package:PiliPlus/models/common/video/video_quality.dart';
-import 'package:PiliPlus/utils/storage.dart';
-import 'package:flutter/material.dart';
-import 'package:hive/hive.dart';
-
-class SetSelectItem extends StatefulWidget {
-  final String? title;
-  final String? subTitle;
-  final String? setKey;
-  const SetSelectItem({
-    this.title,
-    this.subTitle,
-    this.setKey,
-    super.key,
-  });
-
-  @override
-  State<SetSelectItem> createState() => _SetSelectItemState();
-}
-
-class _SetSelectItemState extends State<SetSelectItem> {
-  late dynamic currentVal;
-  late int currentIndex;
-  late List menus;
-  late List<PopupMenuEntry> popMenuItems;
-
-  Box get setting => GStorage.setting;
-
-  @override
-  void initState() {
-    super.initState();
-    late String defaultVal;
-    switch (widget.setKey) {
-      case 'defaultVideoQa':
-        defaultVal = VideoQuality.values.last.description;
-        List<VideoQuality> list = menus = VideoQuality.values.reversed.toList();
-        currentVal = setting.get(widget.setKey, defaultValue: defaultVal);
-        currentIndex =
-            list.firstWhere((i) => i.description == currentVal).index;
-
-        popMenuItems = [
-          for (var i in list) ...[
-            PopupMenuItem(
-              value: i.code,
-              child: Text(i.description),
-            )
-          ]
-        ];
-
-        break;
-      case 'defaultAudioQa':
-        defaultVal = AudioQuality.values.last.description;
-        List<AudioQuality> list = menus = AudioQuality.values.reversed.toList();
-        currentVal = setting.get(widget.setKey, defaultValue: defaultVal);
-        currentIndex =
-            list.firstWhere((i) => i.description == currentVal).index;
-
-        popMenuItems = [
-          for (var i in list) ...[
-            PopupMenuItem(
-              value: i.index,
-              child: Text(i.description),
-            ),
-          ]
-        ];
-        break;
-      case 'defaultDecode':
-        defaultVal = VideoDecodeFormatType.values[0].description;
-        currentVal = setting.get(widget.setKey, defaultValue: defaultVal);
-        List<VideoDecodeFormatType> list = menus = VideoDecodeFormatType.values;
-
-        currentIndex =
-            list.firstWhere((i) => i.description == currentVal).index;
-
-        popMenuItems = [
-          for (var i in list) ...[
-            PopupMenuItem(
-              value: i.index,
-              child: Text(i.description),
-            ),
-          ]
-        ];
-        break;
-      case 'defaultVideoSpeed':
-        defaultVal = '1.0';
-        currentVal = setting.get(widget.setKey, defaultValue: defaultVal);
-
-        break;
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final theme = Theme.of(context);
-    TextStyle subTitleStyle =
-        theme.textTheme.labelMedium!.copyWith(color: theme.colorScheme.outline);
-    return ListTile(
-      onTap: () {},
-      title: Text(widget.title!),
-      subtitle: Text(
-        '当前${widget.title!} $currentVal',
-        style: subTitleStyle,
-      ),
-      trailing: PopupMenuButton(
-        initialValue: currentIndex,
-        icon: const Icon(
-          Icons.arrow_forward_rounded,
-          size: 22,
-        ),
-        onSelected: (item) {
-          currentVal = menus.firstWhere((e) => e.code == item).first;
-          setState(() {});
-        },
-        itemBuilder: (BuildContext context) =>
-            <PopupMenuEntry>[...popMenuItems],
-      ),
-    );
-  }
-}