From 6acf359978263ad01f9a12d1f545540ef28099c2 Mon Sep 17 00:00:00 2001 From: ErBW_s Date: Mon, 6 Jan 2025 22:40:20 +0800 Subject: [PATCH 1/2] fix #567 --- lib/bean/card/bangumi_info_card.dart | 17 +++++++++++++---- lib/pages/collect/collect_page.dart | 17 +++++++++++++---- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/lib/bean/card/bangumi_info_card.dart b/lib/bean/card/bangumi_info_card.dart index 7d341c15..006a0c4f 100644 --- a/lib/bean/card/bangumi_info_card.dart +++ b/lib/bean/card/bangumi_info_card.dart @@ -50,10 +50,19 @@ class _BangumiInfoCardVState extends State { fadeOutDuration: const Duration(milliseconds: 0), ), Positioned( - right: 5, - bottom: 5, - child: - CollectButton(bangumiItem: widget.bangumiItem)), + right: 5, + bottom: 5, + child: Container( + // padding: EdgeInsets.all(padding), + decoration: BoxDecoration( + color: Theme.of(context) + .colorScheme + .secondaryContainer, + shape: BoxShape.circle, + ), + child: + CollectButton(bangumiItem: widget.bangumiItem)), + ), ], ); }), diff --git a/lib/pages/collect/collect_page.dart b/lib/pages/collect/collect_page.dart index 78ba98cb..2c6768df 100644 --- a/lib/pages/collect/collect_page.dart +++ b/lib/pages/collect/collect_page.dart @@ -149,10 +149,19 @@ class _CollectPageState extends State right: 5, bottom: 5, child: showDelete - ? CollectButton( - bangumiItem: - collectedBangumiRenderItem[index] - .bangumiItem) + ? Container( + // padding: EdgeInsets.all(padding), + decoration: BoxDecoration( + color: Theme.of(context) + .colorScheme + .secondaryContainer, + shape: BoxShape.circle, + ), + child: CollectButton( + bangumiItem: + collectedBangumiRenderItem[index] + .bangumiItem), + ) : Container(), ), ], From 512c63395321f7e71fb94bcd15f82dd1c3060fac Mon Sep 17 00:00:00 2001 From: ErBW_s Date: Mon, 6 Jan 2025 23:07:26 +0800 Subject: [PATCH 2/2] rename withRounder --- lib/bean/card/bangumi_history_card.dart | 5 ++++- lib/bean/card/bangumi_info_card.dart | 23 ++++++++++++++--------- lib/bean/widget/collect_button.dart | 17 ++++++----------- lib/pages/collect/collect_page.dart | 10 +++++++--- lib/pages/player/player_item.dart | 3 +-- 5 files changed, 32 insertions(+), 26 deletions(-) diff --git a/lib/bean/card/bangumi_history_card.dart b/lib/bean/card/bangumi_history_card.dart index 78034c64..6a73e5c3 100644 --- a/lib/bean/card/bangumi_history_card.dart +++ b/lib/bean/card/bangumi_history_card.dart @@ -158,7 +158,10 @@ class _BangumiHistoryCardVState extends State { ), Column( children: [ - CollectButton(bangumiItem: widget.historyItem.bangumiItem), + CollectButton( + bangumiItem: widget.historyItem.bangumiItem, + color: Theme.of(context).colorScheme.onSecondaryContainer, + ), widget.showDelete ? IconButton( icon: Icon( diff --git a/lib/bean/card/bangumi_info_card.dart b/lib/bean/card/bangumi_info_card.dart index 006a0c4f..4e0ffcd2 100644 --- a/lib/bean/card/bangumi_info_card.dart +++ b/lib/bean/card/bangumi_info_card.dart @@ -53,15 +53,20 @@ class _BangumiInfoCardVState extends State { right: 5, bottom: 5, child: Container( - // padding: EdgeInsets.all(padding), - decoration: BoxDecoration( - color: Theme.of(context) - .colorScheme - .secondaryContainer, - shape: BoxShape.circle, - ), - child: - CollectButton(bangumiItem: widget.bangumiItem)), + // padding: EdgeInsets.all(padding), + decoration: BoxDecoration( + color: Theme.of(context) + .colorScheme + .secondaryContainer, + shape: BoxShape.circle, + ), + child: CollectButton( + bangumiItem: widget.bangumiItem, + color: Theme.of(context) + .colorScheme + .onSecondaryContainer, + ), + ), ), ], ); diff --git a/lib/bean/widget/collect_button.dart b/lib/bean/widget/collect_button.dart index baa77693..df58342b 100644 --- a/lib/bean/widget/collect_button.dart +++ b/lib/bean/widget/collect_button.dart @@ -5,10 +5,10 @@ import 'package:flutter_modular/flutter_modular.dart'; class CollectButton extends StatefulWidget { const CollectButton( - {super.key, required this.bangumiItem, this.withRounder = true}); + {super.key, required this.bangumiItem, this.color = Colors.white}); final BangumiItem bangumiItem; - final bool withRounder; + final Color color; @override State createState() => _CollectButtonState(); @@ -67,15 +67,10 @@ class _CollectButtonState extends State { collectType = collectController.getCollectType(widget.bangumiItem); return PopupMenuButton( tooltip: '', - icon: widget.withRounder - ? Icon( - getIconByInt(collectType), - color: Theme.of(context).colorScheme.onSecondaryContainer, - ) - : Icon( - getIconByInt(collectType), - color: Colors.white, - ), + icon: Icon( + getIconByInt(collectType), + color: widget.color, + ), itemBuilder: (context) { return List.generate( 6, diff --git a/lib/pages/collect/collect_page.dart b/lib/pages/collect/collect_page.dart index 2c6768df..b41d7d86 100644 --- a/lib/pages/collect/collect_page.dart +++ b/lib/pages/collect/collect_page.dart @@ -158,9 +158,13 @@ class _CollectPageState extends State shape: BoxShape.circle, ), child: CollectButton( - bangumiItem: - collectedBangumiRenderItem[index] - .bangumiItem), + bangumiItem: + collectedBangumiRenderItem[index] + .bangumiItem, + color: Theme.of(context) + .colorScheme + .onSecondaryContainer, + ), ) : Container(), ), diff --git a/lib/pages/player/player_item.dart b/lib/pages/player/player_item.dart index f1d5fb59..45c9ec58 100644 --- a/lib/pages/player/player_item.dart +++ b/lib/pages/player/player_item.dart @@ -1447,8 +1447,7 @@ class _PlayerItemState extends State ), // 追番 CollectButton( - bangumiItem: infoController.bangumiItem, - withRounder: false), + bangumiItem: infoController.bangumiItem), PopupMenuButton( tooltip: '', icon: const Icon(