diff --git a/lib/pages/bangumi/introduction/view.dart b/lib/pages/bangumi/introduction/view.dart index 34cec708..5eb34468 100644 --- a/lib/pages/bangumi/introduction/view.dart +++ b/lib/pages/bangumi/introduction/view.dart @@ -254,7 +254,7 @@ class _BangumiInfoState extends State : bangumiItem!.title!, style: const TextStyle( fontSize: 16, - fontWeight: FontWeight.w600, + fontWeight: FontWeight.w400, ), maxLines: 1, overflow: TextOverflow.ellipsis, diff --git a/lib/pages/bangumi/introduction/widgets/intro_detail.dart b/lib/pages/bangumi/introduction/widgets/intro_detail.dart index 7e0ec296..b6dc0755 100644 --- a/lib/pages/bangumi/introduction/widgets/intro_detail.dart +++ b/lib/pages/bangumi/introduction/widgets/intro_detail.dart @@ -53,7 +53,7 @@ class IntroDetail extends StatelessWidget { bangumiDetail!.title, style: const TextStyle( fontSize: 16, - fontWeight: FontWeight.w600, + fontWeight: FontWeight.w400, ), ), const SizedBox(height: 4), diff --git a/lib/pages/fav/widgets/item.dart b/lib/pages/fav/widgets/item.dart index f5b78784..d3799964 100644 --- a/lib/pages/fav/widgets/item.dart +++ b/lib/pages/fav/widgets/item.dart @@ -76,7 +76,7 @@ class VideoContent extends StatelessWidget { favFolderItem.title, textAlign: TextAlign.start, style: const TextStyle( - fontWeight: FontWeight.w600, + fontWeight: FontWeight.w400, letterSpacing: 0.3, ), ), diff --git a/lib/pages/subscription/widgets/item.dart b/lib/pages/subscription/widgets/item.dart index a793216c..b10d1e7e 100644 --- a/lib/pages/subscription/widgets/item.dart +++ b/lib/pages/subscription/widgets/item.dart @@ -97,7 +97,7 @@ class VideoContent extends StatelessWidget { subFolderItem.title!, textAlign: TextAlign.start, style: const TextStyle( - fontWeight: FontWeight.w600, + fontWeight: FontWeight.w400, letterSpacing: 0.3, ), ), diff --git a/lib/pages/subscription_detail/widget/sub_video_card.dart b/lib/pages/subscription_detail/widget/sub_video_card.dart index 2973e05f..a3fcbfe5 100644 --- a/lib/pages/subscription_detail/widget/sub_video_card.dart +++ b/lib/pages/subscription_detail/widget/sub_video_card.dart @@ -130,7 +130,7 @@ class VideoContent extends StatelessWidget { videoItem.title, textAlign: TextAlign.start, style: const TextStyle( - fontWeight: FontWeight.w600, + fontWeight: FontWeight.w400, letterSpacing: 0.3, ), maxLines: 2, diff --git a/lib/pages/video/detail/introduction/controller.dart b/lib/pages/video/detail/introduction/controller.dart index 644fe911..acb5dd34 100644 --- a/lib/pages/video/detail/introduction/controller.dart +++ b/lib/pages/video/detail/introduction/controller.dart @@ -613,19 +613,18 @@ class VideoIntroController extends GetxController bool prevPlay() { final List episodes = []; bool isPages = false; - if (videoDetail.value.ugcSeason != null) { + if ((videoDetail.value.pages?.length ?? 0) > 1) { + isPages = true; + final List pages = videoDetail.value.pages!; + episodes.addAll(pages); + } else if (videoDetail.value.ugcSeason != null) { final UgcSeason ugcSeason = videoDetail.value.ugcSeason!; final List sections = ugcSeason.sections!; for (int i = 0; i < sections.length; i++) { final List episodesList = sections[i].episodes!; episodes.addAll(episodesList); } - } else if (videoDetail.value.pages != null) { - isPages = true; - final List pages = videoDetail.value.pages!; - episodes.addAll(pages); } - final int currentIndex = episodes.indexWhere((e) => e.cid == lastPlayCid.value); int prevIndex = currentIndex - 1; @@ -652,17 +651,17 @@ class VideoIntroController extends GetxController bool nextPlay() { final List episodes = []; bool isPages = false; - if (videoDetail.value.ugcSeason != null) { + if ((videoDetail.value.pages?.length ?? 0) > 1) { + isPages = true; + final List pages = videoDetail.value.pages!; + episodes.addAll(pages); + } else if (videoDetail.value.ugcSeason != null) { final UgcSeason ugcSeason = videoDetail.value.ugcSeason!; final List sections = ugcSeason.sections!; for (int i = 0; i < sections.length; i++) { final List episodesList = sections[i].episodes!; episodes.addAll(episodesList); } - } else if (videoDetail.value.pages != null) { - isPages = true; - final List pages = videoDetail.value.pages!; - episodes.addAll(pages); } final VideoDetailController videoDetailCtr = Get.find(tag: heroTag);