From 579a4f2a8190021134187aec69e80d4bc757af4e Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 24 Dec 2023 19:39:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=86=E9=A2=91=E5=90=88=E9=9B=86?= =?UTF-8?q?=EF=BC=8C=E5=90=91=E4=B8=8B=E6=BB=91=E5=8A=A8=20ui=20=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=20issues=20#314?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/bangumi/widgets/bangumi_panel.dart | 76 ++++---- .../detail/introduction/widgets/season.dart | 170 +++--------------- pubspec.lock | 8 + pubspec.yaml | 1 + 4 files changed, 76 insertions(+), 179 deletions(-) diff --git a/lib/pages/bangumi/widgets/bangumi_panel.dart b/lib/pages/bangumi/widgets/bangumi_panel.dart index e9b777f1..6948172f 100644 --- a/lib/pages/bangumi/widgets/bangumi_panel.dart +++ b/lib/pages/bangumi/widgets/bangumi_panel.dart @@ -5,6 +5,7 @@ import 'package:hive/hive.dart'; import 'package:pilipala/models/bangumi/info.dart'; import 'package:pilipala/pages/video/detail/index.dart'; import 'package:pilipala/utils/storage.dart'; +import 'package:scrollable_positioned_list/scrollable_positioned_list.dart'; class BangumiPanel extends StatefulWidget { final List pages; @@ -35,6 +36,7 @@ class _BangumiPanelState extends State { late int cid; String heroTag = Get.arguments['heroTag']; late final VideoDetailController videoDetailCtr; + final ItemScrollController itemScrollController = ItemScrollController(); @override void initState() { @@ -70,10 +72,11 @@ class _BangumiPanelState extends State { return StatefulBuilder( builder: (BuildContext context, StateSetter setState) { WidgetsBinding.instance.addPostFrameCallback((_) async { - await Future.delayed(const Duration(milliseconds: 200)); - listViewScrollCtr_2.animateTo(currentIndex * 56, - duration: const Duration(milliseconds: 500), - curve: Curves.easeInOut); + // await Future.delayed(const Duration(milliseconds: 200)); + // listViewScrollCtr_2.animateTo(currentIndex * 56, + // duration: const Duration(milliseconds: 500), + // curve: Curves.easeInOut); + itemScrollController.jumpTo(index: currentIndex); }); // 在这里使用 setState 更新状态 return Container( @@ -101,42 +104,39 @@ class _BangumiPanelState extends State { ), Expanded( child: Material( - child: ListView.builder( - controller: listViewScrollCtr_2, + child: ScrollablePositionedList.builder( itemCount: widget.pages.length, - itemBuilder: (context, index) { - return ListTile( - onTap: () { - setState(() { - changeFucCall(widget.pages[index], index); - }); - }, - dense: false, - leading: index == currentIndex - ? Image.asset( - 'assets/images/live.gif', - color: - Theme.of(context).colorScheme.primary, - height: 12, - ) - : null, - title: Text( - '第${index + 1}话 ${widget.pages[index].longTitle!}', - style: TextStyle( - fontSize: 14, - color: index == currentIndex - ? Theme.of(context).colorScheme.primary - : Theme.of(context).colorScheme.onSurface, - ), + itemBuilder: (context, index) => ListTile( + onTap: () { + setState(() { + changeFucCall(widget.pages[index], index); + }); + }, + dense: false, + leading: index == currentIndex + ? Image.asset( + 'assets/images/live.gif', + color: Theme.of(context).colorScheme.primary, + height: 12, + ) + : null, + title: Text( + '第${index + 1}话 ${widget.pages[index].longTitle!}', + style: TextStyle( + fontSize: 14, + color: index == currentIndex + ? Theme.of(context).colorScheme.primary + : Theme.of(context).colorScheme.onSurface, ), - trailing: widget.pages[index].badge != null - ? Image.asset( - 'assets/images/big-vip.png', - height: 20, - ) - : const SizedBox(), - ); - }, + ), + trailing: widget.pages[index].badge != null + ? Image.asset( + 'assets/images/big-vip.png', + height: 20, + ) + : const SizedBox(), + ), + itemScrollController: itemScrollController, ), ), ), diff --git a/lib/pages/video/detail/introduction/widgets/season.dart b/lib/pages/video/detail/introduction/widgets/season.dart index 4b075c66..cb83f69c 100644 --- a/lib/pages/video/detail/introduction/widgets/season.dart +++ b/lib/pages/video/detail/introduction/widgets/season.dart @@ -3,6 +3,7 @@ import 'package:get/get.dart'; import 'package:pilipala/models/video_detail_res.dart'; import 'package:pilipala/pages/video/detail/index.dart'; import 'package:pilipala/utils/id_utils.dart'; +import 'package:scrollable_positioned_list/scrollable_positioned_list.dart'; class SeasonPanel extends StatefulWidget { final UgcSeason ugcSeason; @@ -29,6 +30,7 @@ class _SeasonPanelState extends State { String heroTag = Get.arguments['heroTag']; late VideoDetailController _videoDetailController; final ScrollController _scrollController = ScrollController(); + final ItemScrollController itemScrollController = ItemScrollController(); @override void initState() { @@ -101,8 +103,7 @@ class _SeasonPanelState extends State { return StatefulBuilder( builder: (BuildContext context, StateSetter setState) { WidgetsBinding.instance.addPostFrameCallback((_) async { - await Future.delayed(const Duration(milliseconds: 200)); - _scrollController.jumpTo(currentIndex * 56); + itemScrollController.jumpTo(index: currentIndex); }); return Container( height: widget.sheetHeight, @@ -133,38 +134,34 @@ class _SeasonPanelState extends State { ), Expanded( child: Material( - child: ListView.builder( - controller: _scrollController, + child: ScrollablePositionedList.builder( itemCount: episodes.length, - itemBuilder: (context, index) { - return ListTile( - onTap: () => - changeFucCall(episodes[index], index), - dense: false, - leading: index == currentIndex - ? Image.asset( - 'assets/images/live.gif', - color: Theme.of(context) - .colorScheme - .primary, - height: 12, - ) - : null, - title: Text( - episodes[index].title!, - style: TextStyle( - fontSize: 14, - color: index == currentIndex - ? Theme.of(context) - .colorScheme - .primary - : Theme.of(context) - .colorScheme - .onSurface, - ), + itemBuilder: (context, index) => ListTile( + onTap: () => + changeFucCall(episodes[index], index), + dense: false, + leading: index == currentIndex + ? Image.asset( + 'assets/images/live.gif', + color: Theme.of(context) + .colorScheme + .primary, + height: 12, + ) + : null, + title: Text( + episodes[index].title!, + style: TextStyle( + fontSize: 14, + color: index == currentIndex + ? Theme.of(context).colorScheme.primary + : Theme.of(context) + .colorScheme + .onSurface, ), - ); - }, + ), + ), + itemScrollController: itemScrollController, ), ), ), @@ -210,112 +207,3 @@ class _SeasonPanelState extends State { }); } } - -// Widget seasonPanel(UgcSeason ugcSeason, cid, sheetHeight) { -// return Builder(builder: (context) { -// List episodes = ugcSeason.sections!.first.episodes!; -// int currentIndex = episodes.indexWhere((e) => e.cid == cid); -// return Container( -// margin: const EdgeInsets.only( -// top: 8, -// left: 2, -// right: 2, -// bottom: 2, -// ), -// child: Material( -// color: Theme.of(context).colorScheme.onInverseSurface, -// borderRadius: BorderRadius.circular(6), -// clipBehavior: Clip.hardEdge, -// child: InkWell( -// onTap: () => showBottomSheet( -// context: context, -// builder: (_) => Container( -// height: sheetHeight, -// color: Theme.of(context).colorScheme.background, -// child: Column( -// children: [ -// Container( -// height: 45, -// padding: const EdgeInsets.only(left: 14, right: 14), -// child: Row( -// mainAxisAlignment: MainAxisAlignment.spaceBetween, -// children: [ -// Text( -// '合集（${episodes.length}）', -// style: Theme.of(context).textTheme.titleMedium, -// ), -// IconButton( -// icon: const Icon(Icons.close), -// onPressed: () => Navigator.pop(context), -// ), -// ], -// ), -// ), -// Divider( -// height: 1, -// color: Theme.of(context).dividerColor.withOpacity(0.1), -// ), -// Expanded( -// child: Material( -// child: ListView.builder( -// itemCount: episodes.length, -// itemBuilder: (context, index) { -// return InkWell( -// onTap: () {}, -// child: Padding( -// padding: const EdgeInsets.only( -// top: 10, bottom: 10, left: 15, right: 15), -// child: Text( -// episodes[index].title!, -// style: TextStyle( -// color: index == currentIndex -// ? Theme.of(context).colorScheme.primary -// : Theme.of(context) -// .colorScheme -// .onSurface), -// ), -// ), -// ); -// }, -// ), -// ), -// ), -// ], -// ), -// ), -// ), -// child: Padding( -// padding: const EdgeInsets.fromLTRB(8, 12, 8, 12), -// child: Row( -// children: [ -// Expanded( -// child: Text( -// '合集：${ugcSeason.title!}', -// style: Theme.of(context).textTheme.labelMedium, -// overflow: TextOverflow.ellipsis, -// ), -// ), -// const SizedBox(width: 15), -// Image.asset( -// 'assets/images/live.gif', -// color: Theme.of(context).colorScheme.primary, -// height: 12, -// ), -// const SizedBox(width: 10), -// Text( -// '${currentIndex + 1}/${ugcSeason.epCount}', -// style: Theme.of(context).textTheme.labelMedium, -// ), -// const SizedBox(width: 6), -// const Icon( -// Icons.arrow_forward_ios_outlined, -// size: 13, -// ) -// ], -// ), -// ), -// ), -// ), -// ); -// }); -// } diff --git a/pubspec.lock b/pubspec.lock index 8c373d79..c16788c0 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1198,6 +1198,14 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "0.1.3" + scrollable_positioned_list: + dependency: "direct main" + description: + name: scrollable_positioned_list + sha256: "1b54d5f1329a1e263269abc9e2543d90806131aa14fe7c6062a8054d57249287" + url: "https://pub.flutter-io.cn" + source: hosted + version: "0.3.8" share_plus: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 496dacb5..901dccaf 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -132,6 +132,7 @@ dependencies: # 极验 gt3_flutter_plugin: ^0.0.8 uuid: ^3.0.7 + scrollable_positioned_list: ^0.3.8 dev_dependencies: