HCha/PiliPlus
1
0
Fork 0
mirror of https://github.com/HChaZZY/PiliPlus.git synced 2025-12-19 16:46:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix #897

Browse Source 
Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
This commit is contained in:
bggRGjQaUbCoE
2025-07-26 23:21:14 +08:00
parent c46058ef4d
commit f281e6e36a
2 changed files with 17 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pages/home/controller.dart
View File

@@ -8,8 +8,6 @@ import 'package:PiliPlus/pages/common/common_controller.dart';
import 'package:PiliPlus/pages/mine/view.dart'; import 'package:PiliPlus/pages/mine/view.dart';
import 'package:PiliPlus/services/account_service.dart'; import 'package:PiliPlus/services/account_service.dart';
import 'package:PiliPlus/utils/feed_back.dart'; import 'package:PiliPlus/utils/feed_back.dart';
import 'package:PiliPlus/utils/storage.dart';
import 'package:PiliPlus/utils/storage_key.dart';
import 'package:PiliPlus/utils/storage_pref.dart'; import 'package:PiliPlus/utils/storage_pref.dart';
import 'package:flutter/foundation.dart' show kDebugMode; import 'package:flutter/foundation.dart' show kDebugMode;
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@@ -59,9 +57,8 @@ class HomeController extends GetxController
} }
void setTabConfig() { void setTabConfig() {
List<int>? localTabs = GStorage.setting.get(SettingBoxKey.tabBarSort);
tabs = tabs =
localTabs?.map((i) => HomeTabType.values[i]).toList() ?? Pref.tabbarSort?.map((i) => HomeTabType.values[i]).toList() ??
HomeTabType.values; HomeTabType.values;
tabController = TabController( tabController = TabController(

40
lib/utils/storage_pref.dart
View File

@@ -5,7 +5,6 @@ import 'package:PiliPlus/common/widgets/pair.dart';
import 'package:PiliPlus/http/constants.dart'; import 'package:PiliPlus/http/constants.dart';
import 'package:PiliPlus/models/common/dynamic/dynamic_badge_mode.dart'; import 'package:PiliPlus/models/common/dynamic/dynamic_badge_mode.dart';
import 'package:PiliPlus/models/common/dynamic/up_panel_position.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/member/tab_type.dart';
import 'package:PiliPlus/models/common/msg/msg_unread_type.dart'; import 'package:PiliPlus/models/common/msg/msg_unread_type.dart';
import 'package:PiliPlus/models/common/sponsor_block/segment_type.dart'; import 'package:PiliPlus/models/common/sponsor_block/segment_type.dart';
@@ -95,41 +94,34 @@ class Pref {
), ),
); );
static List<int> get tabbarSort => List<int>.from( static List<int>? get tabbarSort =>
_setting.get(SettingBoxKey.tabBarSort) ?? (_setting.get(SettingBoxKey.tabBarSort) as List?)?.cast<int>();
HomeTabType.values.map((item) => item.index).toList(),
);
static List<Pair<SegmentType, SkipType>> get blockSettings { static List<Pair<SegmentType, SkipType>> get blockSettings {
List<int> list = List<int>.from( List<int>? list = (_setting.get(SettingBoxKey.blockSettings) as List?)
_setting.get(SettingBoxKey.blockSettings) ?? ?.cast<int>();
List.generate(SegmentType.values.length, (_) => 1),
);
return SegmentType.values return SegmentType.values
.map( .map(
(item) => Pair<SegmentType, SkipType>( (item) => Pair<SegmentType, SkipType>(
first: item, first: item,
second: SkipType.values[list[item.index]], second: SkipType.values[list?[item.index] ?? 1],
), ),
) )
.toList(); .toList();
} }
static List<Color> get blockColor { static List<Color> get blockColor {
List<String> list = List<String>.from( List<String>? list = (_setting.get(SettingBoxKey.blockColor) as List?)
_setting.get(SettingBoxKey.blockColor) ?? ?.cast<String>();
List.generate(SegmentType.values.length, (_) => ''), return SegmentType.values.map(
); (item) {
return SegmentType.values final e = list?[item.index];
.map( final color = e != null && e.isNotEmpty
(item) => list[item.index].isNotEmpty ? int.tryParse('FF$e', radix: 16)
? Color( : null;
int.tryParse('FF${list[item.index]}', radix: 16) ?? return color != null ? Color(color) : item.color;
0xFF000000, },
) ).toList();
: item.color,
)
.toList();
} }
static bool get hiddenSettingUnlocked => static bool get hiddenSettingUnlocked =>