diff --git a/lib/models/common/home_tab_type.dart b/lib/models/common/home_tab_type.dart index 6066cd82..a84b4a83 100644 --- a/lib/models/common/home_tab_type.dart +++ b/lib/models/common/home_tab_type.dart @@ -18,7 +18,7 @@ extension HomeTabTypeExt on HomeTabType { String get description => const ['直播', '推荐', '热门', '分区', '番剧', '影视'][index]; } -List get tabsConfig => [ +List get homeTabsConfig => [ { 'icon': const Icon( Icons.live_tv_outlined, diff --git a/lib/models/common/rank_type.dart b/lib/models/common/rank_type.dart index 78f33a01..1e646f14 100644 --- a/lib/models/common/rank_type.dart +++ b/lib/models/common/rank_type.dart @@ -1,4 +1,4 @@ -const List tabsConfig = [ +const List rankTabsConfig = [ { 'rid': 0, 'label': '全站', diff --git a/lib/pages/home/controller.dart b/lib/pages/home/controller.dart index 79944d42..f0268410 100644 --- a/lib/pages/home/controller.dart +++ b/lib/pages/home/controller.dart @@ -73,7 +73,7 @@ class HomeController extends GetxController } Future setTabConfig() async { - final defaultTabs = [...tabsConfig]; + final defaultTabs = [...homeTabsConfig]; final tabbarSort = GStorage.tabbarSort; defaultTabs ..retainWhere( diff --git a/lib/pages/rank/controller.dart b/lib/pages/rank/controller.dart index d63f38f0..6e1695b5 100644 --- a/lib/pages/rank/controller.dart +++ b/lib/pages/rank/controller.dart @@ -12,7 +12,7 @@ class RankController extends GetxController late TabController tabController; ZoneController get controller { - final item = tabsConfig[tabController.index]; + final item = rankTabsConfig[tabController.index]; return Get.find( tag: '${item['rid']}${item['season_type']}'); } @@ -23,7 +23,7 @@ class RankController extends GetxController @override void onInit() { super.onInit(); - tabController = TabController(length: tabsConfig.length, vsync: this); + tabController = TabController(length: rankTabsConfig.length, vsync: this); } @override diff --git a/lib/pages/rank/view.dart b/lib/pages/rank/view.dart index 7d20fd06..2a79e621 100644 --- a/lib/pages/rank/view.dart +++ b/lib/pages/rank/view.dart @@ -32,7 +32,7 @@ class _RankPageState extends State ), child: Column( children: List.generate( - tabsConfig.length, + rankTabsConfig.length, (index) => Obx( () => IntrinsicHeight( child: InkWell( @@ -65,7 +65,7 @@ class _RankPageState extends State padding: const EdgeInsets.symmetric(vertical: 7), child: Text( - tabsConfig[index]['label'], + rankTabsConfig[index]['label'], style: TextStyle( color: index == _rankController.tabIndex.value @@ -92,7 +92,7 @@ class _RankPageState extends State child: TabBarView( physics: const NeverScrollableScrollPhysics(), controller: _rankController.tabController, - children: tabsConfig + children: rankTabsConfig .map((item) => ZonePage( rid: item['rid'], seasonType: item['season_type'], diff --git a/lib/pages/setting/pages/home_tabbar_set.dart b/lib/pages/setting/pages/home_tabbar_set.dart index 208c5f7c..d07bd216 100644 --- a/lib/pages/setting/pages/home_tabbar_set.dart +++ b/lib/pages/setting/pages/home_tabbar_set.dart @@ -17,7 +17,7 @@ class _TabbarSetPageState extends State { @override void initState() { super.initState(); - defaultTabs = tabsConfig; + defaultTabs = homeTabsConfig; tabbarSort = GStorage.tabbarSort; // 对 tabData 进行排序 defaultTabs.sort((a, b) { diff --git a/lib/utils/login_utils.dart b/lib/utils/login_utils.dart index 34bacac6..d6d5cd9a 100644 --- a/lib/utils/login_utils.dart +++ b/lib/utils/login_utils.dart @@ -4,7 +4,7 @@ import 'package:PiliPlus/grpc/grpc_repo.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/http/user.dart'; import 'package:PiliPlus/models/common/dynamic/dynamics_type.dart'; -import 'package:PiliPlus/models/common/home_tab_type.dart' hide tabsConfig; +import 'package:PiliPlus/models/common/home_tab_type.dart'; import 'package:PiliPlus/models/user/info.dart'; import 'package:PiliPlus/models/user/stat.dart'; import 'package:PiliPlus/pages/bangumi/controller.dart';