Skip to content

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

feat(player): better danmaku offset settings && redesign danmaku offset and adaptive bottom sheets

Predidite676f052564e
diff --git a/lib/bean/card/character_card.dart b/lib/bean/card/character_card.dart
index 396037ea..45fba2f5 100644
--- a/lib/bean/card/character_card.dart
+++ b/lib/bean/card/character_card.dart
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
+import 'package:kazumi/bean/dialog/adaptive_bottom_sheet.dart';
import 'package:kazumi/modules/characters/character_item.dart';
import 'package:kazumi/pages/info/character_page.dart';
-import 'package:kazumi/utils/device.dart';
class CharacterCard extends StatelessWidget {
const CharacterCard({
@@ -29,18 +29,12 @@ class CharacterCard extends StatelessWidget {
: null,
trailing: Text(characterItem.relation),
onTap: () {
- showModalBottomSheet(
- isScrollControlled: true,
- constraints: BoxConstraints(
- maxHeight: MediaQuery.of(context).size.height * 3 / 4,
- maxWidth: (isDesktop() || isTablet())
- ? MediaQuery.of(context).size.width * 9 / 16
- : MediaQuery.of(context).size.width),
- clipBehavior: Clip.antiAlias,
- context: context,
- builder: (context) {
- return CharacterPage(characterID: characterItem.id);
- });
+ showAdaptiveBottomSheet<void>(
+ context: context,
+ builder: (context) {
+ return CharacterPage(characterID: characterItem.id);
+ },
+ );
},
);
}
diff --git a/lib/bean/dialog/adaptive_bottom_sheet.dart b/lib/bean/dialog/adaptive_bottom_sheet.dart
new file mode 100644
index 00000000..923ed31d
--- /dev/null
+++ b/lib/bean/dialog/adaptive_bottom_sheet.dart
@@ -0,0 +1,51 @@
+import 'dart:math' as math;
+
+import 'package:flutter/material.dart';
+import 'package:kazumi/utils/device.dart';
+
+BoxConstraints adaptiveBottomSheetConstraints(
+ BuildContext context, {
+ double maxHeightFactor = 0.75,
+ double compactLandscapeMaxHeightFactor = 0.9,
+}) {
+ final size = MediaQuery.sizeOf(context);
+ final isLandscape = size.width > size.height;
+ final isLargeScreen = size.shortestSide >= 600;
+ final useFullWidth = !isLandscape && size.width < 600;
+ final maxWidth =
+ useFullWidth ? size.width : math.min(size.width * 0.72, 640.0);
+ final useExpandedLandscapeHeight =
+ isLandscape && !isDesktop() && !isLargeScreen;
+ final maxHeight = size.height *
+ (useExpandedLandscapeHeight
+ ? compactLandscapeMaxHeightFactor
+ : maxHeightFactor);
+
+ return BoxConstraints(
+ maxWidth: maxWidth,
+ maxHeight: maxHeight,
+ );
+}
+
+Future<T?> showAdaptiveBottomSheet<T>({
+ required BuildContext context,
+ required WidgetBuilder builder,
+ double maxHeightFactor = 0.75,
+ double compactLandscapeMaxHeightFactor = 0.9,
+ Color? backgroundColor,
+}) {
+ return showModalBottomSheet<T>(
+ context: context,
+ builder: builder,
+ isScrollControlled: true,
+ useSafeArea: true,
+ showDragHandle: false,
+ constraints: adaptiveBottomSheetConstraints(
+ context,
+ maxHeightFactor: maxHeightFactor,
+ compactLandscapeMaxHeightFactor: compactLandscapeMaxHeightFactor,
+ ),
+ clipBehavior: Clip.antiAlias,
+ backgroundColor: backgroundColor,
+ );
+}
diff --git a/lib/pages/info/info_page.dart b/lib/pages/info/info_page.dart
index a3c6d7ea..82f48101 100644
--- a/lib/pages/info/info_page.dart
+++ b/lib/pages/info/info_page.dart
@@ -1,12 +1,12 @@
import 'dart:io';
import 'dart:ui';
+import 'package:kazumi/bean/dialog/adaptive_bottom_sheet.dart';
import 'package:kazumi/bean/dialog/dialog_helper.dart';
import 'package:kazumi/pages/info/rating_review_dialog.dart';
import 'package:flutter/material.dart';
import 'package:flutter_modular/flutter_modular.dart';
import 'package:kazumi/bean/widget/collect_button.dart';
import 'package:kazumi/bean/widget/embedded_native_control_area.dart';
-import 'package:kazumi/utils/constants.dart';
import 'package:kazumi/services/storage/storage.dart';
import 'package:kazumi/pages/info/info_controller.dart';
import 'package:kazumi/bean/card/bangumi_info_card.dart';
@@ -491,23 +491,10 @@ class _InfoPageState extends State<InfoPage> with TickerProviderStateMixin {
)
: FloatingActionButton.extended(
tooltip: '开始观看',
- onPressed: () async {
- showModalBottomSheet(
- isScrollControlled: true,
- constraints: BoxConstraints(
- maxHeight: (MediaQuery.sizeOf(context).height >=
- LayoutBreakpoint.compact['height']!)
- ? MediaQuery.of(context).size.height * 3 / 4
- : MediaQuery.of(context).size.height,
- maxWidth: (MediaQuery.sizeOf(context).width >=
- LayoutBreakpoint.medium['width']!)
- ? MediaQuery.of(context).size.width * 9 / 16
- : MediaQuery.of(context).size.width,
- ),
- clipBehavior: Clip.antiAlias,
+ onPressed: () {
+ showAdaptiveBottomSheet<void>(
backgroundColor:
Theme.of(context).scaffoldBackgroundColor,
- showDragHandle: true,
context: context,
builder: (context) {
return SourceSheet(
diff --git a/lib/pages/player/player_item.dart b/lib/pages/player/player_item.dart
index e42bac14..e45aa762 100644
--- a/lib/pages/player/player_item.dart
+++ b/lib/pages/player/player_item.dart
@@ -20,6 +20,7 @@ import 'package:flutter_modular/flutter_modular.dart';
import 'package:kazumi/pages/video/video_controller.dart';
import 'package:window_manager/window_manager.dart';
import 'package:canvas_danmaku/canvas_danmaku.dart';
+import 'package:kazumi/bean/dialog/adaptive_bottom_sheet.dart';
import 'package:kazumi/bean/dialog/dialog_helper.dart';
import 'package:screen_brightness_platform_interface/screen_brightness_platform_interface.dart';
import 'package:kazumi/pages/history/history_controller.dart';
@@ -1346,46 +1347,40 @@ class _PlayerItemState extends State<PlayerItem>
);
}
- void showVideoInfo() async {
- showModalBottomSheet(
- isScrollControlled: true,
- constraints: BoxConstraints(
- maxHeight: MediaQuery.of(context).size.height * 3 / 4,
- maxWidth: (isDesktop() || isTablet())
- ? MediaQuery.of(context).size.width * 9 / 16
- : MediaQuery.of(context).size.width),
- clipBehavior: Clip.antiAlias,
- context: context,
- builder: (context) {
- return DefaultTabController(
- length: 2,
- child: Scaffold(
- body: Column(
- children: [
- const PreferredSize(
- preferredSize: Size.fromHeight(kToolbarHeight),
- child: Material(
- child: TabBar(
- tabs: [
- Tab(text: '状态'),
- Tab(text: '日志'),
- ],
- ),
- ),
- ),
- Expanded(
- child: TabBarView(
- children: [
- videoInfoBody,
- videoDebugLogBody,
+ void showVideoInfo() {
+ showAdaptiveBottomSheet<void>(
+ context: context,
+ builder: (context) {
+ return DefaultTabController(
+ length: 2,
+ child: Scaffold(
+ body: Column(
+ children: [
+ const PreferredSize(
+ preferredSize: Size.fromHeight(kToolbarHeight),
+ child: Material(
+ child: TabBar(
+ tabs: [
+ Tab(text: '状态'),
+ Tab(text: '日志'),
],
),
),
- ],
- ),
+ ),
+ Expanded(
+ child: TabBarView(
+ children: [
+ videoInfoBody,
+ videoDebugLogBody,
+ ],
+ ),
+ ),
+ ],
),
- );
- });
+ ),
+ );
+ },
+ );
}
void showSyncPlayEndPointSwitchDialog() {
diff --git a/lib/pages/player/player_item_panel.dart b/lib/pages/player/player_item_panel.dart
index e608e6d2..78a74285 100644
--- a/lib/pages/player/player_item_panel.dart
+++ b/lib/pages/player/player_item_panel.dart
@@ -714,38 +714,16 @@ class _PlayerItemPanelState extends State<PlayerItemPanel> {
IconButton(
onPressed: () {
widget.keyboardFocus.requestFocus();
- showModalBottomSheet(
- isScrollControlled: true,
- constraints: BoxConstraints(
- maxHeight: MediaQuery.of(context)
- .size
- .height *
- 3 /
- 4,
- maxWidth:
- (isDesktop() || isTablet())
- ? MediaQuery.of(context)
- .size
- .width *
- 9 /
- 16
- : MediaQuery.of(context)
- .size
- .width),
- clipBehavior: Clip.antiAlias,
- context: context,
- builder: (context) {
- return DanmakuSettingsSheet(
- danmakuController: playerController
- .danmaku.canvasController,
- onUpdateDanmakuSpeed:
- playerController
- .updateDanmakuSpeed,
- onTimelineOffsetChanged:
- playerController.danmaku
- .clearAndInvalidateScheduledDanmakus,
- );
- });
+ showDanmakuSettingsSheet(
+ context: context,
+ danmakuController: playerController
+ .danmaku.canvasController,
+ onUpdateDanmakuSpeed:
+ playerController.updateDanmakuSpeed,
+ onTimelineOffsetChanged: playerController
+ .danmaku
+ .clearAndInvalidateScheduledDanmakus,
+ );
},
color: Colors.white,
icon: cachedDanmakuSettingIcon!,
@@ -773,31 +751,15 @@ class _PlayerItemPanelState extends State<PlayerItemPanel> {
if (playerController.danmaku.danmakuOn) ...[
IconButton(
onPressed: () {
- showModalBottomSheet(
- isScrollControlled: true,
- constraints: BoxConstraints(
- maxHeight:
- MediaQuery.of(context).size.height *
- 3 /
- 4,
- maxWidth: (isDesktop() || isTablet())
- ? MediaQuery.of(context).size.width *
- 9 /
- 16
- : MediaQuery.of(context).size.width),
- clipBehavior: Clip.antiAlias,
- context: context,
- builder: (context) {
- return DanmakuSettingsSheet(
- danmakuController:
- playerController.danmaku.canvasController,
- onUpdateDanmakuSpeed:
- playerController.updateDanmakuSpeed,
- onTimelineOffsetChanged: playerController
- .danmaku
- .clearAndInvalidateScheduledDanmakus,
- );
- });
+ showDanmakuSettingsSheet(
+ context: context,
+ danmakuController:
+ playerController.danmaku.canvasController,
+ onUpdateDanmakuSpeed:
+ playerController.updateDanmakuSpeed,
+ onTimelineOffsetChanged: playerController
+ .danmaku.clearAndInvalidateScheduledDanmakus,
+ );
},
color: Colors.white,
icon: cachedDanmakuSettingIcon!,
diff --git a/lib/pages/player/smallest_player_item_panel.dart b/lib/pages/player/smallest_player_item_panel.dart
index 790f7fac..58925bf0 100644
--- a/lib/pages/player/smallest_player_item_panel.dart
+++ b/lib/pages/player/smallest_player_item_panel.dart
@@ -748,25 +748,13 @@ class _SmallestPlayerItemPanelState extends State<SmallestPlayerItemPanel> {
),
MenuItemButton(
onPressed: () {
- showModalBottomSheet(
- isScrollControlled: true,
- constraints: BoxConstraints(
- maxHeight: MediaQuery.of(context).size.height * 3 / 4,
- maxWidth: (isDesktop() || isTablet())
- ? MediaQuery.of(context).size.width * 9 / 16
- : MediaQuery.of(context).size.width),
- clipBehavior: Clip.antiAlias,
+ showDanmakuSettingsSheet(
context: context,
- builder: (context) {
- return DanmakuSettingsSheet(
- danmakuController:
- playerController.danmaku.canvasController,
- onUpdateDanmakuSpeed:
- playerController.updateDanmakuSpeed,
- onTimelineOffsetChanged: playerController
- .danmaku.clearAndInvalidateScheduledDanmakus,
- );
- },
+ danmakuController:
+ playerController.danmaku.canvasController,
+ onUpdateDanmakuSpeed: playerController.updateDanmakuSpeed,
+ onTimelineOffsetChanged: playerController
+ .danmaku.clearAndInvalidateScheduledDanmakus,
);
},
child: Container(
diff --git a/lib/pages/search/search_page.dart b/lib/pages/search/search_page.dart
index 6e5caf83..fab0d0fc 100644
--- a/lib/pages/search/search_page.dart
+++ b/lib/pages/search/search_page.dart
@@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:flutter_modular/flutter_modular.dart';
+import 'package:kazumi/bean/dialog/adaptive_bottom_sheet.dart';
import 'package:kazumi/bean/appbar/sys_app_bar.dart';
import 'package:kazumi/bean/card/bangumi_card.dart';
import 'package:kazumi/bean/widget/error_widget.dart';
@@ -97,16 +98,8 @@ class _SearchPageState extends State<SearchPage> {
}
Future<void> showWorkbench() async {
- final result = await showModalBottomSheet<_SearchWorkbenchResult>(
- isScrollControlled: true,
- constraints: BoxConstraints(
- maxHeight: MediaQuery.of(context).size.height * 0.86,
- maxWidth: (MediaQuery.sizeOf(context).width >=
- LayoutBreakpoint.medium['width']!)
- ? MediaQuery.of(context).size.width * 9 / 16
- : MediaQuery.of(context).size.width,
- ),
- clipBehavior: Clip.antiAlias,
+ final result = await showAdaptiveBottomSheet<_SearchWorkbenchResult>(
+ maxHeightFactor: 0.86,
backgroundColor: Theme.of(context).scaffoldBackgroundColor,
context: context,
builder: (context) {
diff --git a/lib/pages/settings/danmaku/danmaku_settings_sheet.dart b/lib/pages/settings/danmaku/danmaku_settings_sheet.dart
index d681f7e9..dd9a522b 100644
--- a/lib/pages/settings/danmaku/danmaku_settings_sheet.dart
+++ b/lib/pages/settings/danmaku/danmaku_settings_sheet.dart
@@ -1,64 +1,67 @@
import 'package:canvas_danmaku/canvas_danmaku.dart';
import 'package:flutter/material.dart';
+import 'package:kazumi/bean/dialog/adaptive_bottom_sheet.dart';
import 'package:kazumi/services/storage/storage.dart';
import 'package:kazumi/pages/settings/danmaku/danmaku_shield_settings_sheet.dart';
+import 'package:kazumi/pages/settings/danmaku/danmaku_time_offset_sheet.dart';
import 'package:card_settings_ui/card_settings_ui.dart';
import 'package:kazumi/utils/device.dart';
-class DanmakuSettingsSheet extends StatefulWidget {
+enum _DanmakuSettingsDestination {
+ timeOffset,
+}
+
+Future<void> showDanmakuSettingsSheet({
+ required BuildContext context,
+ required DanmakuController danmakuController,
+ VoidCallback? onUpdateDanmakuSpeed,
+ VoidCallback? onTimelineOffsetChanged,
+}) async {
+ final destination =
+ await showAdaptiveBottomSheet<_DanmakuSettingsDestination>(
+ context: context,
+ builder: (context) {
+ return _DanmakuSettingsSheet(
+ danmakuController: danmakuController,
+ onUpdateDanmakuSpeed: onUpdateDanmakuSpeed,
+ );
+ },
+ );
+
+ if (!context.mounted ||
+ destination != _DanmakuSettingsDestination.timeOffset) {
+ return;
+ }
+
+ await showAdaptiveBottomSheet<void>(
+ context: context,
+ builder: (context) {
+ return DanmakuTimeOffsetSheet(
+ onTimelineOffsetChanged: onTimelineOffsetChanged,
+ );
+ },
+ );
+}
+
+class _DanmakuSettingsSheet extends StatefulWidget {
final DanmakuController danmakuController;
final VoidCallback? onUpdateDanmakuSpeed;
- final VoidCallback? onTimelineOffsetChanged;
- const DanmakuSettingsSheet({
- super.key,
+ const _DanmakuSettingsSheet({
required this.danmakuController,
this.onUpdateDanmakuSpeed,
- this.onTimelineOffsetChanged,
});
@override
- State<DanmakuSettingsSheet> createState() => _DanmakuSettingsSheetState();
+ State<_DanmakuSettingsSheet> createState() => _DanmakuSettingsSheetState();
}
-class _DanmakuSettingsSheetState extends State<DanmakuSettingsSheet> {
- late double _danmakuTimeOffset;
-
- double _readDanmakuTimeOffset() {
- final offset = GStorage.getSetting(SettingsKeys.danmakuTimeOffset);
- return offset.clamp(-60.0, 60.0).toDouble();
- }
-
- String _formatDanmakuTimeOffset(double value) {
- if (value == 0) {
- return '无偏移';
- }
- final direction = value > 0 ? '延后' : '提前';
- return '$direction ${value.abs().toStringAsFixed(1)} 秒';
- }
-
- @override
- void initState() {
- super.initState();
- _danmakuTimeOffset = _readDanmakuTimeOffset();
- }
-
- void showDanmakuShieldSheet() {
- showModalBottomSheet(
- isScrollControlled: true,
- constraints: BoxConstraints(
- maxHeight: MediaQuery.of(context).size.height * 3 / 4,
- maxWidth: (isDesktop() || isTablet())
- ? MediaQuery.of(context).size.width * 9 / 16
- : MediaQuery.of(context).size.width),
- clipBehavior: Clip.antiAlias,
- context: context,
- builder: (context) {
- return SafeArea(
- bottom: false,
- child: DanmakuShieldSettingsSheet(),
- );
- });
+class _DanmakuSettingsSheetState extends State<_DanmakuSettingsSheet> {
+ void _showDanmakuShieldSheet() {
+ showAdaptiveBottomSheet<void>(
+ context: context,
+ builder: (context) => const DanmakuShieldSettingsSheet(),
+ );
}
@override
@@ -73,7 +76,7 @@ class _DanmakuSettingsSheetState extends State<DanmakuSettingsSheet> {
tiles: [
SettingsTile.navigation(
onPressed: (_) {
- showDanmakuShieldSheet();
+ _showDanmakuShieldSheet();
},
title: Text('关键词屏蔽', style: TextStyle(fontFamily: fontFamily)),
),
@@ -125,23 +128,20 @@ class _DanmakuSettingsSheetState extends State<DanmakuSettingsSheet> {
SettingsSection(
title: Text('弹幕显示', style: TextStyle(fontFamily: fontFamily)),
tiles: [
- SettingsTile(
+ SettingsTile.navigation(
+ onPressed: (context) {
+ Navigator.of(context)
+ .pop(_DanmakuSettingsDestination.timeOffset);
+ },
title: Text('时间轴偏移', style: TextStyle(fontFamily: fontFamily)),
- description: Slider(
- value: _danmakuTimeOffset,
- min: -60,
- max: 60,
- divisions: 240,
- label: _formatDanmakuTimeOffset(_danmakuTimeOffset),
- onChanged: (value) {
- final offset = double.parse(value.toStringAsFixed(1));
- setState(() {
- _danmakuTimeOffset = offset;
- });
- GStorage.putSetting<double>(
- SettingsKeys.danmakuTimeOffset, offset);
- widget.onTimelineOffsetChanged?.call();
- },
+ value: Text(
+ formatDanmakuTimeOffset(
+ normalizeDanmakuTimeOffset(
+ GStorage.getSetting<double>(
+ SettingsKeys.danmakuTimeOffset),
+ ),
+ ),
+ style: TextStyle(fontFamily: fontFamily),
),
),
SettingsTile(
@@ -204,7 +204,7 @@ class _DanmakuSettingsSheetState extends State<DanmakuSettingsSheet> {
),
),
SettingsTile.switchTile(
- onToggle: (value) async {
+ onToggle: (value) {
bool show = value ?? widget.danmakuController.option.hideTop;
setState(() => widget.danmakuController.updateOption(
widget.danmakuController.option.copyWith(
@@ -217,7 +217,7 @@ class _DanmakuSettingsSheetState extends State<DanmakuSettingsSheet> {
initialValue: !widget.danmakuController.option.hideTop,
),
SettingsTile.switchTile(
- onToggle: (value) async {
+ onToggle: (value) {
bool show =
value ?? widget.danmakuController.option.hideBottom;
setState(() => widget.danmakuController.updateOption(
@@ -231,7 +231,7 @@ class _DanmakuSettingsSheetState extends State<DanmakuSettingsSheet> {
initialValue: !widget.danmakuController.option.hideBottom,
),
SettingsTile.switchTile(
- onToggle: (value) async {
+ onToggle: (value) {
bool show =
value ?? widget.danmakuController.option.hideScroll;
setState(() => widget.danmakuController.updateOption(
@@ -245,7 +245,7 @@ class _DanmakuSettingsSheetState extends State<DanmakuSettingsSheet> {
initialValue: !widget.danmakuController.option.hideScroll,
),
SettingsTile.switchTile(
- onToggle: (value) async {
+ onToggle: (value) {
bool followSpeed = value ??
!GStorage.getSetting<bool>(
SettingsKeys.danmakuFollowSpeed);
diff --git a/lib/pages/settings/danmaku/danmaku_time_offset_sheet.dart b/lib/pages/settings/danmaku/danmaku_time_offset_sheet.dart
new file mode 100644
index 00000000..f4751bb1
--- /dev/null
+++ b/lib/pages/settings/danmaku/danmaku_time_offset_sheet.dart
@@ -0,0 +1,213 @@
+import 'package:flutter/material.dart';
+import 'package:kazumi/services/storage/storage.dart';
+
+const double _minDanmakuTimeOffset = -180;
+const double _maxDanmakuTimeOffset = 180;
+const int _danmakuTimeOffsetDivisions = 36;
+
+double normalizeDanmakuTimeOffset(double value) {
+ return value
+ .round()
+ .clamp(_minDanmakuTimeOffset, _maxDanmakuTimeOffset)
+ .toDouble();
+}
+
+String formatDanmakuTimeOffset(double value) {
+ if (value == 0) {
+ return '无偏移';
+ }
+ return '${value > 0 ? '延后' : '提前'} ${_formatDanmakuOffsetDuration(value)}';
+}
+
+String _formatDanmakuOffsetDuration(double value) {
+ final totalSeconds = value.abs().round();
+ final minutes = totalSeconds ~/ Duration.secondsPerMinute;
+ final seconds = totalSeconds % Duration.secondsPerMinute;
+ return '${minutes.toString().padLeft(2, '0')}:'
+ '${seconds.toString().padLeft(2, '0')}';
+}
+
+class DanmakuTimeOffsetSheet extends StatefulWidget {
+ const DanmakuTimeOffsetSheet({
+ super.key,
+ this.onTimelineOffsetChanged,
+ });
+
+ final VoidCallback? onTimelineOffsetChanged;
+
+ @override
+ State<DanmakuTimeOffsetSheet> createState() => _DanmakuTimeOffsetSheetState();
+}
+
+class _DanmakuTimeOffsetSheetState extends State<DanmakuTimeOffsetSheet> {
+ late double _offset;
+
+ @override
+ void initState() {
+ super.initState();
+ final storedOffset =
+ GStorage.getSetting<double>(SettingsKeys.danmakuTimeOffset);
+ _offset = normalizeDanmakuTimeOffset(storedOffset);
+ if (_offset != storedOffset) {
+ GStorage.putSetting<double>(SettingsKeys.danmakuTimeOffset, _offset);
+ WidgetsBinding.instance.addPostFrameCallback((_) {
+ if (mounted) {
+ widget.onTimelineOffsetChanged?.call();
+ }
+ });
+ }
+ }
+
+ void _updateOffset(double value) {
+ final offset = normalizeDanmakuTimeOffset(value);
+ if (_offset == offset) {
+ return;
+ }
+ setState(() {
+ _offset = offset;
+ });
+ GStorage.putSetting<double>(SettingsKeys.danmakuTimeOffset, offset);
+ widget.onTimelineOffsetChanged?.call();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ final theme = Theme.of(context);
+ final colorScheme = theme.colorScheme;
+ final fontFamily = theme.textTheme.bodyMedium?.fontFamily;
+ final direction = _offset == 0 ? '无偏移' : (_offset > 0 ? '延后' : '提前');
+
+ return SafeArea(
+ top: false,
+ child: SingleChildScrollView(
+ padding: const EdgeInsets.fromLTRB(24, 20, 24, 24),
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Text(
+ '弹幕时间轴偏移',
+ style: theme.textTheme.titleLarge?.copyWith(
+ fontFamily: fontFamily,
+ fontWeight: FontWeight.w600,
+ ),
+ ),
+ const SizedBox(height: 24),
+ Container(
+ width: double.infinity,
+ padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 20),
+ decoration: BoxDecoration(
+ color: colorScheme.secondaryContainer,
+ borderRadius: BorderRadius.circular(28),
+ ),
+ child: Column(
+ children: [
+ Text(
+ direction,
+ style: theme.textTheme.titleMedium?.copyWith(
+ color: colorScheme.onSecondaryContainer,
+ fontFamily: fontFamily,
+ fontWeight: FontWeight.w600,
+ ),
+ ),
+ const SizedBox(height: 4),
+ Text(
+ _formatDanmakuOffsetDuration(_offset),
+ style: theme.textTheme.displaySmall?.copyWith(
+ color: colorScheme.onSecondaryContainer,
+ fontFamily: fontFamily,
+ fontFeatures: const [FontFeature.tabularFigures()],
+ fontWeight: FontWeight.w500,
+ ),
+ ),
+ ],
+ ),
+ ),
+ const SizedBox(height: 24),
+ Row(
+ children: [
+ Text(
+ '提前 3:00',
+ style: theme.textTheme.labelMedium?.copyWith(
+ color: colorScheme.onSurfaceVariant,
+ fontFamily: fontFamily,
+ ),
+ ),
+ const Spacer(),
+ Text(
+ '延后 3:00',
+ style: theme.textTheme.labelMedium?.copyWith(
+ color: colorScheme.onSurfaceVariant,
+ fontFamily: fontFamily,
+ ),
+ ),
+ ],
+ ),
+ Slider(
+ value: _offset,
+ min: _minDanmakuTimeOffset,
+ max: _maxDanmakuTimeOffset,
+ divisions: _danmakuTimeOffsetDivisions,
+ label: formatDanmakuTimeOffset(_offset),
+ onChanged: _updateOffset,
+ ),
+ const SizedBox(height: 12),
+ LayoutBuilder(
+ builder: (context, constraints) {
+ final advanceButton = SizedBox(
+ width: double.infinity,
+ height: 56,
+ child: FilledButton.tonalIcon(
+ onPressed: _offset > _minDanmakuTimeOffset
+ ? () => _updateOffset(_offset - 1)
+ : null,
+ icon: const Icon(Icons.remove_rounded),
+ label: const Text('提前 1 秒'),
+ ),
+ );
+ final delayButton = SizedBox(
+ width: double.infinity,
+ height: 56,
+ child: FilledButton.tonalIcon(
+ onPressed: _offset < _maxDanmakuTimeOffset
+ ? () => _updateOffset(_offset + 1)
+ : null,
+ icon: const Icon(Icons.add_rounded),
+ label: const Text('延后 1 秒'),
+ ),
+ );
+
+ if (constraints.maxWidth < 360) {
+ return Column(
+ children: [
+ advanceButton,
+ const SizedBox(height: 12),
+ delayButton,
+ ],
+ );
+ }
+ return Row(
+ children: [
+ Expanded(child: advanceButton),
+ const SizedBox(width: 12),
+ Expanded(child: delayButton),
+ ],
+ );
+ },
+ ),
+ const SizedBox(height: 12),
+ SizedBox(
+ width: double.infinity,
+ height: 52,
+ child: OutlinedButton.icon(
+ onPressed: _offset != 0 ? () => _updateOffset(0) : null,
+ icon: const Icon(Icons.restart_alt_rounded),
+ label: const Text('恢复无偏移'),
+ ),
+ ),
+ ],
+ ),
+ ),
+ );
+ }
+}
diff --git a/lib/pages/timeline/timeline_page.dart b/lib/pages/timeline/timeline_page.dart
index 46705e17..f7eaa790 100644
--- a/lib/pages/timeline/timeline_page.dart
+++ b/lib/pages/timeline/timeline_page.dart
@@ -4,6 +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/dialog/adaptive_bottom_sheet.dart';
import 'package:kazumi/bean/card/bangumi_timeline_card.dart';
import 'package:kazumi/utils/constants.dart';
import 'package:kazumi/services/storage/storage.dart';
@@ -109,9 +110,7 @@ class _TimelinePageState extends State<TimelinePage>
double? compactHeightFactor,
}) {
final mediaSize = MediaQuery.sizeOf(context);
- final maxWidth = mediaSize.width >= LayoutBreakpoint.medium['width']!
- ? mediaSize.width * 9 / 16
- : mediaSize.width;
+ final adaptiveConstraints = adaptiveBottomSheetConstraints(context);
final maxHeight = compactHeightFactor != null
? (mediaSize.height >= LayoutBreakpoint.compact['height']!
? mediaSize.height * compactHeightFactor
@@ -119,7 +118,7 @@ class _TimelinePageState extends State<TimelinePage>
: double.infinity;
return BoxConstraints(
- maxWidth: maxWidth,
+ maxWidth: adaptiveConstraints.maxWidth,
maxHeight: maxHeight,
);
}
@@ -186,7 +185,6 @@ class _TimelinePageState extends State<TimelinePage>
BuildContext context, {
required Widget header,
required Widget body,
- bool showDragHandle = false,
}) {
final colorScheme = Theme.of(context).colorScheme;
@@ -198,24 +196,8 @@ class _TimelinePageState extends State<TimelinePage>
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
- if (showDragHandle) ...[
- const SizedBox(height: 12),
- Container(
- width: 32,
- height: 4,
- decoration: BoxDecoration(
- color: colorScheme.onSurfaceVariant.withValues(alpha: 0.4),
- borderRadius: BorderRadius.circular(999),
- ),
- ),
- ],
Padding(
- padding: EdgeInsets.fromLTRB(
- 16,
- showDragHandle ? 12 : 16,
- 16,
- 8,
- ),
+ padding: const EdgeInsets.fromLTRB(16, 16, 16, 8),
child: header,
),
Flexible(child: body),
@@ -839,7 +821,7 @@ class _TimelinePageState extends State<TimelinePage>
),
),
floatingActionButton: FloatingActionButton(
- onPressed: () async {
+ onPressed: () {
KazumiDialog.showBottomSheet(
backgroundColor: Theme.of(context).colorScheme.surface,
shape: const RoundedRectangleBorder(
diff --git a/lib/pages/video/video_page.dart b/lib/pages/video/video_page.dart
index d6909117..5b224b3d 100644
--- a/lib/pages/video/video_page.dart
+++ b/lib/pages/video/video_page.dart
@@ -11,6 +11,7 @@ import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:kazumi/services/storage/storage.dart';
import 'package:kazumi/services/player/pip_utils.dart';
import 'package:kazumi/bean/appbar/drag_to_move_bar.dart' as dtb;
+import 'package:kazumi/bean/dialog/adaptive_bottom_sheet.dart';
import 'package:kazumi/bean/dialog/dialog_helper.dart';
import 'package:screen_brightness_platform_interface/screen_brightness_platform_interface.dart';
import 'package:scrollview_observer/scrollview_observer.dart';
@@ -499,68 +500,58 @@ class _VideoPageState extends State<VideoPage>
}
}
- void showMobileDanmakuInput() {
+ Future<void> showMobileDanmakuInput() async {
String danmakuText = '';
- showModalBottomSheet(
- shape: const BeveledRectangleBorder(),
- isScrollControlled: true,
+ final message = await showAdaptiveBottomSheet<String>(
context: context,
builder: (context) {
- return StatefulBuilder(
- builder: (context, setModalState) {
- return Padding(
- padding: EdgeInsets.only(
- bottom: MediaQuery.of(context).viewInsets.bottom,
- left: 8,
- ),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.center,
- children: [
- Expanded(
- child: Container(
- constraints: const BoxConstraints(maxHeight: 34),
- child: TextField(
- style: const TextStyle(fontSize: 15),
- autofocus: true,
- textAlignVertical: TextAlignVertical.center,
- onChanged: (value) => danmakuText = value,
- decoration: const InputDecoration(
- filled: true,
- floatingLabelBehavior: FloatingLabelBehavior.never,
- hintText: '发个友善的弹幕见证当下',
- hintStyle: TextStyle(fontSize: 14),
- alignLabelWithHint: true,
- contentPadding:
- EdgeInsets.symmetric(vertical: 8, horizontal: 12),
- border: OutlineInputBorder(
- borderSide: BorderSide.none,
- borderRadius: BorderRadius.all(Radius.circular(20)),
- ),
- ),
- onSubmitted: (msg) {
- showDanmakuDestinationPickerAndSend(msg);
- Navigator.pop(context);
- },
- ),
+ return Padding(
+ padding: EdgeInsets.fromLTRB(
+ 16,
+ 12,
+ 16,
+ 16 + MediaQuery.viewInsetsOf(context).bottom,
+ ),
+ child: Row(
+ crossAxisAlignment: CrossAxisAlignment.center,
+ children: [
+ Expanded(
+ child: TextField(
+ autofocus: true,
+ textInputAction: TextInputAction.send,
+ onChanged: (value) => danmakuText = value,
+ onSubmitted: (message) {
+ Navigator.of(context).pop(message);
+ },
+ decoration: const InputDecoration(
+ filled: true,
+ hintText: '发个友善的弹幕见证当下',
+ prefixIcon: Icon(Icons.chat_bubble_outline_rounded),
+ border: OutlineInputBorder(
+ borderSide: BorderSide.none,
+ borderRadius: BorderRadius.all(Radius.circular(20)),
),
),
- IconButton(
- onPressed: () {
- Navigator.pop(context);
- showDanmakuDestinationPickerAndSend(danmakuText);
- },
- icon: Icon(
- Icons.send_rounded,
- color: Theme.of(context).colorScheme.primary,
- ),
- )
- ],
+ ),
+ ),
+ const SizedBox(width: 12),
+ IconButton.filled(
+ tooltip: '发送',
+ onPressed: () {
+ Navigator.of(context).pop(danmakuText);
+ },
+ icon: const Icon(Icons.send_rounded),
),
- );
- },
+ ],
+ ),
);
},
);
+
+ if (!mounted || message == null) {
+ return;
+ }
+ showDanmakuDestinationPickerAndSend(message);
}
void showDanmakuDestinationPickerAndSend(String msg) async {
@@ -574,27 +565,47 @@ class _VideoPageState extends State<VideoPage>
}
final DanmakuDestination? result =
- await showModalBottomSheet<DanmakuDestination>(
+ await showAdaptiveBottomSheet<DanmakuDestination>(
context: context,
- shape: const BeveledRectangleBorder(),
builder: (context) {
- return SafeArea(
- left: false,
- right: false,
+ final theme = Theme.of(context);
+ return Padding(
+ padding: const EdgeInsets.fromLTRB(16, 20, 16, 16),
child: Column(
mainAxisSize: MainAxisSize.min,
+ crossAxisAlignment: CrossAxisAlignment.start,
children: [
+ Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 8),
+ child: Text(
+ '发送弹幕至',
+ style: theme.textTheme.titleLarge?.copyWith(
+ fontWeight: FontWeight.w600,
+ ),
+ ),
+ ),
+ const SizedBox(height: 12),
ListTile(
+ leading: const Icon(Icons.groups_rounded),
title: const Text('发送到聊天室'),
+ subtitle: const Text('同步观看成员均可看到'),
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.circular(16),
+ ),
onTap: () =>
Navigator.of(context).pop(DanmakuDestination.chatRoom),
),
+ const SizedBox(height: 4),
ListTile(
+ leading: const Icon(Icons.cloud_upload_rounded),
title: const Text('发送到远程弹幕库'),
+ subtitle: const Text('作为视频弹幕发送'),
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.circular(16),
+ ),
onTap: () =>
Navigator.of(context).pop(DanmakuDestination.remoteDanmaku),
),
- const SizedBox(height: 8),
],
),
);
@@ -1240,9 +1251,8 @@ class _VideoPageState extends State<VideoPage>
child: FloatingActionButton(
child: const Icon(Icons.download_rounded),
onPressed: () {
- showModalBottomSheet(
+ showAdaptiveBottomSheet<void>(
context: context,
- isScrollControlled: true,
builder: (context) =>
DownloadEpisodeSheet(road: visibleRoad),
);