13 Commits
Author SHA1 Message Date
Zhou Weidong c4adbd0665 chore(release): 发布 v1.0.1 客户端 UI 优化
flutter-ci / test (push) Canceled after 0s
2026-10-31 14:39:52 +08:00
Zhou Weidong a833d62c50 chore(release): bump version to 1.0.1 2026-10-31 14:39:20 +08:00
Zhou Weidong bc01716449 merge: 更新客户端导航与播放加载视觉
flutter-ci / test (push) Canceled after 0s
2026-10-31 14:37:00 +08:00
Zhou Weidong 12b1a11bd3 feat(ui): 更新底栏图标与播放加载视觉 2026-10-31 14:35:26 +08:00
Zhou Weidong 66c03ee245 chore(release): 发布 iOS 分享面板修复
flutter-ci / test (push) Canceled after 0s
# Conflicts:
#	lib/core/config/app_config.dart
2026-10-31 14:02:40 +08:00
Zhou Weidong a3ac007759 fix(config): release 构建自动使用生产环境 2026-10-31 14:00:33 +08:00
Zhou Weidong 8ec6df2be5 merge: 修复 iOS 系统分享面板
flutter-ci / test (push) Canceled after 0s
2026-10-31 13:40:14 +08:00
Zhou Weidong 5ec4db151a fix(ios): 修复分享面板并同步互动栏布局断言 2026-10-31 13:33:13 +08:00
Vicky 525f58c150 chore(release): 合并 develop 到 main
flutter-ci / test (push) Canceled after 0s
2026-10-31 09:49:54 +08:00
Vicky a47af8c3ad style(player): 视频信息区文案统一为 65% 半透明白
flutter-ci / test (push) Canceled after 0s
2026-10-31 09:41:19 +08:00
Vicky 0a02620564 chore(release): 合并 develop 到 main
flutter-ci / test (push) Canceled after 0s
2026-10-31 00:02:59 +08:00
Vicky 78a33cd4f1 chore(release): 合并 develop 到 main
flutter-ci / test (push) Canceled after 0s
2026-10-30 22:56:52 +08:00
Vicky e8610b7aed chore(release): 生产包切换为生产环境地址
flutter-ci / test (push) Canceled after 0s
2026-10-30 17:20:48 +08:00
23 changed files with 691 additions and 94 deletions

No files matched your search

+48 -6
View File
@@ -386,15 +386,29 @@ final class PipShadowCoordinator: NSObject, AVPictureInPictureControllerDelegate
guard call.method == "shareText", guard call.method == "shareText",
let arguments = call.arguments as? [String: Any], let arguments = call.arguments as? [String: Any],
let text = arguments["text"] as? String, let text = arguments["text"] as? String,
!text.isEmpty, !text.isEmpty else {
let controller = self?.window?.rootViewController else {
result(FlutterError(code: "share_unavailable", message: "Share sheet is unavailable", details: nil)) result(FlutterError(code: "share_unavailable", message: "Share sheet is unavailable", details: nil))
return return
} }
let activity = UIActivityViewController(activityItems: [text], applicationActivities: nil) DispatchQueue.main.async {
activity.popoverPresentationController?.sourceView = controller.view guard let controller = self?.sharePresenter() else {
activity.completionWithItemsHandler = { _, _, _, _ in result(nil) } result(FlutterError(code: "share_unavailable", message: "Share sheet is unavailable", details: nil))
controller.present(activity, animated: true) return
}
let activity = UIActivityViewController(activityItems: [text], applicationActivities: nil)
if let popover = activity.popoverPresentationController {
popover.sourceView = controller.view
popover.sourceRect = CGRect(
x: controller.view.bounds.midX,
y: controller.view.bounds.midY,
width: 0,
height: 0
)
popover.permittedArrowDirections = []
}
activity.completionWithItemsHandler = { _, _, _, _ in result(nil) }
controller.present(activity, animated: true)
}
} }
let thumbnailChannel = FlutterMethodChannel( let thumbnailChannel = FlutterMethodChannel(
@@ -459,6 +473,34 @@ final class PipShadowCoordinator: NSObject, AVPictureInPictureControllerDelegate
} }
} }
/// 当前前台 Scene 的根控制器之上,最适合展示系统分享面板的控制器。
private func sharePresenter() -> UIViewController? {
let keyWindow = UIApplication.shared.connectedScenes
.compactMap { $0 as? UIWindowScene }
.first { $0.activationState == .foregroundActive }?
.windows.first { $0.isKeyWindow }
guard let rootController = keyWindow?.rootViewController else { return nil }
let presenter = topPresentedController(from: rootController)
guard presenter.viewIfLoaded?.window != nil else { return nil }
return presenter
}
/// 解析已展示页面、导航栈和标签页中的当前可见控制器。
private func topPresentedController(from controller: UIViewController) -> UIViewController {
if let presented = controller.presentedViewController {
return topPresentedController(from: presented)
}
if let navigation = controller as? UINavigationController,
let visible = navigation.visibleViewController {
return topPresentedController(from: visible)
}
if let tabs = controller as? UITabBarController,
let selected = tabs.selectedViewController {
return topPresentedController(from: selected)
}
return controller
}
/// iOS 画中画:影子播放器通道,与 Android 共用同一 channel 名。 /// iOS 画中画:影子播放器通道,与 Android 共用同一 channel 名。
private func registerPipChannel(_ engineBridge: FlutterImplicitEngineBridge) { private func registerPipChannel(_ engineBridge: FlutterImplicitEngineBridge) {
let channel = FlutterMethodChannel( let channel = FlutterMethodChannel(
+5 -5
View File
@@ -1,5 +1,7 @@
// Author: fruit.com.cn // Author: fruit.com.cn
import 'package:flutter/foundation.dart';
import 'dev_config.dart'; import 'dev_config.dart';
import 'prod_config.dart'; import 'prod_config.dart';
@@ -9,12 +11,10 @@ import 'prod_config.dart';
/// - `dev_config.dart`:[DevConfig](本机联调) /// - `dev_config.dart`:[DevConfig](本机联调)
/// - `prod_config.dart`:[ProdConfig](生产) /// - `prod_config.dart`:[ProdConfig](生产)
/// ///
/// 切换环境只改下面这一个布尔值,不用传任何构建参数、也不做网络探测。 /// Debug 使用开发环境,Release 自动使用生产环境,不做网络探测。
abstract final class AppConfig { abstract final class AppConfig {
/// **环境开关**:true 用开发环境,false 用生产环境。 /// **环境开关**:Debug 使用开发环境,Release 使用生产环境。
/// static const bool useDevConfig = !kReleaseMode;
/// 打生产包前必须改成 false;release 构建若仍为 true 会在启动时直接报错。
static const bool useDevConfig = true;
/// 当前选中的环境地址。 /// 当前选中的环境地址。
static String get baseUrl => static String get baseUrl =>
+3
View File
@@ -27,6 +27,9 @@ abstract final class AppColors {
static const overlaySecondary = Color(0xFFC7C7CC); static const overlaySecondary = Color(0xFFC7C7CC);
static const overlayLabel = Color(0xFFE6E6EB); static const overlayLabel = Color(0xFFE6E6EB);
/// 首页及剧集播放页视频信息文案:参考设计图的 65% 半透明白。
static const homeFeedVideoCopy = Color(0xA6FFFFFF);
/// 主操作、选中态、播放进度。旧品牌橙已全量映射为品牌红(2026-10 改版)。 /// 主操作、选中态、播放进度。旧品牌橙已全量映射为品牌红(2026-10 改版)。
static const blue = Color(0xFFF04E4E); static const blue = Color(0xFFF04E4E);
static const primary = blue; static const primary = blue;
+24 -17
View File
@@ -18,6 +18,7 @@ class AppBottomNavItem {
this.selected = false, this.selected = false,
this.assetPath, this.assetPath,
this.selectedAssetPath, this.selectedAssetPath,
this.customIcon,
}); });
final Key tabKey; final Key tabKey;
@@ -25,6 +26,7 @@ class AppBottomNavItem {
final IconData selectedIcon; final IconData selectedIcon;
final String? assetPath; final String? assetPath;
final String? selectedAssetPath; final String? selectedAssetPath;
final Widget? customIcon;
final String label; final String label;
final VoidCallback onTap; final VoidCallback onTap;
final bool selected; final bool selected;
@@ -93,26 +95,31 @@ class _NavDestination extends StatelessWidget {
duration: const Duration(milliseconds: 160), duration: const Duration(milliseconds: 160),
curve: Curves.easeOut, curve: Curves.easeOut,
scale: item.selected ? 1 : 0.96, scale: item.selected ? 1 : 0.96,
child: assetPath == null child:
? Icon( item.customIcon ??
fallbackIcon, (assetPath == null
size: AppDimens.navIcon, ? Icon(
color: color,
)
: ColorFiltered(
colorFilter: ColorFilter.mode(color, BlendMode.srcIn),
child: Image.asset(
assetPath,
width: AppDimens.navIcon,
height: AppDimens.navIcon,
fit: BoxFit.contain,
errorBuilder: (_, _, _) => Icon(
fallbackIcon, fallbackIcon,
size: AppDimens.navIcon, size: AppDimens.navIcon,
color: color, color: color,
), )
), : ColorFiltered(
), colorFilter: ColorFilter.mode(
color,
BlendMode.srcIn,
),
child: Image.asset(
assetPath,
width: AppDimens.navIcon,
height: AppDimens.navIcon,
fit: BoxFit.contain,
errorBuilder: (_, _, _) => Icon(
fallbackIcon,
size: AppDimens.navIcon,
color: color,
),
),
)),
), ),
const SizedBox(height: AppDimens.navLabelGap), const SizedBox(height: AppDimens.navLabelGap),
Text( Text(
+14
View File
@@ -2,8 +2,10 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../theme/app_dimens.dart';
import '../../l10n/app_localizations.dart'; import '../../l10n/app_localizations.dart';
import 'app_bottom_nav.dart'; import 'app_bottom_nav.dart';
import 'root_nav_glyph.dart';
/// 客户端根导航的固定顺序。 /// 客户端根导航的固定顺序。
enum AppRootTab { enum AppRootTab {
@@ -16,6 +18,13 @@ enum AppRootTab {
} }
extension AppRootTabUi on AppRootTab { extension AppRootTabUi on AppRootTab {
RootNavGlyphKind get glyphKind => switch (this) {
AppRootTab.home => RootNavGlyphKind.home,
AppRootTab.recommend => RootNavGlyphKind.recommend,
AppRootTab.following => RootNavGlyphKind.following,
AppRootTab.mine => RootNavGlyphKind.mine,
};
Key get tabKey => switch (this) { Key get tabKey => switch (this) {
AppRootTab.home => const Key('tab-home'), AppRootTab.home => const Key('tab-home'),
AppRootTab.recommend => const Key('tab-recommend'), AppRootTab.recommend => const Key('tab-recommend'),
@@ -71,6 +80,11 @@ class AppRootBottomNav extends StatelessWidget {
selectedIcon: tab.selectedIcon, selectedIcon: tab.selectedIcon,
label: tab.label(l10n), label: tab.label(l10n),
selected: tab == selected, selected: tab == selected,
customIcon: RootNavGlyph(
kind: tab.glyphKind,
selected: tab == selected,
size: AppDimens.navIcon,
),
onTap: () => onSelected(tab), onTap: () => onSelected(tab),
), ),
], ],
+180
View File
@@ -0,0 +1,180 @@
// Author: fruit.com.cn
// 职责:绘制根导航使用的饱满品牌插画图标。
import 'package:flutter/material.dart';
import '../theme/app_colors.dart';
const double _designSize = 30;
/// 根导航四个入口对应的图标种类。
enum RootNavGlyphKind { home, recommend, following, mine }
/// 根导航插画图标,根据选中态使用品牌红和中性灰白配色。
class RootNavGlyph extends StatelessWidget {
const RootNavGlyph({
super.key,
required this.kind,
required this.selected,
required this.size,
});
final RootNavGlyphKind kind;
final bool selected;
final double size;
@override
Widget build(BuildContext context) {
return CustomPaint(
size: Size.square(size),
painter: _RootNavGlyphPainter(kind: kind, selected: selected),
);
}
}
class _RootNavGlyphPainter extends CustomPainter {
const _RootNavGlyphPainter({required this.kind, required this.selected});
final RootNavGlyphKind kind;
final bool selected;
Color get _main => selected ? AppColors.navSelected : const Color(0xFFD0D0D2);
Color get _light => selected ? AppColors.homeCrownGold : Colors.white;
Color get _shade =>
selected ? const Color(0xFF9F2935) : const Color(0xFF858589);
@override
void paint(Canvas canvas, Size size) {
canvas.save();
canvas.scale(size.width / _designSize);
switch (kind) {
case RootNavGlyphKind.home:
_paintHome(canvas);
case RootNavGlyphKind.recommend:
_paintRecommend(canvas);
case RootNavGlyphKind.following:
_paintFollowing(canvas);
case RootNavGlyphKind.mine:
_paintMine(canvas);
}
canvas.restore();
}
void _paintHome(Canvas canvas) {
final roof = Path()
..moveTo(3, 13)
..lineTo(15, 3)
..lineTo(27, 13)
..lineTo(24, 16)
..lineTo(15, 8.5)
..lineTo(6, 16)
..close();
canvas.drawShadow(roof, AppColors.shadow, 2, false);
canvas.drawPath(roof, _gradient(const Rect.fromLTWH(3, 3, 24, 13)));
final body = RRect.fromRectAndRadius(
const Rect.fromLTRB(6, 13, 24, 27),
const Radius.circular(3),
);
canvas.drawRRect(body, _gradient(const Rect.fromLTWH(6, 13, 18, 14)));
canvas.drawRRect(
RRect.fromRectAndRadius(
const Rect.fromLTRB(12, 18, 18, 27),
const Radius.circular(2),
),
Paint()..color = _shade,
);
canvas.drawRRect(
RRect.fromRectAndRadius(
const Rect.fromLTRB(8, 16, 11, 19),
const Radius.circular(1),
),
Paint()..color = _light,
);
}
void _paintRecommend(Canvas canvas) {
final body = RRect.fromRectAndRadius(
const Rect.fromLTRB(6, 4, 24, 27),
const Radius.circular(5),
);
canvas.drawShadow(Path()..addRRect(body), AppColors.shadow, 2, false);
canvas.drawRRect(body, _gradient(const Rect.fromLTWH(6, 4, 18, 23)));
for (var index = 0; index < 3; index++) {
final left = 9.0 + index * 5;
canvas.drawRRect(
RRect.fromRectAndRadius(
Rect.fromLTWH(left, 7, 3, 2.5),
const Radius.circular(1),
),
Paint()..color = _light,
);
}
final play = Path()
..moveTo(12, 13)
..quadraticBezierTo(12, 11.5, 13.5, 12.3)
..lineTo(19.5, 15.7)
..quadraticBezierTo(21, 16.5, 19.5, 17.3)
..lineTo(13.5, 20.7)
..quadraticBezierTo(12, 21.5, 12, 20)
..close();
canvas.drawPath(play, Paint()..color = _light);
}
void _paintFollowing(Canvas canvas) {
final page = RRect.fromRectAndRadius(
const Rect.fromLTRB(5, 4, 25, 27),
const Radius.circular(4),
);
canvas.drawShadow(Path()..addRRect(page), AppColors.shadow, 2, false);
canvas.drawRRect(page, _gradient(const Rect.fromLTWH(5, 4, 20, 23)));
canvas.drawRRect(
RRect.fromRectAndRadius(
const Rect.fromLTRB(8, 9, 17, 10.5),
const Radius.circular(0.7),
),
Paint()..color = _light,
);
canvas.drawRRect(
RRect.fromRectAndRadius(
const Rect.fromLTRB(8, 13, 16, 14.5),
const Radius.circular(0.7),
),
Paint()..color = _light,
);
final bookmark = Path()
..moveTo(18, 7)
..lineTo(22, 7)
..lineTo(22, 20)
..lineTo(20, 18)
..lineTo(18, 20)
..close();
canvas.drawPath(bookmark, Paint()..color = _light);
}
void _paintMine(Canvas canvas) {
final bounds = Rect.fromCircle(center: const Offset(15, 15), radius: 13);
canvas.drawShadow(Path()..addOval(bounds), AppColors.shadow, 2, false);
canvas.drawCircle(const Offset(15, 15), 13, _gradient(bounds));
canvas.drawCircle(const Offset(15, 11), 4, Paint()..color = _light);
final shoulders = Path()
..moveTo(7, 24)
..cubicTo(7.5, 19, 10.5, 17, 15, 17)
..cubicTo(19.5, 17, 22.5, 19, 23, 24)
..quadraticBezierTo(15, 29, 7, 24)
..close();
canvas.drawPath(shoulders, Paint()..color = _light);
canvas.drawCircle(const Offset(13.5, 11), 0.55, Paint()..color = _shade);
canvas.drawCircle(const Offset(16.5, 11), 0.55, Paint()..color = _shade);
}
Paint _gradient(Rect bounds) => Paint()
..shader = LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [_light, _main, _shade],
).createShader(bounds);
@override
bool shouldRepaint(covariant _RootNavGlyphPainter oldDelegate) =>
oldDelegate.kind != kind || oldDelegate.selected != selected;
}
@@ -12,7 +12,6 @@ const double _synopsisToggleWidthFraction = 0.55;
const double _synopsisToggleGap = 6; const double _synopsisToggleGap = 6;
const _synopsisMotion = Duration(milliseconds: 240); const _synopsisMotion = Duration(milliseconds: 240);
const _synopsisStyle = TextStyle( const _synopsisStyle = TextStyle(
color: AppColors.overlaySecondary,
fontSize: _synopsisFont, fontSize: _synopsisFont,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
height: _synopsisLineHeight, height: _synopsisLineHeight,
@@ -32,6 +31,7 @@ class ExpandableSynopsis extends StatefulWidget {
required this.synopsis, required this.synopsis,
this.keyPrefix = 'home-feed', this.keyPrefix = 'home-feed',
this.expandedFooter, this.expandedFooter,
this.textColor = AppColors.homeFeedVideoCopy,
}); });
/// 按当前语言获取的简介正文。 /// 按当前语言获取的简介正文。
@@ -43,6 +43,9 @@ class ExpandableSynopsis extends StatefulWidget {
/// 展开后附加的声明等内容。 /// 展开后附加的声明等内容。
final Widget? expandedFooter; final Widget? expandedFooter;
/// 简介正文颜色;默认使用视频信息区统一的半透明浅灰白。
final Color textColor;
@override @override
State<ExpandableSynopsis> createState() => _ExpandableSynopsisState(); State<ExpandableSynopsis> createState() => _ExpandableSynopsisState();
} }
@@ -88,7 +91,7 @@ class _ExpandableSynopsisState extends State<ExpandableSynopsis> {
} }
bool _needsToggle(double maxWidth) { bool _needsToggle(double maxWidth) {
final painter = _painter(widget.synopsis, _synopsisStyle); final painter = _painter(widget.synopsis, _bodyStyle);
painter.layout(maxWidth: maxWidth); painter.layout(maxWidth: maxWidth);
final overflows = painter.didExceedMaxLines; final overflows = painter.didExceedMaxLines;
painter.dispose(); painter.dispose();
@@ -120,11 +123,14 @@ class _ExpandableSynopsisState extends State<ExpandableSynopsis> {
Key _key(String suffix) => Key('${widget.keyPrefix}-synopsis-$suffix'); Key _key(String suffix) => Key('${widget.keyPrefix}-synopsis-$suffix');
TextStyle get _bodyStyle => _synopsisStyle.copyWith(color: widget.textColor);
Widget _body() { Widget _body() {
final style = _bodyStyle;
final text = Text.rich( final text = Text.rich(
TextSpan(text: widget.synopsis, style: _synopsisStyle), TextSpan(text: widget.synopsis, style: style),
key: _expanded ? _key('expanded') : Key('${widget.keyPrefix}-synopsis'), key: _expanded ? _key('expanded') : Key('${widget.keyPrefix}-synopsis'),
style: _synopsisStyle, style: style,
maxLines: _expanded ? null : _collapsedSynopsisLines, maxLines: _expanded ? null : _collapsedSynopsisLines,
overflow: _expanded ? TextOverflow.clip : TextOverflow.ellipsis, overflow: _expanded ? TextOverflow.clip : TextOverflow.ellipsis,
); );
@@ -101,7 +101,7 @@ class _TagChip extends StatelessWidget {
maxLines: 1, maxLines: 1,
strutStyle: _metadataStrutStyle, strutStyle: _metadataStrutStyle,
style: const TextStyle( style: const TextStyle(
color: AppColors.overlaySecondary, color: AppColors.homeFeedVideoCopy,
fontSize: _tagFont, fontSize: _tagFont,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
height: _metadataLineHeight, height: _metadataLineHeight,
@@ -27,6 +27,7 @@ const double _progressHeight = 2;
const double _progressHitHeight = 16; const double _progressHitHeight = 16;
const double _pageHorizontal = 20; const double _pageHorizontal = 20;
const double _railRight = 14; const double _railRight = 14;
const double _railShiftRight = 8;
const double _railGap = 12; const double _railGap = 12;
const double _railWidth = 56; const double _railWidth = 56;
const double _infoWatchAllGap = 2; const double _infoWatchAllGap = 2;
@@ -234,7 +235,10 @@ class _HomeFeedOverlayState extends State<HomeFeedOverlay> {
padding: const EdgeInsets.only( padding: const EdgeInsets.only(
bottom: _railBottomOffset, bottom: _railBottomOffset,
), ),
child: _rail(), child: Transform.translate(
offset: const Offset(_railShiftRight, 0),
child: _rail(),
),
), ),
), ),
], ],
@@ -103,6 +103,7 @@ class _HomeFeedInfoPanelState extends State<HomeFeedInfoPanel> {
ExpandableSynopsis( ExpandableSynopsis(
key: ValueKey(widget.drama.id), key: ValueKey(widget.drama.id),
synopsis: synopsis, synopsis: synopsis,
textColor: AppColors.homeFeedVideoCopy,
), ),
], ],
], ],
@@ -3,8 +3,19 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../../../core/theme/app_colors.dart'; import '../../../core/theme/app_colors.dart';
import '../../../core/theme/app_dimens.dart';
const _fadeDuration = Duration(milliseconds: 140);
const _motionDuration = Duration(milliseconds: 1350);
const _surfaceSize = Size(56, 36);
const _logoSize = Size(48, 29);
const _minimumScale = 0.98;
const _staticProgress = 0.5;
const _waveMultiplier = 2.0;
const _sweepStart = -1.2;
const _sweepTravel = 3.4;
const _sweepFeather = 0.16;
/// 剧集播放页首帧出现前的非阻塞 YMB 品牌加载层。
class PlayerLoadingOverlay extends StatelessWidget { class PlayerLoadingOverlay extends StatelessWidget {
const PlayerLoadingOverlay({ const PlayerLoadingOverlay({
super.key, super.key,
@@ -19,27 +30,124 @@ class PlayerLoadingOverlay extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AnimatedOpacity( return AnimatedOpacity(
opacity: opacity, opacity: opacity,
duration: const Duration(milliseconds: 140), duration: _fadeDuration,
curve: Curves.easeOut, curve: Curves.easeOut,
onEnd: onFadeEnd, onEnd: onFadeEnd,
child: Container( child: Container(
key: const Key('player-loading-surface'), key: const Key('player-loading-surface'),
width: AppDimens.refreshIndicatorSize, width: _surfaceSize.width,
height: AppDimens.refreshIndicatorSize, height: _surfaceSize.height,
decoration: BoxDecoration(
color: AppColors.refreshIndicatorSurface,
borderRadius: BorderRadius.circular(AppDimens.refreshIndicatorRadius),
),
alignment: Alignment.center, alignment: Alignment.center,
child: const SizedBox.square( child: const _YmbLoadingMark(),
dimension: AppDimens.refreshSpinnerSize,
child: CircularProgressIndicator(
key: Key('player-entry-loading'),
color: Colors.white,
strokeWidth: AppDimens.refreshSpinnerStroke,
),
),
), ),
); );
} }
} }
class _YmbLoadingMark extends StatefulWidget {
const _YmbLoadingMark();
@override
State<_YmbLoadingMark> createState() => _YmbLoadingMarkState();
}
class _YmbLoadingMarkState extends State<_YmbLoadingMark>
with SingleTickerProviderStateMixin, WidgetsBindingObserver {
late final AnimationController _controller;
bool _disableAnimations = false;
@override
void initState() {
super.initState();
WidgetsBinding.instance.addObserver(this);
_controller = AnimationController(vsync: this, duration: _motionDuration);
}
@override
void didChangeDependencies() {
super.didChangeDependencies();
final disableAnimations = MediaQuery.disableAnimationsOf(context);
if (_disableAnimations == disableAnimations && _controller.isAnimating) {
return;
}
_disableAnimations = disableAnimations;
_syncMotion(WidgetsBinding.instance.lifecycleState);
}
@override
void didChangeAppLifecycleState(AppLifecycleState state) {
_syncMotion(state);
}
void _syncMotion(AppLifecycleState? state) {
if (_disableAnimations) {
_controller
..stop()
..value = _staticProgress;
return;
}
if (state == null || state == AppLifecycleState.resumed) {
if (!_controller.isAnimating) {
_controller.repeat();
}
return;
}
_controller.stop();
}
@override
void dispose() {
WidgetsBinding.instance.removeObserver(this);
_controller.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
return AnimatedBuilder(
animation: _controller,
builder: (context, child) {
final progress = _controller.value;
return _buildLogo(progress);
},
);
}
Widget _buildLogo(double progress) {
final pulse = Curves.easeInOut.transform(_triangleWave(progress));
final scale = _minimumScale + (1 - _minimumScale) * pulse;
return Transform.scale(
key: const Key('player-entry-loading-motion'),
scale: scale,
child: ShaderMask(
blendMode: BlendMode.srcATop,
shaderCallback: (bounds) =>
_logoGradient(progress).createShader(bounds),
child: Image.asset(
'assets/icon/splash_logo.png',
key: const Key('player-entry-loading'),
width: _logoSize.width,
height: _logoSize.height,
fit: BoxFit.contain,
),
),
);
}
LinearGradient _logoGradient(double progress) {
final center = _sweepStart + progress * _sweepTravel;
return LinearGradient(
begin: Alignment.centerLeft,
end: Alignment.centerRight,
colors: const [
Colors.white,
Colors.white,
AppColors.brandRed,
Colors.white,
],
stops: [0, (center - _sweepFeather).clamp(0, 1), center.clamp(0, 1), 1],
);
}
double _triangleWave(double value) => 1 - (value * _waveMultiplier - 1).abs();
}
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
import '../../../core/data/models/content_category.dart'; import '../../../core/data/models/content_category.dart';
import '../../../core/theme/app_colors.dart'; import '../../../core/theme/app_colors.dart';
import '../../../core/theme/app_dimens.dart';
import '../../../core/widgets/animated_nav_label.dart'; import '../../../core/widgets/animated_nav_label.dart';
import '../../../l10n/app_localizations.dart'; import '../../../l10n/app_localizations.dart';
import 'search_gift_glyphs.dart'; import 'search_gift_glyphs.dart';
@@ -11,7 +12,7 @@ import 'search_gift_glyphs.dart';
const double _navHeight = 56; const double _navHeight = 56;
const double _tabGap = 20; const double _tabGap = 20;
const double _tabFont = 17; const double _tabFont = 17;
const double _searchHitSize = 40; const double _searchHitSize = AppDimens.tapTarget;
const double _searchIconSize = 26; const double _searchIconSize = 26;
const double _giftIconSize = 26; const double _giftIconSize = 26;
const double _underlineWidth = 26; const double _underlineWidth = 26;
@@ -39,7 +39,7 @@ class RecommendTopNav extends StatelessWidget {
/// 首页横向页面的连续位置,用于文字和下划线跟手过渡。 /// 首页横向页面的连续位置,用于文字和下划线跟手过渡。
final double? pagePosition; final double? pagePosition;
/// 右上角金色礼物盒(钱包入口);为空时不显示。 /// 右上角礼包入口;为空时不显示。
final VoidCallback? onGift; final VoidCallback? onGift;
@override @override
@@ -50,8 +50,12 @@ class _SearchPainter extends CustomPainter {
final center = Offset(circleDiameter / 2, circleDiameter / 2); final center = Offset(circleDiameter / 2, circleDiameter / 2);
canvas.drawCircle(center, circleDiameter / 2 - stroke / 2, paint); canvas.drawCircle(center, circleDiameter / 2 - stroke / 2, paint);
final start = center + Offset.fromDirection(direction, circleDiameter / 2 - stroke * 0.2); final start =
final end = center + Offset.fromDirection(direction, circleDiameter / 2 + size.width * 0.12); center +
Offset.fromDirection(direction, circleDiameter / 2 - stroke * 0.2);
final end =
center +
Offset.fromDirection(direction, circleDiameter / 2 + size.width * 0.12);
canvas.drawLine(start, end, paint); canvas.drawLine(start, end, paint);
} }
@@ -60,7 +64,7 @@ class _SearchPainter extends CustomPainter {
oldDelegate.color != color; oldDelegate.color != color;
} }
/// emoji 礼盒(红盒金丝带,随系统 emoji 风格渲染)。 /// YMB 品牌礼盒静态图标,使用玫红礼盒与金色丝带。
class GiftGlyph extends StatelessWidget { class GiftGlyph extends StatelessWidget {
const GiftGlyph({super.key, required this.size}); const GiftGlyph({super.key, required this.size});
@@ -68,11 +72,94 @@ class GiftGlyph extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return SizedBox.square( return CustomPaint(size: Size.square(size), painter: _GiftPainter());
dimension: size,
child: FittedBox(
child: Text('🎁', style: TextStyle(fontSize: size, height: 1)),
),
);
} }
} }
class _GiftPainter extends CustomPainter {
const _GiftPainter();
static const double _designSize = 26;
@override
void paint(Canvas canvas, Size size) {
canvas.save();
canvas.scale(size.width / _designSize);
_paintBox(canvas);
_paintRibbon(canvas);
_paintBow(canvas);
canvas.restore();
}
void _paintBox(Canvas canvas) {
final body = RRect.fromRectAndRadius(
const Rect.fromLTRB(4, 13, 22, 23),
const Radius.circular(2),
);
canvas.drawRRect(
body,
Paint()
..shader = const LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [Color(0xFFFF5C82), Color(0xFFEF315D)],
).createShader(const Rect.fromLTRB(4, 13, 22, 23)),
);
canvas.drawRRect(
RRect.fromRectAndRadius(
const Rect.fromLTRB(3, 10, 23, 14),
const Radius.circular(1.5),
),
Paint()
..shader = const LinearGradient(
colors: [Color(0xFFFF7190), Color(0xFFF52E5C)],
).createShader(const Rect.fromLTRB(3, 10, 23, 14)),
);
}
void _paintRibbon(Canvas canvas) {
final ribbon = Paint()
..shader = const LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [Color(0xFFFFFFA8), Color(0xFFFFD52F), Color(0xFFFFB900)],
).createShader(const Rect.fromLTRB(10.5, 10, 15.5, 23));
canvas.drawRect(const Rect.fromLTRB(10.5, 13, 15.5, 23), ribbon);
canvas.drawRect(const Rect.fromLTRB(3, 10.5, 23, 14), ribbon);
canvas.drawLine(
const Offset(11, 14),
const Offset(11, 22),
Paint()
..color = const Color(0xFFFFFFAE)
..strokeWidth = 0.6,
);
}
void _paintBow(Canvas canvas) {
final gold = Paint()
..shader = const LinearGradient(
colors: [Color(0xFFFFFFA8), Color(0xFFFFD52F), Color(0xFFFFB900)],
).createShader(const Rect.fromLTRB(5, 1, 21, 12));
final tails = Path()
..moveTo(11.8, 7)
..lineTo(15, 7)
..lineTo(17, 13)
..lineTo(14.1, 12)
..lineTo(12.6, 14)
..lineTo(10.8, 8)
..close();
canvas.drawPath(tails, gold);
final bow = Path()
..moveTo(13, 7)
..cubicTo(5.2, 0, 5.2, 4.8, 7.5, 6.7)
..cubicTo(9, 8, 11.5, 8, 13, 7)
..cubicTo(14.5, 8, 17, 8, 18.5, 6.7)
..cubicTo(20.8, 4.8, 20.8, 0, 13, 7)
..close();
canvas.drawPath(bow, gold);
canvas.drawCircle(const Offset(13, 7), 1.55, gold);
}
@override
bool shouldRepaint(covariant _GiftPainter oldDelegate) => false;
}
+1 -1
View File
@@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts # In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix. # of the product and file versions while build-number is used as the build suffix.
version: 1.0.0+1 version: 1.0.1+2
environment: environment:
sdk: ^3.12.2 sdk: ^3.12.2
@@ -0,0 +1,18 @@
// Author: fruit.com.cn
// 应用环境选择测试。
import 'package:flutter/foundation.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:fruitshorts/core/config/app_config.dart';
import 'package:fruitshorts/core/config/dev_config.dart';
import 'package:fruitshorts/core/config/prod_config.dart';
void main() {
test('should_use_environment_matching_build_mode', () {
expect(AppConfig.useDevConfig, !kReleaseMode);
expect(
AppConfig.baseUrl,
kReleaseMode ? ProdConfig.baseUrl : DevConfig.baseUrl,
);
});
}
+4 -4
View File
@@ -136,7 +136,7 @@ void _expectExpandedSynopsis(WidgetTester tester) {
final expanded = find.byKey(const Key('home-feed-synopsis-expanded')); final expanded = find.byKey(const Key('home-feed-synopsis-expanded'));
expect( expect(
tester.widget<Text>(expanded).textSpan?.style?.color, tester.widget<Text>(expanded).textSpan?.style?.color,
AppColors.overlaySecondary, AppColors.homeFeedVideoCopy,
); );
_expectNoShadows(tester); _expectNoShadows(tester);
_expectWatchGap(tester); _expectWatchGap(tester);
@@ -187,7 +187,7 @@ void main() {
matching: find.byType(Text), matching: find.byType(Text),
), ),
); );
expect(tag.style?.color, AppColors.overlaySecondary); expect(tag.style?.color, AppColors.homeFeedVideoCopy);
}); });
testWidgets('should_skip_motion_when_system_disables_animations', ( testWidgets('should_skip_motion_when_system_disables_animations', (
@@ -343,7 +343,7 @@ void main() {
final synopsis = tester.widget<Text>( final synopsis = tester.widget<Text>(
find.byKey(const Key('home-feed-synopsis')), find.byKey(const Key('home-feed-synopsis')),
); );
expect(synopsis.style?.color, AppColors.overlaySecondary); expect(synopsis.style?.color, AppColors.homeFeedVideoCopy);
expect(synopsis.style?.fontSize, 15); expect(synopsis.style?.fontSize, 15);
expect(synopsis.maxLines, 2); expect(synopsis.maxLines, 2);
final episode = tester.widget<Text>( final episode = tester.widget<Text>(
@@ -353,7 +353,7 @@ void main() {
expect(episode.style?.fontSize, 14); expect(episode.style?.fontSize, 14);
expect(episode.data, 'Episode 2 / 24'); expect(episode.data, 'Episode 2 / 24');
final tag = tester.widget<Text>(find.text('Romance')); final tag = tester.widget<Text>(find.text('Romance'));
expect(tag.style?.color, AppColors.overlaySecondary); expect(tag.style?.color, AppColors.homeFeedVideoCopy);
expect(tag.style?.color, synopsis.style?.color); expect(tag.style?.color, synopsis.style?.color);
expect(tag.style?.fontSize, 13); expect(tag.style?.fontSize, 13);
final hotSearch = tester.widget<Text>( final hotSearch = tester.widget<Text>(
+17 -14
View File
@@ -11,6 +11,7 @@ import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart
import 'package:fruitshorts/core/theme/app_colors.dart'; import 'package:fruitshorts/core/theme/app_colors.dart';
import 'package:fruitshorts/core/theme/app_dimens.dart'; import 'package:fruitshorts/core/theme/app_dimens.dart';
import 'package:fruitshorts/core/widgets/app_bottom_nav.dart'; import 'package:fruitshorts/core/widgets/app_bottom_nav.dart';
import 'package:fruitshorts/core/widgets/root_nav_glyph.dart';
import 'package:fruitshorts/pages/following/following_page.dart'; import 'package:fruitshorts/pages/following/following_page.dart';
import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart'; import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart'; import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
@@ -138,18 +139,20 @@ void main() {
.duration, .duration,
lessThanOrEqualTo(const Duration(milliseconds: 200)), lessThanOrEqualTo(const Duration(milliseconds: 200)),
); );
final selectedHomeIcon = tester.widget<Icon>( final selectedHomeIcon = tester.widget<RootNavGlyph>(
find.descendant( find.descendant(
of: find.byKey(const Key('tab-home')), of: find.byKey(const Key('tab-home')),
matching: find.byIcon(Icons.home_rounded), matching: find.byType(RootNavGlyph),
), ),
); );
expect(selectedHomeIcon.color, AppColors.navSelected); expect(selectedHomeIcon.kind, RootNavGlyphKind.home);
expect(selectedHomeIcon.selected, isTrue);
expect(selectedHomeIcon.size, AppDimens.navIcon);
expect( expect(
tester.getSize( tester.getSize(
find.descendant( find.descendant(
of: find.byKey(const Key('tab-home')), of: find.byKey(const Key('tab-home')),
matching: find.byIcon(Icons.home_rounded), matching: find.byType(RootNavGlyph),
), ),
), ),
const Size.square(AppDimens.navIcon), const Size.square(AppDimens.navIcon),
@@ -157,21 +160,21 @@ void main() {
expect( expect(
find.descendant( find.descendant(
of: find.byKey(const Key('tab-recommend')), of: find.byKey(const Key('tab-recommend')),
matching: find.byIcon(Icons.smart_display_outlined), matching: find.byType(RootNavGlyph),
), ),
findsOneWidget, findsOneWidget,
); );
expect( expect(
find.descendant( find.descendant(
of: find.byKey(const Key('tab-follow')), of: find.byKey(const Key('tab-follow')),
matching: find.byIcon(Icons.bookmark_border_rounded), matching: find.byType(RootNavGlyph),
), ),
findsOneWidget, findsOneWidget,
); );
expect( expect(
find.descendant( find.descendant(
of: find.byKey(const Key('tab-mine')), of: find.byKey(const Key('tab-mine')),
matching: find.byIcon(Icons.person_outline_rounded), matching: find.byType(RootNavGlyph),
), ),
findsOneWidget, findsOneWidget,
); );
@@ -188,7 +191,7 @@ void main() {
expect( expect(
find.descendant( find.descendant(
of: find.byKey(const Key('tab-recommend')), of: find.byKey(const Key('tab-recommend')),
matching: find.byIcon(Icons.smart_display_rounded), matching: find.byType(RootNavGlyph),
), ),
findsOneWidget, findsOneWidget,
); );
@@ -219,20 +222,20 @@ void main() {
expect( expect(
find.descendant( find.descendant(
of: find.byKey(const Key('tab-home')), of: find.byKey(const Key('tab-home')),
matching: find.byIcon(Icons.home_outlined), matching: find.byType(RootNavGlyph),
), ),
findsOneWidget, findsOneWidget,
); );
expect( expect(
tester tester
.widget<Icon>( .widget<RootNavGlyph>(
find.descendant( find.descendant(
of: find.byKey(const Key('tab-home')), of: find.byKey(const Key('tab-home')),
matching: find.byIcon(Icons.home_outlined), matching: find.byType(RootNavGlyph),
), ),
) )
.color, .selected,
AppColors.navUnselected, isFalse,
); );
}); });
@@ -270,7 +273,7 @@ void main() {
expect( expect(
find.descendant( find.descendant(
of: find.byKey(const Key('tab-follow')), of: find.byKey(const Key('tab-follow')),
matching: find.byIcon(Icons.bookmark_rounded), matching: find.byType(RootNavGlyph),
), ),
findsOneWidget, findsOneWidget,
); );
+1 -1
View File
@@ -373,7 +373,7 @@ void main() {
expect( expect(
tester.getRect(find.byKey(const Key('home-feed-action-rail'))).right, tester.getRect(find.byKey(const Key('home-feed-action-rail'))).right,
closeTo( closeTo(
tester.getRect(find.byKey(const Key('home-feed-gesture'))).right - 14, tester.getRect(find.byKey(const Key('home-feed-gesture'))).right - 6,
0.1, 0.1,
), ),
); );
+38
View File
@@ -0,0 +1,38 @@
// Author: fruit.com.cn
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:fruitshorts/core/widgets/app_root_tab.dart';
import 'package:fruitshorts/core/widgets/root_nav_glyph.dart';
import 'package:fruitshorts/l10n/app_localizations.dart';
void main() {
testWidgets(
'should_render_four_ordered_glyphs_with_home_selected_when_root_nav_builds',
(tester) async {
await tester.pumpWidget(
MaterialApp(
localizationsDelegates: AppLocalizations.localizationsDelegates,
supportedLocales: AppLocalizations.supportedLocales,
home: Scaffold(
bottomNavigationBar: AppRootBottomNav(
selected: AppRootTab.home,
onSelected: (_) {},
),
),
),
);
final glyphs = tester
.widgetList<RootNavGlyph>(find.byType(RootNavGlyph))
.toList();
expect(glyphs.map((glyph) => glyph.kind), RootNavGlyphKind.values);
expect(glyphs.map((glyph) => glyph.selected), [
true,
false,
false,
false,
]);
},
);
}
@@ -2,6 +2,7 @@
// 职责:验证共用简介的短文案、展开声明、内容更新与减少动画行为。 // 职责:验证共用简介的短文案、展开声明、内容更新与减少动画行为。
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
import 'package:fruitshorts/core/theme/app_colors.dart';
import 'package:fruitshorts/core/theme/app_theme.dart'; import 'package:fruitshorts/core/theme/app_theme.dart';
import 'package:fruitshorts/l10n/app_localizations.dart'; import 'package:fruitshorts/l10n/app_localizations.dart';
import 'package:fruitshorts/pages/player/widgets/expandable_synopsis.dart'; import 'package:fruitshorts/pages/player/widgets/expandable_synopsis.dart';
@@ -54,6 +55,14 @@ Future<void> _pump(
} }
void main() { void main() {
testWidgets('should_use_video_copy_color_when_player_does_not_override', (
tester,
) async {
await _pump(tester, synopsis: _shortCopy);
final synopsis = tester.widget<Text>(find.byKey(_collapsed));
expect(synopsis.style?.color, AppColors.homeFeedVideoCopy);
});
testWidgets('should_hide_toggle_when_synopsis_fits_two_lines', ( testWidgets('should_hide_toggle_when_synopsis_fits_two_lines', (
tester, tester,
) async { ) async {
+16 -13
View File
@@ -313,7 +313,7 @@ void main() {
.first; .first;
expect(loadingOverlay, findsOneWidget); expect(loadingOverlay, findsOneWidget);
expect(tester.widget<IgnorePointer>(loadingOverlay).ignoring, isTrue); expect(tester.widget<IgnorePointer>(loadingOverlay).ignoring, isTrue);
expect(tester.getSize(loadingOverlay), const Size(40, 40)); expect(tester.getSize(loadingOverlay), const Size(56, 36));
expect( expect(
tester tester
.widget<AnimatedOpacity>( .widget<AnimatedOpacity>(
@@ -327,26 +327,29 @@ void main() {
); );
expect( expect(
tester.getSize(find.byKey(const Key('player-loading-surface'))), tester.getSize(find.byKey(const Key('player-loading-surface'))),
const Size(40, 40), const Size(56, 36),
); );
expect( expect(
tester.getSize(find.byKey(const Key('player-entry-loading'))), tester.getSize(find.byKey(const Key('player-entry-loading'))),
const Size(20, 20), const Size(48, 29),
); );
expect( expect(
tester find.descendant(
.widget<CircularProgressIndicator>( of: loadingOverlay,
find.byKey(const Key('player-entry-loading')), matching: find.byType(CircularProgressIndicator),
) ),
.color, findsNothing,
Colors.white, );
expect(find.text('Loading'), findsNothing);
expect(find.byKey(const Key('player-entry-loading-track')), findsNothing);
expect(
find.byKey(const Key('player-entry-loading-highlight')),
findsNothing,
); );
final loadingSurface = tester.widget<Container>( final loadingSurface = tester.widget<Container>(
find.byKey(const Key('player-loading-surface')), find.byKey(const Key('player-loading-surface')),
); );
final decoration = loadingSurface.decoration! as BoxDecoration; expect(loadingSurface.decoration, isNull);
expect(decoration.color, AppColors.refreshIndicatorSurface);
expect(decoration.borderRadius, BorderRadius.circular(20));
expect( expect(
find.descendant(of: loadingOverlay, matching: find.byType(ColoredBox)), find.descendant(of: loadingOverlay, matching: find.byType(ColoredBox)),
findsNothing, findsNothing,
@@ -1517,7 +1520,7 @@ void main() {
final style = line.style ?? const TextStyle(); final style = line.style ?? const TextStyle();
expect(style.fontSize, 15); expect(style.fontSize, 15);
expect(style.fontWeight, FontWeight.w400); expect(style.fontWeight, FontWeight.w400);
expect(style.color, AppColors.overlaySecondary); expect(style.color, AppColors.homeFeedVideoCopy);
expect(style.shadows ?? <Shadow>[], isEmpty); expect(style.shadows ?? <Shadow>[], isEmpty);
expect(line.textSpan!.toPlainText(), isNot(startsWith('Episode '))); expect(line.textSpan!.toPlainText(), isNot(startsWith('Episode ')));
expect(line.textSpan!.toPlainText(), isNot(contains(' | '))); expect(line.textSpan!.toPlainText(), isNot(contains(' | ')));
@@ -0,0 +1,73 @@
// Author: fruit.com.cn
// 职责:验证剧集播放页 YMB 入场 loading 的品牌视觉、运动和减少动画行为。
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:fruitshorts/l10n/app_localizations.dart';
import 'package:fruitshorts/pages/player/widgets/player_loading_overlay.dart';
const _surface = Key('player-loading-surface');
const _logo = Key('player-entry-loading');
const _motion = Key('player-entry-loading-motion');
void main() {
testWidgets('should_show_ymb_motion_without_circular_spinner', (
tester,
) async {
await _pump(tester);
expect(find.byType(CircularProgressIndicator), findsNothing);
expect(find.byKey(_surface), findsOneWidget);
expect(find.byKey(_logo), findsOneWidget);
expect(find.text('Loading'), findsNothing);
expect(find.byKey(const Key('player-entry-loading-track')), findsNothing);
expect(
find.byKey(const Key('player-entry-loading-highlight')),
findsNothing,
);
expect(find.byType(ShaderMask), findsOneWidget);
expect(tester.getSize(find.byKey(_surface)), const Size(56, 36));
expect(tester.getSize(find.byKey(_logo)), const Size(48, 29));
expect(tester.widget<Container>(find.byKey(_surface)).decoration, isNull);
final initialScale = _scaleOf(tester);
await tester.pump(const Duration(milliseconds: 300));
expect(_scaleOf(tester), isNot(initialScale));
});
testWidgets('should_keep_loading_static_when_motion_is_disabled', (
tester,
) async {
await _pump(tester, disableAnimations: true);
final initialScale = _scaleOf(tester);
await tester.pump(const Duration(milliseconds: 300));
expect(_scaleOf(tester), initialScale);
expect(find.byKey(_logo), findsOneWidget);
expect(find.text('Loading'), findsNothing);
});
}
double _scaleOf(WidgetTester tester) {
return tester.widget<Transform>(find.byKey(_motion)).transform.storage.first;
}
Future<void> _pump(
WidgetTester tester, {
bool disableAnimations = false,
}) async {
await tester.pumpWidget(
MaterialApp(
locale: const Locale('en'),
localizationsDelegates: AppLocalizations.localizationsDelegates,
supportedLocales: AppLocalizations.supportedLocales,
home: MediaQuery(
data: MediaQueryData(disableAnimations: disableAnimations),
child: Scaffold(
body: Center(
child: PlayerLoadingOverlay(opacity: 1, onFadeEnd: () {}),
),
),
),
),
);
}