基于自定义规则的番剧采集APP,支持流媒体在线观看,支持弹幕,支持实时超分辨率。
feat: better history page && better timeline page layout
Predidit1bb6b321b7b5
diff --git a/lib/bean/card/bangumi_history_card.dart b/lib/bean/card/bangumi_history_card.dartindex d33c2715..8c846f74 100644--- a/lib/bean/card/bangumi_history_card.dart+++ b/lib/bean/card/bangumi_history_card.dart@@ -13,11 +13,18 @@ import 'package:logger/logger.dart';// 视频历史记录卡片 - 水平布局class BangumiHistoryCardV extends StatefulWidget {- const BangumiHistoryCardV(- {super.key, required this.historyItem, this.showDelete = true});+ const BangumiHistoryCardV({+ super.key,+ required this.historyItem,+ this.showDelete = true,+ this.cardHeight = 120,+ this.cardWidth,+ });final History historyItem;final bool showDelete;+ final double cardHeight;+ final double? cardWidth;@overrideState<BangumiHistoryCardV> createState() => _BangumiHistoryCardVState();@@ -50,10 +57,35 @@ class _BangumiHistoryCardVState extends State<BangumiHistoryCardV> {);}+ Widget buildImage(+ BuildContext context, String imageUrl, double width, double height) {+ final borderRadius = BorderRadius.circular(16);+ Widget img = NetworkImgLayer(+ src: imageUrl,+ width: width,+ height: height,+ );+ img = ClipRRect(+ borderRadius: borderRadius,+ child: img,+ );+ return img;+ }+@overrideWidget build(BuildContext context) {+ final theme = Theme.of(context);+ final double borderRadius = 18;+ final double imageWidth = widget.cardHeight * 0.7;+return Card(+ elevation: 1,+ margin: const EdgeInsets.symmetric(vertical: 6, horizontal: 8),+ shape: RoundedRectangleBorder(+ borderRadius: BorderRadius.circular(borderRadius),+ ),clipBehavior: Clip.antiAlias,+ color: theme.colorScheme.surface,child: InkWell(onTap: () async {if (widget.showDelete) {@@ -93,25 +125,19 @@ class _BangumiHistoryCardVState extends State<BangumiHistoryCardV> {KazumiDialog.showToast(message: '网络资源获取失败 ${e.toString()}');}},- child: Padding(- padding: const EdgeInsets.all(6),- child: Row(- crossAxisAlignment: CrossAxisAlignment.start,- children: [- AspectRatio(- aspectRatio: 0.65,- child: LayoutBuilder(builder: (context, boxConstraints) {- final double maxWidth = boxConstraints.maxWidth;- final double maxHeight = boxConstraints.maxHeight;- return NetworkImgLayer(- src: widget.historyItem.bangumiItem.images['large'] ?? '',- width: maxWidth,- height: maxHeight,- );- }),- ),- const SizedBox(width: 12),- Expanded(+ child: Row(+ crossAxisAlignment: CrossAxisAlignment.start,+ children: [+ buildImage(+ context,+ widget.historyItem.bangumiItem.images['large'] ?? '',+ imageWidth,+ widget.cardHeight),+ const SizedBox(width: 12),+ Expanded(+ child: Padding(+ padding:+ const EdgeInsets.symmetric(vertical: 2, horizontal: 6),child: Column(crossAxisAlignment: CrossAxisAlignment.start,children: [@@ -149,47 +175,45 @@ class _BangumiHistoryCardVState extends State<BangumiHistoryCardV> {],),),- Column(- mainAxisAlignment: MainAxisAlignment.spaceBetween,- children: [- if (!widget.showDelete) ...[- CollectButton(- onClose: () {- FocusScope.of(context).unfocus();- },- bangumiItem: widget.historyItem.bangumiItem,+ ),+ Column(+ mainAxisAlignment: MainAxisAlignment.spaceBetween,+ children: [+ if (!widget.showDelete) ...[+ CollectButton(+ onClose: () {+ FocusScope.of(context).unfocus();+ },+ bangumiItem: widget.historyItem.bangumiItem,+ color: Theme.of(context).colorScheme.onSecondaryContainer,+ ),+ IconButton(+ icon: Icon(+ Icons.open_in_new,color: Theme.of(context).colorScheme.onSecondaryContainer,),- IconButton(- icon: Icon(- Icons.open_in_new,- color:- Theme.of(context).colorScheme.onSecondaryContainer,- ),- tooltip: '番剧详情',- onPressed: () {- Modular.to.pushNamed(- '/info/',- arguments: widget.historyItem.bangumiItem,- );- },- ),- ],- if (widget.showDelete)- IconButton(- icon: Icon(- Icons.delete,- color:- Theme.of(context).colorScheme.onSecondaryContainer,- ),- onPressed: () {- historyController.deleteHistory(widget.historyItem);- },- ),+ tooltip: '番剧详情',+ onPressed: () {+ Modular.to.pushNamed(+ '/info/',+ arguments: widget.historyItem.bangumiItem,+ );+ },+ ),],- ),- ],- ),+ if (widget.showDelete)+ IconButton(+ icon: Icon(+ Icons.delete,+ color: Theme.of(context).colorScheme.onSecondaryContainer,+ ),+ onPressed: () {+ historyController.deleteHistory(widget.historyItem);+ },+ ),+ ],+ ),+ ],),),);diff --git a/lib/bean/card/timeline_bangumi_card.dart b/lib/bean/card/bangumi_timeline_card.dartsimilarity index 91%rename from lib/bean/card/timeline_bangumi_card.dartrename to lib/bean/card/bangumi_timeline_card.dartindex beec05e2..c765bbaa 100644--- a/lib/bean/card/timeline_bangumi_card.dart+++ b/lib/bean/card/bangumi_timeline_card.dart@@ -5,17 +5,21 @@ import 'package:kazumi/utils/utils.dart';import 'package:kazumi/bean/card/network_img_layer.dart';/// 时间线番剧卡片-class TimelineBangumiCard extends StatelessWidget {- const TimelineBangumiCard({+class BangumiTimelineCard extends StatelessWidget {+ const BangumiTimelineCard({super.key,required this.bangumiItem,this.onTap,+ this.cardHeight = 120,+ this.cardWidth,this.enableHero = true,});final BangumiItem bangumiItem;final VoidCallback? onTap;final bool enableHero;+ final double cardHeight;+ final double? cardWidth;@overrideWidget build(BuildContext context) {@@ -23,13 +27,12 @@ class TimelineBangumiCard extends StatelessWidget {final isTablet = Utils.isTablet();final theme = Theme.of(context);final textScaler = MediaQuery.textScalerOf(context);- final double cardHeight = isDesktop ? 160 : (isTablet ? 140 : 120);final double imageWidth = cardHeight * 0.7;final double borderRadius = 18;return Card(elevation: 1,- margin: const EdgeInsets.symmetric(vertical: 6, horizontal: 8),+ margin: const EdgeInsets.symmetric(vertical: 4, horizontal: 6),shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(borderRadius),),@@ -43,10 +46,11 @@ class TimelineBangumiCard extends StatelessWidget {},child: SizedBox(height: cardHeight,+ width: cardWidth,child: Row(crossAxisAlignment: CrossAxisAlignment.stretch,children: [- buildImage(context, imageWidth, cardHeight),+ buildImage(context, bangumiItem.images['large'] ?? '', imageWidth, cardHeight),Expanded(child: Padding(padding:@@ -61,8 +65,7 @@ class TimelineBangumiCard extends StatelessWidget {);}- Widget buildImage(BuildContext context, double width, double height) {- final imageUrl = bangumiItem.images['large'] ?? '';+ Widget buildImage(BuildContext context, String imageUrl, double width, double height) {final borderRadius = BorderRadius.circular(16);Widget img = NetworkImgLayer(src: imageUrl,diff --git a/lib/pages/history/history_page.dart b/lib/pages/history/history_page.dartindex 5a600613..3bfa4073 100644--- a/lib/pages/history/history_page.dart+++ b/lib/pages/history/history_page.dart@@ -119,47 +119,32 @@ class _HistoryPageState extends State<HistoryPage>if (MediaQuery.sizeOf(context).width > LayoutBreakpoint.medium['width']!) {crossCount = 3;}+ double cardHeight = 100;return CustomScrollView(slivers: [- SliverPadding(- padding: const EdgeInsets.only(- left: StyleString.cardSpace + 2,- right: StyleString.cardSpace + 2,- bottom: StyleString.safeSpace * 2),- sliver: SliverGrid(- gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(- mainAxisSpacing: StyleString.cardSpace - 2,- crossAxisSpacing: StyleString.cardSpace - 2,- crossAxisCount: crossCount,- mainAxisExtent: MediaQuery.textScalerOf(context).scale(150),- ),- delegate: SliverChildBuilderDelegate(- (BuildContext context, int index) {- return historyController.histories.isNotEmpty- ? BangumiHistoryCardV(- showDelete: showDelete,- historyItem: historyController.histories[index])- : null;- },- childCount: historyController.histories.isNotEmpty- ? historyController.histories.length- : 10,- ),+ SliverGrid(+ gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(+ mainAxisSpacing: StyleString.cardSpace - 2,+ crossAxisSpacing: StyleString.cardSpace,+ crossAxisCount: crossCount,+ mainAxisExtent: cardHeight + 12,),- )+ delegate: SliverChildBuilderDelegate(+ (BuildContext context, int index) {+ return historyController.histories.isNotEmpty+ ? BangumiHistoryCardV(+ showDelete: showDelete,+ cardHeight: cardHeight,+ historyItem: historyController.histories[index])+ : null;+ },+ childCount: historyController.histories.isNotEmpty+ ? historyController.histories.length+ : 10,+ ),+ ),],);}--// Widget contentGrid(List<History> histories) {-// return ListView.builder(-// itemCount: histories.isNotEmpty ? histories.length : 10,-// itemBuilder: (BuildContext context, int index) {-// return histories.isNotEmpty-// ? BangumiHistoryCardV(historyItem: histories[index])-// : Container();-// },-// );-// }}diff --git a/lib/pages/timeline/timeline_page.dart b/lib/pages/timeline/timeline_page.dartindex 08161253..2d96fc98 100644--- a/lib/pages/timeline/timeline_page.dart+++ b/lib/pages/timeline/timeline_page.dart@@ -4,7 +4,7 @@ import 'package:flutter_modular/flutter_modular.dart';import 'package:kazumi/pages/menu/menu.dart';import 'package:kazumi/modules/bangumi/bangumi_item.dart';import 'package:kazumi/pages/timeline/timeline_controller.dart';-import 'package:kazumi/bean/card/timeline_bangumi_card.dart';+import 'package:kazumi/bean/card/bangumi_timeline_card.dart';import 'package:kazumi/utils/utils.dart';import 'package:kazumi/utils/constants.dart';import 'package:provider/provider.dart';@@ -187,37 +187,37 @@ class _TimelinePageState extends State<TimelinePage>List<Widget> contentGrid(List<List<BangumiItem>> bangumiCalendar, Orientation orientation) {List<Widget> gridViewList = [];- int crossCount;- crossCount = orientation == Orientation.portrait ? 1 : 3;- double cardHeight = Utils.isDesktop()- ? 160- : (Utils.isTablet()- ? 140- : 120);+ int crossCount = 1;+ if (MediaQuery.sizeOf(context).width > LayoutBreakpoint.compact['width']!) {+ crossCount = 2;+ }+ if (MediaQuery.sizeOf(context).width > LayoutBreakpoint.medium['width']!) {+ crossCount = 3;+ }+ double cardHeight =+ Utils.isDesktop() ? 160 : (Utils.isTablet() ? 140 : 120);for (var bangumiList in bangumiCalendar) {gridViewList.add(- Padding(- padding: const EdgeInsets.only(left: 8, right: 8, top: 8),- child: CustomScrollView(- slivers: [- SliverGrid(- gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(- mainAxisSpacing: StyleString.cardSpace - 2,- crossAxisSpacing: StyleString.cardSpace,- crossAxisCount: crossCount,- mainAxisExtent: cardHeight + 12,- ),- delegate: SliverChildBuilderDelegate(- (BuildContext context, int index) {- if (bangumiList.isEmpty) return null;- final item = bangumiList[index];- return TimelineBangumiCard(bangumiItem: item);- },- childCount: bangumiList.isNotEmpty ? bangumiList.length : 10,- ),+ CustomScrollView(+ slivers: [+ SliverGrid(+ gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(+ mainAxisSpacing: StyleString.cardSpace - 2,+ crossAxisSpacing: StyleString.cardSpace,+ crossAxisCount: crossCount,+ mainAxisExtent: cardHeight + 12,),- ],- ),+ delegate: SliverChildBuilderDelegate(+ (BuildContext context, int index) {+ if (bangumiList.isEmpty) return null;+ final item = bangumiList[index];+ return BangumiTimelineCard(+ bangumiItem: item, cardHeight: cardHeight);+ },+ childCount: bangumiList.isNotEmpty ? bangumiList.length : 10,+ ),+ ),+ ],),);}