Skip to content

基于自定义规则的番剧采集APP,支持流媒体在线观看,支持弹幕,支持实时超分辨率。

refactor(ui): consolidate dropdown menus and remove legacy code

Predidit0ea0bbd455a4
diff --git a/lib/bean/settings/settings_dropdown_tile.dart b/lib/bean/settings/settings_dropdown_tile.dart
new file mode 100644
index 00000000..27b78c79
--- /dev/null
+++ b/lib/bean/settings/settings_dropdown_tile.dart
@@ -0,0 +1,68 @@
+import 'package:flutter/material.dart';
+import 'package:kazumi/bean/settings/settings_list.dart';
+import 'package:kazumi/bean/widget/kazumi_menu.dart';
+
+class SettingsDropdownTile<T> extends StatefulWidget {
+ const SettingsDropdownTile({
+ super.key,
+ required this.title,
+ required this.value,
+ required this.options,
+ required this.onChanged,
+ this.leading,
+ this.description,
+ this.icons = const {},
+ this.fallbackLabel = '',
+ this.enabled = true,
+ });
+
+ final Widget title;
+ final IconData? leading;
+ final Widget? description;
+ final T value;
+ final Map<T, String> options;
+ final Map<T, IconData> icons;
+ final ValueChanged<T> onChanged;
+ final String fallbackLabel;
+ final bool enabled;
+
+ @override
+ State<SettingsDropdownTile<T>> createState() =>
+ _SettingsDropdownTileState<T>();
+}
+
+class _SettingsDropdownTileState<T> extends State<SettingsDropdownTile<T>> {
+ final _controller = MenuController();
+
+ @override
+ Widget build(BuildContext context) {
+ final enabled = widget.enabled && widget.options.isNotEmpty;
+ return SettingsTile(
+ leading: widget.leading,
+ title: widget.title,
+ description: widget.description,
+ enabled: enabled,
+ onPressed: (_) =>
+ _controller.isOpen ? _controller.close() : _controller.open(),
+ value: KazumiMenuButton(
+ controller: _controller,
+ enabled: enabled,
+ builder: (_, _) =>
+ Text(widget.options[widget.value] ?? widget.fallbackLabel),
+ menuChildren: [
+ for (final entry in widget.options.entries)
+ KazumiMenuItem(
+ label: entry.value,
+ selected: entry.key == widget.value,
+ leadingIcon: widget.icons[entry.key] == null
+ ? null
+ : Icon(widget.icons[entry.key]),
+ requestFocusOnHover: false,
+ onPressed: enabled ? () => widget.onChanged(entry.key) : null,
+ ),
+ ],
+ ),
+ trailing: const Icon(Icons.arrow_drop_down_rounded),
+ );
+ }
+}
diff --git a/lib/bean/widget/collect_button.dart b/lib/bean/widget/collect_button.dart
index a5fb9334..8f0907b4 100644
--- a/lib/bean/widget/collect_button.dart
+++ b/lib/bean/widget/collect_button.dart
@@ -1,168 +1,89 @@
import 'package:flutter/material.dart';
+import 'package:flutter_modular/flutter_modular.dart';
+import 'package:kazumi/bean/widget/kazumi_menu.dart';
import 'package:kazumi/modules/bangumi/bangumi_item.dart';
+import 'package:kazumi/modules/collect/collect_type.dart';
import 'package:kazumi/pages/collect/collect_controller.dart';
-import 'package:flutter_modular/flutter_modular.dart';
class CollectButton extends StatefulWidget {
- CollectButton({
+ const CollectButton({
super.key,
required this.bangumiItem,
this.color = Colors.white,
this.onOpen,
this.onClose,
- }) {
- isExtended = false;
- }
+ }) : _isExtended = false;
- CollectButton.extend({
+ const CollectButton.extend({
super.key,
required this.bangumiItem,
this.color = Colors.white,
this.onOpen,
this.onClose,
- }) {
- isExtended = true;
- }
+ }) : _isExtended = true;
final BangumiItem bangumiItem;
final Color color;
- late final bool isExtended;
- final void Function()? onOpen;
- final void Function()? onClose;
+ final bool _isExtended;
+ final VoidCallback? onOpen;
+ final VoidCallback? onClose;
@override
State<CollectButton> createState() => _CollectButtonState();
}
class _CollectButtonState extends State<CollectButton> {
- // 1. 在看
- // 2. 想看
- // 3. 搁置
- // 4. 看过
- // 5. 抛弃
- late int collectType;
- final CollectController collectController = inject<CollectController>();
+ final _collectController = inject<CollectController>();
- @override
- void initState() {
- super.initState();
- }
+ String _labelFor(CollectType type) =>
+ type == CollectType.none ? '未追' : type.label;
- String getTypeStringByInt(int collectType) {
- switch (collectType) {
- case 1:
- return "在看";
- case 2:
- return "想看";
- case 3:
- return "搁置";
- case 4:
- return "看过";
- case 5:
- return "抛弃";
- default:
- return "未追";
- }
- }
+ IconData _iconFor(CollectType type) => switch (type) {
+ CollectType.none => Icons.favorite_border,
+ CollectType.watching => Icons.favorite,
+ CollectType.planToWatch => Icons.star_rounded,
+ CollectType.onHold => Icons.pending_actions,
+ CollectType.watched => Icons.done,
+ CollectType.abandoned => Icons.heart_broken,
+ };
- IconData getIconByInt(int collectType) {
- switch (collectType) {
- case 1:
- return Icons.favorite;
- case 2:
- return Icons.star_rounded;
- case 3:
- return Icons.pending_actions;
- case 4:
- return Icons.done;
- case 5:
- return Icons.heart_broken;
- default:
- return Icons.favorite_border;
+ Future<void> _selectType(CollectType type) async {
+ if (!mounted ||
+ type.value == _collectController.getCollectType(widget.bangumiItem)) {
+ return;
}
+ await _collectController.addCollect(widget.bangumiItem, type: type.value);
+ if (mounted) setState(() {});
}
@override
Widget build(BuildContext context) {
- collectType = collectController.getCollectType(widget.bangumiItem);
- return MenuAnchor(
- consumeOutsideTap: true,
+ final collectType = CollectType.fromValue(
+ _collectController.getCollectType(widget.bangumiItem),
+ );
+ return KazumiMenuButton(
onClose: widget.onClose,
onOpen: widget.onOpen,
crossAxisUnconstrained: false,
- builder: (_, MenuController controller, __) {
- if (widget.isExtended) {
- return FilledButton.icon(
- onPressed: () {
- if (controller.isOpen) {
- controller.close();
- } else {
- controller.open();
- }
- },
- icon: Icon(getIconByInt(collectType)),
- label: Text(getTypeStringByInt(collectType)),
- );
- } else {
- return IconButton(
- onPressed: () {
- if (controller.isOpen) {
- controller.close();
- } else {
- controller.open();
- }
- },
- tooltip: getTypeStringByInt(collectType),
- icon: Icon(
- getIconByInt(collectType),
- color: widget.color,
- ),
- );
- }
- },
- menuChildren: List<MenuItemButton>.generate(
- 6,
- (int index) => MenuItemButton(
- onPressed: () async {
- if (index != collectType && mounted) {
- await collectController.addCollect(widget.bangumiItem,
- type: index);
- // 防止状态错误刷新
- if (!mounted) {
- return;
- }
- setState(() {});
- }
- },
- child: Container(
- height: 48,
- constraints: BoxConstraints(minWidth: 112),
- child: Align(
- alignment: Alignment.centerLeft,
- child: Row(
- mainAxisSize: MainAxisSize.min,
- children: [
- Icon(
- getIconByInt(index),
- color: index == collectType
- ? Theme.of(context).colorScheme.primary
- : null,
- ),
- SizedBox(width: 4),
- Text(
- ' ${getTypeStringByInt(index)}',
- style: TextStyle(
- color: index == collectType
- ? Theme.of(context).colorScheme.primary
- : null,
- ),
- ),
- ],
- ),
+ builder: (context, toggle) => widget._isExtended
+ ? FilledButton.icon(
+ onPressed: toggle,
+ icon: Icon(_iconFor(collectType)),
+ label: Text(_labelFor(collectType)),
+ )
+ : IconButton(
+ onPressed: toggle,
+ tooltip: _labelFor(collectType),
+ icon: Icon(_iconFor(collectType), color: widget.color),
),
+ menuChildren: [
+ for (final type in CollectType.values)
+ KazumiMenuItem(
+ label: _labelFor(type),
+ selected: type == collectType,
+ onPressed: () => _selectType(type),
),
- ),
- ),
+ ],
);
}
}
diff --git a/lib/bean/widget/custom_dropdown_menu.dart b/lib/bean/widget/custom_dropdown_menu.dart
deleted file mode 100644
index 89e11c92..00000000
--- a/lib/bean/widget/custom_dropdown_menu.dart
+++ /dev/null
@@ -1,116 +0,0 @@
-import 'package:flutter/material.dart';
-
-/// A custom dropdown menu widget that provides smooth animations without flickering.
-///
-/// This widget was created to solve the visual flickering issue in Flutter's built-in
-/// [PopupMenuButton] where menu items are rendered before the animation completes,
-/// causing an uncoordinated visual effect.
-class CustomDropdownMenu extends StatelessWidget {
- final Offset offset;
- final Size buttonSize;
- final Animation<double> animation;
- final List<String> items;
- final String Function(String) itemBuilder;
- final double? maxHeight;
-
- /// Minimum width constraint for the menu. Defaults to 140.
- /// Note: If [maxWidth] is less than [minWidth], [minWidth] will be used as both min and max.
- final double? minWidth;
-
- /// Maximum width constraint for the menu. Defaults to 200.
- /// Note: If this value is less than [minWidth], it will be adjusted to equal [minWidth].
- final double? maxWidth;
- final double gap;
-
- const CustomDropdownMenu({
- super.key,
- required this.offset,
- required this.buttonSize,
- required this.animation,
- required this.items,
- required this.itemBuilder,
- this.maxHeight,
- this.minWidth,
- this.maxWidth,
- this.gap = 4,
- });
-
- @override
- Widget build(BuildContext context) {
- final theme = Theme.of(context);
-
- // Ensure width constraints are valid (minWidth <= maxWidth)
- final computedMinWidth = minWidth ?? 140;
- final computedMaxWidth = maxWidth ?? 200;
- final normalizedMinWidth = computedMinWidth;
- final normalizedMaxWidth = computedMaxWidth < computedMinWidth
- ? computedMinWidth
- : computedMaxWidth;
-
- return GestureDetector(
- onTap: () => Navigator.pop(context),
- behavior: HitTestBehavior.opaque,
- child: Stack(
- children: [
- Positioned(
- left: offset.dx,
- top: offset.dy + buttonSize.height + gap,
- child: Material(
- elevation: 6,
- borderRadius: BorderRadius.circular(8),
- color: theme.colorScheme.surface,
- surfaceTintColor: Colors.transparent,
- shadowColor: Colors.black26,
- child: AnimatedBuilder(
- animation: animation,
- builder: (context, child) {
- final curvedValue =
- Curves.easeOutCubic.transform(animation.value);
- return ClipRect(
- child: Align(
- alignment: Alignment.topCenter,
- heightFactor: curvedValue,
- child: Opacity(
- opacity: curvedValue,
- child: child,
- ),
- ),
- );
- },
- child: Container(
- constraints: BoxConstraints(
- maxHeight: maxHeight ?? 350,
- minWidth: normalizedMinWidth,
- maxWidth: normalizedMaxWidth,
- ),
- child: ListView.builder(
- padding: const EdgeInsets.symmetric(vertical: 8),
- shrinkWrap: true,
- itemCount: items.length,
- itemBuilder: (context, index) {
- final itemValue = items[index];
- final displayText = itemBuilder(itemValue);
- return InkWell(
- onTap: () => Navigator.pop(context, itemValue),
- child: Padding(
- padding: const EdgeInsets.symmetric(
- horizontal: 16,
- vertical: 12,
- ),
- child: Text(
- displayText,
- style: const TextStyle(fontSize: 14),
- ),
- ),
- );
- },
- ),
- ),
- ),
- ),
- ),
- ],
- ),
- );
- }
-}
diff --git a/lib/bean/widget/kazumi_menu.dart b/lib/bean/widget/kazumi_menu.dart
new file mode 100644
index 00000000..4d00cba9
--- /dev/null
+++ b/lib/bean/widget/kazumi_menu.dart
@@ -0,0 +1,114 @@
+import 'package:flutter/material.dart';
+
+typedef KazumiMenuBuilder =
+ Widget Function(BuildContext context, VoidCallback? toggle);
+
+const _menuItemStyle = ButtonStyle(
+ minimumSize: WidgetStatePropertyAll(Size(144, 48)),
+ padding: WidgetStatePropertyAll(EdgeInsets.symmetric(horizontal: 16)),
+ alignment: AlignmentDirectional.centerStart,
+ visualDensity: VisualDensity.standard,
+);
+
+class KazumiMenuButton extends StatelessWidget {
+ const KazumiMenuButton({
+ super.key,
+ required this.builder,
+ required this.menuChildren,
+ this.controller,
+ this.enabled = true,
+ this.animated = false,
+ this.crossAxisUnconstrained = true,
+ this.onOpen,
+ this.onClose,
+ this.style,
+ });
+
+ final KazumiMenuBuilder builder;
+ final List<Widget> menuChildren;
+ final MenuController? controller;
+ final bool enabled;
+
+ /// Opt in only for menus that previously animated.
+ final bool animated;
+ final bool crossAxisUnconstrained;
+ final VoidCallback? onOpen;
+ final VoidCallback? onClose;
+ final MenuStyle? style;
+
+ @override
+ Widget build(BuildContext context) {
+ return MenuButtonTheme(
+ data: MenuButtonThemeData(
+ // Submenu entries must use the same inset as ordinary menu items.
+ style: _menuItemStyle.merge(MenuButtonTheme.of(context).style),
+ ),
+ child: MenuAnchor(
+ controller: controller,
+ consumeOutsideTap: true,
+ crossAxisUnconstrained: crossAxisUnconstrained,
+ animated: animated && !MediaQuery.disableAnimationsOf(context),
+ onOpen: onOpen,
+ onClose: onClose,
+ style: style,
+ menuChildren: menuChildren,
+ builder: (context, controller, _) => builder(
+ context,
+ enabled && menuChildren.isNotEmpty
+ ? () => controller.isOpen ? controller.close() : controller.open()
+ : null,
+ ),
+ ),
+ );
+ }
+}
+
+class KazumiMenuItem extends StatelessWidget {
+ const KazumiMenuItem({
+ super.key,
+ required this.label,
+ required this.onPressed,
+ this.leadingIcon,
+ this.selected,
+ this.destructive = false,
+ this.requestFocusOnHover = true,
+ });
+
+ final String label;
+ final VoidCallback? onPressed;
+ final Widget? leadingIcon;
+
+ /// Null for actions; a bool exposes single-choice selection semantics.
+ final bool? selected;
+ final bool destructive;
+ final bool requestFocusOnHover;
+
+ @override
+ Widget build(BuildContext context) {
+ final colors = Theme.of(context).colorScheme;
+ final color = destructive
+ ? colors.error
+ : selected == true
+ ? colors.primary
+ : null;
+ final foregroundColor = color == null
+ ? null
+ : WidgetStateProperty.resolveWith<Color?>(
+ (states) => states.contains(WidgetState.disabled) ? null : color,
+ );
+ return MenuItemButton(
+ onPressed: onPressed,
+ requestFocusOnHover: requestFocusOnHover,
+ style: ButtonStyle(
+ foregroundColor: foregroundColor,
+ iconColor: foregroundColor,
+ ),
+ leadingIcon: leadingIcon,
+ child: Semantics(
+ selected: selected,
+ inMutuallyExclusiveGroup: selected == null ? null : true,
+ child: Text(label, textAlign: TextAlign.start),
+ ),
+ );
+ }
+}
diff --git a/lib/pages/collect/collect_library_card.dart b/lib/pages/collect/collect_library_card.dart
index 8f15816f..dbc02a1d 100644
--- a/lib/pages/collect/collect_library_card.dart
+++ b/lib/pages/collect/collect_library_card.dart
@@ -367,13 +367,8 @@ class _CollectEntryMenu extends StatelessWidget {
final colors = Theme.of(context).colorScheme;
final type = CollectType.fromValue(entry.type);
final title = CollectLibraryQuery.titleOf(entry);
- const itemStyle = ButtonStyle(
- visualDensity: VisualDensity.standard,
- minimumSize: WidgetStatePropertyAll(Size(192, 48)),
- padding: WidgetStatePropertyAll(EdgeInsets.symmetric(horizontal: 16)),
- );
- return MenuAnchor(
- consumeOutsideTap: true,
+ return KazumiMenuButton(
+ enabled: onChanged != null,
style: MenuStyle(
shape: WidgetStatePropertyAll(RoundedRectangleBorder(
borderRadius: BorderRadius.circular(showStatusLabel ? 16 : 20),
@@ -382,27 +377,22 @@ class _CollectEntryMenu extends StatelessWidget {
menuChildren: [
for (final status
in CollectType.values.where((type) => type.isCollected))
- MenuItemButton(
- style: itemStyle,
- trailingIcon:
- status == type ? const Icon(Icons.check_rounded) : null,
+ KazumiMenuItem(
+ selected: status == type,
onPressed: onChanged == null || status == type
? null
: () => onChanged!(status),
- child: Text(status.label),
+ label: status.label,
),
const Divider(indent: 16, endIndent: 16),
- MenuItemButton(
- style: itemStyle,
+ KazumiMenuItem(
onPressed:
onChanged == null ? null : () => onChanged!(CollectType.none),
- child: Text('取消收藏', style: TextStyle(color: colors.error)),
+ label: '取消收藏',
+ destructive: true,
),
],
- builder: (context, controller, child) {
- final VoidCallback? toggle = onChanged == null
- ? null
- : () => controller.isOpen ? controller.close() : controller.open();
+ builder: (context, toggle) {
return showStatusLabel
? Tooltip(
message: '调整《$title》的观看状态',
diff --git a/lib/pages/collect/collect_library_controls.dart b/lib/pages/collect/collect_library_controls.dart
index ac795c64..c188145f 100644
--- a/lib/pages/collect/collect_library_controls.dart
+++ b/lib/pages/collect/collect_library_controls.dart
@@ -131,20 +131,16 @@ class _CollectSortMenu extends StatelessWidget {
@override
Widget build(BuildContext context) {
- return MenuAnchor(
- consumeOutsideTap: true,
+ return KazumiMenuButton(
menuChildren: [
for (final sort in CollectSort.values)
- MenuItemButton(
- trailingIcon:
- value == sort ? const Icon(Icons.check_rounded) : null,
+ KazumiMenuItem(
+ selected: value == sort,
onPressed: () => onChanged(sort),
- child: Text(sort.label),
+ label: sort.label,
),
],
- builder: (context, controller, child) {
- void toggle() =>
- controller.isOpen ? controller.close() : controller.open();
+ builder: (context, toggle) {
return Tooltip(
message: '排序:${value.label}',
child: showLabel
diff --git a/lib/pages/collect/collect_library_view.dart b/lib/pages/collect/collect_library_view.dart
index d59c08b8..6dc73c0a 100644
--- a/lib/pages/collect/collect_library_view.dart
+++ b/lib/pages/collect/collect_library_view.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:kazumi/bean/card/network_img_layer.dart';
import 'package:kazumi/bean/widget/empty_state_widget.dart';
+import 'package:kazumi/bean/widget/kazumi_menu.dart';
import 'package:kazumi/modules/bangumi/bangumi_item.dart';
import 'package:kazumi/modules/collect/collect_layout.dart';
import 'package:kazumi/modules/collect/collect_module.dart';
diff --git a/lib/pages/download/download_widgets.dart b/lib/pages/download/download_widgets.dart
index d5953f34..5835290c 100644
--- a/lib/pages/download/download_widgets.dart
+++ b/lib/pages/download/download_widgets.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:kazumi/bean/card/network_img_layer.dart';
import 'package:kazumi/bean/card/rule_card.dart';
+import 'package:kazumi/bean/widget/kazumi_menu.dart';
import 'package:kazumi/bean/widget/loading_indicator.dart';
import 'package:kazumi/modules/download/download_module.dart';
import 'package:kazumi/utils/format.dart';
@@ -120,30 +121,20 @@ class DownloadRecordCard extends StatelessWidget {
],
),
),
- PopupMenuButton<String>(
- icon: Icon(
- Icons.more_vert,
- color: colorScheme.onSurfaceVariant,
+ KazumiMenuButton(
+ animated: false,
+ builder: (context, toggle) => IconButton(
+ icon: Icon(Icons.more_vert,
+ color: colorScheme.onSurfaceVariant),
+ tooltip: '更多操作',
+ onPressed: toggle,
),
- tooltip: '更多操作',
- onSelected: (value) {
- if (value == 'resume_all') {
- onResumeAll();
- } else if (value == 'delete') {
- onDeleteAll();
- }
- },
- itemBuilder: (context) => [
- const PopupMenuItem(
- value: 'resume_all',
- child: Text('全部开始'),
- ),
- PopupMenuItem(
- value: 'delete',
- child: Text(
- '全部删除',
- style: TextStyle(color: colorScheme.error),
- ),
+ menuChildren: [
+ KazumiMenuItem(label: '全部开始', onPressed: onResumeAll),
+ KazumiMenuItem(
+ label: '全部删除',
+ destructive: true,
+ onPressed: onDeleteAll,
),
],
),
diff --git a/lib/pages/history/history_record_tile.dart b/lib/pages/history/history_record_tile.dart
index 1666ac7d..e3093cae 100644
--- a/lib/pages/history/history_record_tile.dart
+++ b/lib/pages/history/history_record_tile.dart
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:kazumi/bean/card/network_img_layer.dart';
+import 'package:kazumi/bean/widget/kazumi_menu.dart';
import 'package:kazumi/bean/widget/loading_indicator.dart';
import 'package:kazumi/modules/collect/collect_type.dart';
import 'package:kazumi/modules/history/history_module.dart';
@@ -226,43 +227,36 @@ class HistoryRecordTile extends StatelessWidget {
onPressed: onPlay,
icon: const Icon(Icons.play_arrow_rounded),
),
- MenuAnchor(
- consumeOutsideTap: true,
+ KazumiMenuButton(
menuChildren: [
- MenuItemButton(
- leadingIcon: const Icon(Icons.info_outline_rounded),
+ KazumiMenuItem(
onPressed: onDetails,
- child: const Text('番剧详情'),
+ label: '番剧详情',
),
SubmenuButton(
- leadingIcon: const Icon(Icons.bookmark_outline_rounded),
menuChildren: [
for (final type in CollectType.values)
- MenuItemButton(
- leadingIcon: Icon(collectType == type
- ? Icons.radio_button_checked_rounded
- : Icons.radio_button_unchecked_rounded),
+ KazumiMenuItem(
+ selected: collectType == type,
onPressed: onChangeCollect == null
? null
: () => onChangeCollect!(type),
- child: Text(type.label),
+ label: type.label,
),
],
- child: Text('收藏 · ${collectType.label}'),
+ child: Text(collectType.label),
),
const Divider(),
- MenuItemButton(
- leadingIcon:
- Icon(Icons.delete_outline_rounded, color: colors.error),
+ KazumiMenuItem(
+ destructive: true,
onPressed: onDelete,
- child: Text('删除记录', style: TextStyle(color: colors.error)),
+ label: '删除记录',
),
],
- builder: (context, controller, child) => IconButton(
+ builder: (context, toggle) => IconButton(
tooltip: '更多操作',
constraints: const BoxConstraints(minWidth: 48, minHeight: 48),
- onPressed: () =>
- controller.isOpen ? controller.close() : controller.open(),
+ onPressed: toggle,
icon: const Icon(Icons.more_horiz_rounded),
),
),
diff --git a/lib/pages/info/info_actions_menu.dart b/lib/pages/info/info_actions_menu.dart
index 4174d0cb..7eb2f171 100644
--- a/lib/pages/info/info_actions_menu.dart
+++ b/lib/pages/info/info_actions_menu.dart
@@ -5,6 +5,7 @@ import 'package:file_picker/file_picker.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:kazumi/bean/dialog/dialog.dart';
+import 'package:kazumi/bean/widget/kazumi_menu.dart';
import 'package:kazumi/modules/bangumi/bangumi_item.dart';
import 'package:kazumi/services/logging/logger.dart';
import 'package:kazumi/utils/device.dart';
@@ -103,35 +104,25 @@ class _InfoActionsMenuState extends State<InfoActionsMenu> {
@override
Widget build(BuildContext context) {
- const itemStyle = ButtonStyle(
- minimumSize: WidgetStatePropertyAll(Size(120, 48)),
- padding: WidgetStatePropertyAll(EdgeInsets.symmetric(horizontal: 16)),
- visualDensity: VisualDensity.standard,
- );
- return MenuAnchor(
- consumeOutsideTap: true,
+ return KazumiMenuButton(
menuChildren: [
- MenuItemButton(
- style: itemStyle,
+ KazumiMenuItem(
onPressed: _savingCover ? null : _saveCover,
- child: Text(_savingCover ? '保存中…' : '保存封面'),
+ label: _savingCover ? '保存中…' : '保存封面',
),
- MenuItemButton(
- style: itemStyle,
+ KazumiMenuItem(
onPressed: _title.trim().isEmpty ? null : _copyTitle,
- child: const Text('复制标题'),
+ label: '复制标题',
),
- MenuItemButton(
- style: itemStyle,
+ KazumiMenuItem(
onPressed: _openExternally,
- child: const Text('外部打开'),
+ label: '外部打开',
),
],
- builder: (context, controller, child) => IconButton(
+ builder: (context, toggle) => IconButton(
tooltip: '更多操作',
icon: const Icon(Icons.more_horiz_rounded),
- onPressed: () =>
- controller.isOpen ? controller.close() : controller.open(),
+ onPressed: toggle,
),
);
}
diff --git a/lib/pages/info/source_sheet.dart b/lib/pages/info/source_sheet.dart
index 10f1fcd5..999676de 100644
--- a/lib/pages/info/source_sheet.dart
+++ b/lib/pages/info/source_sheet.dart
@@ -8,6 +8,7 @@ import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:flutter_modular/flutter_modular.dart';
import 'package:kazumi/bean/dialog/dialog_helper.dart';
import 'package:kazumi/bean/dialog/material_bottom_sheet.dart';
+import 'package:kazumi/bean/widget/kazumi_menu.dart';
import 'package:kazumi/bean/widget/loading_indicator.dart';
import 'package:kazumi/bean/widget/empty_state_widget.dart';
import 'package:kazumi/bean/widget/split_list_row.dart';
diff --git a/lib/pages/info/source_sheet_view.dart b/lib/pages/info/source_sheet_view.dart
index 1fb60870..f157f26d 100644
--- a/lib/pages/info/source_sheet_view.dart
+++ b/lib/pages/info/source_sheet_view.dart
@@ -357,26 +357,29 @@ class _SourceSheetViewState extends State<_SourceSheetView> {
Widget _buildSourceMenu(_SourceSearchGroup group) => TooltipVisibility(
visible: false,
- child: PopupMenuButton<VoidCallback>(
- tooltip: '${group.name} 的更多操作',
- icon: const Icon(Icons.more_horiz_rounded, size: 20),
- onSelected: (action) => action(),
- itemBuilder: (_) => [
- PopupMenuItem(
- value: () => widget.onSourceSearch(group.name),
- child: const Text('修改此来源的检索词'),
+ child: KazumiMenuButton(
+ animated: true,
+ builder: (context, toggle) => IconButton(
+ tooltip: '${group.name} 的更多操作',
+ icon: const Icon(Icons.more_horiz_rounded, size: 20),
+ onPressed: toggle,
+ ),
+ menuChildren: [
+ KazumiMenuItem(
+ label: '修改此来源的检索词',
+ onPressed: () => widget.onSourceSearch(group.name),
),
- PopupMenuItem(
- value: () => widget.onSourceAliasSearch(group.name),
- child: const Text('使用别名检索此来源'),
+ KazumiMenuItem(
+ label: '使用别名检索此来源',
+ onPressed: () => widget.onSourceAliasSearch(group.name),
),
- PopupMenuItem(
- value: () => widget.onRetry(group.name),
- child: const Text('重新检索此来源'),
+ KazumiMenuItem(
+ label: '重新检索此来源',
+ onPressed: () => widget.onRetry(group.name),
),
- PopupMenuItem(
- value: () => widget.onOpenBrowser(group.name),
- child: const Text('在浏览器中打开'),
+ KazumiMenuItem(
+ label: '在浏览器中打开',
+ onPressed: () => widget.onOpenBrowser(group.name),
),
],
),
diff --git a/lib/pages/player/player_item_panel.dart b/lib/pages/player/player_item_panel.dart
index 5216f7bb..41df01bb 100644
--- a/lib/pages/player/player_item_panel.dart
+++ b/lib/pages/player/player_item_panel.dart
@@ -5,6 +5,7 @@ import 'package:canvas_danmaku/models/danmaku_content_item.dart';
import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:flutter_svg/flutter_svg.dart';
+import 'package:kazumi/bean/widget/kazumi_menu.dart';
import 'package:kazumi/bean/widget/play_pause_icon.dart';
import 'package:kazumi/pages/player/player_adjustment_hud.dart';
import 'package:kazumi/pages/player/danmaku_destination_sheet.dart';
@@ -557,9 +558,10 @@ class _PlayerItemPanelState extends State<PlayerItemPanel> {
}) =>
[
for (final value in values)
- MenuItemButton(
+ KazumiMenuItem(
onPressed: () => onSelected(value),
- child: _menuLabel(label(value), selected: selected(value)),
+ label: label(value),
+ selected: selected(value),
),
];
@@ -592,14 +594,9 @@ class _PlayerItemPanelState extends State<PlayerItemPanel> {
PlayerPanelHoldMenuAnchor(
acquirePlayerPanelHold: widget.acquirePlayerPanelHold,
onVisibilityChanged: widget.onMenuVisibilityChanged,
- consumeOutsideTap: true,
- builder: (context, controller, menuChild) {
- void toggle() =>
- controller.isOpen ? controller.close() : controller.open();
- return tooltip == null
- ? TextButton(onPressed: toggle, child: child)
- : IconButton(onPressed: toggle, icon: child, tooltip: tooltip);
- },
+ builder: (context, toggle) => tooltip == null
+ ? TextButton(onPressed: toggle, child: child)
+ : IconButton(onPressed: toggle, icon: child, tooltip: tooltip),
menuChildren: items,
);
@@ -623,24 +620,14 @@ class _PlayerItemPanelState extends State<PlayerItemPanel> {
),
);
- Widget get _syncPlayMenuItem => MenuItemButton(
+ Widget get _syncPlayMenuItem => KazumiMenuItem(
onPressed: widget.showSyncPlayPanel,
- child: _menuLabel('一起看'),
+ label: '一起看',
);
- Widget get _danmakuSettingsMenuItem => MenuItemButton(
+ Widget get _danmakuSettingsMenuItem => KazumiMenuItem(
onPressed: _showDanmakuSettings,
- child: _menuLabel('弹幕设置'),
- );
-
- Widget _menuLabel(String label, {bool selected = false}) => Container(
- height: 48,
- constraints: const BoxConstraints(minWidth: 112),
- alignment: Alignment.centerLeft,
- child: Text(label,
- style: selected
- ? TextStyle(color: Theme.of(context).colorScheme.primary)
- : null),
+ label: '弹幕设置',
);
Widget get _wideControls => Row(children: [
@@ -847,17 +834,9 @@ class _PlayerItemPanelState extends State<PlayerItemPanel> {
PlayerPanelHoldMenuAnchor(
acquirePlayerPanelHold: widget.acquirePlayerPanelHold,
onVisibilityChanged: widget.onMenuVisibilityChanged,
- consumeOutsideTap: true,
- builder: (BuildContext context, MenuController controller,
- Widget? child) {
+ builder: (context, toggle) {
return IconButton(
- onPressed: () {
- if (controller.isOpen) {
- controller.close();
- } else {
- controller.open();
- }
- },
+ onPressed: toggle,
tooltip: '更多选项',
icon: const Icon(
Icons.more_vert,
@@ -869,24 +848,24 @@ class _PlayerItemPanelState extends State<PlayerItemPanel> {
if (compact) ...[
SubmenuButton(
menuChildren: _aspectRatioItems,
- child: _menuLabel('视频比例')),
+ child: const Text('视频比例')),
SubmenuButton(
- menuChildren: _speedItems, child: _menuLabel('倍速')),
+ menuChildren: _speedItems, child: const Text('倍速')),
SubmenuButton(
menuChildren: _superResolutionItems,
- child: _menuLabel('超分辨率')),
+ child: const Text('超分辨率')),
_syncPlayMenuItem,
],
- MenuItemButton(
+ KazumiMenuItem(
onPressed: widget.showDanmakuSwitch,
- child: _menuLabel('弹幕切换'),
+ label: '弹幕切换',
),
if (compact) _danmakuSettingsMenuItem,
- MenuItemButton(
+ KazumiMenuItem(
onPressed: widget.showVideoInfo,
- child: _menuLabel('视频详情'),
+ label: '视频详情',
),
- MenuItemButton(
+ KazumiMenuItem(
onPressed: () {
final needRestart = playerController.playback.playing;
playerController.pause();
@@ -899,21 +878,21 @@ class _PlayerItemPanelState extends State<PlayerItemPanel> {
}
});
},
- child: _menuLabel('远程投屏'),
+ label: '远程投屏',
),
- MenuItemButton(
+ KazumiMenuItem(
onPressed: playerController.launchExternalPlayer,
- child: _menuLabel('外部播放'),
+ label: '外部播放',
),
SubmenuButton(
menuChildren: [
- MenuItemButton(
+ KazumiMenuItem(
onPressed: TimedShutdownService().cancel,
- child: _menuLabel('不开启',
- selected: !TimedShutdownService().isActive),
+ label: '不开启',
+ selected: !TimedShutdownService().isActive,
),
for (final int minutes in [15, 30, 60])
- MenuItemButton(
+ KazumiMenuItem(
onPressed: () {
TimedShutdownService().start(minutes,
onExpired: widget.pauseForTimedShutdown);
@@ -921,35 +900,26 @@ class _PlayerItemPanelState extends State<PlayerItemPanel> {
message:
'已设置 ${TimedShutdownService().formatMinutesToDisplay(minutes)} 后定时关闭');
},
- child: _menuLabel('$minutes 分钟',
- selected:
- TimedShutdownService().setMinutes == minutes),
+ label: '$minutes 分钟',
+ selected:
+ TimedShutdownService().setMinutes == minutes,
),
- MenuItemButton(
+ KazumiMenuItem(
onPressed: () {
TimedShutdownService.showCustomTimerDialog(
onExpired: widget.pauseForTimedShutdown,
);
},
- child: _menuLabel('自定义'),
+ label: '自定义',
),
],
- child: Container(
- height: 48,
- constraints: BoxConstraints(minWidth: 112),
- child: Align(
- alignment: Alignment.centerLeft,
- child: ValueListenableBuilder<int>(
- valueListenable:
- TimedShutdownService().remainingSecondsNotifier,
- builder: (context, remainingSeconds, child) {
- return Text(
- remainingSeconds > 0
- ? "定时关闭 (${TimedShutdownService().formatRemainingTime()})"
- : "定时关闭",
- );
- },
- ),
+ child: ValueListenableBuilder<int>(
+ valueListenable:
+ TimedShutdownService().remainingSecondsNotifier,
+ builder: (context, remainingSeconds, _) => Text(
+ remainingSeconds > 0
+ ? "定时关闭 (${TimedShutdownService().formatRemainingTime()})"
+ : "定时关闭",
),
),
),
diff --git a/lib/pages/player/player_panel_hold.dart b/lib/pages/player/player_panel_hold.dart
index fd571130..2afb0357 100644
--- a/lib/pages/player/player_panel_hold.dart
+++ b/lib/pages/player/player_panel_hold.dart
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:kazumi/bean/widget/collect_button.dart';
+import 'package:kazumi/bean/widget/kazumi_menu.dart';
import 'package:kazumi/modules/bangumi/bangumi_item.dart';
/// A one-shot lease that keeps the player panel visible until released.
@@ -125,18 +126,12 @@ class PlayerPanelHoldMenuAnchor extends StatefulWidget {
required this.onVisibilityChanged,
required this.builder,
required this.menuChildren,
- this.consumeOutsideTap = false,
});
final PlayerPanelHold Function() acquirePlayerPanelHold;
final ValueChanged<bool> onVisibilityChanged;
- final Widget Function(
- BuildContext context,
- MenuController controller,
- Widget? child,
- ) builder;
+ final KazumiMenuBuilder builder;
final List<Widget> menuChildren;
- final bool consumeOutsideTap;
@override
State<PlayerPanelHoldMenuAnchor> createState() =>
@@ -159,9 +154,6 @@ class _PlayerPanelHoldMenuAnchorState extends State<PlayerPanelHoldMenuAnchor> {
}
_isOpen = true;
widget.onVisibilityChanged(true);
- if (_hold?.isReleased == false) {
- return;
- }
_hold = widget.acquirePlayerPanelHold();
}
@@ -176,8 +168,8 @@ class _PlayerPanelHoldMenuAnchorState extends State<PlayerPanelHoldMenuAnchor> {
@override
Widget build(BuildContext context) {
- return MenuAnchor(
- consumeOutsideTap: widget.consumeOutsideTap,
+ return KazumiMenuButton(
+ animated: false,
onOpen: _handleOpen,
onClose: _handleClose,
builder: widget.builder,
diff --git a/lib/pages/player/player_screenshot_sheet.dart b/lib/pages/player/player_screenshot_sheet.dart
index d2d81e3d..58b0895c 100644
--- a/lib/pages/player/player_screenshot_sheet.dart
+++ b/lib/pages/player/player_screenshot_sheet.dart
@@ -6,6 +6,7 @@ import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:kazumi/bean/widget/kazumi_menu.dart';
import 'package:kazumi/pages/player/controller/player_screenshot_controller.dart';
import 'package:kazumi/pages/player/player_screenshot_image.dart';
import 'package:kazumi/services/player/screenshot_candidate.dart';
@@ -490,24 +491,27 @@ class _PlayerScreenshotSheetState extends State<_PlayerScreenshotSheet> {
),
),
if (current != null)
- PopupMenuButton<bool>(
- tooltip: '管理截图',
+ KazumiMenuButton(
+ animated: true,
enabled: !collection.busy,
- icon: const Icon(Icons.more_vert_rounded),
- onSelected: (clear) {
- if (clear) {
- unawaited(_clearCandidates());
- } else {
- _removeSelected();
- }
- },
- itemBuilder: (context) => [
- PopupMenuItem(
- value: false,
- enabled: collection.selectedCount > 0,
- child: const Text('移除所选'),
+ builder: (context, toggle) => IconButton(
+ tooltip: '管理截图',
+ icon: const Icon(Icons.more_vert_rounded),
+ onPressed: toggle,
+ ),
+ menuChildren: [
+ KazumiMenuItem(
+ label: '移除所选',
+ onPressed: !collection.busy && collection.selectedCount > 0
+ ? _removeSelected
+ : null,
+ ),
+ KazumiMenuItem(
+ label: '清空候选',
+ onPressed: collection.busy
+ ? null
+ : () => unawaited(_clearCandidates()),
),
- const PopupMenuItem(value: true, child: Text('清空候选')),
],
),
if (current != null)
diff --git a/lib/pages/plugin_editor/plugin_catalog_view.dart b/lib/pages/plugin_editor/plugin_catalog_view.dart
index 09b9b93f..931e24f6 100644
--- a/lib/pages/plugin_editor/plugin_catalog_view.dart
+++ b/lib/pages/plugin_editor/plugin_catalog_view.dart
@@ -5,6 +5,7 @@ import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:kazumi/bean/card/rule_card.dart';
import 'package:kazumi/bean/dialog/dialog_helper.dart';
import 'package:kazumi/bean/widget/error_widget.dart';
+import 'package:kazumi/bean/widget/kazumi_menu.dart';
import 'package:kazumi/bean/widget/empty_state_widget.dart';
import 'package:kazumi/bean/widget/loading_indicator.dart';
import 'package:kazumi/bean/widget/state_presentation.dart';
@@ -144,20 +145,18 @@ class _PluginCatalogViewState extends State<PluginCatalogView> {
return items;
}
- Widget _sortButton() => MenuAnchor(
- builder: (context, controller, _) => TextButton.icon(
- onPressed: () =>
- controller.isOpen ? controller.close() : controller.open(),
+ Widget _sortButton() => KazumiMenuButton(
+ builder: (context, toggle) => TextButton.icon(
+ onPressed: toggle,
icon: const Icon(Icons.sort_rounded, size: 20),
label: Text(_sort == _CatalogSort.name ? '名称排序' : '最近更新'),
),
menuChildren: [
for (final sort in _CatalogSort.values)
- MenuItemButton(
- leadingIcon: Icon(
- _sort == sort ? Icons.check_rounded : Icons.sort_rounded),
+ KazumiMenuItem(
+ selected: _sort == sort,
onPressed: () => setState(() => _sort = sort),
- child: Text(sort == _CatalogSort.name ? '按名称排序' : '按更新时间排序'),
+ label: sort == _CatalogSort.name ? '按名称排序' : '按更新时间排序',
),
],
);
diff --git a/lib/pages/plugin_editor/plugin_view_page.dart b/lib/pages/plugin_editor/plugin_view_page.dart
index 1558e574..098fb8c3 100644
--- a/lib/pages/plugin_editor/plugin_view_page.dart
+++ b/lib/pages/plugin_editor/plugin_view_page.dart
@@ -10,6 +10,7 @@ import 'package:flutter_modular/flutter_modular.dart';
import 'package:kazumi/bean/card/rule_card.dart';
import 'package:kazumi/bean/dialog/dialog_helper.dart';
import 'package:kazumi/bean/settings/settings_detail_scaffold.dart';
+import 'package:kazumi/bean/widget/kazumi_menu.dart';
import 'package:kazumi/bean/widget/loading_indicator.dart';
import 'package:kazumi/bean/widget/empty_state_widget.dart';
import 'package:kazumi/bean/widget/state_presentation.dart';
@@ -440,56 +441,45 @@ class _PluginViewPageState extends State<PluginViewPage> {
),
);
- Widget _menu(Plugin plugin, int index) => MenuAnchor(
- consumeOutsideTap: true,
+ Widget _menu(Plugin plugin, int index) => KazumiMenuButton(
style: MenuStyle(
shape: WidgetStatePropertyAll(
RoundedRectangleBorder(borderRadius: BorderRadius.circular(20))),
padding: const WidgetStatePropertyAll(EdgeInsets.all(8)),
),
- builder: (context, controller, child) => IconButton(
+ builder: (context, toggle) => IconButton(
tooltip: '${plugin.name} 的更多操作',
- onPressed: () =>
- controller.isOpen ? controller.close() : controller.open(),
+ onPressed: toggle,
icon: const Icon(Icons.more_horiz_rounded)),
menuChildren: [
- MenuItemButton(
- leadingIcon: const Icon(Icons.edit_outlined),
+ KazumiMenuItem(
onPressed: () => context.pushNamed('/settings/plugin/editor',
arguments: plugin),
- child: const Text('编辑规则')),
- MenuItemButton(
- leadingIcon: const Icon(Icons.bug_report_outlined),
+ label: '编辑规则'),
+ KazumiMenuItem(
onPressed: () =>
context.pushNamed('/settings/plugin/test', arguments: plugin),
- child: const Text('测试规则')),
- MenuItemButton(
- leadingIcon: const Icon(Icons.sync_rounded),
+ label: '测试规则'),
+ KazumiMenuItem(
onPressed: _updating ? null : () => _updateOne(plugin),
- child: const Text('检查更新')),
- MenuItemButton(
- leadingIcon: const Icon(Icons.ios_share_rounded),
+ label: '检查更新'),
+ KazumiMenuItem(
onPressed: () => showRuleShareDialog(context, plugin),
- child: const Text('分享规则')),
+ label: '分享规则'),
const Divider(),
- MenuItemButton(
- leadingIcon: const Icon(Icons.arrow_upward_rounded),
+ KazumiMenuItem(
onPressed: index == 0 ? null : () => _reorder(index, index - 1),
- child: const Text('上移')),
- MenuItemButton(
- leadingIcon: const Icon(Icons.arrow_downward_rounded),
+ label: '上移'),
+ KazumiMenuItem(
onPressed: index == _controller.pluginList.length - 1
? null
: () => _reorder(index, index + 1),
- child: const Text('下移')),
+ label: '下移'),
const Divider(),
- MenuItemButton(
- leadingIcon: Icon(Icons.delete_outline_rounded,
- color: Theme.of(context).colorScheme.error),
+ KazumiMenuItem(
+ destructive: true,
onPressed: _deleting ? null : () => _delete({plugin.name}),
- child: Text('删除规则',
- style:
- TextStyle(color: Theme.of(context).colorScheme.error))),
+ label: '删除规则'),
],
);
}
diff --git a/lib/pages/popular/popular_page.dart b/lib/pages/popular/popular_page.dart
index 29ce7cdc..bc2bdf18 100644
--- a/lib/pages/popular/popular_page.dart
+++ b/lib/pages/popular/popular_page.dart
@@ -2,7 +2,7 @@ import 'dart:ui';
import 'package:flutter/material.dart';
import 'package:flutter_modular/flutter_modular.dart';
import 'package:kazumi/bean/widget/bangumi_mirror_error_widget.dart';
-import 'package:kazumi/bean/widget/custom_dropdown_menu.dart';
+import 'package:kazumi/bean/widget/kazumi_menu.dart';
import 'package:kazumi/modules/bangumi/bangumi_item.dart';
import 'package:kazumi/pages/popular/popular_controller.dart';
import 'package:kazumi/bean/card/bangumi_card.dart';
@@ -30,9 +30,6 @@ class _PopularPageState extends State<PopularPage> {
late final ScrollController scrollController;
PopularController get popularController => widget.controller;
- // Key used to position the dropdown menu for the tag selector
- final GlobalKey selectorKey = GlobalKey();
-
@override
void initState() {
super.initState();
@@ -194,24 +191,37 @@ class _PopularPageState extends State<PopularPage> {
child: Observer(
builder: (_) {
final bool isTrend = popularController.currentTag == '';
- return InkWell(
- key: selectorKey,
- borderRadius: BorderRadius.circular(8),
- onTap: showTagMenu,
- child: Row(
- mainAxisSize: MainAxisSize.min,
- children: [
- Text(
- isTrend ? '热门番组' : popularController.currentTag,
- style: theme.textTheme.headlineMedium!.copyWith(
- fontWeight: fontWeight,
- fontSize: fontSize,
- ),
+ return KazumiMenuButton(
+ animated: true,
+ style: const MenuStyle(
+ maximumSize: WidgetStatePropertyAll(Size(240, 350)),
+ ),
+ menuChildren: [
+ for (final tag in ['', ...defaultAnimeTags])
+ KazumiMenuItem(
+ label: tag.isEmpty ? '热门番组' : tag,
+ selected: tag == popularController.currentTag,
+ onPressed: () => _selectTag(tag),
),
- const SizedBox(width: 4),
- Icon(Icons.keyboard_arrow_down,
- size: fontSize, color: theme.iconTheme.color),
- ],
+ ],
+ builder: (context, toggle) => InkWell(
+ borderRadius: BorderRadius.circular(8),
+ onTap: toggle,
+ child: Row(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ Text(
+ isTrend ? '热门番组' : popularController.currentTag,
+ style: theme.textTheme.headlineMedium!.copyWith(
+ fontWeight: fontWeight,
+ fontSize: fontSize,
+ ),
+ ),
+ const SizedBox(width: 4),
+ Icon(Icons.keyboard_arrow_down,
+ size: fontSize, color: theme.iconTheme.color),
+ ],
+ ),
),
);
},
@@ -248,52 +258,17 @@ class _PopularPageState extends State<PopularPage> {
];
}
- Future<void> showTagMenu() async {
- // Calculate the position of the button manually to position the dropdown menu.
- // Using CustomDropdownMenu instead of PopupMenuButton to avoid flickering issues
- // and to support different font sizes in the button and menu items.
- final RenderBox renderBox =
- selectorKey.currentContext!.findRenderObject() as RenderBox;
- final Offset offset = renderBox.localToGlobal(Offset.zero);
- final Size size = renderBox.size;
-
- final selected = await Navigator.push<String>(
- context,
- PageRouteBuilder(
- opaque: false,
- barrierDismissible: true,
- barrierColor: Colors.transparent,
- pageBuilder: (context, animation, secondaryAnimation) {
- return CustomDropdownMenu(
- offset: offset,
- buttonSize: size,
- animation: animation,
- maxWidth: 80,
- items: [
- '',
- ...defaultAnimeTags,
- ],
- itemBuilder: (item) => item.isEmpty ? '热门番组' : item,
- );
- },
- transitionDuration: const Duration(milliseconds: 200),
- reverseTransitionDuration: const Duration(milliseconds: 150),
- ),
- );
-
- if (selected == null) return;
- if (selected == '' && popularController.currentTag != '') {
- scrollController.animateTo(0,
- duration: const Duration(milliseconds: 250), curve: Curves.easeOut);
- popularController.setCurrentTag('');
+ Future<void> _selectTag(String selected) async {
+ if (!mounted || selected == popularController.currentTag) return;
+ scrollController.animateTo(0,
+ duration: const Duration(milliseconds: 250), curve: Curves.easeOut);
+ popularController.setCurrentTag(selected);
+ if (selected.isEmpty) {
popularController.clearBangumiList();
if (popularController.trendList.isEmpty) {
await popularController.queryBangumiByTrend();
}
- } else if (selected != '' && selected != popularController.currentTag) {
- scrollController.animateTo(0,
- duration: const Duration(milliseconds: 250), curve: Curves.easeOut);
- popularController.setCurrentTag(selected);
+ } else {
await popularController.queryBangumiByTag(type: 'init');
}
}
diff --git a/lib/pages/search/search_page.dart b/lib/pages/search/search_page.dart
index 526512c3..a854c98a 100644
--- a/lib/pages/search/search_page.dart
+++ b/lib/pages/search/search_page.dart
@@ -8,6 +8,7 @@ import 'package:kazumi/bean/appbar/sys_app_bar.dart';
import 'package:kazumi/bean/card/network_img_layer.dart';
import 'package:kazumi/bean/dialog/adaptive_bottom_sheet.dart';
import 'package:kazumi/bean/dialog/material_bottom_sheet.dart';
+import 'package:kazumi/bean/widget/kazumi_menu.dart';
import 'package:kazumi/bean/widget/loading_indicator.dart';
import 'package:kazumi/bean/widget/empty_state_widget.dart';
import 'package:kazumi/bean/widget/state_presentation.dart';
diff --git a/lib/pages/search/search_widgets.dart b/lib/pages/search/search_widgets.dart
index 6387166d..1589619d 100644
--- a/lib/pages/search/search_widgets.dart
+++ b/lib/pages/search/search_widgets.dart
@@ -41,27 +41,28 @@ class _SearchSortMenu extends StatelessWidget {
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
- return PopupMenuButton<String>(
- tooltip: '排序方式',
- initialValue: value,
- onSelected: onChanged,
- itemBuilder: (_) => [
+ return KazumiMenuButton(
+ animated: true,
+ menuChildren: [
for (final sort in _searchSortLabels.entries)
- CheckedPopupMenuItem(
- value: sort.key,
- checked: sort.key == value,
- child: Text('按${sort.value}排序')),
+ KazumiMenuItem(
+ label: '按${sort.value}排序',
+ selected: sort.key == value,
+ onPressed: () => onChanged(sort.key),
+ ),
],
- child: Padding(
- padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 14),
- child: Row(mainAxisSize: MainAxisSize.min, children: [
- Text(_sortLabel(value),
- style: theme.textTheme.labelLarge
- ?.copyWith(color: theme.colorScheme.onSurfaceVariant)),
- const SizedBox(width: 4),
- Icon(Icons.keyboard_arrow_down_rounded,
- size: 20, color: theme.colorScheme.onSurfaceVariant),
- ]),
+ builder: (context, toggle) => Tooltip(
+ message: '排序方式',
+ child: TextButton.icon(
+ onPressed: toggle,
+ style: TextButton.styleFrom(
+ foregroundColor: theme.colorScheme.onSurfaceVariant,
+ padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 14),
+ ),
+ iconAlignment: IconAlignment.end,
+ icon: const Icon(Icons.keyboard_arrow_down_rounded, size: 20),
+ label: Text(_sortLabel(value)),
+ ),
),
);
}
diff --git a/lib/pages/settings/danmaku/danmaku_ch_convert_tile.dart b/lib/pages/settings/danmaku/danmaku_ch_convert_tile.dart
index 7cadd268..9432347c 100644
--- a/lib/pages/settings/danmaku/danmaku_ch_convert_tile.dart
+++ b/lib/pages/settings/danmaku/danmaku_ch_convert_tile.dart
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:kazumi/bean/dialog/dialog_helper.dart';
-import 'package:kazumi/bean/settings/settings_list.dart';
+import 'package:kazumi/bean/settings/settings_dropdown_tile.dart';
import 'package:kazumi/modules/danmaku/danmaku_ch_convert.dart';
import 'package:kazumi/services/storage/storage.dart';
@@ -20,7 +20,6 @@ class DanmakuChConvertTile extends StatefulWidget {
}
class _DanmakuChConvertTileState extends State<DanmakuChConvertTile> {
- final _menuController = MenuController();
late final _settingsChanges = GStorage.watchSettings([
SettingsKeys.danmakuChConvert,
]);
@@ -48,33 +47,16 @@ class _DanmakuChConvertTileState extends State<DanmakuChConvertTile> {
final mode = DanmakuChConvert.fromValue(
GStorage.getSetting(SettingsKeys.danmakuChConvert),
);
- return SettingsTile(
+ return SettingsDropdownTile<DanmakuChConvert>(
leading: Icons.translate_rounded,
title: const Text('简繁转换'),
description: const Text('下次联网加载弹幕时生效,已缓存弹幕保留下载时的文字'),
enabled: !_saving,
- onPressed: (_) => _menuController.isOpen
- ? _menuController.close()
- : _menuController.open(),
- value: MenuAnchor(
- controller: _menuController,
- consumeOutsideTap: true,
- menuChildren: [
- for (final option in DanmakuChConvert.values)
- MenuItemButton(
- requestFocusOnHover: false,
- onPressed: _saving ? null : () => _selectMode(option),
- leadingIcon: Icon(
- option == mode
- ? Icons.radio_button_checked_rounded
- : Icons.radio_button_unchecked_rounded,
- ),
- child: Text(option.label),
- ),
- ],
- builder: (_, _, _) => Text(mode.label),
- ),
- trailing: const Icon(Icons.arrow_drop_down_rounded),
+ value: mode,
+ options: {
+ for (final option in DanmakuChConvert.values) option: option.label,
+ },
+ onChanged: _selectMode,
);
},
);
diff --git a/lib/pages/settings/interface_settings.dart b/lib/pages/settings/interface_settings.dart
index af095e69..8b296eb1 100644
--- a/lib/pages/settings/interface_settings.dart
+++ b/lib/pages/settings/interface_settings.dart
@@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:kazumi/bean/dialog/dialog_helper.dart';
import 'package:kazumi/bean/settings/settings_detail_scaffold.dart';
+import 'package:kazumi/bean/settings/settings_dropdown_tile.dart';
import 'package:kazumi/bean/settings/settings_list.dart';
import 'package:kazumi/modules/collect/collect_layout.dart';
import 'package:kazumi/services/storage/storage.dart';
@@ -18,12 +19,9 @@ class _InterfaceSettingsPageState extends State<InterfaceSettingsPage> {
late String defaultPage;
late CollectLayout _defaultCollectLayout;
bool _savingCollectLayout = false;
- final _collectLayoutMenuController = MenuController();
- final _exitBehaviorMenuController = MenuController();
static const _exitBehaviorTitles = ['退出 Kazumi', '最小化至托盘', '每次都询问'];
int _exitBehavior = GStorage.getSetting(SettingsKeys.exitBehavior)
.clamp(0, _exitBehaviorTitles.length - 1);
- final MenuController defaultPageMenuController = MenuController();
static const Map<String, String> defaultPageMap = {
'/tab/popular/': '推荐',
@@ -62,27 +60,6 @@ class _InterfaceSettingsPageState extends State<InterfaceSettingsPage> {
}
}
- Widget _menuItem({
- required String label,
- required bool selected,
- required VoidCallback? onPressed,
- }) =>
- MenuItemButton(
- requestFocusOnHover: false,
- onPressed: onPressed,
- child: Container(
- height: 48,
- constraints: const BoxConstraints(minWidth: 112),
- alignment: Alignment.centerLeft,
- child: Text(
- label,
- style: TextStyle(
- color: selected ? Theme.of(context).colorScheme.primary : null,
- ),
- ),
- ),
- );
-
@override
Widget build(BuildContext context) {
return SettingsDetailScaffold(
@@ -90,60 +67,27 @@ class _InterfaceSettingsPageState extends State<InterfaceSettingsPage> {
body: SettingsList(
sections: [
SettingsSection(title: Text('启动'), tiles: [
- SettingsTile(
+ SettingsDropdownTile<String>(
leading: Icons.home_rounded,
- onPressed: (_) async {
- if (defaultPageMenuController.isOpen) {
- defaultPageMenuController.close();
- } else {
- defaultPageMenuController.open();
- }
- },
- title: Text('启动界面设置'),
- description: Text('设置应用开启时的默认页面'),
- value: MenuAnchor(
- consumeOutsideTap: true,
- controller: defaultPageMenuController,
- builder: (_, __, ___) {
- return Text(
- defaultPageMap[defaultPage] ?? '推荐',
- );
- },
- menuChildren: [
- for (final entry in defaultPageMap.entries)
- _menuItem(
- label: entry.value,
- selected: entry.key == defaultPage,
- onPressed: () => updateDefaultPage(entry.key),
- ),
- ],
- ),
+ title: const Text('启动界面设置'),
+ description: const Text('设置应用开启时的默认页面'),
+ value: defaultPage,
+ options: defaultPageMap,
+ fallbackLabel: '推荐',
+ onChanged: updateDefaultPage,
),
]),
SettingsSection(title: Text('展示信息'), tiles: [
- SettingsTile(
+ SettingsDropdownTile<CollectLayout>(
leading: Icons.view_agenda_rounded,
title: const Text('追番默认布局'),
description: const Text('下次打开追番页时使用,页面内切换不会改变此设置'),
enabled: !_savingCollectLayout,
- onPressed: (_) => _collectLayoutMenuController.isOpen
- ? _collectLayoutMenuController.close()
- : _collectLayoutMenuController.open(),
- value: MenuAnchor(
- controller: _collectLayoutMenuController,
- consumeOutsideTap: true,
- menuChildren: [
- for (final layout in CollectLayout.values)
- _menuItem(
- label: layout.label,
- selected: layout == _defaultCollectLayout,
- onPressed: _savingCollectLayout
- ? null
- : () => _updateDefaultCollectLayout(layout),
- ),
- ],
- builder: (_, __, ___) => Text(_defaultCollectLayout.label),
- ),
+ value: _defaultCollectLayout,
+ options: {
+ for (final layout in CollectLayout.values) layout: layout.label,
+ },
+ onChanged: _updateDefaultCollectLayout,
),
SettingsTile.switchTile(
leading: Icons.star_rounded,
@@ -161,30 +105,19 @@ class _InterfaceSettingsPageState extends State<InterfaceSettingsPage> {
SettingsSection(
title: const Text('窗口行为'),
tiles: [
- SettingsTile(
+ SettingsDropdownTile<int>(
leading: Icons.exit_to_app_rounded,
title: const Text('关闭窗口时'),
description: const Text('设置点击窗口关闭按钮后的行为'),
- onPressed: (_) => _exitBehaviorMenuController.isOpen
- ? _exitBehaviorMenuController.close()
- : _exitBehaviorMenuController.open(),
- value: MenuAnchor(
- controller: _exitBehaviorMenuController,
- consumeOutsideTap: true,
- builder: (_, __, ___) =>
- Text(_exitBehaviorTitles[_exitBehavior]),
- menuChildren: [
- for (var i = 0; i < _exitBehaviorTitles.length; i++)
- _menuItem(
- label: _exitBehaviorTitles[i],
- selected: i == _exitBehavior,
- onPressed: () {
- setState(() => _exitBehavior = i);
- GStorage.putSetting(SettingsKeys.exitBehavior, i);
- },
- ),
- ],
- ),
+ value: _exitBehavior,
+ options: {
+ for (var i = 0; i < _exitBehaviorTitles.length; i++)
+ i: _exitBehaviorTitles[i],
+ },
+ onChanged: (value) {
+ setState(() => _exitBehavior = value);
+ GStorage.putSetting(SettingsKeys.exitBehavior, value);
+ },
),
],
),
diff --git a/lib/pages/settings/player_settings.dart b/lib/pages/settings/player_settings.dart
index e6ccac55..322325e8 100644
--- a/lib/pages/settings/player_settings.dart
+++ b/lib/pages/settings/player_settings.dart
@@ -4,6 +4,7 @@ import 'package:flutter/services.dart' show FilteringTextInputFormatter;
import 'package:flutter_modular/flutter_modular.dart';
import 'package:kazumi/bean/dialog/dialog_helper.dart';
import 'package:kazumi/bean/settings/settings_detail_scaffold.dart';
+import 'package:kazumi/bean/settings/settings_dropdown_tile.dart';
import 'package:kazumi/pages/player/controller/player_aspect_ratio.dart';
import 'package:kazumi/pages/settings/low_memory_mode_settings.dart';
import 'package:kazumi/utils/constants.dart';
@@ -43,8 +44,6 @@ class _PlayerSettingsPageState extends State<PlayerSettingsPage> {
late int playerArrowKeySkipTime;
late int playerLogLevel;
late int playerControllerLayerDisappearTime;
- final MenuController playerAspectRatioMenuController = MenuController();
- final MenuController playerLogLevelMenuController = MenuController();
@override
void initState() {
@@ -437,48 +436,14 @@ class _PlayerSettingsPageState extends State<PlayerSettingsPage> {
description: Text('记录播放器内部日志'),
initialValue: playerDebugMode,
),
- SettingsTile(
+ SettingsDropdownTile<int>(
leading: Icons.receipt_long_rounded,
- onPressed: (_) async {
- if (playerLogLevelMenuController.isOpen) {
- playerLogLevelMenuController.close();
- } else {
- playerLogLevelMenuController.open();
- }
- },
- title: Text('日志等级'),
- description: Text('播放器内部日志等级'),
- value: MenuAnchor(
- consumeOutsideTap: true,
- controller: playerLogLevelMenuController,
- builder: (_, __, ___) {
- return Text(
- playerLogLevelMap[playerLogLevel] ?? '???',
- );
- },
- menuChildren: [
- for (final entry in playerLogLevelMap.entries)
- MenuItemButton(
- requestFocusOnHover: false,
- onPressed: () => updatePlayerLogLevel(entry.key),
- child: Container(
- height: 48,
- constraints: BoxConstraints(minWidth: 112),
- child: Align(
- alignment: Alignment.centerLeft,
- child: Text(
- entry.value,
- style: TextStyle(
- color: entry.key == playerLogLevel
- ? Theme.of(context).colorScheme.primary
- : null,
- ),
- ),
- ),
- ),
- ),
- ],
- ),
+ title: const Text('日志等级'),
+ description: const Text('播放器内部日志等级'),
+ value: playerLogLevel,
+ options: playerLogLevelMap,
+ fallbackLabel: '???',
+ onChanged: updatePlayerLogLevel,
),
],
),
@@ -550,48 +515,14 @@ class _PlayerSettingsPageState extends State<PlayerSettingsPage> {
playerControllerLayerDisappearSeconds),
onChanged: updatePlayerControllerLayerDisappearSeconds,
),
- SettingsTile(
+ SettingsDropdownTile<PlayerAspectRatio>(
leading: Icons.aspect_ratio_rounded,
- onPressed: (_) async {
- if (playerAspectRatioMenuController.isOpen) {
- playerAspectRatioMenuController.close();
- } else {
- playerAspectRatioMenuController.open();
- }
+ title: const Text('默认视频比例'),
+ value: defaultAspectRatioMode,
+ options: {
+ for (final mode in PlayerAspectRatio.values) mode: mode.label,
},
- title: Text('默认视频比例'),
- value: MenuAnchor(
- consumeOutsideTap: true,
- controller: playerAspectRatioMenuController,
- builder: (_, __, ___) {
- return Text(
- defaultAspectRatioMode.label,
- );
- },
- menuChildren: [
- for (final aspectRatioMode in PlayerAspectRatio.values)
- MenuItemButton(
- requestFocusOnHover: false,
- onPressed: () =>
- updateDefaultAspectRatioMode(aspectRatioMode),
- child: Container(
- height: 48,
- constraints: BoxConstraints(minWidth: 112),
- child: Align(
- alignment: Alignment.centerLeft,
- child: Text(
- aspectRatioMode.label,
- style: TextStyle(
- color: aspectRatioMode == defaultAspectRatioMode
- ? Theme.of(context).colorScheme.primary
- : null,
- ),
- ),
- ),
- ),
- ),
- ],
- ),
+ onChanged: updateDefaultAspectRatioMode,
),
],
),
diff --git a/lib/pages/settings/theme_settings_page.dart b/lib/pages/settings/theme_settings_page.dart
index bf59e637..16b94ed0 100644
--- a/lib/pages/settings/theme_settings_page.dart
+++ b/lib/pages/settings/theme_settings_page.dart
@@ -8,6 +8,7 @@ import 'package:kazumi/bean/dialog/dialog_helper.dart';
import 'package:kazumi/bean/settings/theme_provider.dart';
import 'package:kazumi/bean/settings/color_type.dart';
import 'package:kazumi/bean/settings/settings_detail_scaffold.dart';
+import 'package:kazumi/bean/settings/settings_dropdown_tile.dart';
import 'package:kazumi/bean/settings/settings_list.dart';
import 'package:window_manager/window_manager.dart';
import 'package:kazumi/utils/device.dart';
@@ -28,7 +29,6 @@ class _ThemeSettingsPageState extends State<ThemeSettingsPage> {
late bool showWindowButton;
late bool useSystemFont;
late final ThemeProvider themeProvider;
- final MenuController menuController = MenuController();
@override
void initState() {
@@ -134,118 +134,13 @@ class _ThemeSettingsPageState extends State<ThemeSettingsPage> {
SettingsSection(
title: Text('外观'),
tiles: [
- SettingsTile(
+ SettingsDropdownTile<String>(
leading: Icons.dark_mode_rounded,
- onPressed: (_) {
- if (menuController.isOpen) {
- menuController.close();
- } else {
- menuController.open();
- }
- },
- title: Text('深色模式'),
- value: MenuAnchor(
- consumeOutsideTap: true,
- controller: menuController,
- builder: (_, __, ___) {
- return Text(
- defaultThemeMode == 'light'
- ? '浅色'
- : (defaultThemeMode == 'dark' ? '深色' : '跟随系统'),
- );
- },
- menuChildren: [
- MenuItemButton(
- requestFocusOnHover: false,
- onPressed: () => updateTheme('system'),
- child: Container(
- height: 48,
- constraints: BoxConstraints(minWidth: 112),
- child: Align(
- alignment: Alignment.centerLeft,
- child: Row(
- children: [
- Icon(
- Icons.brightness_auto_rounded,
- color: defaultThemeMode == 'system'
- ? Theme.of(context).colorScheme.primary
- : null,
- ),
- SizedBox(width: 8),
- Text(
- '跟随系统',
- style: TextStyle(
- color: defaultThemeMode == 'system'
- ? Theme.of(context).colorScheme.primary
- : null,
- ),
- ),
- ],
- ),
- ),
- ),
- ),
- MenuItemButton(
- requestFocusOnHover: false,
- onPressed: () => updateTheme('light'),
- child: Container(
- height: 48,
- constraints: BoxConstraints(minWidth: 112),
- child: Align(
- alignment: Alignment.centerLeft,
- child: Row(
- children: [
- Icon(
- Icons.light_mode_rounded,
- color: defaultThemeMode == 'light'
- ? Theme.of(context).colorScheme.primary
- : null,
- ),
- SizedBox(width: 8),
- Text(
- '浅色',
- style: TextStyle(
- color: defaultThemeMode == 'light'
- ? Theme.of(context).colorScheme.primary
- : null),
- ),
- ],
- ),
- ),
- ),
- ),
- MenuItemButton(
- requestFocusOnHover: false,
- onPressed: () => updateTheme('dark'),
- child: Container(
- height: 48,
- constraints: BoxConstraints(minWidth: 112),
- child: Align(
- alignment: Alignment.centerLeft,
- child: Row(
- children: [
- Icon(
- Icons.dark_mode_rounded,
- color: defaultThemeMode == 'dark'
- ? Theme.of(context).colorScheme.primary
- : null,
- ),
- SizedBox(width: 8),
- Text(
- '深色',
- style: TextStyle(
- color: defaultThemeMode == 'dark'
- ? Theme.of(context).colorScheme.primary
- : null,
- ),
- ),
- ],
- ),
- ),
- ),
- ),
- ],
- ),
+ title: const Text('深色模式'),
+ value: defaultThemeMode,
+ fallbackLabel: '跟随系统',
+ options: const {'system': '跟随系统', 'light': '浅色', 'dark': '深色'},
+ onChanged: updateTheme,
),
SettingsTile(
leading: Icons.palette_rounded,
diff --git a/lib/pages/video/episode_selection_panel.dart b/lib/pages/video/episode_selection_panel.dart
index 3d94d84d..41dc8df4 100644
--- a/lib/pages/video/episode_selection_panel.dart
+++ b/lib/pages/video/episode_selection_panel.dart
@@ -373,8 +373,6 @@ class _RoadSelectorState extends State<_RoadSelector> {
),
)),
),
- trailingIcon:
- selected ? const Icon(Icons.check_rounded, size: 20) : null,
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,