fix(flutter): 首页 feed 去底色并优化整集条

This commit is contained in:
Zhou Weidong committed 2026-10-20 14:05:24 +08:00
1 parent f94926cff5
commit 636b369bd4
6 files changed
+171 -97

No files matched your search

+15 -6
View File
@@ -3,6 +3,7 @@
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
import '../../core/data/models/drama.dart';
@@ -32,10 +33,7 @@ class HomePage extends StatelessWidget {
final l10n = AppLocalizations.of(context)!;
return Theme(
data: AppTheme.light(),
child: DecoratedBox(
decoration: const BoxDecoration(gradient: AppTheme.pageGradient),
child: _buildHome(context, catalog, l10n),
),
child: _buildHome(context, catalog, l10n),
);
}
@@ -136,7 +134,8 @@ class _HomeTabsState extends State<_HomeTabs> {
Widget _scaffold(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
return PopScope(
final feed = logic.tab == 0;
final content = PopScope(
canPop: false,
onPopInvokedWithResult: (didPop, _) {
if (didPop) return;
@@ -144,11 +143,21 @@ class _HomeTabsState extends State<_HomeTabs> {
},
child: Scaffold(
key: logic.scaffoldKey,
backgroundColor: logic.tab == 0 ? Colors.black : Colors.transparent,
backgroundColor: Colors.transparent,
body: _body(context),
bottomNavigationBar: logic.videoImmersive ? null : _nav(context, l10n),
),
);
return AnnotatedRegion<SystemUiOverlayStyle>(
value: feed ? SystemUiOverlayStyle.light : SystemUiOverlayStyle.dark,
child: feed
? content
: DecoratedBox(
key: const Key('home-page-gradient'),
decoration: const BoxDecoration(gradient: AppTheme.pageGradient),
child: content,
),
);
}
Widget _body(BuildContext context) {
+6 -3
View File
@@ -75,7 +75,7 @@ class PlayerPage extends StatefulWidget {
final List<Drama>? feedDramas;
final ValueChanged<Drama>? onDramaChanged;
final ValueChanged<bool>? onImmersiveChanged;
final void Function(Drama drama, Episode episode)? onOpenFullPlayer;
final Future<void> Function(Drama drama, Episode episode)? onOpenFullPlayer;
final VoidCallback? onRefreshFeed;
final WalletController? wallet;
final DownloadController? downloads;
@@ -415,8 +415,11 @@ class _PlayerPageState extends State<PlayerPage> with WidgetsBindingObserver {
onShare: () => logic.shareDrama(context, drama),
onEpisodes: () => logic.showEpisodes(context),
onDetail: () => unawaited(logic.openDetail(context)),
onOpenFullPlayer: () =>
widget.onOpenFullPlayer?.call(drama, episode),
onOpenFullPlayer: () async {
await widget.onOpenFullPlayer?.call(drama, episode);
if (!mounted || !widget.active) return;
logic.session.setUserWantsPlay(true);
},
onRefreshFeed: () => widget.onRefreshFeed?.call(),
onDownload: () => requestEpisodeDownload(context, episode.id),
onClear: () => setState(() => _chromeVisible = false),
+43 -74
View File
@@ -14,7 +14,6 @@ import 'interaction_rail.dart';
part 'home_feed_overlay_parts.dart';
const Color _overlayPill = Color(0x66000000);
const Color _fullBarColor = Color(0xCC000000);
const double _topIconSize = 36;
const double _topIconGlyph = 22;
const double _tabGap = 22;
@@ -24,7 +23,7 @@ const double _underlineHeight = 2;
const double _titleFontSize = 17;
const double _metaFontSize = 12;
const double _tagFontSize = 11;
const double _fullBarHeight = 48;
const double _fullBarHeight = 44;
const double _progressHeight = 2;
const double _progressHitHeight = 20;
const int _maxTags = 4;
@@ -96,56 +95,25 @@ class _HomeFeedOverlayState extends State<HomeFeedOverlay> {
Widget build(BuildContext context) {
return SafeArea(
bottom: false,
child: Stack(
child: Column(
children: [
Positioned(
top: 0,
left: 0,
right: 0,
child: IgnorePointer(child: _gradient(top: true)),
),
Positioned(
left: 0,
right: 0,
bottom: 0,
child: IgnorePointer(child: _gradient(top: false)),
),
Column(
children: [
_header(context),
Expanded(
child: Align(
alignment: const Alignment(1.0, 0.45),
child: Padding(
padding: const EdgeInsets.fromLTRB(0, 0, 10, 16),
child: _rail(),
),
),
_header(context),
Expanded(
child: Align(
alignment: const Alignment(1.0, 0.45),
child: Padding(
padding: const EdgeInsets.fromLTRB(0, 0, 10, 16),
child: _rail(),
),
_bottomInfo(),
_fullSeriesBar(),
],
),
),
_bottomInfo(),
_fullSeriesBar(),
],
),
);
}
Widget _gradient({required bool top}) {
return Container(
height: top ? 140 : 360,
decoration: BoxDecoration(
gradient: LinearGradient(
begin: top ? Alignment.topCenter : Alignment.bottomCenter,
end: top ? Alignment.bottomCenter : Alignment.topCenter,
colors: top
? const [Color(0xB3000000), Color(0x00000000)]
: const [Color(0xE6000000), Color(0x00000000)],
),
),
);
}
Widget _header(BuildContext context) {
return Padding(
padding: const EdgeInsets.fromLTRB(8, 6, 8, 4),
@@ -386,41 +354,42 @@ class _HomeFeedOverlayState extends State<HomeFeedOverlay> {
return GestureDetector(
key: const Key('home-feed-full-series'),
onTap: widget.onOpenFullPlayer,
child: Container(
child: SizedBox(
height: _fullBarHeight,
color: _fullBarColor,
child: Stack(
children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 14),
child: Row(
children: [
const Icon(
Icons.play_arrow_rounded,
color: Colors.white,
size: 14,
),
const SizedBox(width: 6),
Expanded(
child: Text(
widget.l10n.watchFullSeries(
'${widget.drama.episodeCount}',
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
color: Colors.white,
fontSize: 13,
fontWeight: FontWeight.w600,
Positioned.fill(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 14),
child: Row(
children: [
const Icon(
Icons.play_arrow_rounded,
color: Colors.white,
size: 14,
),
const SizedBox(width: 6),
Expanded(
child: Text(
widget.l10n.watchFullSeries(
'${widget.drama.episodeCount}',
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
color: Colors.white,
fontSize: 13,
fontWeight: FontWeight.w600,
),
),
),
),
const Icon(
Icons.chevron_right_rounded,
color: Colors.white,
size: 18,
),
],
const Icon(
Icons.chevron_right_rounded,
color: Colors.white,
size: 18,
),
],
),
),
),
Positioned(
@@ -2,6 +2,9 @@
part of 'home_feed_overlay.dart';
const double _thumbSize = 6;
const double _thumbActiveSize = 10;
/// 顶部频道 tab:漫剧点击提示即将上线。
enum _FeedTab {
anime,
@@ -208,10 +211,7 @@ class _FeedProgressBarState extends State<_FeedProgressBar> {
_update(details.localPosition.dx / width),
onHorizontalDragEnd: (_) => _commit(_preview),
onHorizontalDragCancel: () => setState(() => _preview = null),
child: SizedBox(
height: widget.hitHeight,
child: Align(alignment: Alignment.bottomCenter, child: track),
),
child: track,
);
},
);
@@ -233,15 +233,43 @@ class _FeedProgressBarState extends State<_FeedProgressBar> {
}
Widget _track(double fraction, double width) {
final active = _preview != null;
final size = active ? _thumbActiveSize : _thumbSize;
final left = (width * fraction - size / 2)
.clamp(0.0, width - size)
.toDouble();
return SizedBox(
height: widget.height,
height: widget.hitHeight,
child: Stack(
clipBehavior: Clip.none,
children: [
Container(width: width, height: widget.height, color: Colors.white24),
Container(
width: width * fraction,
height: widget.height,
color: AppColors.blue,
Positioned(
left: 0,
right: 0,
bottom: 0,
child: Container(height: widget.height, color: Colors.white24),
),
Positioned(
left: 0,
bottom: 0,
child: Container(
width: width * fraction,
height: widget.height,
color: AppColors.blue,
),
),
Positioned(
left: left,
bottom: 0,
child: Container(
key: const Key('home-feed-progress-thumb'),
width: size,
height: size,
decoration: const BoxDecoration(
color: Colors.white,
shape: BoxShape.circle,
),
),
),
],
),