36 Commits
Author SHA1 Message Date
Vicky e8b9a090e0 chore(release): 合并 develop 到 main
flutter-ci / test (push) Failing after 19m28s
2026-11-02 14:54:00 +08:00
Zhou Weidong 3ad371aa9d style(download): 补全条件分支花括号
flutter-ci / test (push) Failing after 21m34s
2026-11-02 14:44:38 +08:00
Zhou Weidong 7463d3ee26 refactor(empty-state): 空状态支持内容居中 2026-11-02 14:44:38 +08:00
Zhou Weidong 59fbd33059 feat(category): 分类频道接入榜单快照 2026-11-02 14:44:38 +08:00
Zhou Weidong 8c1662475a feat(ranking): 榜单改为统一行布局 2026-11-02 14:44:32 +08:00
Zhou Weidong 7f65fe4d48 feat(media): 图片占位改为纯色块并去掉扫光 2026-11-02 14:44:28 +08:00
Zhou Weidong 613147c20c feat(branding): 更换应用图标与开屏资源 2026-11-02 14:44:23 +08:00
Zhou Weidong 731638b31b merge: 同步 v1.0.1 发布版本到 develop
flutter-ci / test (push) Canceled after 0s
2026-10-31 14:40:37 +08:00
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 2ddf9ee1c6 test(config): 服务地址断言跟随环境开关
flutter-ci / test (push) Canceled after 0s
2026-10-31 00:02:53 +08:00
Vicky 3bc79ad8e2 fix(i18n): 去掉印尼语内容完整性过滤,缺失时回退中文 2026-10-31 00:02:53 +08:00
Vicky 78a33cd4f1 chore(release): 合并 develop 到 main
flutter-ci / test (push) Canceled after 0s
2026-10-30 22:56:52 +08:00
Vicky c307903c42 docs: 修正 README 中的分析基线文案
flutter-ci / test (push) Canceled after 0s
2026-10-30 22:53:18 +08:00
Vicky c5b94633f1 feat(following): 收藏页改为紧凑布局并去掉重复续播横幅 2026-10-30 22:53:18 +08:00
Vicky fd2ba0bf43 feat(player): 重做播放页信息层级与互动栏点击动效 2026-10-30 22:53:18 +08:00
Vicky aed9ee2b01 feat(image): 图片加载占位改为微光骨架 2026-10-30 22:53:18 +08:00
Vicky 335e5dc286 feat(home): 顶部导航随翻页联动并把推荐更名为精选 2026-10-30 22:53:15 +08:00
Vicky e8610b7aed chore(release): 生产包切换为生产环境地址
flutter-ci / test (push) Canceled after 0s
2026-10-30 17:20:48 +08:00
Vicky 2f4593a46e fix(a11y): 限制底栏文字缩放并统一播放页触控尺寸
flutter-ci / test (push) Canceled after 0s
2026-10-30 17:14:40 +08:00
Vicky 7509cf2ecd fix(following): 减淡继续观看封面遮罩亮度 2026-10-30 17:14:40 +08:00
Vicky 501bc66282 fix(wallet): 丢弃切换账号后返回的旧余额响应 2026-10-30 17:14:40 +08:00
Vicky 19196ceb8e fix(i18n): 印尼语内容缺失时不再回退中文 2026-10-30 17:14:37 +08:00
Vicky 9ef8eb15b0 feat(recommend): 轮播只保留标题简介并重做顶部导航 2026-10-30 17:14:34 +08:00
Vicky 53e8c924a6 feat(mine): 重做我的页会员卡与功能宫格布局 2026-10-30 17:14:32 +08:00
Vicky e7399fa3fd feat(auth): 登录页改为 ymb 品牌并支持后台配置背景图 2026-10-30 17:14:30 +08:00
Vicky 22cc669bbe feat(brand): 应用图标、开屏资源与品牌字体切换为 ymb 2026-10-30 17:14:27 +08:00
198 changed files with 8612 additions and 2603 deletions

No files matched your search

+8 -5
View File
@@ -81,12 +81,15 @@ Android 模拟器访问宿主机时,同样在调试条里填 `http://10.0.2.2:
### iOS ### iOS
手机与 Mac 需在同一网络,首次启动允许“本地网络”权限: iOS 模拟器直接访问 Mac 本机服务,默认地址为 `http://127.0.0.1:8081`:
```bash ```bash
flutter run -d <udid> flutter run -d <simulator-udid>
``` ```
iPhone 真机不能用 `127.0.0.1` 访问 Mac;真机联调时需让手机与 Mac 位于同一网络,
并通过调试入口临时填写 Mac 的局域网地址。
### 服务地址配置 ### 服务地址配置
地址是代码里的一个开关,**不做任何网络探测**,也不用传构建参数。两套环境各占 地址是代码里的一个开关,**不做任何网络探测**,也不用传构建参数。两套环境各占
@@ -94,7 +97,7 @@ flutter run -d <udid>
| 文件 | 用途 | 默认值 | | 文件 | 用途 | 默认值 |
| --- | --- | --- | | --- | --- | --- |
| `lib/core/config/dev_config.dart` | 开发 / 联调 | `http://192.168.31.243:8081` | | `lib/core/config/dev_config.dart` | 开发 / 联调 | `http://127.0.0.1:8081` |
| `lib/core/config/prod_config.dart` | 生产 | `http://39.162.50.99:8081` | | `lib/core/config/prod_config.dart` | 生产 | `http://39.162.50.99:8081` |
切换环境只改 `lib/core/config/app_config.dart` 里的一个布尔值: 切换环境只改 `lib/core/config/app_config.dart` 里的一个布尔值:
@@ -103,7 +106,7 @@ flutter run -d <udid>
static const bool useDevConfig = true; // false 即用生产地址 static const bool useDevConfig = true; // false 即用生产地址
``` ```
换 Wi-Fi 或换网段时只改 `dev_config.dart` 的 `baseUrl`。打生产包前把 真机或 Android 模拟器联调时,通过调试入口覆盖地址,不修改默认开发配置。打生产包前把
`useDevConfig` 改成 `false`;release 构建若仍为 `true` 会在启动时直接报错, `useDevConfig` 改成 `false`;release 构建若仍为 `true` 会在启动时直接报错,
避免线上包连到开发机。 避免线上包连到开发机。
@@ -197,7 +200,7 @@ flutter test
flutter build apk --debug flutter build apk --debug
``` ```
当前基线:`dart analyze` 仅 1 条既存 info(`intl` 未在 `pubspec.yaml` 声明); 当前基线:`dart analyze` 仅 1 条既存 info(`intl` 未在 `pubspec.yaml` 声明);
`flutter test` 全量 775 例通过。测试文件按模块放在 `test/` 下,用例名使用 `flutter test` 全量 775 例通过。测试文件按模块放在 `test/` 下,用例名使用
`should_<期望>_when_<条件>`。真实后端联调测试在服务未启动时会跳过。 `should_<期望>_when_<条件>`。真实后端联调测试在服务未启动时会跳过。
+1 -1
View File
@@ -6,7 +6,7 @@
<uses-permission <uses-permission
android:name="android.permission.SYSTEM_ALERT_WINDOW"/> android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
<application <application
android:label="FruitShorts" android:label="ymb"
android:name="${applicationName}" android:name="${applicationName}"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:usesCleartextTraffic="true"> android:usesCleartextTraffic="true">
Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 156 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 113 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.7 KiB

After

Width:  |  Height:  |  Size: 216 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 384 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 623 B

@@ -8,7 +8,7 @@
<item name="android:windowDrawsSystemBarBackgrounds">false</item> <item name="android:windowDrawsSystemBarBackgrounds">false</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item> <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
<item name="android:windowSplashScreenBackground">#000000</item> <item name="android:windowSplashScreenBackground">#000000</item>
<item name="android:windowSplashScreenAnimatedIcon">@drawable/splash_brand</item> <item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
<item name="android:windowSplashScreenAnimationDuration">0</item> <item name="android:windowSplashScreenAnimationDuration">0</item>
</style> </style>
<style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar"> <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
@@ -8,7 +8,7 @@
<item name="android:windowDrawsSystemBarBackgrounds">false</item> <item name="android:windowDrawsSystemBarBackgrounds">false</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item> <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
<item name="android:windowSplashScreenBackground">#000000</item> <item name="android:windowSplashScreenBackground">#000000</item>
<item name="android:windowSplashScreenAnimatedIcon">@drawable/splash_brand</item> <item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
<item name="android:windowSplashScreenAnimationDuration">0</item> <item name="android:windowSplashScreenAnimationDuration">0</item>
</style> </style>
<style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar"> <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+1 -1
View File
@@ -3,5 +3,5 @@
<resources> <resources>
<color name="splash_background">#000000</color> <color name="splash_background">#000000</color>
<color name="ic_launcher_background">#FF6B2C</color> <color name="ic_launcher_background">#000000</color>
</resources> </resources>
Binary file not shown.

Before

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

+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(
Binary file not shown.

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 412 B

After

Width:  |  Height:  |  Size: 361 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 907 B

After

Width:  |  Height:  |  Size: 799 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 593 B

After

Width:  |  Height:  |  Size: 587 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 907 B

After

Width:  |  Height:  |  Size: 799 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 20 KiB

+103 -103
View File
@@ -1,115 +1,115 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict>
<key>CADisableMinimumFrameDurationOnPhone</key>
<true/>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
<string>ymb</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>ymb</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>$(FLUTTER_BUILD_NAME)</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(FLUTTER_BUILD_NUMBER)</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
<dict> <dict>
<key>CADisableMinimumFrameDurationOnPhone</key> <key>NSAllowsArbitraryLoads</key>
<true/> <true/>
<key>CFBundleDevelopmentRegion</key> <key>NSAllowsLocalNetworking</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
<string>FruitShorts</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>FruitShorts</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>$(FLUTTER_BUILD_NAME)</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(FLUTTER_BUILD_NUMBER)</string>
<key>LSRequiresIPhoneOS</key>
<true/> <true/>
<key>NSAppTransportSecurity</key> <key>NSExceptionDomains</key>
<dict> <dict>
<key>NSAllowsArbitraryLoads</key> <key>127.0.0.1</key>
<true/>
<key>NSAllowsLocalNetworking</key>
<true/>
<key>NSExceptionDomains</key>
<dict> <dict>
<key>127.0.0.1</key> <key>NSExceptionAllowsInsecureHTTPLoads</key>
<dict> <true/>
<key>NSExceptionAllowsInsecureHTTPLoads</key> <key>NSIncludesSubdomains</key>
<true/> <true/>
<key>NSIncludesSubdomains</key> </dict>
<true/> <key>192.168.31.243</key>
</dict> <dict>
<key>localhost</key> <key>NSExceptionAllowsInsecureHTTPLoads</key>
<dict> <true/>
<key>NSExceptionAllowsInsecureHTTPLoads</key> <key>NSIncludesSubdomains</key>
<true/> <true/>
<key>NSIncludesSubdomains</key> </dict>
<true/> <key>39.162.50.99</key>
</dict> <dict>
<key>192.168.31.243</key> <key>NSExceptionAllowsInsecureHTTPLoads</key>
<dict> <true/>
<key>NSExceptionAllowsInsecureHTTPLoads</key> <key>NSIncludesSubdomains</key>
<true/> <true/>
<key>NSIncludesSubdomains</key> </dict>
<true/> <key>localhost</key>
</dict> <dict>
<key>39.162.50.99</key> <key>NSExceptionAllowsInsecureHTTPLoads</key>
<dict> <true/>
<key>NSExceptionAllowsInsecureHTTPLoads</key> <key>NSIncludesSubdomains</key>
<true/> <true/>
<key>NSIncludesSubdomains</key>
<true/>
</dict>
</dict> </dict>
</dict> </dict>
<key>NSLocalNetworkUsageDescription</key>
<string>开发阶段需要访问同一局域网内的短剧内容服务。</string>
<key>UIApplicationSceneManifest</key>
<dict>
<key>UIApplicationSupportsMultipleScenes</key>
<false/>
<key>UISceneConfigurations</key>
<dict>
<key>UIWindowSceneSessionRoleApplication</key>
<array>
<dict>
<key>UISceneClassName</key>
<string>UIWindowScene</string>
<key>UISceneConfigurationName</key>
<string>flutter</string>
<key>UISceneDelegateClassName</key>
<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
<key>UISceneStoryboardFile</key>
<string>Main</string>
</dict>
</array>
</dict>
</dict>
<key>UIBackgroundModes</key>
<array>
<string>audio</string>
</array>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UIStatusBarHidden</key>
<false/>
</dict> </dict>
<key>NSLocalNetworkUsageDescription</key>
<string>开发阶段需要访问同一局域网内的短剧内容服务。</string>
<key>UIApplicationSceneManifest</key>
<dict>
<key>UIApplicationSupportsMultipleScenes</key>
<false/>
<key>UISceneConfigurations</key>
<dict>
<key>UIWindowSceneSessionRoleApplication</key>
<array>
<dict>
<key>UISceneClassName</key>
<string>UIWindowScene</string>
<key>UISceneConfigurationName</key>
<string>flutter</string>
<key>UISceneDelegateClassName</key>
<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
<key>UISceneStoryboardFile</key>
<string>Main</string>
</dict>
</array>
</dict>
</dict>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
<key>UIBackgroundModes</key>
<array>
<string>audio</string>
</array>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<key>UIStatusBarHidden</key>
<false/>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
</dict>
</plist> </plist>
+13 -1
View File
@@ -14,6 +14,7 @@ import 'core/data/remote/catalog_api.dart';
import 'core/data/remote/category_api.dart'; import 'core/data/remote/category_api.dart';
import 'core/data/remote/comment_api.dart'; import 'core/data/remote/comment_api.dart';
import 'core/data/remote/commerce_api.dart'; import 'core/data/remote/commerce_api.dart';
import 'core/data/remote/config_api.dart';
import 'core/data/remote/device_profile.dart'; import 'core/data/remote/device_profile.dart';
import 'core/data/remote/download_api.dart'; import 'core/data/remote/download_api.dart';
import 'core/data/remote/interaction_api.dart'; import 'core/data/remote/interaction_api.dart';
@@ -35,6 +36,7 @@ import 'core/data/repositories/playlist_repository.dart';
import 'core/data/repositories/search_repository.dart'; import 'core/data/repositories/search_repository.dart';
import 'core/data/repositories/store_repository.dart'; import 'core/data/repositories/store_repository.dart';
import 'core/data/repositories/watch_history_repository.dart'; import 'core/data/repositories/watch_history_repository.dart';
import 'core/data/services/app_config_controller.dart';
import 'core/data/services/auth_controller.dart'; import 'core/data/services/auth_controller.dart';
import 'core/data/services/auth_session_store.dart'; import 'core/data/services/auth_session_store.dart';
import 'core/data/services/catalog_controller.dart'; import 'core/data/services/catalog_controller.dart';
@@ -208,6 +210,11 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
late final LocaleController _localeController = LocaleController(); late final LocaleController _localeController = LocaleController();
/// 后台下发的启动配置(登录页背景等);拉不到就用本地默认。
late final AppConfigController _appConfigController = AppConfigController(
ConfigApi(_apiClient),
);
/// 登录期内共享的「已解锁收费集」:播放页进出、feed 与全屏切换都要沿用。 /// 登录期内共享的「已解锁收费集」:播放页进出、feed 与全屏切换都要沿用。
late final UnlockedEpisodeRegistry _unlockedEpisodes = late final UnlockedEpisodeRegistry _unlockedEpisodes =
UnlockedEpisodeRegistry(); UnlockedEpisodeRegistry();
@@ -218,6 +225,7 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
// 恢复本地令牌与设备号;未登录也能正常浏览,不阻塞首屏 // 恢复本地令牌与设备号;未登录也能正常浏览,不阻塞首屏
_auth.load(); _auth.load();
unawaited(_localeController.load()); unawaited(_localeController.load());
unawaited(_appConfigController.load());
// 登录/登出时同步收藏状态:收藏属于账号,不能跨账号串联 // 登录/登出时同步收藏状态:收藏属于账号,不能跨账号串联
_auth.addListener(_onAuthChanged); _auth.addListener(_onAuthChanged);
unawaited(_favoriteController.load()); unawaited(_favoriteController.load());
@@ -252,6 +260,7 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
_walletController.dispose(); _walletController.dispose();
_interactionController.dispose(); _interactionController.dispose();
_localeController.dispose(); _localeController.dispose();
_appConfigController.dispose();
_apiClient.close(); _apiClient.close();
super.dispose(); super.dispose();
} }
@@ -259,7 +268,9 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
CategoryController _createCategories() { CategoryController _createCategories() {
final controller = CategoryController(_categoryRepository); final controller = CategoryController(_categoryRepository);
if (widget.catalogRepository == null) { if (widget.catalogRepository == null) {
controller.dramaPageLoader = CategoryApi(_apiClient).dramas; final api = CategoryApi(_apiClient);
controller.dramaPageLoader = api.dramas;
controller.rankingLoader = api.ranking;
} }
controller.load(); controller.load();
return controller; return controller;
@@ -304,6 +315,7 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
ChangeNotifierProvider.value(value: _walletController), ChangeNotifierProvider.value(value: _walletController),
ChangeNotifierProvider.value(value: _interactionController), ChangeNotifierProvider.value(value: _interactionController),
ChangeNotifierProvider.value(value: _localeController), ChangeNotifierProvider.value(value: _localeController),
ChangeNotifierProvider.value(value: _appConfigController),
ChangeNotifierProvider.value(value: _auth), ChangeNotifierProvider.value(value: _auth),
], ],
child: Consumer<LocaleController>( child: Consumer<LocaleController>(
+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 -2
View File
@@ -2,8 +2,9 @@
/// 开发环境配置。 /// 开发环境配置。
/// ///
/// 本机联调用:换 Wi-Fi、换网段后只改这里的 [baseUrl],地址不要带结尾斜杠。 /// 本机联调用:模拟器与桌面端可直接用回环地址,但 iOS/Android 真机必须用
/// 开发机的局域网 IP(真机上的 127.0.0.1 指向手机自己)。地址不要带结尾斜杠。
abstract final class DevConfig { abstract final class DevConfig {
/// 开发机后端地址。 /// 开发机后端地址(Mac 当前 Wi-Fi 地址,换网络后需要同步修改)。
static const String baseUrl = 'http://192.168.31.243:8081'; static const String baseUrl = 'http://192.168.31.243:8081';
} }
@@ -0,0 +1,67 @@
// Author: fruit.com.cn
import 'drama.dart';
import 'locale_text.dart';
/// 服务端推荐榜快照;顺序和排名均不可在客户端重算。
class CategoryRanking {
const CategoryRanking({
required this.id,
required this.code,
required this.revision,
required this.entries,
this.locales = const {},
this.generatedAt,
});
final String id;
final String code;
final String revision;
final Map<String, String> locales;
final DateTime? generatedAt;
final List<CategoryRankingEntry> entries;
/// 解析 `GET /app/categories/{id}/ranking`。
factory CategoryRanking.fromJson(Map<String, dynamic> json) {
final rawList = json['list'];
final entries = rawList is List
? rawList
.whereType<Map>()
.map(
(item) =>
CategoryRankingEntry.fromJson(item.cast<String, dynamic>()),
)
.toList(growable: false)
: const <CategoryRankingEntry>[];
return CategoryRanking(
id: (json['id'] ?? '').toString(),
code: json['code'] as String? ?? '',
revision: (json['revision'] ?? '1').toString(),
locales: localeMap(json['locales']),
generatedAt: DateTime.tryParse(json['generatedAt'] as String? ?? ''),
entries: entries,
);
}
}
/// 推荐榜中的一部短剧及其服务端排名。
class CategoryRankingEntry {
const CategoryRankingEntry({required this.rank, required this.drama});
final int rank;
final Drama drama;
factory CategoryRankingEntry.fromJson(Map<String, dynamic> json) {
final rawDrama = json['drama'];
return CategoryRankingEntry(
rank: (json['rank'] as num?)?.toInt() ?? 0,
drama: Drama.fromCardJson(
rawDrama is Map<String, dynamic>
? rawDrama
: rawDrama is Map
? rawDrama.cast<String, dynamic>()
: const <String, dynamic>{},
),
);
}
}
+19 -1
View File
@@ -7,10 +7,19 @@ class ContentCategory {
const ContentCategory({ const ContentCategory({
required this.id, required this.id,
required this.name, required this.name,
this.code = '',
this.layoutType = gridLayout,
this.revision = '1',
this.locales = const {}, this.locales = const {},
}); });
static const String gridLayout = 'GRID';
static const String rankingLayout = 'RANKING';
final String id; final String id;
final String code;
final String layoutType;
final String revision;
/// 中文名称,与 locales 里的 zh 相同。 /// 中文名称,与 locales 里的 zh 相同。
final String name; final String name;
@@ -20,9 +29,18 @@ class ContentCategory {
factory ContentCategory.fromJson(Map<String, dynamic> json) { factory ContentCategory.fromJson(Map<String, dynamic> json) {
final locales = localeMap(json['locales']); final locales = localeMap(json['locales']);
final name = json['name'] as String? ?? locales['zh'] ?? ''; final name = json['name'] as String? ?? locales['zh'] ?? '';
return ContentCategory(id: (json['id'] ?? '').toString(), name: name, locales: locales); return ContentCategory(
id: (json['id'] ?? '').toString(),
name: name,
code: json['code'] as String? ?? '',
layoutType: json['layoutType'] as String? ?? gridLayout,
revision: (json['revision'] ?? '1').toString(),
locales: locales,
);
} }
bool get isRanking => layoutType == rankingLayout;
/// 按界面语言取名称。缺对应语言时回落到中文。 /// 按界面语言取名称。缺对应语言时回落到中文。
String localizedName(String languageCode) { String localizedName(String languageCode) {
return localizedText(languageCode, name, locales); return localizedText(languageCode, name, locales);
+5 -1
View File
@@ -7,7 +7,11 @@ Map<String, String> localeMap(Object? raw) {
} }
/// 按当前语言取文案。没有对应语言时用中文,中文也没有时用 fallback。 /// 按当前语言取文案。没有对应语言时用中文,中文也没有时用 fallback。
String localizedText(String languageCode, String fallback, Map<String, String> locales) { String localizedText(
String languageCode,
String fallback,
Map<String, String> locales,
) {
final selected = locales[languageCode] ?? ''; final selected = locales[languageCode] ?? '';
if (selected.isNotEmpty) return selected; if (selected.isNotEmpty) return selected;
final chinese = locales['zh'] ?? ''; final chinese = locales['zh'] ?? '';
+8 -4
View File
@@ -1,6 +1,7 @@
// Author: fruit.com.cn // Author: fruit.com.cn
import '../models/content_category.dart'; import '../models/content_category.dart';
import '../models/category_ranking.dart';
import '../models/drama.dart'; import '../models/drama.dart';
import '../models/page_result.dart'; import '../models/page_result.dart';
import 'api_client.dart'; import 'api_client.dart';
@@ -30,11 +31,14 @@ class CategoryApi {
}) async { }) async {
final data = await _client.get( final data = await _client.get(
'/app/categories/$categoryId/dramas', '/app/categories/$categoryId/dramas',
query: { query: {'pageIndex': '$pageIndex', 'pageSize': '$pageSize'},
'pageIndex': '$pageIndex',
'pageSize': '$pageSize',
},
); );
return PageResult.parse(data, Drama.fromCardJson); return PageResult.parse(data, Drama.fromCardJson);
} }
/// 推荐榜快照,服务端已确定内容顺序和连续排名。
Future<CategoryRanking> ranking(String categoryId) async {
final data = await _client.get('/app/categories/$categoryId/ranking');
return CategoryRanking.fromJson(ResponseDecoders.asMap(data));
}
} }
+16
View File
@@ -0,0 +1,16 @@
// Author: fruit.com.cn
import 'api_client.dart';
/// 启动配置:`GET /app/config`(匿名,后台只下发白名单键)。
class ConfigApi {
const ConfigApi(this._client);
final ApiClient _client;
/// 白名单配置表;结构异常时返回空表,调用方按本地默认处理。
Future<Map<String, dynamic>> appConfig() async {
final data = await _client.get('/app/config');
return data is Map<String, dynamic> ? data : const <String, dynamic>{};
}
}
@@ -0,0 +1,31 @@
// Author: fruit.com.cn
import 'package:flutter/foundation.dart';
import '../remote/config_api.dart';
/// 后台下发的启动配置。
///
/// 失败一律静默:拿不到就用 App 内置默认,不阻塞启动、不弹错。
class AppConfigController extends ChangeNotifier {
AppConfigController(this._api);
final ConfigApi _api;
String _loginBackgroundUrl = '';
/// 登录页整屏背景图;空串表示用本地默认图。
String get loginBackgroundUrl => _loginBackgroundUrl;
Future<void> load() async {
try {
final config = await _api.appConfig();
final url = (config['loginBackgroundUrl'] as String? ?? '').trim();
if (url == _loginBackgroundUrl) return;
_loginBackgroundUrl = url;
notifyListeners();
} catch (error) {
debugPrint('[config] load failed: $error');
}
}
}
@@ -4,6 +4,7 @@ import 'package:flutter/foundation.dart';
import '../../config/app_config.dart'; import '../../config/app_config.dart';
import '../models/content_category.dart'; import '../models/content_category.dart';
import '../models/category_ranking.dart';
import '../models/drama.dart'; import '../models/drama.dart';
import '../models/home_feed.dart'; import '../models/home_feed.dart';
import '../models/page_result.dart'; import '../models/page_result.dart';
@@ -21,10 +22,15 @@ class CategoryController extends ChangeNotifier {
String categoryId, { String categoryId, {
int pageIndex, int pageIndex,
int pageSize, int pageSize,
})? dramaPageLoader; })?
dramaPageLoader;
/// 生产环境推荐榜加载器,测试与本地数据模式可不注入。
Future<CategoryRanking> Function(String categoryId)? rankingLoader;
List<ContentCategory> categories = const []; List<ContentCategory> categories = const [];
final Map<String, CategoryDramaSlot> _slots = {}; final Map<String, CategoryDramaSlot> _slots = {};
final Map<String, CategoryRankingSlot> _rankingSlots = {};
HomeFeed feed = const HomeFeed(); HomeFeed feed = const HomeFeed();
bool loading = false; bool loading = false;
String? error; String? error;
@@ -36,6 +42,29 @@ class CategoryController extends ChangeNotifier {
return _slots.putIfAbsent(categoryId, CategoryDramaSlot.new); return _slots.putIfAbsent(categoryId, CategoryDramaSlot.new);
} }
CategoryRankingSlot rankingSlotOf(String categoryId) {
return _rankingSlots.putIfAbsent(categoryId, CategoryRankingSlot.new);
}
/// 打开推荐榜并获取当前服务端快照。
Future<void> openRanking(String categoryId) async {
final loader = rankingLoader;
if (loader == null) return;
final slot = rankingSlotOf(categoryId);
slot.loading = true;
slot.error = null;
_notify();
try {
slot.ranking = await loader(categoryId);
} catch (exception) {
slot.error = exception;
if (kDebugMode) debugPrint('[category-ranking] $exception');
} finally {
slot.loading = false;
_notify();
}
}
/// 打开分类并加载第一页短剧。 /// 打开分类并加载第一页短剧。
Future<void> openCategory(String categoryId) async { Future<void> openCategory(String categoryId) async {
final loader = dramaPageLoader; final loader = dramaPageLoader;
@@ -126,8 +155,14 @@ class CategoryController extends ChangeNotifier {
loading = false; loading = false;
_notify(); _notify();
} }
if (error == null && dramaPageLoader != null && categories.isNotEmpty) { final hasRemoteLoader = dramaPageLoader != null || rankingLoader != null;
await openCategory(categories.first.id); if (error == null && hasRemoteLoader && categories.isNotEmpty) {
final first = categories.first;
if (first.isRanking) {
await openRanking(first.id);
} else {
await openCategory(first.id);
}
} }
} }
@@ -152,3 +187,10 @@ class CategoryDramaSlot {
bool get hasMore => dramas.length < total; bool get hasMore => dramas.length < total;
} }
/// 单个推荐榜的快照状态。
class CategoryRankingSlot {
CategoryRanking? ranking;
Object? error;
bool loading = false;
}
@@ -120,7 +120,9 @@ class DownloadController extends ChangeNotifier {
String episodeId, { String episodeId, {
DownloadLicense? license, DownloadLicense? license,
}) async { }) async {
if (_downloading.contains(episodeId)) return const DownloadActionResult(ok: true); if (_downloading.contains(episodeId)) {
return const DownloadActionResult(ok: true);
}
final source = license ?? _licenseFor(episodeId); final source = license ?? _licenseFor(episodeId);
if (source == null) return const DownloadActionResult(ok: false); if (source == null) return const DownloadActionResult(ok: false);
_beginDownload(episodeId); _beginDownload(episodeId);
@@ -129,7 +131,8 @@ class DownloadController extends ChangeNotifier {
final media = await _storage.download( final media = await _storage.download(
episodeId: episodeId, episodeId: episodeId,
url: resolved, url: resolved,
onProgress: (received, total) => _onProgress(episodeId, received, total), onProgress: (received, total) =>
_onProgress(episodeId, received, total),
); );
_localPaths[episodeId] = media.filePath; _localPaths[episodeId] = media.filePath;
_progress[episodeId] = 1; _progress[episodeId] = 1;
+14 -5
View File
@@ -21,23 +21,29 @@ class WalletController extends ChangeNotifier {
String? unlockError; String? unlockError;
String? unlockingEpisodeId; String? unlockingEpisodeId;
bool _disposed = false; bool _disposed = false;
int _requestSeq = 0;
int get balance => snapshot?.wallet.coinBalance ?? 0; int get balance => snapshot?.wallet.coinBalance ?? 0;
List<CoinLedgerEntry> get ledger => snapshot?.ledger ?? const []; List<CoinLedgerEntry> get ledger => snapshot?.ledger ?? const [];
Future<void> load() async { Future<void> load() async {
if (_disposed) return;
final request = ++_requestSeq;
loading = true; loading = true;
error = null; error = null;
_notify(); _notify();
try { try {
snapshot = await _repository.fetchWallet(); final result = await _repository.fetchWallet();
if (_isCurrent(request)) snapshot = result;
} on ApiException catch (exception) { } on ApiException catch (exception) {
error = exception.message; if (_isCurrent(request)) error = exception.message;
} catch (_) { } catch (_) {
error = 'walletLoadFailed'; if (_isCurrent(request)) error = 'walletLoadFailed';
} finally { } finally {
loading = false; if (_isCurrent(request)) {
_notify(); loading = false;
_notify();
}
} }
} }
@@ -75,6 +81,7 @@ class WalletController extends ChangeNotifier {
} }
void reset() { void reset() {
_requestSeq += 1;
snapshot = null; snapshot = null;
loading = false; loading = false;
unlocking = false; unlocking = false;
@@ -88,6 +95,8 @@ class WalletController extends ChangeNotifier {
if (!_disposed) notifyListeners(); if (!_disposed) notifyListeners();
} }
bool _isCurrent(int request) => !_disposed && request == _requestSeq;
@override @override
void dispose() { void dispose() {
_disposed = true; _disposed = true;
+31 -5
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;
@@ -48,10 +51,20 @@ abstract final class AppColors {
static const vipGoldStart = Color(0xFFF5D9A0); static const vipGoldStart = Color(0xFFF5D9A0);
static const vipGoldEnd = Color(0xFFE8B65A); static const vipGoldEnd = Color(0xFFE8B65A);
/// 「我的」页 VIP 卡的浅香槟金(见设计稿,接近纯色)。 /// 「我的」页 VIP 卡:品牌酒红、暖黑与香槟金共同形成会员层级。
static const vipCardStart = Color(0xFFF6E8C6); static const vipCardStart = Color(0xFF351318);
static const vipCardEnd = Color(0xFFEDD9A8); static const vipCardMiddle = Color(0xFF1B1112);
static const vipBadgeSurface = Color(0x1F3D2408); static const vipCardEnd = Color(0xFF0D0B0C);
static const vipCardBorder = Color(0x66F5D9A0);
static const vipCardRedGlow = Color(0x52F04E4E);
static const vipCardGoldGlow = Color(0x38F3B34C);
static const vipCardText = Color(0xFFFFF5E6);
static const vipCardMuted = Color(0xB3F5D9A0);
static const vipBadgeSurface = Color(0x24FFFFFF);
static const vipBenefitSurface = Color(0x12FFFFFF);
static const vipBenefitBorder = Color(0x33F5D9A0);
static const vipButtonStart = brandRed;
static const vipButtonEnd = Color(0xFFFF745E);
static const bronze = Color(0xFFCD7F32); static const bronze = Color(0xFFCD7F32);
static const bronzeDeep = Color(0xFFA9713A); static const bronzeDeep = Color(0xFFA9713A);
static const rankSilver = Color(0xFFC0C0C0); static const rankSilver = Color(0xFFC0C0C0);
@@ -113,9 +126,18 @@ abstract final class AppColors {
static const mineGridSurface = Color(0x99101010); static const mineGridSurface = Color(0x99101010);
static const minePanelSurface = Color(0xFF101010); static const minePanelSurface = Color(0xFF101010);
static const mineMoreDivider = Color(0xFF1C1C1E); static const mineMoreDivider = Color(0xFF1C1C1E);
static const mineGridDivider = Color(0xFF2A2A2A); static const mineGridDivider = Color(0x10FFFFFF);
static const mineGridIconSurface = Color(0xFF1C1C1E); static const mineGridIconSurface = Color(0xFF1C1C1E);
static const mineGridLabel = Color(0xFFE6E6EB); static const mineGridLabel = Color(0xFFE6E6EB);
static const mineGridIconAccent = brandRed;
/// 个人数据图标:品牌红的亮面、暗部与暖白反光。
static const mineStatHighlight = Color(0xFFFFAAA3);
static const mineStatShade = Color(0xFFAF263C);
static const mineStatDepth = Color(0xFF681D2B);
static const mineStatGlint = Color(0xFFFFE8E2);
static const mineStatEdge = Color(0x80FFD1CB);
static const mineStatGlow = Color(0x24F04E4E);
static const mineIconWallet = Color(0xFFF5C451); static const mineIconWallet = Color(0xFFF5C451);
static const mineIconDownloads = Color(0xFF4DA3FF); static const mineIconDownloads = Color(0xFF4DA3FF);
static const mineIconHistory = Color(0xFF4ADE80); static const mineIconHistory = Color(0xFF4ADE80);
@@ -134,6 +156,10 @@ abstract final class AppColors {
/// 列表底部「没有更多了」这类弱提示。 /// 列表底部「没有更多了」这类弱提示。
static const textHint = Color(0xFF5C5C60); static const textHint = Color(0xFF5C5C60);
static const textTabInactive = Color(0xFFB0B0B0); static const textTabInactive = Color(0xFFB0B0B0);
/// 首页顶部三项导航未选中文字,略暗于选中白色但保持清晰。
static const homeTabInactive = Color(0xFFC7C7CC);
static const textFilterIcon = Color(0xFF7A7A7E); static const textFilterIcon = Color(0xFF7A7A7E);
static const searchResultMeta = Color(0xFF9E9E9E); static const searchResultMeta = Color(0xFF9E9E9E);
+33 -29
View File
@@ -141,7 +141,7 @@ abstract final class AppDimens {
static const double homePrimarySecondaryGap = 8; static const double homePrimarySecondaryGap = 8;
static const double homeSecondaryGridGap = 10; static const double homeSecondaryGridGap = 10;
static const double homeHeaderIcon = 22; static const double homeHeaderIcon = 22;
static const double homeActionSlot = 40; static const double homeActionSlot = tapTarget;
static const double homeActionIcon = 30; static const double homeActionIcon = 30;
static const double homeActionGap = 6; static const double homeActionGap = 6;
@@ -157,17 +157,9 @@ abstract final class AppDimens {
/// 首页热播榜。 /// 首页热播榜。
static const double rankingHeroTitle = 22; static const double rankingHeroTitle = 22;
static const double rankingHeroSubtitle = 11; static const double rankingHeroSubtitle = 11;
static const double rankingPodiumChampionWidth = 110;
static const double rankingPodiumChampionHeight = 146;
static const double rankingPodiumWidth = 92;
static const double rankingPodiumHeight = 122;
static const double rankingPodiumRadius = 10;
static const double rankingRowHeight = 96;
static const double rankingNumberWidth = 56;
static const double rankingNumberFont = 48;
static const double rankingCoverWidth = 60;
static const double rankingCoverHeight = 80;
static const double rankingCoverRadius = 6; static const double rankingCoverRadius = 6;
static const double rankingCardCoverWidth = 96;
static const double rankingCardCoverHeight = 128;
/// 全部短剧筛选与追剧双列。 /// 全部短剧筛选与追剧双列。
static const double filterChipFont = 16; static const double filterChipFont = 16;
@@ -184,7 +176,7 @@ abstract final class AppDimens {
static const double followingTabFont = 18; static const double followingTabFont = 18;
static const double followingTabGap = 24; static const double followingTabGap = 24;
static const double followingEditIconSize = 20; static const double followingEditIconSize = 20;
static const double followingEditHitSize = 40; static const double followingEditHitSize = tapTarget;
static const double followingAddIconSize = 20; static const double followingAddIconSize = 20;
static const double followingAddIconStroke = 1.5; static const double followingAddIconStroke = 1.5;
static const double followingGridGap = 6; static const double followingGridGap = 6;
@@ -269,32 +261,44 @@ abstract final class AppDimens {
static const double mineGridIconSurface = 44; static const double mineGridIconSurface = 44;
static const double mineGridIcon = 22; static const double mineGridIcon = 22;
static const double mineGridLabel = 12; static const double mineGridLabel = 12;
static const double mineGridLabelLineHeight = 1.15;
static const double mineGridDividerWidth = 1; static const double mineGridDividerWidth = 1;
/// 宫格内部分隔线:0.5pt 发丝线,深色底上比 1pt 更轻。
static const double mineGridHairline = 0.5;
static const int mineGridRows = 2;
static const double mineGridHeight =
mineGridCellHeight * mineGridRows + mineGridHairline;
static const double mineSectionTitleFont = 16; static const double mineSectionTitleFont = 16;
static const double mineSectionLinkFont = 12; static const double mineSectionLinkFont = 12;
static const double mineSectionGap = 12; static const double mineSectionGap = 12;
/// 「我的」页新版:快捷图标行与服务列表。 /// 「我的」页会员卡。高度由内容撑开,上下内边距恒为 [mineVipPadding]。
static const double mineQuickActionIcon = 28; static const double mineVipRadius = 18;
static const double mineQuickActionLabelFont = 14; static const double mineVipPadding = 16;
static const double mineQuickActionGap = 8; static const double mineVipTitleFont = 22;
static const double mineServiceRowHeight = 56; static const double mineVipSubtitleFont = 12;
static const double mineServiceIcon = 24; static const double mineVipEmblem = 48;
static const double mineServiceTitleFont = 16; static const double mineVipEmblemIcon = 28;
static const double mineServiceValueFont = 14; static const double mineVipActionWidth = 100;
static const double mineVipBenefitFont = 14; static const double mineVipBenefitFont = 10.5;
static const double mineVipBenefitIcon = 20; static const double mineVipBenefitBox = 34;
static const double mineVipBenefitBox = 30; static const double mineVipBenefitBoxRadius = 11;
static const double mineVipBenefitBoxRadius = 7; static const double mineVipBenefitGlyph = 19;
static const double mineVipBenefitGlyph = 17; static const double mineVipBenefitRowGap = 6;
static const double mineVipBenefitRowGap = 4; static const double mineVipButtonHeight = tapTarget;
static const double mineVipButtonHeight = 36;
static const double mineContinueCardWidth = 96; static const double mineContinueCardWidth = 96;
static const double mineContinueRowHeight = 172; static const double mineContinueRowHeight = 172;
static const double mineContinueTitleFont = 13; static const double mineContinueTitleFont = 13;
static const double mineContinueMetaFont = 11; static const double mineContinueMetaFont = 11;
static const double mineStatsValueFont = 18; static const double mineStatsValueFont = 24;
static const double mineStatsLabelFont = 11; static const double mineStatsLabelFont = 12;
static const double mineStatsIcon = 42;
static const double mineStatsMinHeight = 104;
static const double mineStatsDividerHeight = 32;
static const double mineStatsDividerWidth = 0.5;
static const double mineStatsValueLineHeight = 1.1;
static const double mineStatsLabelLineHeight = 1.25;
static const double minePanelPadding = 12; static const double minePanelPadding = 12;
static const double mineMoreRowHeight = 52; static const double mineMoreRowHeight = 52;
static const double mineMoreFont = 15; static const double mineMoreFont = 15;
+71
View File
@@ -0,0 +1,71 @@
// Author: fruit.com.cn
// 职责:固定顶部导航文字排版,以绘制缩放和颜色插值实现选中切换。
import 'package:flutter/material.dart';
import '../theme/app_colors.dart';
import '../theme/app_dimens.dart';
const double _inactiveScale = 0.9;
/// 保留最大字号、固定字重与占位,避免选中动画触发相邻标签重新布局。
class AnimatedNavLabel extends StatelessWidget {
/// [style] 指定选中态字号与颜色;字重固定,未指定时默认加粗。
const AnimatedNavLabel({
super.key,
required this.label,
required this.selected,
required this.style,
this.alignment = Alignment.bottomCenter,
this.selectionProgress,
this.inactiveColor = AppColors.textTabInactive,
});
final String label;
final bool selected;
final TextStyle style;
final Alignment alignment;
/// 未选中文字颜色;默认保持通用导航原有灰色。
final Color inactiveColor;
/// 页面拖动时直接使用连续进度,避免再叠加一层延迟动画。
final double? selectionProgress;
@override
Widget build(BuildContext context) {
final target = selected ? 1.0 : 0.0;
final reduceMotion = MediaQuery.disableAnimationsOf(context);
return Semantics(
selected: selected,
child: selectionProgress != null
? _label(selectionProgress!.clamp(0.0, 1.0))
: TweenAnimationBuilder<double>(
tween: Tween(begin: target, end: target),
duration: reduceMotion
? Duration.zero
: AppDimens.homePrimaryTabAnimationDuration,
curve: Curves.easeOut,
builder: (context, progress, _) => _label(progress),
),
);
}
Widget _label(double progress) => Transform.scale(
scale: _inactiveScale + (1 - _inactiveScale) * progress,
alignment: alignment,
child: Text(
label,
maxLines: 1,
textAlign: TextAlign.left,
style: style.copyWith(
fontWeight: style.fontWeight ?? FontWeight.w700,
letterSpacing: 0,
color: Color.lerp(
inactiveColor,
style.color ?? AppColors.textPrimary,
progress,
),
),
),
);
}
+37 -25
View File
@@ -5,6 +5,8 @@ import 'package:flutter/material.dart';
import '../theme/app_colors.dart'; import '../theme/app_colors.dart';
import '../theme/app_dimens.dart'; import '../theme/app_dimens.dart';
const double _maxNavigationTextScale = 1.3;
/// 底部导航普通目的地。 /// 底部导航普通目的地。
class AppBottomNavItem { class AppBottomNavItem {
const AppBottomNavItem({ const AppBottomNavItem({
@@ -16,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;
@@ -23,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;
@@ -41,14 +45,17 @@ class AppBottomNav extends StatelessWidget {
key: barKey, key: barKey,
height: AppDimens.navHeight, height: AppDimens.navHeight,
color: AppColors.navBackground, color: AppColors.navBackground,
child: Row( child: MediaQuery.withClampedTextScaling(
children: [ maxScaleFactor: _maxNavigationTextScale,
for (final item in items) child: Row(
_NavDestination( children: [
item: item, for (final item in items)
unselectedColor: AppColors.navUnselected, _NavDestination(
), item: item,
], unselectedColor: AppColors.navUnselected,
),
],
),
), ),
); );
return ColoredBox( return ColoredBox(
@@ -88,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(
+16 -2
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'),
@@ -25,14 +34,14 @@ extension AppRootTabUi on AppRootTab {
IconData get icon => switch (this) { IconData get icon => switch (this) {
AppRootTab.home => Icons.home_outlined, AppRootTab.home => Icons.home_outlined,
AppRootTab.recommend => Icons.celebration_outlined, AppRootTab.recommend => Icons.smart_display_outlined,
AppRootTab.following => Icons.bookmark_border_rounded, AppRootTab.following => Icons.bookmark_border_rounded,
AppRootTab.mine => Icons.person_outline_rounded, AppRootTab.mine => Icons.person_outline_rounded,
}; };
IconData get selectedIcon => switch (this) { IconData get selectedIcon => switch (this) {
AppRootTab.home => Icons.home_rounded, AppRootTab.home => Icons.home_rounded,
AppRootTab.recommend => Icons.celebration_rounded, AppRootTab.recommend => Icons.smart_display_rounded,
AppRootTab.following => Icons.bookmark_rounded, AppRootTab.following => Icons.bookmark_rounded,
AppRootTab.mine => Icons.person_rounded, AppRootTab.mine => Icons.person_rounded,
}; };
@@ -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),
), ),
], ],
+40 -27
View File
@@ -5,12 +5,12 @@ import 'package:flutter/material.dart';
import '../theme/app_colors.dart'; import '../theme/app_colors.dart';
import '../theme/app_dimens.dart'; import '../theme/app_dimens.dart';
const double _regularIconSize = 72; const double _iconSize = 72;
const double _compactIconSize = 44;
const double _maxContentWidth = 260; const double _maxContentWidth = 260;
const double _regularHorizontal = 24; const double _regularHorizontal = 24;
const double _regularVertical = 28; const double _regularVertical = 28;
const double _compactPad = 16; const double _compactHorizontal = 16;
const double _compactVertical = 4;
const double _regularGap = 20; const double _regularGap = 20;
const double _compactGap = 12; const double _compactGap = 12;
const double _actionMinHeight = 44; const double _actionMinHeight = 44;
@@ -27,6 +27,7 @@ class EmptyState extends StatelessWidget {
this.onAction, this.onAction,
this.footer, this.footer,
this.compact = false, this.compact = false,
this.stretchContent = false,
}); });
final IconData icon; final IconData icon;
@@ -38,6 +39,9 @@ class EmptyState extends StatelessWidget {
final Widget? footer; final Widget? footer;
final bool compact; final bool compact;
/// 让图标和文案占满内容宽度,适用于需要严格居中的宽版空状态。
final bool stretchContent;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final hasAction = actionLabel != null && onAction != null; final hasAction = actionLabel != null && onAction != null;
@@ -48,28 +52,33 @@ class EmptyState extends StatelessWidget {
child: Padding( child: Padding(
key: const Key('empty-state-padding'), key: const Key('empty-state-padding'),
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
horizontal: compact ? _compactPad : _regularHorizontal, horizontal: compact ? _compactHorizontal : _regularHorizontal,
vertical: compact ? _compactPad : _regularVertical, vertical: compact ? _compactVertical : _regularVertical,
), ),
child: Semantics( child: SizedBox(
container: true, width: stretchContent ? double.infinity : null,
label: title, child: Semantics(
child: Column( container: true,
mainAxisSize: MainAxisSize.min, label: title,
children: [ child: Column(
ExcludeSemantics( mainAxisSize: MainAxisSize.min,
child: _EmptyMark(icon: icon, compact: compact), children: [
), ExcludeSemantics(child: _EmptyMark(icon: icon)),
SizedBox(height: compact ? _compactGap : _regularGap), SizedBox(height: compact ? _compactGap : _regularGap),
_EmptyCopy( SizedBox(
title: title, width: stretchContent ? double.infinity : null,
subtitle: subtitle, child: _EmptyCopy(
actionLabel: hasAction ? actionLabel : null, title: title,
actionKey: actionKey, subtitle: subtitle,
onAction: hasAction ? onAction : null, actionLabel: hasAction ? actionLabel : null,
footer: footer, actionKey: actionKey,
), onAction: hasAction ? onAction : null,
], footer: footer,
stretchContent: stretchContent,
),
),
],
),
), ),
), ),
), ),
@@ -80,17 +89,16 @@ class EmptyState extends StatelessWidget {
/// 空列表只放一枚大图标,不画线框,也不铺底色。 /// 空列表只放一枚大图标,不画线框,也不铺底色。
class _EmptyMark extends StatelessWidget { class _EmptyMark extends StatelessWidget {
const _EmptyMark({required this.icon, required this.compact}); const _EmptyMark({required this.icon});
final IconData icon; final IconData icon;
final bool compact;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Icon( return Icon(
icon, icon,
key: const Key('empty-state-icon'), key: const Key('empty-state-icon'),
size: compact ? _compactIconSize : _regularIconSize, size: _iconSize,
color: AppColors.subtle, color: AppColors.subtle,
); );
} }
@@ -104,6 +112,7 @@ class _EmptyCopy extends StatelessWidget {
required this.actionKey, required this.actionKey,
required this.onAction, required this.onAction,
required this.footer, required this.footer,
required this.stretchContent,
}); });
final String title; final String title;
@@ -112,11 +121,15 @@ class _EmptyCopy extends StatelessWidget {
final Key? actionKey; final Key? actionKey;
final VoidCallback? onAction; final VoidCallback? onAction;
final Widget? footer; final Widget? footer;
final bool stretchContent;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Column( return Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: stretchContent
? CrossAxisAlignment.stretch
: CrossAxisAlignment.center,
children: [ children: [
ExcludeSemantics( ExcludeSemantics(
child: Text( child: Text(
+18 -37
View File
@@ -1,4 +1,5 @@
// Author: fruit.com.cn // Author: fruit.com.cn
// 职责:统一网络图片入口,补服务地址,并在加载中/失败时显示纯色占位块。
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@@ -31,10 +32,9 @@ class RemoteImage extends StatelessWidget {
this.width, this.width,
this.height, this.height,
this.fit = BoxFit.cover, this.fit = BoxFit.cover,
this.showFallbackIcon = false,
this.fallbackIconKey,
this.fallbackAspectRatio, this.fallbackAspectRatio,
this.fallbackColor = AppColors.raised, this.fallbackColor = AppColors.raised,
this.fallbackWidget,
this.decodeWidth, this.decodeWidth,
this.decodeHeight, this.decodeHeight,
}); });
@@ -43,17 +43,18 @@ class RemoteImage extends StatelessWidget {
final double? width; final double? width;
final double? height; final double? height;
final BoxFit fit; final BoxFit fit;
final bool showFallbackIcon;
final Key? fallbackIconKey;
final double? fallbackAspectRatio; final double? fallbackAspectRatio;
final Color fallbackColor; final Color fallbackColor;
/// 自定义占位:地址为空、加载中、加载失败时都显示它(优先于 [fallbackColor])。
final Widget? fallbackWidget;
final int? decodeWidth; final int? decodeWidth;
final int? decodeHeight; final int? decodeHeight;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final url = AppConfig.mediaUrl(path); final url = AppConfig.mediaUrl(path);
if (url.isEmpty) return _fallback(brand: showFallbackIcon); if (url.isEmpty) return _fallback();
return LayoutBuilder( return LayoutBuilder(
builder: (context, constraints) { builder: (context, constraints) {
final pixelRatio = MediaQuery.devicePixelRatioOf(context); final pixelRatio = MediaQuery.devicePixelRatioOf(context);
@@ -77,9 +78,9 @@ class RemoteImage extends StatelessWidget {
// cover/contain 本身会保持宽高比,此时若同时强制 cacheWidth 和 // cover/contain 本身会保持宽高比,此时若同时强制 cacheWidth 和
// cacheHeight,解码会把竖版图强行拉成横版像素。只在显式指定了 // cacheHeight,解码会把竖版图强行拉成横版像素。只在显式指定了
// decodeHeight、或 fit 不保持宽高比时才限定解码高度。 // decodeHeight、或 fit 不保持宽高比时才限定解码高度。
final keepsAspectRatio = final keepsAspectRatio = fit == BoxFit.cover || fit == BoxFit.contain;
fit == BoxFit.cover || fit == BoxFit.contain; final cacheHeight =
final cacheHeight = decodeHeight ?? decodeHeight ??
(keepsAspectRatio || inferredHeight == null (keepsAspectRatio || inferredHeight == null
? null ? null
: resolveImageDecodePixels(inferredHeight, pixelRatio)); : resolveImageDecodePixels(inferredHeight, pixelRatio));
@@ -95,43 +96,23 @@ class RemoteImage extends StatelessWidget {
?.clamp(_minImageDecodePixels, _maxImageDecodePixels) ?.clamp(_minImageDecodePixels, _maxImageDecodePixels)
.toInt(), .toInt(),
gaplessPlayback: true, gaplessPlayback: true,
errorBuilder: (_, _, _) => _fallback(brand: showFallbackIcon), errorBuilder: (_, _, _) => _fallback(),
frameBuilder: (context, child, frame, wasSynchronouslyLoaded) { frameBuilder: (context, child, frame, wasSynchronouslyLoaded) {
if (wasSynchronouslyLoaded || frame != null) return child; if (wasSynchronouslyLoaded || frame != null) return child;
return _fallback(brand: showFallbackIcon); return _fallback();
}, },
); );
}, },
); );
} }
Widget _fallback({required bool brand}) { Widget _fallback() {
final mark = brand final custom = fallbackWidget;
? LayoutBuilder( final content = custom != null
builder: (context, constraints) { ? SizedBox(width: width, height: height, child: custom)
final width = constraints.maxWidth.isFinite : Container(width: width, height: height, color: fallbackColor);
? constraints.maxWidth
: 120.0;
return Center(
child: Image.asset(
'assets/icon/splash_logo.png',
key: fallbackIconKey,
width: width * 0.72,
fit: BoxFit.contain,
),
);
},
)
: null;
final fallback = Container(
width: width,
height: height,
color: brand ? AppColors.mediaBlack : fallbackColor,
alignment: Alignment.center,
child: mark,
);
final ratio = fallbackAspectRatio; final ratio = fallbackAspectRatio;
if (ratio == null) return fallback; if (ratio == null) return content;
return AspectRatio(aspectRatio: ratio, child: fallback); return AspectRatio(aspectRatio: ratio, child: content);
} }
} }
+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;
}
+14 -7
View File
@@ -1,6 +1,6 @@
{ {
"@@locale": "en", "@@locale": "en",
"appName": "FruitShorts", "appName": "ymb",
"demo": "DEMO", "demo": "DEMO",
"homeHeadline": "Watch now", "homeHeadline": "Watch now",
"homeSubtitle": "Free short drama preview.", "homeSubtitle": "Free short drama preview.",
@@ -19,7 +19,7 @@
"searchCancel": "Cancel", "searchCancel": "Cancel",
"featured": "Featured", "featured": "Featured",
"recommended": "Recommended", "recommended": "Recommended",
"fruitShortsBrand": "FruitShorts", "fruitShortsBrand": "ymb",
"comingSoon": "Coming soon", "comingSoon": "Coming soon",
"authLegal": "By continuing, you agree to the Terms of Service and Privacy Policy.", "authLegal": "By continuing, you agree to the Terms of Service and Privacy Policy.",
"authLegalLead": "By continuing, you agree to the", "authLegalLead": "By continuing, you agree to the",
@@ -83,6 +83,12 @@
"count": {"type": "String"} "count": {"type": "String"}
} }
}, },
"likesLabel": "{count} likes",
"@likesLabel": {
"placeholders": {
"count": {"type": "String"}
}
},
"topCharts": "Hot Ranking", "topCharts": "Hot Ranking",
"newReleases": "New Releases", "newReleases": "New Releases",
"newDramas": "New", "newDramas": "New",
@@ -359,7 +365,7 @@
"categoriesError": "Categories could not be loaded.", "categoriesError": "Categories could not be loaded.",
"detailError": "The episode list could not be loaded.", "detailError": "The episode list could not be loaded.",
"noMediaNotice": "This episode has no playable media yet.", "noMediaNotice": "This episode has no playable media yet.",
"noStories": "No stories available yet.", "noStories": "No stories available yet",
"notices": "Notices", "notices": "Notices",
"noNotices": "No notices yet.", "noNotices": "No notices yet.",
"noticesLoadFailed": "Notices could not be loaded.", "noticesLoadFailed": "Notices could not be loaded.",
@@ -408,8 +414,8 @@
"genreDramaMystery": "Drama · Mystery", "genreDramaMystery": "Drama · Mystery",
"continueWatchingHeading": "CONTINUE WATCHING", "continueWatchingHeading": "CONTINUE WATCHING",
"preferencesHeading": "PREFERENCES", "preferencesHeading": "PREFERENCES",
"brandMark": "FRUITSHORTS", "brandMark": "YMB",
"shareFooter": "FruitShorts", "shareFooter": "ymb",
"shortsTab": "Shorts", "shortsTab": "Shorts",
"myListTab": "My List", "myListTab": "My List",
"watchFull": "Watch Full", "watchFull": "Watch Full",
@@ -761,7 +767,7 @@
"homeBadgeNew": "New", "homeBadgeNew": "New",
"homeBadgeAnime": "Anime", "homeBadgeAnime": "Anime",
"emptyContent": "No content yet", "emptyContent": "No content yet",
"recommendTopTab": "Recommend", "recommendTopTab": "Featured",
"playlistTopTab": "Playlists", "playlistTopTab": "Playlists",
"allDramasTopTab": "All Dramas", "allDramasTopTab": "All Dramas",
"weeklyHitsTitle": "This Week's Hits", "weeklyHitsTitle": "This Week's Hits",
@@ -789,7 +795,7 @@
"offlineDownloads": "Downloads", "offlineDownloads": "Downloads",
"watchPreferences": "Watch preferences", "watchPreferences": "Watch preferences",
"contactSupport": "Contact support", "contactSupport": "Contact support",
"vipBrandName": "FruitShorts VIP", "vipBrandName": "VIP",
"vipOpenNow": "Get VIP", "vipOpenNow": "Get VIP",
"vipBenefitFree": "Free full access", "vipBenefitFree": "Free full access",
"vipBenefitNoAds": "Ad-free viewing", "vipBenefitNoAds": "Ad-free viewing",
@@ -851,6 +857,7 @@
"dataUnavailable": "—", "dataUnavailable": "—",
"commonQuestions": "Common questions", "commonQuestions": "Common questions",
"aboutUs": "About us", "aboutUs": "About us",
"aboutBrandName": "Your mini business",
"aboutDescription": "A focused, immersive place to watch short dramas.", "aboutDescription": "A focused, immersive place to watch short dramas.",
"versionLabel": "Version {version}", "versionLabel": "Version {version}",
"@versionLabel": { "@versionLabel": {
+9 -7
View File
@@ -1,6 +1,6 @@
{ {
"@@locale": "id", "@@locale": "id",
"appName": "FruitShorts", "appName": "ymb",
"demo": "Demo", "demo": "Demo",
"homeHeadline": "Tonton sekarang", "homeHeadline": "Tonton sekarang",
"homeSubtitle": "Pratinjau drama pendek gratis.", "homeSubtitle": "Pratinjau drama pendek gratis.",
@@ -19,7 +19,7 @@
"searchCancel": "Batal", "searchCancel": "Batal",
"featured": "Unggulan", "featured": "Unggulan",
"recommended": "Rekomendasi", "recommended": "Rekomendasi",
"fruitShortsBrand": "FruitShorts", "fruitShortsBrand": "ymb",
"comingSoon": "Segera hadir", "comingSoon": "Segera hadir",
"authLegal": "Dengan melanjutkan, Anda menyetujui Ketentuan Layanan dan Kebijakan Privasi.", "authLegal": "Dengan melanjutkan, Anda menyetujui Ketentuan Layanan dan Kebijakan Privasi.",
"authLegalLead": "Dengan melanjutkan, Anda menyetujui", "authLegalLead": "Dengan melanjutkan, Anda menyetujui",
@@ -72,6 +72,7 @@
"authorNoteLabel": "Catatan penulis", "authorNoteLabel": "Catatan penulis",
"reserve": "Reservasi", "reserve": "Reservasi",
"heatLabel": "{count} panas", "heatLabel": "{count} panas",
"likesLabel": "{count} suka",
"topCharts": "Peringkat Populer", "topCharts": "Peringkat Populer",
"newReleases": "Rilisan Baru", "newReleases": "Rilisan Baru",
"newDramas": "Baru", "newDramas": "Baru",
@@ -338,7 +339,7 @@
"categoriesError": "Kategori gagal dimuat.", "categoriesError": "Kategori gagal dimuat.",
"detailError": "Daftar episode gagal dimuat.", "detailError": "Daftar episode gagal dimuat.",
"noMediaNotice": "Episode ini belum punya media yang bisa diputar.", "noMediaNotice": "Episode ini belum punya media yang bisa diputar.",
"noStories": "Belum ada cerita.", "noStories": "Belum ada cerita",
"notices": "Notifikasi", "notices": "Notifikasi",
"noNotices": "Belum ada notifikasi.", "noNotices": "Belum ada notifikasi.",
"noticesLoadFailed": "Notifikasi tidak dapat dimuat.", "noticesLoadFailed": "Notifikasi tidak dapat dimuat.",
@@ -387,8 +388,8 @@
"genreDramaMystery": "Drama · Misteri", "genreDramaMystery": "Drama · Misteri",
"continueWatchingHeading": "LANJUT TONTON", "continueWatchingHeading": "LANJUT TONTON",
"preferencesHeading": "PREFERENSI", "preferencesHeading": "PREFERENSI",
"brandMark": "FRUITSHORTS", "brandMark": "YMB",
"shareFooter": "FruitShorts", "shareFooter": "ymb",
"shortsTab": "Drama Pendek", "shortsTab": "Drama Pendek",
"myListTab": "Daftar Saya", "myListTab": "Daftar Saya",
"watchFull": "Tonton Penuh", "watchFull": "Tonton Penuh",
@@ -723,7 +724,7 @@
"homeBadgeNew": "Baru", "homeBadgeNew": "Baru",
"homeBadgeAnime": "Anime", "homeBadgeAnime": "Anime",
"emptyContent": "Belum ada konten", "emptyContent": "Belum ada konten",
"recommendTopTab": "Rekomendasi", "recommendTopTab": "Unggulan",
"playlistTopTab": "Daftar Putar", "playlistTopTab": "Daftar Putar",
"allDramasTopTab": "Semua", "allDramasTopTab": "Semua",
"weeklyHitsTitle": "Hits Minggu Ini", "weeklyHitsTitle": "Hits Minggu Ini",
@@ -751,7 +752,7 @@
"offlineDownloads": "Unduhan", "offlineDownloads": "Unduhan",
"watchPreferences": "Preferensi tontonan", "watchPreferences": "Preferensi tontonan",
"contactSupport": "Hubungi dukungan", "contactSupport": "Hubungi dukungan",
"vipBrandName": "FruitShorts VIP", "vipBrandName": "VIP",
"vipOpenNow": "Buka VIP", "vipOpenNow": "Buka VIP",
"vipBenefitFree": "Nonton semua gratis", "vipBenefitFree": "Nonton semua gratis",
"vipBenefitNoAds": "Bebas iklan", "vipBenefitNoAds": "Bebas iklan",
@@ -813,6 +814,7 @@
"dataUnavailable": "—", "dataUnavailable": "—",
"commonQuestions": "Pertanyaan umum", "commonQuestions": "Pertanyaan umum",
"aboutUs": "Tentang kami", "aboutUs": "Tentang kami",
"aboutBrandName": "Your mini business",
"aboutDescription": "Tempat fokus dan imersif untuk menonton drama pendek.", "aboutDescription": "Tempat fokus dan imersif untuk menonton drama pendek.",
"versionLabel": "Versi {version}", "versionLabel": "Versi {version}",
"@versionLabel": { "@versionLabel": {
+19 -7
View File
@@ -103,7 +103,7 @@ abstract class AppLocalizations {
/// No description provided for @appName. /// No description provided for @appName.
/// ///
/// In en, this message translates to: /// In en, this message translates to:
/// **'FruitShorts'** /// **'ymb'**
String get appName; String get appName;
/// No description provided for @demo. /// No description provided for @demo.
@@ -217,7 +217,7 @@ abstract class AppLocalizations {
/// No description provided for @fruitShortsBrand. /// No description provided for @fruitShortsBrand.
/// ///
/// In en, this message translates to: /// In en, this message translates to:
/// **'FruitShorts'** /// **'ymb'**
String get fruitShortsBrand; String get fruitShortsBrand;
/// No description provided for @comingSoon. /// No description provided for @comingSoon.
@@ -442,6 +442,12 @@ abstract class AppLocalizations {
/// **'{count} heat'** /// **'{count} heat'**
String heatLabel(String count); String heatLabel(String count);
/// No description provided for @likesLabel.
///
/// In en, this message translates to:
/// **'{count} likes'**
String likesLabel(String count);
/// No description provided for @topCharts. /// No description provided for @topCharts.
/// ///
/// In en, this message translates to: /// In en, this message translates to:
@@ -1393,7 +1399,7 @@ abstract class AppLocalizations {
/// No description provided for @noStories. /// No description provided for @noStories.
/// ///
/// In en, this message translates to: /// In en, this message translates to:
/// **'No stories available yet.'** /// **'No stories available yet'**
String get noStories; String get noStories;
/// No description provided for @notices. /// No description provided for @notices.
@@ -1627,13 +1633,13 @@ abstract class AppLocalizations {
/// No description provided for @brandMark. /// No description provided for @brandMark.
/// ///
/// In en, this message translates to: /// In en, this message translates to:
/// **'FRUITSHORTS'** /// **'YMB'**
String get brandMark; String get brandMark;
/// No description provided for @shareFooter. /// No description provided for @shareFooter.
/// ///
/// In en, this message translates to: /// In en, this message translates to:
/// **'FruitShorts'** /// **'ymb'**
String get shareFooter; String get shareFooter;
/// No description provided for @shortsTab. /// No description provided for @shortsTab.
@@ -3271,7 +3277,7 @@ abstract class AppLocalizations {
/// No description provided for @recommendTopTab. /// No description provided for @recommendTopTab.
/// ///
/// In en, this message translates to: /// In en, this message translates to:
/// **'Recommend'** /// **'Featured'**
String get recommendTopTab; String get recommendTopTab;
/// No description provided for @playlistTopTab. /// No description provided for @playlistTopTab.
@@ -3439,7 +3445,7 @@ abstract class AppLocalizations {
/// No description provided for @vipBrandName. /// No description provided for @vipBrandName.
/// ///
/// In en, this message translates to: /// In en, this message translates to:
/// **'FruitShorts VIP'** /// **'VIP'**
String get vipBrandName; String get vipBrandName;
/// No description provided for @vipOpenNow. /// No description provided for @vipOpenNow.
@@ -3592,6 +3598,12 @@ abstract class AppLocalizations {
/// **'About us'** /// **'About us'**
String get aboutUs; String get aboutUs;
/// No description provided for @aboutBrandName.
///
/// In en, this message translates to:
/// **'Your mini business'**
String get aboutBrandName;
/// No description provided for @aboutDescription. /// No description provided for @aboutDescription.
/// ///
/// In en, this message translates to: /// In en, this message translates to:
+15 -7
View File
@@ -9,7 +9,7 @@ class AppLocalizationsEn extends AppLocalizations {
AppLocalizationsEn([String locale = 'en']) : super(locale); AppLocalizationsEn([String locale = 'en']) : super(locale);
@override @override
String get appName => 'FruitShorts'; String get appName => 'ymb';
@override @override
String get demo => 'DEMO'; String get demo => 'DEMO';
@@ -67,7 +67,7 @@ class AppLocalizationsEn extends AppLocalizations {
String get recommended => 'Recommended'; String get recommended => 'Recommended';
@override @override
String get fruitShortsBrand => 'FruitShorts'; String get fruitShortsBrand => 'ymb';
@override @override
String get comingSoon => 'Coming soon'; String get comingSoon => 'Coming soon';
@@ -191,6 +191,11 @@ class AppLocalizationsEn extends AppLocalizations {
return '$count heat'; return '$count heat';
} }
@override
String likesLabel(String count) {
return '$count likes';
}
@override @override
String get topCharts => 'Hot Ranking'; String get topCharts => 'Hot Ranking';
@@ -709,7 +714,7 @@ class AppLocalizationsEn extends AppLocalizations {
String get noMediaNotice => 'This episode has no playable media yet.'; String get noMediaNotice => 'This episode has no playable media yet.';
@override @override
String get noStories => 'No stories available yet.'; String get noStories => 'No stories available yet';
@override @override
String get notices => 'Notices'; String get notices => 'Notices';
@@ -831,10 +836,10 @@ class AppLocalizationsEn extends AppLocalizations {
String get preferencesHeading => 'PREFERENCES'; String get preferencesHeading => 'PREFERENCES';
@override @override
String get brandMark => 'FRUITSHORTS'; String get brandMark => 'YMB';
@override @override
String get shareFooter => 'FruitShorts'; String get shareFooter => 'ymb';
@override @override
String get shortsTab => 'Shorts'; String get shortsTab => 'Shorts';
@@ -1711,7 +1716,7 @@ class AppLocalizationsEn extends AppLocalizations {
String get emptyContent => 'No content yet'; String get emptyContent => 'No content yet';
@override @override
String get recommendTopTab => 'Recommend'; String get recommendTopTab => 'Featured';
@override @override
String get playlistTopTab => 'Playlists'; String get playlistTopTab => 'Playlists';
@@ -1795,7 +1800,7 @@ class AppLocalizationsEn extends AppLocalizations {
String get contactSupport => 'Contact support'; String get contactSupport => 'Contact support';
@override @override
String get vipBrandName => 'FruitShorts VIP'; String get vipBrandName => 'VIP';
@override @override
String get vipOpenNow => 'Get VIP'; String get vipOpenNow => 'Get VIP';
@@ -1886,6 +1891,9 @@ class AppLocalizationsEn extends AppLocalizations {
@override @override
String get aboutUs => 'About us'; String get aboutUs => 'About us';
@override
String get aboutBrandName => 'Your mini business';
@override @override
String get aboutDescription => String get aboutDescription =>
'A focused, immersive place to watch short dramas.'; 'A focused, immersive place to watch short dramas.';
+15 -7
View File
@@ -9,7 +9,7 @@ class AppLocalizationsId extends AppLocalizations {
AppLocalizationsId([String locale = 'id']) : super(locale); AppLocalizationsId([String locale = 'id']) : super(locale);
@override @override
String get appName => 'FruitShorts'; String get appName => 'ymb';
@override @override
String get demo => 'Demo'; String get demo => 'Demo';
@@ -67,7 +67,7 @@ class AppLocalizationsId extends AppLocalizations {
String get recommended => 'Rekomendasi'; String get recommended => 'Rekomendasi';
@override @override
String get fruitShortsBrand => 'FruitShorts'; String get fruitShortsBrand => 'ymb';
@override @override
String get comingSoon => 'Segera hadir'; String get comingSoon => 'Segera hadir';
@@ -191,6 +191,11 @@ class AppLocalizationsId extends AppLocalizations {
return '$count panas'; return '$count panas';
} }
@override
String likesLabel(String count) {
return '$count suka';
}
@override @override
String get topCharts => 'Peringkat Populer'; String get topCharts => 'Peringkat Populer';
@@ -712,7 +717,7 @@ class AppLocalizationsId extends AppLocalizations {
'Episode ini belum punya media yang bisa diputar.'; 'Episode ini belum punya media yang bisa diputar.';
@override @override
String get noStories => 'Belum ada cerita.'; String get noStories => 'Belum ada cerita';
@override @override
String get notices => 'Notifikasi'; String get notices => 'Notifikasi';
@@ -834,10 +839,10 @@ class AppLocalizationsId extends AppLocalizations {
String get preferencesHeading => 'PREFERENSI'; String get preferencesHeading => 'PREFERENSI';
@override @override
String get brandMark => 'FRUITSHORTS'; String get brandMark => 'YMB';
@override @override
String get shareFooter => 'FruitShorts'; String get shareFooter => 'ymb';
@override @override
String get shortsTab => 'Drama Pendek'; String get shortsTab => 'Drama Pendek';
@@ -1711,7 +1716,7 @@ class AppLocalizationsId extends AppLocalizations {
String get emptyContent => 'Belum ada konten'; String get emptyContent => 'Belum ada konten';
@override @override
String get recommendTopTab => 'Rekomendasi'; String get recommendTopTab => 'Unggulan';
@override @override
String get playlistTopTab => 'Daftar Putar'; String get playlistTopTab => 'Daftar Putar';
@@ -1797,7 +1802,7 @@ class AppLocalizationsId extends AppLocalizations {
String get contactSupport => 'Hubungi dukungan'; String get contactSupport => 'Hubungi dukungan';
@override @override
String get vipBrandName => 'FruitShorts VIP'; String get vipBrandName => 'VIP';
@override @override
String get vipOpenNow => 'Buka VIP'; String get vipOpenNow => 'Buka VIP';
@@ -1888,6 +1893,9 @@ class AppLocalizationsId extends AppLocalizations {
@override @override
String get aboutUs => 'Tentang kami'; String get aboutUs => 'Tentang kami';
@override
String get aboutBrandName => 'Your mini business';
@override @override
String get aboutDescription => String get aboutDescription =>
'Tempat fokus dan imersif untuk menonton drama pendek.'; 'Tempat fokus dan imersif untuk menonton drama pendek.';
+15 -7
View File
@@ -9,7 +9,7 @@ class AppLocalizationsZh extends AppLocalizations {
AppLocalizationsZh([String locale = 'zh']) : super(locale); AppLocalizationsZh([String locale = 'zh']) : super(locale);
@override @override
String get appName => 'FruitShorts'; String get appName => 'ymb';
@override @override
String get demo => '演示'; String get demo => '演示';
@@ -66,7 +66,7 @@ class AppLocalizationsZh extends AppLocalizations {
String get recommended => '推荐'; String get recommended => '推荐';
@override @override
String get fruitShortsBrand => 'FruitShorts'; String get fruitShortsBrand => 'ymb';
@override @override
String get comingSoon => '即将上线'; String get comingSoon => '即将上线';
@@ -189,6 +189,11 @@ class AppLocalizationsZh extends AppLocalizations {
return '$count热度'; return '$count热度';
} }
@override
String likesLabel(String count) {
return '$count次点赞';
}
@override @override
String get topCharts => '热播榜'; String get topCharts => '热播榜';
@@ -702,7 +707,7 @@ class AppLocalizationsZh extends AppLocalizations {
String get noMediaNotice => '该剧集还没有可播放的片源。'; String get noMediaNotice => '该剧集还没有可播放的片源。';
@override @override
String get noStories => '暂无剧目。'; String get noStories => '暂无剧目';
@override @override
String get notices => '通知'; String get notices => '通知';
@@ -821,10 +826,10 @@ class AppLocalizationsZh extends AppLocalizations {
String get preferencesHeading => '偏好设置'; String get preferencesHeading => '偏好设置';
@override @override
String get brandMark => 'FRUITSHORTS'; String get brandMark => 'YMB';
@override @override
String get shareFooter => 'FruitShorts'; String get shareFooter => 'ymb';
@override @override
String get shortsTab => '短剧'; String get shortsTab => '短剧';
@@ -1686,7 +1691,7 @@ class AppLocalizationsZh extends AppLocalizations {
String get emptyContent => '暂无内容'; String get emptyContent => '暂无内容';
@override @override
String get recommendTopTab => '推荐'; String get recommendTopTab => '精选';
@override @override
String get playlistTopTab => '剧单'; String get playlistTopTab => '剧单';
@@ -1770,7 +1775,7 @@ class AppLocalizationsZh extends AppLocalizations {
String get contactSupport => '联系客服'; String get contactSupport => '联系客服';
@override @override
String get vipBrandName => 'FruitShorts VIP'; String get vipBrandName => 'VIP';
@override @override
String get vipOpenNow => '立即开通'; String get vipOpenNow => '立即开通';
@@ -1861,6 +1866,9 @@ class AppLocalizationsZh extends AppLocalizations {
@override @override
String get aboutUs => '关于我们'; String get aboutUs => '关于我们';
@override
String get aboutBrandName => 'Your mini business';
@override @override
String get aboutDescription => '专注于短剧观看与沉浸式追剧体验。'; String get aboutDescription => '专注于短剧观看与沉浸式追剧体验。';
+9 -7
View File
@@ -1,6 +1,6 @@
{ {
"@@locale": "zh", "@@locale": "zh",
"appName": "FruitShorts", "appName": "ymb",
"demo": "演示", "demo": "演示",
"homeHeadline": "即刻观看", "homeHeadline": "即刻观看",
"homeSubtitle": "免费短剧预览。", "homeSubtitle": "免费短剧预览。",
@@ -19,7 +19,7 @@
"searchCancel": "取消", "searchCancel": "取消",
"featured": "精选", "featured": "精选",
"recommended": "推荐", "recommended": "推荐",
"fruitShortsBrand": "FruitShorts", "fruitShortsBrand": "ymb",
"comingSoon": "即将上线", "comingSoon": "即将上线",
"authLegal": "继续即代表同意《用户协议》与《隐私政策》", "authLegal": "继续即代表同意《用户协议》与《隐私政策》",
"authLegalLead": "继续即代表同意", "authLegalLead": "继续即代表同意",
@@ -72,6 +72,7 @@
"authorNoteLabel": "作者声明", "authorNoteLabel": "作者声明",
"reserve": "预约", "reserve": "预约",
"heatLabel": "{count}热度", "heatLabel": "{count}热度",
"likesLabel": "{count}次点赞",
"topCharts": "热播榜", "topCharts": "热播榜",
"newReleases": "新剧", "newReleases": "新剧",
"newDramas": "新剧", "newDramas": "新剧",
@@ -300,7 +301,7 @@
"categoriesError": "分类加载失败。", "categoriesError": "分类加载失败。",
"detailError": "剧集信息加载失败。", "detailError": "剧集信息加载失败。",
"noMediaNotice": "该剧集还没有可播放的片源。", "noMediaNotice": "该剧集还没有可播放的片源。",
"noStories": "暂无剧目。", "noStories": "暂无剧目",
"notices": "通知", "notices": "通知",
"noNotices": "暂无通知。", "noNotices": "暂无通知。",
"noticesLoadFailed": "通知加载失败,请重试。", "noticesLoadFailed": "通知加载失败,请重试。",
@@ -349,8 +350,8 @@
"genreDramaMystery": "剧情 · 悬疑", "genreDramaMystery": "剧情 · 悬疑",
"continueWatchingHeading": "继续观看", "continueWatchingHeading": "继续观看",
"preferencesHeading": "偏好设置", "preferencesHeading": "偏好设置",
"brandMark": "FRUITSHORTS", "brandMark": "YMB",
"shareFooter": "FruitShorts", "shareFooter": "ymb",
"shortsTab": "短剧", "shortsTab": "短剧",
"myListTab": "片单", "myListTab": "片单",
"watchFull": "看全集", "watchFull": "看全集",
@@ -685,7 +686,7 @@
"homeBadgeNew": "新剧", "homeBadgeNew": "新剧",
"homeBadgeAnime": "漫剧", "homeBadgeAnime": "漫剧",
"emptyContent": "暂无内容", "emptyContent": "暂无内容",
"recommendTopTab": "推荐", "recommendTopTab": "精选",
"playlistTopTab": "剧单", "playlistTopTab": "剧单",
"allDramasTopTab": "全部短剧", "allDramasTopTab": "全部短剧",
"weeklyHitsTitle": "本週爆款推薦", "weeklyHitsTitle": "本週爆款推薦",
@@ -713,7 +714,7 @@
"offlineDownloads": "离线缓存", "offlineDownloads": "离线缓存",
"watchPreferences": "观看偏好", "watchPreferences": "观看偏好",
"contactSupport": "联系客服", "contactSupport": "联系客服",
"vipBrandName": "FruitShorts VIP", "vipBrandName": "VIP",
"vipOpenNow": "立即开通", "vipOpenNow": "立即开通",
"vipBenefitFree": "全剧免费看", "vipBenefitFree": "全剧免费看",
"vipBenefitNoAds": "免广告打扰", "vipBenefitNoAds": "免广告打扰",
@@ -775,6 +776,7 @@
"dataUnavailable": "—", "dataUnavailable": "—",
"commonQuestions": "常见问题", "commonQuestions": "常见问题",
"aboutUs": "关于我们", "aboutUs": "关于我们",
"aboutBrandName": "Your mini business",
"aboutDescription": "专注于短剧观看与沉浸式追剧体验。", "aboutDescription": "专注于短剧观看与沉浸式追剧体验。",
"versionLabel": "版本 {version}", "versionLabel": "版本 {version}",
"@versionLabel": { "@versionLabel": {
+9 -27
View File
@@ -300,7 +300,7 @@ class _AuthBrand extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final copy = _brandCopy(context, centered: !compact); final copy = _brandCopy(centered: !compact);
if (compact) { if (compact) {
return Row( return Row(
key: const Key('auth-brand'), key: const Key('auth-brand'),
@@ -324,32 +324,14 @@ class _AuthBrand extends StatelessWidget {
radius: compact ? _compactBrandMarkRadius : _brandMarkRadius, radius: compact ? _compactBrandMarkRadius : _brandMarkRadius,
); );
Widget _brandCopy(BuildContext context, {required bool centered}) => Column( Widget _brandCopy({required bool centered}) => Text(
crossAxisAlignment: centered tagline,
? CrossAxisAlignment.center textAlign: centered ? TextAlign.center : TextAlign.start,
: CrossAxisAlignment.start, style: const TextStyle(
children: [ color: AppColors.muted,
Text( fontSize: 13,
AppLocalizations.of(context)!.appName, height: 1.35,
textAlign: centered ? TextAlign.center : TextAlign.start, ),
style: const TextStyle(
color: AppColors.onSurface,
fontSize: 24,
fontWeight: FontWeight.w700,
height: 1.1,
),
),
const SizedBox(height: 6),
Text(
tagline,
textAlign: centered ? TextAlign.center : TextAlign.start,
style: const TextStyle(
color: AppColors.muted,
fontSize: 13,
height: 1.35,
),
),
],
); );
} }
+71 -74
View File
@@ -7,6 +7,7 @@ import 'package:provider/provider.dart';
import '../../core/data/remote/api_client.dart'; import '../../core/data/remote/api_client.dart';
import '../../core/formatting/error_text.dart'; import '../../core/formatting/error_text.dart';
import '../../core/data/services/app_config_controller.dart';
import '../../core/data/services/auth_controller.dart'; import '../../core/data/services/auth_controller.dart';
import '../../core/platform/haptics.dart'; import '../../core/platform/haptics.dart';
import '../../core/platform/keyboard_inset.dart'; import '../../core/platform/keyboard_inset.dart';
@@ -14,6 +15,7 @@ import '../../core/theme/app_colors.dart';
import '../../core/theme/app_dimens.dart'; import '../../core/theme/app_dimens.dart';
import '../../core/theme/app_theme.dart'; import '../../core/theme/app_theme.dart';
import '../../core/widgets/centered_toast.dart'; import '../../core/widgets/centered_toast.dart';
import '../../core/widgets/remote_image.dart';
import '../../core/widgets/subpage_header.dart'; import '../../core/widgets/subpage_header.dart';
import '../../l10n/app_localizations.dart'; import '../../l10n/app_localizations.dart';
import 'auth_legal_links.dart'; import 'auth_legal_links.dart';
@@ -28,7 +30,7 @@ const double _brandMarkSize = 88;
const double _compactBrandMarkSize = 48; const double _compactBrandMarkSize = 48;
const double _brandMarkRadius = 26; const double _brandMarkRadius = 26;
const double _compactBrandMarkRadius = 14; const double _compactBrandMarkRadius = 14;
const String _appLogoAsset = 'assets/icon/fruitshorts.png'; const String _appLogoAsset = 'assets/icon/ymb.png';
const double _contentMaxWidth = 440; const double _contentMaxWidth = 440;
const double _fieldHeight = 52; const double _fieldHeight = 52;
const double _fieldRadius = 12; const double _fieldRadius = 12;
@@ -276,9 +278,7 @@ class _AuthPageState extends State<AuthPage> {
), ),
), ),
// 全屏海报背景:压暗保证文字可读,顶部再叠品牌红光。 // 全屏海报背景:压暗保证文字可读,顶部再叠品牌红光。
Positioned.fill( Positioned.fill(child: IgnorePointer(child: _AuthPosterBackdrop())),
child: IgnorePointer(child: _AuthPosterBackdrop()),
),
const Positioned.fill( const Positioned.fill(
child: IgnorePointer( child: IgnorePointer(
child: DecoratedBox( child: DecoratedBox(
@@ -396,80 +396,67 @@ class _AuthPageState extends State<AuthPage> {
AppLocalizations l10n, { AppLocalizations l10n, {
required bool compact, required bool compact,
required double minHeight, required double minHeight,
}) => }) => TweenAnimationBuilder<double>(
TweenAnimationBuilder<double>( key: const Key('auth-enter-animation'),
key: const Key('auth-enter-animation'), tween: Tween(begin: 0, end: 1),
tween: Tween(begin: 0, end: 1), duration: _enterDuration,
duration: _enterDuration, curve: Curves.easeOutCubic,
curve: Curves.easeOutCubic, builder: (context, value, child) => Opacity(
builder: (context, value, child) => Opacity( opacity: value,
opacity: value, child: Transform.translate(
child: Transform.translate( offset: Offset(0, _enterSlideDistance * (1 - value)),
offset: Offset(0, _enterSlideDistance * (1 - value)), child: child,
child: child, ),
), ),
), child: _emailEntryOpen
child: _emailEntryOpen ? Column(
? Column( crossAxisAlignment: CrossAxisAlignment.stretch,
crossAxisAlignment: CrossAxisAlignment.stretch, children: [
children: [ _AuthBrand(tagline: l10n.authBrandTagline, compact: compact),
_AuthBrand(tagline: l10n.authBrandTagline, compact: compact), SizedBox(height: compact ? _compactBrandGap : 28),
SizedBox(height: compact ? _compactBrandGap : 28), _authCard(l10n),
_authCard(l10n), ],
], )
) : _landing(l10n, minHeight: minHeight),
: _landing(l10n, minHeight: minHeight), );
);
/// 落地页内容需要有限高度才能用 Spacer 三段分割,这里显式钉住可用高度。 /// 落地页内容需要有限高度才能用 Spacer 三段分割,这里显式钉住可用高度。
Widget _landing(AppLocalizations l10n, {required double minHeight}) => Widget _landing(AppLocalizations l10n, {required double minHeight}) =>
SizedBox( SizedBox(
height: minHeight, height: minHeight,
child: Column( child: Column(
key: const Key('auth-landing'), key: const Key('auth-landing'),
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
const Spacer(flex: 5), const Spacer(flex: 5),
Center( Center(
child: _brandMarkWidget( child: _brandMarkWidget(
key: const Key('auth-brand-logo'), key: const Key('auth-brand-logo'),
size: _brandMarkSize, size: _brandMarkSize,
radius: _brandMarkRadius, radius: _brandMarkRadius,
),
),
const Spacer(flex: 2),
_AuthEntryButton(
key: const Key('auth-entry-phone'),
label: l10n.authPhoneSignIn,
icon: Icons.phone_android_rounded,
primary: true,
onTap: _openPhoneSheet,
),
const SizedBox(height: 12),
_AuthEntryButton(
key: const Key('auth-entry-email'),
label: l10n.authEmailSignIn,
icon: Icons.mail_outline_rounded,
primary: false,
onTap: () => setState(() => _emailEntryOpen = true),
),
const SizedBox(height: 14),
const Opacity(opacity: 0.75, child: AuthLegalLinks()),
const Spacer(flex: 6),
],
), ),
),
const SizedBox(height: 10),
Text(
l10n.fruitShortsBrand,
textAlign: TextAlign.center,
style: const TextStyle(
fontFamily: 'Outfit',
color: AppColors.onSurface,
fontSize: 26,
fontWeight: FontWeight.w700,
letterSpacing: 2,
),
),
const Spacer(flex: 3),
_AuthEntryButton(
key: const Key('auth-entry-phone'),
label: l10n.authPhoneSignIn,
icon: Icons.phone_android_rounded,
primary: true,
onTap: _openPhoneSheet,
),
const SizedBox(height: 12),
_AuthEntryButton(
key: const Key('auth-entry-email'),
label: l10n.authEmailSignIn,
icon: Icons.mail_outline_rounded,
primary: false,
onTap: () => setState(() => _emailEntryOpen = true),
),
const SizedBox(height: 14),
const Opacity(opacity: 0.75, child: AuthLegalLinks()),
const Spacer(flex: 6),
],
),
); );
Future<void> _openPhoneSheet() async { Future<void> _openPhoneSheet() async {
@@ -578,16 +565,26 @@ class _AuthEntryButton extends StatelessWidget {
} }
/// 登录页全屏海报背景(单张,无拼缝)。 /// 登录页全屏海报背景(单张,无拼缝)。
///
/// 优先用后台下发的 `loginBackgroundUrl`(后台未配置或加载失败时回落到本地默认图)。
class _AuthPosterBackdrop extends StatelessWidget { class _AuthPosterBackdrop extends StatelessWidget {
const _AuthPosterBackdrop(); const _AuthPosterBackdrop();
static const String _defaultAsset = 'assets/auth/bg_3.jpg';
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Image.asset( final remoteUrl = context.watch<AppConfigController>().loginBackgroundUrl;
return RemoteImage(
key: const Key('auth-poster-backdrop'), key: const Key('auth-poster-backdrop'),
'assets/auth/bg_3.jpg', remoteUrl,
fit: BoxFit.cover, fit: BoxFit.cover,
alignment: Alignment.center, fallbackWidget: Image.asset(
_defaultAsset,
key: const Key('auth-poster-default'),
fit: BoxFit.cover,
alignment: Alignment.center,
),
); );
} }
} }
+1
View File
@@ -297,6 +297,7 @@ class _DiscoverPageState extends State<DiscoverPage> {
icon: Icons.movie_filter_outlined, icon: Icons.movie_filter_outlined,
title: l10n.noStories, title: l10n.noStories,
subtitle: l10n.emptyHint, subtitle: l10n.emptyHint,
stretchContent: true,
), ),
), ),
) )
@@ -176,7 +176,7 @@ class _FeedBannerCarouselState extends State<FeedBannerCarousel> {
child: Stack( child: Stack(
fit: StackFit.expand, fit: StackFit.expand,
children: [ children: [
RemoteImage(banner.imageUrl, showFallbackIcon: true), RemoteImage(banner.imageUrl),
DecoratedBox( DecoratedBox(
decoration: BoxDecoration( decoration: BoxDecoration(
gradient: LinearGradient( gradient: LinearGradient(
@@ -37,7 +37,6 @@ class SearchResultCard extends StatelessWidget {
RemoteImage( RemoteImage(
drama.posterUrl, drama.posterUrl,
fit: BoxFit.cover, fit: BoxFit.cover,
showFallbackIcon: true,
fallbackColor: AppColors.contentSurface, fallbackColor: AppColors.contentSurface,
), ),
const Positioned( const Positioned(
@@ -60,7 +59,9 @@ class SearchResultCard extends StatelessWidget {
), ),
const SizedBox(height: AppDimens.searchResultTitleGap), const SizedBox(height: AppDimens.searchResultTitleGap),
Text( Text(
drama.localizedTitle(Localizations.localeOf(context).languageCode), drama.localizedTitle(
Localizations.localeOf(context).languageCode,
),
key: Key('search-result-title-${drama.id}'), key: Key('search-result-title-${drama.id}'),
maxLines: 2, maxLines: 2,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
@@ -93,7 +94,9 @@ class SearchResultCard extends StatelessWidget {
} }
List<String> _tags(BuildContext context) { List<String> _tags(BuildContext context) {
final localized = drama.localizedTypeLabels(Localizations.localeOf(context).languageCode); final localized = drama.localizedTypeLabels(
Localizations.localeOf(context).languageCode,
);
if (localized.isNotEmpty) return localized.take(3).toList(growable: false); if (localized.isNotEmpty) return localized.take(3).toList(growable: false);
final seen = <String>{}; final seen = <String>{};
return [drama.genre, drama.category] return [drama.genre, drama.category]
@@ -126,7 +126,6 @@ class DramaDetailHeader extends StatelessWidget {
child: RemoteImage( child: RemoteImage(
drama.posterUrl, drama.posterUrl,
fit: BoxFit.cover, fit: BoxFit.cover,
showFallbackIcon: true,
fallbackAspectRatio: 3 / 4, fallbackAspectRatio: 3 / 4,
), ),
), ),
+32 -27
View File
@@ -38,7 +38,6 @@ const double _synopsisFontSize = 12;
const double _synopsisLineHeight = 1.15; const double _synopsisLineHeight = 1.15;
const double _synopsisGap = 4; const double _synopsisGap = 4;
const int _maxTags = 2; const int _maxTags = 2;
const double _emptyListHeight = 360;
const double _loadMoreThreshold = 240; const double _loadMoreThreshold = 240;
final RegExp _tagSplitter = RegExp(r'[,/、·]'); final RegExp _tagSplitter = RegExp(r'[,/、·]');
@@ -124,37 +123,29 @@ class _FavoritesBody extends StatelessWidget {
); );
} }
if (favorites.error != null && favorites.cards.isEmpty) { if (favorites.error != null && favorites.cards.isEmpty) {
return _refreshable( return _refreshableState(
favorites, favorites,
children: [ child: EmptyState(
SizedBox( key: const Key('favorites-error'),
height: _emptyListHeight, icon: Icons.cloud_off_rounded,
child: EmptyState( title: errorText(l10n, favorites.error, l10n.favoritesError),
key: const Key('favorites-error'), actionLabel: l10n.retry,
icon: Icons.cloud_off_rounded, actionKey: const Key('favorites-retry'),
title: errorText(l10n, favorites.error, l10n.favoritesError), onAction: () => unawaited(favorites.load()),
actionLabel: l10n.retry, stretchContent: true,
actionKey: const Key('favorites-retry'), ),
onAction: () => unawaited(favorites.load()),
),
),
],
); );
} }
if (favorites.cards.isEmpty) { if (favorites.cards.isEmpty) {
return _refreshable( return _refreshableState(
favorites, favorites,
children: [ child: EmptyState(
SizedBox( key: const Key('favorites-empty'),
height: _emptyListHeight, icon: Icons.star_border_rounded,
child: EmptyState( title: l10n.noFavorites,
key: const Key('favorites-empty'), subtitle: l10n.emptyHint,
icon: Icons.star_border_rounded, stretchContent: true,
title: l10n.noFavorites, ),
subtitle: l10n.emptyHint,
),
),
],
); );
} }
return _refreshable( return _refreshable(
@@ -205,6 +196,20 @@ class _FavoritesBody extends StatelessWidget {
); );
} }
Widget _refreshableState(
FavoriteController favorites, {
required Widget child,
}) {
return AppPullToRefresh(
onRefresh: favorites.load,
child: CustomScrollView(
key: const Key('favorites-empty-scroll'),
physics: AppPullToRefresh.physics,
slivers: [SliverFillRemaining(hasScrollBody: false, child: child)],
),
);
}
bool _onScroll(ScrollNotification notification) { bool _onScroll(ScrollNotification notification) {
if (notification.depth != 0) return false; if (notification.depth != 0) return false;
final reachedBottom = final reachedBottom =
@@ -53,7 +53,6 @@ class FilterResultCard extends StatelessWidget {
RemoteImage( RemoteImage(
drama.posterUrl, drama.posterUrl,
fit: BoxFit.cover, fit: BoxFit.cover,
showFallbackIcon: true,
fallbackAspectRatio: 3 / 4, fallbackAspectRatio: 3 / 4,
), ),
if (drama.isHot) if (drama.isHot)
@@ -1,22 +1,18 @@
// Author: fruit.com.cn // Author: fruit.com.cn
// 职责:追剧收藏网格、分页和编辑选择,不承载顶部续播或重复区块标题。
import 'dart:async'; import 'dart:async';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../../core/data/models/watch_record.dart';
import '../../core/data/services/favorite_controller.dart'; import '../../core/data/services/favorite_controller.dart';
import '../../core/data/services/watch_records_controller.dart';
import '../../core/formatting/error_text.dart'; import '../../core/formatting/error_text.dart';
import '../../core/theme/app_colors.dart';
import '../../core/theme/app_dimens.dart';
import '../../core/widgets/empty_state.dart'; import '../../core/widgets/empty_state.dart';
import '../../l10n/app_localizations.dart'; import '../../l10n/app_localizations.dart';
import '../player/open_player.dart'; import '../player/open_player.dart';
import 'following_grid_card.dart'; import 'following_grid_card.dart';
import 'following_paged_grid.dart'; import 'following_paged_grid.dart';
import 'widgets/continue_watching_banner.dart';
/// 追剧编辑中的选中状态。 /// 追剧编辑中的选中状态。
class FollowingFavoriteSelection { class FollowingFavoriteSelection {
@@ -36,19 +32,15 @@ class FollowingFavoritesGrid extends StatelessWidget {
const FollowingFavoritesGrid({ const FollowingFavoritesGrid({
super.key, super.key,
required this.controller, required this.controller,
required this.history,
required this.selection, required this.selection,
required this.scrollController, required this.scrollController,
required this.onGoHome, required this.onGoHome,
required this.onContinueRecord,
}); });
final FavoriteController controller; final FavoriteController controller;
final WatchRecordsController history;
final FollowingFavoriteSelection selection; final FollowingFavoriteSelection selection;
final ScrollController scrollController; final ScrollController scrollController;
final VoidCallback onGoHome; final VoidCallback onGoHome;
final ValueChanged<WatchRecord> onContinueRecord;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@@ -59,7 +51,7 @@ class FollowingFavoritesGrid extends StatelessWidget {
valueListenable: selection.selected, valueListenable: selection.selected,
builder: (context, picked, _) { builder: (context, picked, _) {
return ListenableBuilder( return ListenableBuilder(
listenable: Listenable.merge([controller, history]), listenable: controller,
builder: (context, _) => _grid(context, isEditing, picked), builder: (context, _) => _grid(context, isEditing, picked),
); );
}, },
@@ -89,7 +81,6 @@ class FollowingFavoritesGrid extends StatelessWidget {
onRefresh: controller.load, onRefresh: controller.load,
onLoadMore: controller.loadMore, onLoadMore: controller.loadMore,
itemCount: controller.cards.length + extra, itemCount: controller.cards.length + extra,
topSlivers: _topSlivers(context),
empty: EmptyState( empty: EmptyState(
key: const Key('following-favorites-empty'), key: const Key('following-favorites-empty'),
icon: Icons.bookmark_border_rounded, icon: Icons.bookmark_border_rounded,
@@ -99,68 +90,6 @@ class FollowingFavoritesGrid extends StatelessWidget {
); );
} }
List<Widget> _topSlivers(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
final continueRecord = _continueRecord();
return [
if (continueRecord != null)
SliverToBoxAdapter(
child: Padding(
padding: const EdgeInsets.fromLTRB(
AppDimens.feedPageHorizontal,
4,
AppDimens.feedPageHorizontal,
0,
),
child: ContinueWatchingBanner(
record: continueRecord,
languageCode: Localizations.localeOf(context).languageCode,
onTap: () => onContinueRecord(continueRecord),
),
),
),
SliverToBoxAdapter(
child: Padding(
padding: const EdgeInsets.fromLTRB(
AppDimens.feedPageHorizontal,
AppDimens.followingSectionTopGap,
AppDimens.feedPageHorizontal,
AppDimens.followingSectionBottomGap,
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Text(
l10n.favoriteDramas,
style: const TextStyle(
color: AppColors.textPrimary,
fontSize: AppDimens.followingSectionTitleFont,
fontWeight: FontWeight.w400,
),
),
const Spacer(),
Padding(
padding: const EdgeInsets.only(bottom: 2),
child: Text(
l10n.totalDramasCount(controller.total),
style: const TextStyle(
color: AppColors.textTabInactive,
fontSize: AppDimens.followingSectionCountFont,
),
),
),
],
),
),
),
];
}
/// 最近一条观看记录(records 已按最近观看排序,与观看历史页首条一致)。
WatchRecord? _continueRecord() {
return history.records.isEmpty ? null : history.records.first;
}
Widget _item( Widget _item(
BuildContext context, BuildContext context,
int index, int index,
Loaded 100 of 198 files, more files were not shown because too many files have changed in this diff. Show more