From 252f39e8c7731db2e03725c5445fef4e86aafa27 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 17 Sep 2023 20:26:00 +0800 Subject: [PATCH] mod --- .../favDetail/widget/fav_video_card.dart | 18 +-- lib/pages/follow/widgets/follow_item.dart | 6 - lib/pages/history/controller.dart | 3 +- lib/pages/media/view.dart | 130 ------------------ lib/pages/member/controller.dart | 4 +- lib/pages/video/detail/introduction/view.dart | 8 -- lib/pages/video/detail/view.dart | 100 +++++--------- 7 files changed, 40 insertions(+), 229 deletions(-) diff --git a/lib/pages/favDetail/widget/fav_video_card.dart b/lib/pages/favDetail/widget/fav_video_card.dart index 237a2b9d..e06ced4e 100644 --- a/lib/pages/favDetail/widget/fav_video_card.dart +++ b/lib/pages/favDetail/widget/fav_video_card.dart @@ -142,21 +142,15 @@ class VideoContent extends StatelessWidget { overflow: TextOverflow.ellipsis, ), const Spacer(), - Text( - videoItem.owner.name, - style: TextStyle( - fontSize: Theme.of(context).textTheme.labelMedium!.fontSize, - color: Theme.of(context).colorScheme.outline, - ), - ), Row( children: [ - StatView( - theme: 'gray', - view: videoItem.cntInfo['play'], + Text( + videoItem.owner.name, + style: TextStyle( + fontSize: Theme.of(context).textTheme.labelMedium!.fontSize, + color: Theme.of(context).colorScheme.outline, + ), ), - const SizedBox(width: 8), - StatDanMu(theme: 'gray', danmu: videoItem.cntInfo['danmaku']), const Spacer(), SizedBox( width: 26, diff --git a/lib/pages/follow/widgets/follow_item.dart b/lib/pages/follow/widgets/follow_item.dart index d9b2617b..acbb8a7e 100644 --- a/lib/pages/follow/widgets/follow_item.dart +++ b/lib/pages/follow/widgets/follow_item.dart @@ -27,12 +27,6 @@ Widget followItem({item}) { overflow: TextOverflow.ellipsis, style: const TextStyle(fontSize: 14), ), - subtitle: Text( - item.sign, - maxLines: 1, - overflow: TextOverflow.ellipsis, - ), - dense: true, trailing: const SizedBox(width: 6), ); } diff --git a/lib/pages/history/controller.dart b/lib/pages/history/controller.dart index ae897499..8f78071f 100644 --- a/lib/pages/history/controller.dart +++ b/lib/pages/history/controller.dart @@ -56,8 +56,7 @@ class HistoryController extends GetxController { builder: (BuildContext context) { return AlertDialog( title: const Text('提示'), - content: - Text(!pauseStatus.value ? '啊叻？你要暂停历史记录功能吗？' : '啊叻？要恢复历史记录功能吗？'), + content: Text(!pauseStatus.value ? '你要暂停历史记录功能吗？' : '要恢复历史记录功能吗？'), actions: [ TextButton( onPressed: () => SmartDialog.dismiss(), diff --git a/lib/pages/media/view.dart b/lib/pages/media/view.dart index 03af2e36..76a9109b 100644 --- a/lib/pages/media/view.dart +++ b/lib/pages/media/view.dart @@ -74,140 +74,10 @@ class _MediaPageState extends State ), ), ], - Obx(() => mediaController.userLogin.value - ? favFolder(mediaController, context) - : const SizedBox()) ], ), ); } - - Widget favFolder(mediaController, context) { - return Column( - children: [ - Divider( - height: 35, - color: Theme.of(context).dividerColor.withOpacity(0.1), - ), - ListTile( - onTap: () {}, - leading: null, - dense: true, - title: Padding( - padding: const EdgeInsets.only(left: 10), - child: Obx( - () => Text.rich( - TextSpan( - children: [ - TextSpan( - text: '收藏夹 ', - style: TextStyle( - fontSize: - Theme.of(context).textTheme.titleMedium!.fontSize, - fontWeight: FontWeight.bold), - ), - if (mediaController.favFolderData.value.count != null) - TextSpan( - text: mediaController.favFolderData.value.count - .toString(), - style: TextStyle( - fontSize: - Theme.of(context).textTheme.titleSmall!.fontSize, - color: Theme.of(context).colorScheme.primary, - ), - ), - ], - ), - ), - ), - ), - trailing: IconButton( - onPressed: () { - setState(() { - _futureBuilderFuture = mediaController.queryFavFolder(); - }); - }, - icon: const Icon( - Icons.refresh, - size: 20, - ), - ), - ), - // const SizedBox(height: 10), - SizedBox( - width: double.infinity, - height: 170 * MediaQuery.of(context).textScaleFactor, - child: FutureBuilder( - future: _futureBuilderFuture, - builder: (context, snapshot) { - if (snapshot.connectionState == ConnectionState.done) { - if (snapshot.data == null) { - return const SizedBox(); - } - Map data = snapshot.data as Map; - if (data['status']) { - List favFolderList = - mediaController.favFolderData.value.list!; - int favFolderCount = - mediaController.favFolderData.value.count!; - bool flag = favFolderCount > favFolderList.length; - return Obx(() => ListView.builder( - itemCount: - mediaController.favFolderData.value.list!.length + - (flag ? 1 : 0), - itemBuilder: (context, index) { - if (flag && index == favFolderList.length) { - return Padding( - padding: const EdgeInsets.only( - right: 14, bottom: 35), - child: Center( - child: IconButton( - style: ButtonStyle( - padding: MaterialStateProperty.all( - EdgeInsets.zero), - backgroundColor: - MaterialStateProperty.resolveWith( - (states) { - return Theme.of(context) - .colorScheme - .primaryContainer - .withOpacity(0.5); - }), - ), - onPressed: () => Get.toNamed('/fav'), - icon: Icon( - Icons.arrow_forward_ios, - size: 18, - color: Theme.of(context) - .colorScheme - .primary, - ), - ), - )); - } else { - return FavFolderItem( - item: mediaController - .favFolderData.value.list![index], - index: index); - } - }, - scrollDirection: Axis.horizontal, - )); - } else { - return SizedBox( - height: 160, - child: Center(child: Text(data['msg'])), - ); - } - } else { - // 骨架屏 - return const SizedBox(); - } - }), - ), - ], - ); - } } class FavFolderItem extends StatelessWidget { diff --git a/lib/pages/member/controller.dart b/lib/pages/member/controller.dart index db4deaae..da1955b2 100644 --- a/lib/pages/member/controller.dart +++ b/lib/pages/member/controller.dart @@ -70,11 +70,11 @@ class MemberController extends GetxController { builder: (BuildContext context) { return AlertDialog( title: const Text('提示'), - content: Text(memberInfo.value.isFollowed! ? '取消关注UP主?' : '关注UP主?'), + content: Text(memberInfo.value.isFollowed! ? '取消关注该用户?' : '关注该用户?'), actions: [ TextButton( onPressed: () => SmartDialog.dismiss(), - child: const Text('点错了')), + child: const Text('取消')), TextButton( onPressed: () async { await VideoHttp.relationMod( diff --git a/lib/pages/video/detail/introduction/view.dart b/lib/pages/video/detail/introduction/view.dart index ebe6f85d..d6ab6fa5 100644 --- a/lib/pages/video/detail/introduction/view.dart +++ b/lib/pages/video/detail/introduction/view.dart @@ -382,14 +382,6 @@ class _VideoInfoState extends State with TickerProviderStateMixin { const SizedBox(width: 10), Text(owner.name, style: const TextStyle(fontSize: 13)), - const SizedBox(width: 6), - Text( - follower, - style: TextStyle( - fontSize: t.textTheme.labelSmall!.fontSize, - color: outline, - ), - ), const Spacer(), AnimatedOpacity( opacity: loadingStatus ? 0 : 1, diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index 8464070e..cc1d577b 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -347,78 +347,40 @@ class _VideoDetailPageState extends State }, onlyOneScrollInBody: true, body: Container( - key: Key(heroTag), color: Theme.of(context).colorScheme.background, - child: Column( - children: [ - Opacity( - opacity: 0, - child: SizedBox( - width: double.infinity, - height: 0, - child: Obx( - () => TabBar( - controller: videoDetailController.tabCtr, - dividerColor: Colors.transparent, - indicatorColor: - Theme.of(context).colorScheme.background, - tabs: videoDetailController.tabs - .map((String name) => Tab(text: name)) - .toList(), - ), + child: CustomScrollView( + key: const PageStorageKey('简介'), + slivers: [ + if (videoDetailController.videoType == + SearchType.video) ...[ + const VideoIntroPanel(), + ] else + // if (videoDetailController.videoType == + // SearchType.media_bangumi) ...[ + // BangumiIntroPanel( + // cid: videoDetailController.cid) + // ], + // if (videoDetailController.videoType == + // SearchType.video) ...[ + // SliverPersistentHeader( + // floating: true, + // pinned: true, + // delegate: SliverHeaderDelegate( + // height: 50, + // child: + // const MenuRow(loadingStatus: false), + // ), + // ), + // ], + SliverToBoxAdapter( + child: Divider( + indent: 12, + endIndent: 12, + color: + Theme.of(context).dividerColor.withOpacity(0.06), ), ), - ), - Expanded( - child: TabBarView( - controller: videoDetailController.tabCtr, - children: [ - Builder( - builder: (context) { - return CustomScrollView( - key: const PageStorageKey('简介'), - slivers: [ - if (videoDetailController.videoType == - SearchType.video) ...[ - const VideoIntroPanel(), - ] else - // if (videoDetailController.videoType == - // SearchType.media_bangumi) ...[ - // BangumiIntroPanel( - // cid: videoDetailController.cid) - // ], - // if (videoDetailController.videoType == - // SearchType.video) ...[ - // SliverPersistentHeader( - // floating: true, - // pinned: true, - // delegate: SliverHeaderDelegate( - // height: 50, - // child: - // const MenuRow(loadingStatus: false), - // ), - // ), - // ], - SliverToBoxAdapter( - child: Divider( - indent: 12, - endIndent: 12, - color: Theme.of(context) - .dividerColor - .withOpacity(0.06), - ), - ), - // const RelatedVideoPanel(), - ], - ); - }, - ), - VideoReplyPanel( - bvid: videoDetailController.bvid, - ) - ], - ), - ), + // const RelatedVideoPanel(), ], ), ),