diff --git a/lib/pages/audio/view.dart b/lib/pages/audio/view.dart index 0c77450af..20e6ca98b 100644 --- a/lib/pages/audio/view.dart +++ b/lib/pages/audio/view.dart @@ -494,7 +494,7 @@ class _AudioPageState extends State { Row( mainAxisAlignment: MainAxisAlignment.spaceAround, children: PlayRepeat.values - .sublist(0, 4) + .take(4) .map( (e) => _playModeWidget( colorScheme: colorScheme, diff --git a/lib/pages/fav_sort/view.dart b/lib/pages/fav_sort/view.dart index 13d7cc3a4..4fef53e51 100644 --- a/lib/pages/fav_sort/view.dart +++ b/lib/pages/fav_sort/view.dart @@ -35,7 +35,7 @@ class _FavSortPageState extends State { if (_favDetailController.loadingState.value.isSuccess) { List list = _favDetailController.loadingState.value.data!; - sortList.addAll(list.sublist(sortList.length)); + sortList.addAll(list.skip(sortList.length)); if (mounted) { setState(() {}); } diff --git a/lib/pages/member/widget/user_info_card.dart b/lib/pages/member/widget/user_info_card.dart index 3acb4884c..941de7950 100644 --- a/lib/pages/member/widget/user_info_card.dart +++ b/lib/pages/member/widget/user_info_card.dart @@ -25,7 +25,6 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart' hide ContextExtensionss; - class UserInfoCard extends StatelessWidget { const UserInfoCard({ super.key, diff --git a/lib/pages/member_upower_rank/view.dart b/lib/pages/member_upower_rank/view.dart index fac49de7f..70cb11743 100644 --- a/lib/pages/member_upower_rank/view.dart +++ b/lib/pages/member_upower_rank/view.dart @@ -141,7 +141,7 @@ class _UpowerRankPageState extends State builder: (context) => child, ), ...tabs - .sublist(1) + .skip(1) .map( (e) => UpowerRankPage( upMid: _upMid, diff --git a/lib/pages/setting/models/extra_settings.dart b/lib/pages/setting/models/extra_settings.dart index b2c9782ce..009d90c91 100644 --- a/lib/pages/setting/models/extra_settings.dart +++ b/lib/pages/setting/models/extra_settings.dart @@ -1025,7 +1025,7 @@ List get extraSettings => [ title: '动态展示', value: Pref.defaultDynamicType, values: DynamicsTabType.values - .sublist(0, 4) + .take(4) .map((e) => (e.index, e.label)) .toList(), ); diff --git a/lib/pages/setting/recommend_setting.dart b/lib/pages/setting/recommend_setting.dart index 534bf54b2..7c9e28a2a 100644 --- a/lib/pages/setting/recommend_setting.dart +++ b/lib/pages/setting/recommend_setting.dart @@ -1,5 +1,4 @@ import 'package:PiliPlus/common/widgets/flutter/list_tile.dart'; -import 'package:PiliPlus/pages/setting/models/model.dart'; import 'package:PiliPlus/pages/setting/models/recommend_settings.dart'; import 'package:flutter/material.dart' hide ListTile; @@ -14,14 +13,6 @@ class RecommendSetting extends StatefulWidget { class _RecommendSettingState extends State { final list = recommendSettings; - late final List part; - - @override - void initState() { - super.initState(); - part = list.sublist(0, 4); - list.removeRange(0, 4); - } @override Widget build(BuildContext context) { @@ -40,9 +31,9 @@ class _RecommendSettingState extends State { bottom: padding.bottom + 100, ), children: [ - ...part.map((item) => item.widget), + ...list.take(4).map((item) => item.widget), const Divider(height: 1), - ...list.map((item) => item.widget), + ...list.skip(4).map((item) => item.widget), ListTile( dense: true, subtitle: Text( diff --git a/lib/pages/setting/view.dart b/lib/pages/setting/view.dart index e9fec4ec2..d55b7746d 100644 --- a/lib/pages/setting/view.dart +++ b/lib/pages/setting/view.dart @@ -175,7 +175,7 @@ class _SettingPageState extends State { children: [ _buildSearchItem(theme), ..._items - .sublist(0, _items.length - 1) + .take(_items.length - 1) .map( (item) => ListTile( tileColor: _getTileColor(theme, item.type), diff --git a/lib/pages/webview/view.dart b/lib/pages/webview/view.dart index 59d6a35b7..677dc7444 100644 --- a/lib/pages/webview/view.dart +++ b/lib/pages/webview/view.dart @@ -137,7 +137,7 @@ class _WebviewPageState extends State { }, itemBuilder: (context) => >[ ...WebviewMenuItem.values - .sublist(0, WebviewMenuItem.values.length - 1) + .take(WebviewMenuItem.values.length - 1) .map( (item) => PopupMenuItem( value: item,