From 84bc0d55b735b1a5362d825916eeeb18f8c1b78b Mon Sep 17 00:00:00 2001
From: bggRGjQaUbCoE <githubaccount56556@proton.me>
Date: Fri, 10 Jan 2025 11:46:21 +0800
Subject: [PATCH] opt: tabbarSort

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
---
 lib/pages/home/controller.dart               | 6 +-----
 lib/pages/setting/pages/home_tabbar_set.dart | 6 +-----
 lib/utils/storage.dart                       | 4 ++++
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/lib/pages/home/controller.dart b/lib/pages/home/controller.dart
index 079404c4..76c294a2 100644
--- a/lib/pages/home/controller.dart
+++ b/lib/pages/home/controller.dart
@@ -78,11 +78,7 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
 
   void setTabConfig() async {
     defaultTabs = [...tabsConfig];
-    tabbarSort = GStorage.setting
-        .get(SettingBoxKey.tabbarSort,
-            defaultValue: TabType.values.map((item) => item.name).toList())
-        .map<String>((i) => i.toString())
-        .toList();
+    tabbarSort = GStorage.tabbarSort;
     defaultTabs.retainWhere(
         (item) => tabbarSort.contains((item['type'] as TabType).name));
     defaultTabs.sort((a, b) => tabbarSort
diff --git a/lib/pages/setting/pages/home_tabbar_set.dart b/lib/pages/setting/pages/home_tabbar_set.dart
index cf754b07..1a148ffe 100644
--- a/lib/pages/setting/pages/home_tabbar_set.dart
+++ b/lib/pages/setting/pages/home_tabbar_set.dart
@@ -18,11 +18,7 @@ class _TabbarSetPageState extends State<TabbarSetPage> {
   void initState() {
     super.initState();
     defaultTabs = tabsConfig;
-    tabbarSort = GStorage.setting
-        .get(SettingBoxKey.tabbarSort,
-            defaultValue: ['live', 'rcmd', 'hot', 'rank', 'bangumi'])
-        .map<String>((i) => i.toString())
-        .toList();
+    tabbarSort = GStorage.tabbarSort;
     // 对 tabData 进行排序
     defaultTabs.sort((a, b) {
       int indexA = tabbarSort.indexOf((a['type'] as TabType).name);
diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart
index de666f78..2280ebd4 100644
--- a/lib/utils/storage.dart
+++ b/lib/utils/storage.dart
@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:PiliPlus/common/widgets/pair.dart';
 import 'package:PiliPlus/http/constants.dart';
 import 'package:PiliPlus/models/common/dynamic_badge_mode.dart';
+import 'package:PiliPlus/models/common/tab_type.dart';
 import 'package:PiliPlus/models/common/theme_type.dart';
 import 'package:PiliPlus/models/common/up_panel_position.dart';
 import 'package:PiliPlus/models/video/play/CDN.dart';
@@ -47,6 +48,9 @@ class GStorage {
         ),
       );
 
+  static List<String> get tabbarSort => setting.get(SettingBoxKey.tabbarSort,
+      defaultValue: TabType.values.map((item) => item.name).toList());
+
   static List<Pair<SegmentType, SkipType>> get blockSettings {
     List list = setting.get(
       SettingBoxKey.blockSettings,