8 Commits
132 changed files with 3451 additions and 1133 deletions

No files matched your search

+7 -4
View File
@@ -81,12 +81,15 @@ Android 模拟器访问宿主机时,同样在调试条里填 `http://10.0.2.2:
### iOS
手机与 Mac 需在同一网络,首次启动允许“本地网络”权限:
iOS 模拟器直接访问 Mac 本机服务,默认地址为 `http://127.0.0.1:8081`:
```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/app_config.dart` 里的一个布尔值:
@@ -103,7 +106,7 @@ flutter run -d <udid>
static const bool useDevConfig = true; // false 即用生产地址
```
换 Wi-Fi 或换网段时只改 `dev_config.dart` 的 `baseUrl`。打生产包前把
真机或 Android 模拟器联调时,通过调试入口覆盖地址,不修改默认开发配置。打生产包前把
`useDevConfig` 改成 `false`;release 构建若仍为 `true` 会在启动时直接报错,
避免线上包连到开发机。
+1 -1
View File
@@ -6,7 +6,7 @@
<uses-permission
android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
<application
android:label="FruitShorts"
android:label="ymb"
android:name="${applicationName}"
android:icon="@mipmap/ic_launcher"
android:usesCleartextTraffic="true">
Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.9 KiB

@@ -2,6 +2,18 @@
<!-- Author: fruit.com.cn -->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/splash_background" />
<item>
<shape android:shape="rectangle">
<gradient
android:type="radial"
android:centerX="0"
android:centerY="0"
android:gradientRadius="350dp"
android:startColor="#FF6B011A"
android:centerColor="#616B011A"
android:endColor="#006B011A" />
</shape>
</item>
<item>
<bitmap
android:gravity="center"
@@ -2,6 +2,18 @@
<!-- Author: fruit.com.cn -->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/splash_background" />
<item>
<shape android:shape="rectangle">
<gradient
android:type="radial"
android:centerX="0"
android:centerY="0"
android:gradientRadius="350dp"
android:startColor="#FF6B011A"
android:centerColor="#616B011A"
android:endColor="#006B011A" />
</shape>
</item>
<item>
<bitmap
android:gravity="center"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

@@ -2,6 +2,18 @@
<!-- Author: fruit.com.cn -->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/splash_background" />
<item>
<shape android:shape="rectangle">
<gradient
android:type="radial"
android:centerX="0"
android:centerY="0"
android:gradientRadius="350dp"
android:startColor="#FF6B011A"
android:centerColor="#616B011A"
android:endColor="#006B011A" />
</shape>
</item>
<item>
<bitmap
android:gravity="center"
@@ -2,6 +2,18 @@
<!-- Author: fruit.com.cn -->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/splash_background" />
<item>
<shape android:shape="rectangle">
<gradient
android:type="radial"
android:centerX="0"
android:centerY="0"
android:gradientRadius="350dp"
android:startColor="#FF6B011A"
android:centerColor="#616B011A"
android:endColor="#006B011A" />
</shape>
</item>
<item>
<bitmap
android:gravity="center"
Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 107 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 89 KiB

@@ -2,6 +2,18 @@
<!-- Author: fruit.com.cn -->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/splash_background" />
<item>
<shape android:shape="rectangle">
<gradient
android:type="radial"
android:centerX="0"
android:centerY="0"
android:gradientRadius="350dp"
android:startColor="#FF6B011A"
android:centerColor="#616B011A"
android:endColor="#006B011A" />
</shape>
</item>
<item>
<bitmap
android:gravity="center"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 325 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 218 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 8.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.7 KiB

After

Width:  |  Height:  |  Size: 469 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 762 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

@@ -8,7 +8,7 @@
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</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>
</style>
<style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
@@ -8,7 +8,7 @@
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</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>
</style>
<style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+2 -2
View File
@@ -3,5 +3,5 @@
<resources>
<color name="splash_background">#000000</color>
<color name="ic_launcher_background">#FF6B2C</color>
</resources>
<color name="ic_launcher_background">#E9142E</color>
</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: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 734 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 107 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 734 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 412 B

After

Width:  |  Height:  |  Size: 822 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 907 B

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 593 B

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 907 B

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 109 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 364 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 655 KiB

+103 -103
View File
@@ -1,115 +1,115 @@
<?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">
<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>
<key>CADisableMinimumFrameDurationOnPhone</key>
<key>NSAllowsArbitraryLoads</key>
<true/>
<key>CFBundleDevelopmentRegion</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>
<key>NSAllowsLocalNetworking</key>
<true/>
<key>NSAppTransportSecurity</key>
<key>NSExceptionDomains</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
<key>NSAllowsLocalNetworking</key>
<true/>
<key>NSExceptionDomains</key>
<key>127.0.0.1</key>
<dict>
<key>127.0.0.1</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSIncludesSubdomains</key>
<true/>
</dict>
<key>localhost</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSIncludesSubdomains</key>
<true/>
</dict>
<key>192.168.31.243</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSIncludesSubdomains</key>
<true/>
</dict>
<key>39.162.50.99</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSIncludesSubdomains</key>
<true/>
</dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSIncludesSubdomains</key>
<true/>
</dict>
<key>192.168.31.243</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSIncludesSubdomains</key>
<true/>
</dict>
<key>39.162.50.99</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSIncludesSubdomains</key>
<true/>
</dict>
<key>localhost</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSIncludesSubdomains</key>
<true/>
</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>
<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>
+10
View File
@@ -14,6 +14,7 @@ import 'core/data/remote/catalog_api.dart';
import 'core/data/remote/category_api.dart';
import 'core/data/remote/comment_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/download_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/store_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_session_store.dart';
import 'core/data/services/catalog_controller.dart';
@@ -208,6 +210,11 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
late final LocaleController _localeController = LocaleController();
/// 后台下发的启动配置(登录页背景等);拉不到就用本地默认。
late final AppConfigController _appConfigController = AppConfigController(
ConfigApi(_apiClient),
);
/// 登录期内共享的「已解锁收费集」:播放页进出、feed 与全屏切换都要沿用。
late final UnlockedEpisodeRegistry _unlockedEpisodes =
UnlockedEpisodeRegistry();
@@ -218,6 +225,7 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
// 恢复本地令牌与设备号;未登录也能正常浏览,不阻塞首屏
_auth.load();
unawaited(_localeController.load());
unawaited(_appConfigController.load());
// 登录/登出时同步收藏状态:收藏属于账号,不能跨账号串联
_auth.addListener(_onAuthChanged);
unawaited(_favoriteController.load());
@@ -252,6 +260,7 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
_walletController.dispose();
_interactionController.dispose();
_localeController.dispose();
_appConfigController.dispose();
_apiClient.close();
super.dispose();
}
@@ -304,6 +313,7 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
ChangeNotifierProvider.value(value: _walletController),
ChangeNotifierProvider.value(value: _interactionController),
ChangeNotifierProvider.value(value: _localeController),
ChangeNotifierProvider.value(value: _appConfigController),
ChangeNotifierProvider.value(value: _auth),
],
child: Consumer<LocaleController>(
+3 -2
View File
@@ -2,8 +2,9 @@
/// 开发环境配置。
///
/// 本机联调用:换 Wi-Fi、换网段后只改这里的 [baseUrl],地址不要带结尾斜杠。
/// 本机联调用:模拟器与桌面端可直接用回环地址,但 iOS/Android 真机必须用
/// 开发机的局域网 IP(真机上的 127.0.0.1 指向手机自己)。地址不要带结尾斜杠。
abstract final class DevConfig {
/// 开发机后端地址。
/// 开发机后端地址(Mac 当前 Wi-Fi 地址,换网络后需要同步修改)。
static const String baseUrl = 'http://192.168.31.243:8081';
}
+2 -2
View File
@@ -241,11 +241,11 @@ class Drama {
}
String localizedTitle(String languageCode) {
return localizedText(languageCode, title, titleLocales);
return localizedRequiredText(languageCode, title, titleLocales);
}
String localizedSynopsis(String languageCode) {
return localizedText(languageCode, synopsis, synopsisLocales);
return localizedRequiredText(languageCode, synopsis, synopsisLocales);
}
String localizedTag(String languageCode) {
+18 -1
View File
@@ -7,10 +7,27 @@ Map<String, String> localeMap(Object? raw) {
}
/// 按当前语言取文案。没有对应语言时用中文,中文也没有时用 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] ?? '';
if (selected.isNotEmpty) return selected;
final chinese = locales['zh'] ?? '';
if (chinese.isNotEmpty) return chinese;
return fallback;
}
/// 按当前语言取必须本地化的文案;印尼语缺失时不回退中文。
String localizedRequiredText(
String languageCode,
String fallback,
Map<String, String> locales,
) {
final primaryCode = languageCode.split(RegExp(r'[_-]')).first;
final selected = locales[languageCode] ?? locales[primaryCode] ?? '';
if (selected.trim().isNotEmpty) return selected;
if (primaryCode == 'id') return '';
return localizedText(primaryCode, fallback, locales);
}
+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');
}
}
}
+14 -5
View File
@@ -21,23 +21,29 @@ class WalletController extends ChangeNotifier {
String? unlockError;
String? unlockingEpisodeId;
bool _disposed = false;
int _requestSeq = 0;
int get balance => snapshot?.wallet.coinBalance ?? 0;
List<CoinLedgerEntry> get ledger => snapshot?.ledger ?? const [];
Future<void> load() async {
if (_disposed) return;
final request = ++_requestSeq;
loading = true;
error = null;
_notify();
try {
snapshot = await _repository.fetchWallet();
final result = await _repository.fetchWallet();
if (_isCurrent(request)) snapshot = result;
} on ApiException catch (exception) {
error = exception.message;
if (_isCurrent(request)) error = exception.message;
} catch (_) {
error = 'walletLoadFailed';
if (_isCurrent(request)) error = 'walletLoadFailed';
} finally {
loading = false;
_notify();
if (_isCurrent(request)) {
loading = false;
_notify();
}
}
}
@@ -75,6 +81,7 @@ class WalletController extends ChangeNotifier {
}
void reset() {
_requestSeq += 1;
snapshot = null;
loading = false;
unlocking = false;
@@ -88,6 +95,8 @@ class WalletController extends ChangeNotifier {
if (!_disposed) notifyListeners();
}
bool _isCurrent(int request) => !_disposed && request == _requestSeq;
@override
void dispose() {
_disposed = true;
@@ -0,0 +1,21 @@
// Author: fruit.com.cn
import '../data/models/drama.dart';
const String _indonesianLanguageCode = 'id';
/// 判断短剧是否满足当前界面语言的基础文案完整度。
bool isDramaCompleteForLocale(Drama drama, String languageCode) {
final primaryCode = languageCode.split(RegExp(r'[_-]')).first;
if (primaryCode != _indonesianLanguageCode) return true;
return drama.localizedTitle(primaryCode).trim().isNotEmpty &&
drama.localizedSynopsis(primaryCode).trim().isNotEmpty;
}
/// 过滤不满足首发语言文案完整度的短剧,保持原顺序。
List<Drama> visibleDramasForLocale(
Iterable<Drama> dramas,
String languageCode,
) => dramas
.where((drama) => isDramaCompleteForLocale(drama, languageCode))
.toList(growable: false);
+24 -5
View File
@@ -48,10 +48,20 @@ abstract final class AppColors {
static const vipGoldStart = Color(0xFFF5D9A0);
static const vipGoldEnd = Color(0xFFE8B65A);
/// 「我的」页 VIP 卡的浅香槟金(见设计稿,接近纯色)。
static const vipCardStart = Color(0xFFF6E8C6);
static const vipCardEnd = Color(0xFFEDD9A8);
static const vipBadgeSurface = Color(0x1F3D2408);
/// 「我的」页 VIP 卡:品牌酒红、暖黑与香槟金共同形成会员层级。
static const vipCardStart = Color(0xFF351318);
static const vipCardMiddle = Color(0xFF1B1112);
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 bronzeDeep = Color(0xFFA9713A);
static const rankSilver = Color(0xFFC0C0C0);
@@ -113,9 +123,18 @@ abstract final class AppColors {
static const mineGridSurface = Color(0x99101010);
static const minePanelSurface = Color(0xFF101010);
static const mineMoreDivider = Color(0xFF1C1C1E);
static const mineGridDivider = Color(0xFF2A2A2A);
static const mineGridDivider = Color(0x10FFFFFF);
static const mineGridIconSurface = Color(0xFF1C1C1E);
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 mineIconDownloads = Color(0xFF4DA3FF);
static const mineIconHistory = Color(0xFF4ADE80);
+31 -19
View File
@@ -141,7 +141,7 @@ abstract final class AppDimens {
static const double homePrimarySecondaryGap = 8;
static const double homeSecondaryGridGap = 10;
static const double homeHeaderIcon = 22;
static const double homeActionSlot = 40;
static const double homeActionSlot = tapTarget;
static const double homeActionIcon = 30;
static const double homeActionGap = 6;
@@ -184,7 +184,7 @@ abstract final class AppDimens {
static const double followingTabFont = 18;
static const double followingTabGap = 24;
static const double followingEditIconSize = 20;
static const double followingEditHitSize = 40;
static const double followingEditHitSize = tapTarget;
static const double followingAddIconSize = 20;
static const double followingAddIconStroke = 1.5;
static const double followingGridGap = 6;
@@ -269,32 +269,44 @@ abstract final class AppDimens {
static const double mineGridIconSurface = 44;
static const double mineGridIcon = 22;
static const double mineGridLabel = 12;
static const double mineGridLabelLineHeight = 1.15;
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 mineSectionLinkFont = 12;
static const double mineSectionGap = 12;
/// 「我的」页新版:快捷图标行与服务列表。
static const double mineQuickActionIcon = 28;
static const double mineQuickActionLabelFont = 14;
static const double mineQuickActionGap = 8;
static const double mineServiceRowHeight = 56;
static const double mineServiceIcon = 24;
static const double mineServiceTitleFont = 16;
static const double mineServiceValueFont = 14;
static const double mineVipBenefitFont = 14;
static const double mineVipBenefitIcon = 20;
static const double mineVipBenefitBox = 30;
static const double mineVipBenefitBoxRadius = 7;
static const double mineVipBenefitGlyph = 17;
static const double mineVipBenefitRowGap = 4;
static const double mineVipButtonHeight = 36;
/// 「我的」页会员卡。高度由内容撑开,上下内边距恒为 [mineVipPadding]。
static const double mineVipRadius = 18;
static const double mineVipPadding = 16;
static const double mineVipTitleFont = 22;
static const double mineVipSubtitleFont = 12;
static const double mineVipEmblem = 48;
static const double mineVipEmblemIcon = 28;
static const double mineVipActionWidth = 100;
static const double mineVipBenefitFont = 10.5;
static const double mineVipBenefitBox = 34;
static const double mineVipBenefitBoxRadius = 11;
static const double mineVipBenefitGlyph = 19;
static const double mineVipBenefitRowGap = 6;
static const double mineVipButtonHeight = tapTarget;
static const double mineContinueCardWidth = 96;
static const double mineContinueRowHeight = 172;
static const double mineContinueTitleFont = 13;
static const double mineContinueMetaFont = 11;
static const double mineStatsValueFont = 18;
static const double mineStatsLabelFont = 11;
static const double mineStatsValueFont = 24;
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 mineMoreRowHeight = 52;
static const double mineMoreFont = 15;
+13 -8
View File
@@ -5,6 +5,8 @@ import 'package:flutter/material.dart';
import '../theme/app_colors.dart';
import '../theme/app_dimens.dart';
const double _maxNavigationTextScale = 1.3;
/// 底部导航普通目的地。
class AppBottomNavItem {
const AppBottomNavItem({
@@ -41,14 +43,17 @@ class AppBottomNav extends StatelessWidget {
key: barKey,
height: AppDimens.navHeight,
color: AppColors.navBackground,
child: Row(
children: [
for (final item in items)
_NavDestination(
item: item,
unselectedColor: AppColors.navUnselected,
),
],
child: MediaQuery.withClampedTextScaling(
maxScaleFactor: _maxNavigationTextScale,
child: Row(
children: [
for (final item in items)
_NavDestination(
item: item,
unselectedColor: AppColors.navUnselected,
),
],
),
),
);
return ColoredBox(
+9 -3
View File
@@ -35,6 +35,7 @@ class RemoteImage extends StatelessWidget {
this.fallbackIconKey,
this.fallbackAspectRatio,
this.fallbackColor = AppColors.raised,
this.fallbackWidget,
this.decodeWidth,
this.decodeHeight,
});
@@ -47,6 +48,9 @@ class RemoteImage extends StatelessWidget {
final Key? fallbackIconKey;
final double? fallbackAspectRatio;
final Color fallbackColor;
/// 自定义兜底:地址为空、加载中、加载失败时都显示它(优先于 [fallbackColor])。
final Widget? fallbackWidget;
final int? decodeWidth;
final int? decodeHeight;
@@ -77,9 +81,9 @@ class RemoteImage extends StatelessWidget {
// cover/contain 本身会保持宽高比,此时若同时强制 cacheWidth 和
// cacheHeight,解码会把竖版图强行拉成横版像素。只在显式指定了
// decodeHeight、或 fit 不保持宽高比时才限定解码高度。
final keepsAspectRatio =
fit == BoxFit.cover || fit == BoxFit.contain;
final cacheHeight = decodeHeight ??
final keepsAspectRatio = fit == BoxFit.cover || fit == BoxFit.contain;
final cacheHeight =
decodeHeight ??
(keepsAspectRatio || inferredHeight == null
? null
: resolveImageDecodePixels(inferredHeight, pixelRatio));
@@ -106,6 +110,8 @@ class RemoteImage extends StatelessWidget {
}
Widget _fallback({required bool brand}) {
final custom = fallbackWidget;
if (custom != null) return custom;
final mark = brand
? LayoutBuilder(
builder: (context, constraints) {
+6 -5
View File
@@ -1,6 +1,6 @@
{
"@@locale": "en",
"appName": "FruitShorts",
"appName": "ymb",
"demo": "DEMO",
"homeHeadline": "Watch now",
"homeSubtitle": "Free short drama preview.",
@@ -19,7 +19,7 @@
"searchCancel": "Cancel",
"featured": "Featured",
"recommended": "Recommended",
"fruitShortsBrand": "FruitShorts",
"fruitShortsBrand": "ymb",
"comingSoon": "Coming soon",
"authLegal": "By continuing, you agree to the Terms of Service and Privacy Policy.",
"authLegalLead": "By continuing, you agree to the",
@@ -408,8 +408,8 @@
"genreDramaMystery": "Drama · Mystery",
"continueWatchingHeading": "CONTINUE WATCHING",
"preferencesHeading": "PREFERENCES",
"brandMark": "FRUITSHORTS",
"shareFooter": "FruitShorts",
"brandMark": "YMB",
"shareFooter": "ymb",
"shortsTab": "Shorts",
"myListTab": "My List",
"watchFull": "Watch Full",
@@ -789,7 +789,7 @@
"offlineDownloads": "Downloads",
"watchPreferences": "Watch preferences",
"contactSupport": "Contact support",
"vipBrandName": "FruitShorts VIP",
"vipBrandName": "VIP",
"vipOpenNow": "Get VIP",
"vipBenefitFree": "Free full access",
"vipBenefitNoAds": "Ad-free viewing",
@@ -851,6 +851,7 @@
"dataUnavailable": "—",
"commonQuestions": "Common questions",
"aboutUs": "About us",
"aboutBrandName": "Your mini business",
"aboutDescription": "A focused, immersive place to watch short dramas.",
"versionLabel": "Version {version}",
"@versionLabel": {
+6 -5
View File
@@ -1,6 +1,6 @@
{
"@@locale": "id",
"appName": "FruitShorts",
"appName": "ymb",
"demo": "Demo",
"homeHeadline": "Tonton sekarang",
"homeSubtitle": "Pratinjau drama pendek gratis.",
@@ -19,7 +19,7 @@
"searchCancel": "Batal",
"featured": "Unggulan",
"recommended": "Rekomendasi",
"fruitShortsBrand": "FruitShorts",
"fruitShortsBrand": "ymb",
"comingSoon": "Segera hadir",
"authLegal": "Dengan melanjutkan, Anda menyetujui Ketentuan Layanan dan Kebijakan Privasi.",
"authLegalLead": "Dengan melanjutkan, Anda menyetujui",
@@ -387,8 +387,8 @@
"genreDramaMystery": "Drama · Misteri",
"continueWatchingHeading": "LANJUT TONTON",
"preferencesHeading": "PREFERENSI",
"brandMark": "FRUITSHORTS",
"shareFooter": "FruitShorts",
"brandMark": "YMB",
"shareFooter": "ymb",
"shortsTab": "Drama Pendek",
"myListTab": "Daftar Saya",
"watchFull": "Tonton Penuh",
@@ -751,7 +751,7 @@
"offlineDownloads": "Unduhan",
"watchPreferences": "Preferensi tontonan",
"contactSupport": "Hubungi dukungan",
"vipBrandName": "FruitShorts VIP",
"vipBrandName": "VIP",
"vipOpenNow": "Buka VIP",
"vipBenefitFree": "Nonton semua gratis",
"vipBenefitNoAds": "Bebas iklan",
@@ -813,6 +813,7 @@
"dataUnavailable": "—",
"commonQuestions": "Pertanyaan umum",
"aboutUs": "Tentang kami",
"aboutBrandName": "Your mini business",
"aboutDescription": "Tempat fokus dan imersif untuk menonton drama pendek.",
"versionLabel": "Versi {version}",
"@versionLabel": {
+11 -5
View File
@@ -103,7 +103,7 @@ abstract class AppLocalizations {
/// No description provided for @appName.
///
/// In en, this message translates to:
/// **'FruitShorts'**
/// **'ymb'**
String get appName;
/// No description provided for @demo.
@@ -217,7 +217,7 @@ abstract class AppLocalizations {
/// No description provided for @fruitShortsBrand.
///
/// In en, this message translates to:
/// **'FruitShorts'**
/// **'ymb'**
String get fruitShortsBrand;
/// No description provided for @comingSoon.
@@ -1627,13 +1627,13 @@ abstract class AppLocalizations {
/// No description provided for @brandMark.
///
/// In en, this message translates to:
/// **'FRUITSHORTS'**
/// **'YMB'**
String get brandMark;
/// No description provided for @shareFooter.
///
/// In en, this message translates to:
/// **'FruitShorts'**
/// **'ymb'**
String get shareFooter;
/// No description provided for @shortsTab.
@@ -3439,7 +3439,7 @@ abstract class AppLocalizations {
/// No description provided for @vipBrandName.
///
/// In en, this message translates to:
/// **'FruitShorts VIP'**
/// **'VIP'**
String get vipBrandName;
/// No description provided for @vipOpenNow.
@@ -3592,6 +3592,12 @@ abstract class AppLocalizations {
/// **'About us'**
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.
///
/// In en, this message translates to:
+8 -5
View File
@@ -9,7 +9,7 @@ class AppLocalizationsEn extends AppLocalizations {
AppLocalizationsEn([String locale = 'en']) : super(locale);
@override
String get appName => 'FruitShorts';
String get appName => 'ymb';
@override
String get demo => 'DEMO';
@@ -67,7 +67,7 @@ class AppLocalizationsEn extends AppLocalizations {
String get recommended => 'Recommended';
@override
String get fruitShortsBrand => 'FruitShorts';
String get fruitShortsBrand => 'ymb';
@override
String get comingSoon => 'Coming soon';
@@ -831,10 +831,10 @@ class AppLocalizationsEn extends AppLocalizations {
String get preferencesHeading => 'PREFERENCES';
@override
String get brandMark => 'FRUITSHORTS';
String get brandMark => 'YMB';
@override
String get shareFooter => 'FruitShorts';
String get shareFooter => 'ymb';
@override
String get shortsTab => 'Shorts';
@@ -1795,7 +1795,7 @@ class AppLocalizationsEn extends AppLocalizations {
String get contactSupport => 'Contact support';
@override
String get vipBrandName => 'FruitShorts VIP';
String get vipBrandName => 'VIP';
@override
String get vipOpenNow => 'Get VIP';
@@ -1886,6 +1886,9 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get aboutUs => 'About us';
@override
String get aboutBrandName => 'Your mini business';
@override
String get aboutDescription =>
'A focused, immersive place to watch short dramas.';
+8 -5
View File
@@ -9,7 +9,7 @@ class AppLocalizationsId extends AppLocalizations {
AppLocalizationsId([String locale = 'id']) : super(locale);
@override
String get appName => 'FruitShorts';
String get appName => 'ymb';
@override
String get demo => 'Demo';
@@ -67,7 +67,7 @@ class AppLocalizationsId extends AppLocalizations {
String get recommended => 'Rekomendasi';
@override
String get fruitShortsBrand => 'FruitShorts';
String get fruitShortsBrand => 'ymb';
@override
String get comingSoon => 'Segera hadir';
@@ -834,10 +834,10 @@ class AppLocalizationsId extends AppLocalizations {
String get preferencesHeading => 'PREFERENSI';
@override
String get brandMark => 'FRUITSHORTS';
String get brandMark => 'YMB';
@override
String get shareFooter => 'FruitShorts';
String get shareFooter => 'ymb';
@override
String get shortsTab => 'Drama Pendek';
@@ -1797,7 +1797,7 @@ class AppLocalizationsId extends AppLocalizations {
String get contactSupport => 'Hubungi dukungan';
@override
String get vipBrandName => 'FruitShorts VIP';
String get vipBrandName => 'VIP';
@override
String get vipOpenNow => 'Buka VIP';
@@ -1888,6 +1888,9 @@ class AppLocalizationsId extends AppLocalizations {
@override
String get aboutUs => 'Tentang kami';
@override
String get aboutBrandName => 'Your mini business';
@override
String get aboutDescription =>
'Tempat fokus dan imersif untuk menonton drama pendek.';
+8 -5
View File
@@ -9,7 +9,7 @@ class AppLocalizationsZh extends AppLocalizations {
AppLocalizationsZh([String locale = 'zh']) : super(locale);
@override
String get appName => 'FruitShorts';
String get appName => 'ymb';
@override
String get demo => '演示';
@@ -66,7 +66,7 @@ class AppLocalizationsZh extends AppLocalizations {
String get recommended => '推荐';
@override
String get fruitShortsBrand => 'FruitShorts';
String get fruitShortsBrand => 'ymb';
@override
String get comingSoon => '即将上线';
@@ -821,10 +821,10 @@ class AppLocalizationsZh extends AppLocalizations {
String get preferencesHeading => '偏好设置';
@override
String get brandMark => 'FRUITSHORTS';
String get brandMark => 'YMB';
@override
String get shareFooter => 'FruitShorts';
String get shareFooter => 'ymb';
@override
String get shortsTab => '短剧';
@@ -1770,7 +1770,7 @@ class AppLocalizationsZh extends AppLocalizations {
String get contactSupport => '联系客服';
@override
String get vipBrandName => 'FruitShorts VIP';
String get vipBrandName => 'VIP';
@override
String get vipOpenNow => '立即开通';
@@ -1861,6 +1861,9 @@ class AppLocalizationsZh extends AppLocalizations {
@override
String get aboutUs => '关于我们';
@override
String get aboutBrandName => 'Your mini business';
@override
String get aboutDescription => '专注于短剧观看与沉浸式追剧体验。';
+6 -5
View File
@@ -1,6 +1,6 @@
{
"@@locale": "zh",
"appName": "FruitShorts",
"appName": "ymb",
"demo": "演示",
"homeHeadline": "即刻观看",
"homeSubtitle": "免费短剧预览。",
@@ -19,7 +19,7 @@
"searchCancel": "取消",
"featured": "精选",
"recommended": "推荐",
"fruitShortsBrand": "FruitShorts",
"fruitShortsBrand": "ymb",
"comingSoon": "即将上线",
"authLegal": "继续即代表同意《用户协议》与《隐私政策》",
"authLegalLead": "继续即代表同意",
@@ -349,8 +349,8 @@
"genreDramaMystery": "剧情 · 悬疑",
"continueWatchingHeading": "继续观看",
"preferencesHeading": "偏好设置",
"brandMark": "FRUITSHORTS",
"shareFooter": "FruitShorts",
"brandMark": "YMB",
"shareFooter": "ymb",
"shortsTab": "短剧",
"myListTab": "片单",
"watchFull": "看全集",
@@ -713,7 +713,7 @@
"offlineDownloads": "离线缓存",
"watchPreferences": "观看偏好",
"contactSupport": "联系客服",
"vipBrandName": "FruitShorts VIP",
"vipBrandName": "VIP",
"vipOpenNow": "立即开通",
"vipBenefitFree": "全剧免费看",
"vipBenefitNoAds": "免广告打扰",
@@ -775,6 +775,7 @@
"dataUnavailable": "—",
"commonQuestions": "常见问题",
"aboutUs": "关于我们",
"aboutBrandName": "Your mini business",
"aboutDescription": "专注于短剧观看与沉浸式追剧体验。",
"versionLabel": "版本 {version}",
"@versionLabel": {
+9 -27
View File
@@ -300,7 +300,7 @@ class _AuthBrand extends StatelessWidget {
@override
Widget build(BuildContext context) {
final copy = _brandCopy(context, centered: !compact);
final copy = _brandCopy(centered: !compact);
if (compact) {
return Row(
key: const Key('auth-brand'),
@@ -324,32 +324,14 @@ class _AuthBrand extends StatelessWidget {
radius: compact ? _compactBrandMarkRadius : _brandMarkRadius,
);
Widget _brandCopy(BuildContext context, {required bool centered}) => Column(
crossAxisAlignment: centered
? CrossAxisAlignment.center
: CrossAxisAlignment.start,
children: [
Text(
AppLocalizations.of(context)!.appName,
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,
),
),
],
Widget _brandCopy({required bool centered}) => 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/formatting/error_text.dart';
import '../../core/data/services/app_config_controller.dart';
import '../../core/data/services/auth_controller.dart';
import '../../core/platform/haptics.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_theme.dart';
import '../../core/widgets/centered_toast.dart';
import '../../core/widgets/remote_image.dart';
import '../../core/widgets/subpage_header.dart';
import '../../l10n/app_localizations.dart';
import 'auth_legal_links.dart';
@@ -28,7 +30,7 @@ const double _brandMarkSize = 88;
const double _compactBrandMarkSize = 48;
const double _brandMarkRadius = 26;
const double _compactBrandMarkRadius = 14;
const String _appLogoAsset = 'assets/icon/fruitshorts.png';
const String _appLogoAsset = 'assets/icon/ymb.png';
const double _contentMaxWidth = 440;
const double _fieldHeight = 52;
const double _fieldRadius = 12;
@@ -276,9 +278,7 @@ class _AuthPageState extends State<AuthPage> {
),
),
// 全屏海报背景:压暗保证文字可读,顶部再叠品牌红光。
Positioned.fill(
child: IgnorePointer(child: _AuthPosterBackdrop()),
),
Positioned.fill(child: IgnorePointer(child: _AuthPosterBackdrop())),
const Positioned.fill(
child: IgnorePointer(
child: DecoratedBox(
@@ -396,80 +396,67 @@ class _AuthPageState extends State<AuthPage> {
AppLocalizations l10n, {
required bool compact,
required double minHeight,
}) =>
TweenAnimationBuilder<double>(
key: const Key('auth-enter-animation'),
tween: Tween(begin: 0, end: 1),
duration: _enterDuration,
curve: Curves.easeOutCubic,
builder: (context, value, child) => Opacity(
opacity: value,
child: Transform.translate(
offset: Offset(0, _enterSlideDistance * (1 - value)),
child: child,
),
),
child: _emailEntryOpen
? Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
_AuthBrand(tagline: l10n.authBrandTagline, compact: compact),
SizedBox(height: compact ? _compactBrandGap : 28),
_authCard(l10n),
],
)
: _landing(l10n, minHeight: minHeight),
);
}) => TweenAnimationBuilder<double>(
key: const Key('auth-enter-animation'),
tween: Tween(begin: 0, end: 1),
duration: _enterDuration,
curve: Curves.easeOutCubic,
builder: (context, value, child) => Opacity(
opacity: value,
child: Transform.translate(
offset: Offset(0, _enterSlideDistance * (1 - value)),
child: child,
),
),
child: _emailEntryOpen
? Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
_AuthBrand(tagline: l10n.authBrandTagline, compact: compact),
SizedBox(height: compact ? _compactBrandGap : 28),
_authCard(l10n),
],
)
: _landing(l10n, minHeight: minHeight),
);
/// 落地页内容需要有限高度才能用 Spacer 三段分割,这里显式钉住可用高度。
Widget _landing(AppLocalizations l10n, {required double minHeight}) =>
SizedBox(
height: minHeight,
child: Column(
key: const Key('auth-landing'),
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
const Spacer(flex: 5),
Center(
child: _brandMarkWidget(
key: const Key('auth-brand-logo'),
size: _brandMarkSize,
radius: _brandMarkRadius,
key: const Key('auth-landing'),
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
const Spacer(flex: 5),
Center(
child: _brandMarkWidget(
key: const Key('auth-brand-logo'),
size: _brandMarkSize,
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 {
@@ -578,16 +565,26 @@ class _AuthEntryButton extends StatelessWidget {
}
/// 登录页全屏海报背景(单张,无拼缝)。
///
/// 优先用后台下发的 `loginBackgroundUrl`(后台未配置或加载失败时回落到本地默认图)。
class _AuthPosterBackdrop extends StatelessWidget {
const _AuthPosterBackdrop();
static const String _defaultAsset = 'assets/auth/bg_3.jpg';
@override
Widget build(BuildContext context) {
return Image.asset(
final remoteUrl = context.watch<AppConfigController>().loginBackgroundUrl;
return RemoteImage(
key: const Key('auth-poster-backdrop'),
'assets/auth/bg_3.jpg',
remoteUrl,
fit: BoxFit.cover,
alignment: Alignment.center,
fallbackWidget: Image.asset(
_defaultAsset,
key: const Key('auth-poster-default'),
fit: BoxFit.cover,
alignment: Alignment.center,
),
);
}
}
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
import '../../../core/data/models/drama.dart';
import '../../../core/formatting/error_text.dart';
import '../../../core/formatting/content_locale_guard.dart';
import '../../../core/theme/app_colors.dart';
import '../../../core/widgets/empty_state.dart';
import '../../../l10n/app_localizations.dart';
@@ -33,10 +34,18 @@ class DiscoverSearchResults extends StatelessWidget {
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
if (!loading && error == null && results.isNotEmpty) {
final visibleResults = visibleDramasForLocale(
results,
Localizations.localeOf(context).languageCode,
);
if (!loading && error == null && visibleResults.isNotEmpty) {
return SliverPadding(
padding: _topPadding,
sliver: SliverDramaGrid(l10n: l10n, dramas: results, onOpen: onOpen),
sliver: SliverDramaGrid(
l10n: l10n,
dramas: visibleResults,
onOpen: onOpen,
),
);
}
return SliverPadding(
@@ -49,8 +49,8 @@ class ContinueWatchingBanner extends StatelessWidget {
begin: Alignment.centerLeft,
end: Alignment.centerRight,
colors: [
Color(0xCC000000),
Color(0x99000000),
Color(0x80000000),
Color(0x33000000),
Color(0x00000000),
],
stops: [0, 0.45, 1],
@@ -7,6 +7,7 @@ import 'package:provider/provider.dart';
import '../../../core/data/models/drama.dart';
import '../../../core/data/services/category_controller.dart';
import '../../../core/formatting/content_locale_guard.dart';
import '../../../core/theme/app_dimens.dart';
import '../../../core/widgets/app_pull_to_refresh.dart';
import '../../../core/widgets/drama_grid_skeleton.dart';
@@ -77,7 +78,10 @@ class _HomeCategoryDramasState extends State<HomeCategoryDramas> {
final controller = context.watch<CategoryController>();
final categoryId = widget.lockedCategoryId ?? '';
final slot = categoryId.isEmpty ? null : controller.slotOf(categoryId);
final dramas = slot?.dramas ?? const <Drama>[];
final dramas = visibleDramasForLocale(
slot?.dramas ?? const <Drama>[],
Localizations.localeOf(context).languageCode,
);
return Column(
children: [
Expanded(
@@ -164,9 +168,8 @@ class _HomeCategoryDramasState extends State<HomeCategoryDramas> {
hasMore: slot?.hasMore ?? false,
hasItems: dramas.isNotEmpty,
errorMessage: null,
onRetry: () => context.read<CategoryController>().loadMore(
categoryId,
),
onRetry: () =>
context.read<CategoryController>().loadMore(categoryId),
),
),
),
+13 -3
View File
@@ -12,6 +12,7 @@ import '../../../core/data/services/catalog_controller.dart';
import '../../../core/data/services/category_controller.dart';
import '../../../core/data/services/home_feed_controller.dart';
import '../../../core/data/services/wallet_controller.dart';
import '../../../core/formatting/content_locale_guard.dart';
import '../../../core/theme/app_colors.dart';
import '../../../core/theme/app_dimens.dart';
import '../../../core/widgets/app_pull_to_refresh.dart';
@@ -194,7 +195,10 @@ class _HomeFeedGridState extends State<HomeFeedGrid> {
mainAxisSpacing: AppDimens.homeGridRowGap,
);
}
final dramas = _dramasFor(category);
final dramas = _dramasFor(
category,
Localizations.localeOf(context).languageCode,
);
if (widget.feedController.loadingFirstPage && dramas.isEmpty) {
return const DramaGridSkeleton(
key: Key('home-grid-skeleton'),
@@ -324,8 +328,14 @@ class _HomeFeedGridState extends State<HomeFeedGrid> {
];
}
List<Drama> _dramasFor(HomeGridCategoryShortcut category) {
final dramas = widget.feedController.dramas;
List<Drama> _dramasFor(
HomeGridCategoryShortcut category,
String languageCode,
) {
final dramas = visibleDramasForLocale(
widget.feedController.dramas,
languageCode,
);
final categoryName = category.categoryName.toLowerCase();
if (categoryName.isEmpty) return dramas;
final matched = dramas
+1 -1
View File
@@ -33,7 +33,7 @@ class MineAboutPage extends StatelessWidget {
),
children: [
Text(
l10n.appName,
l10n.aboutBrandName,
textAlign: TextAlign.center,
style: const TextStyle(
fontFamily: 'Outfit',
+96 -95
View File
@@ -31,8 +31,10 @@ import '../watch_records/watch_records_page.dart';
import 'mine_binding.dart';
import 'mine_logic.dart';
import 'mine_types.dart';
import 'widgets/mine_action_grid.dart';
import 'widgets/mine_header.dart';
import 'widgets/mine_menu.dart';
import 'widgets/mine_stats_panel.dart';
/// K28-B 我的页。
class MyPage extends StatefulWidget {
@@ -84,7 +86,9 @@ class _MyPageState extends State<MyPage> {
_activationRefreshScheduled = true;
WidgetsBinding.instance.addPostFrameCallback((_) {
_activationRefreshScheduled = false;
if (mounted) unawaited(_favorites.load());
if (!mounted) return;
unawaited(_favorites.load());
_refreshWallet(onlyIfMissing: true);
});
}
@@ -96,9 +100,17 @@ class _MyPageState extends State<MyPage> {
if (!mounted || !widget.active) return;
logic.syncPage(active: true, wasActive: false);
unawaited(_favorites.load());
_refreshWallet();
});
}
void _refreshWallet({bool onlyIfMissing = false}) {
if (!_auth.isSignedIn) return;
final wallet = context.read<WalletController>();
if (wallet.loading || (onlyIfMissing && wallet.snapshot != null)) return;
unawaited(wallet.load());
}
void _onAuthChanged() {
final signedIn = _auth.isSignedIn;
if (signedIn == _wasSignedIn) return;
@@ -165,78 +177,62 @@ class _MyPageState extends State<MyPage> {
}
Widget _body(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
return ListView(
key: const Key('mine-page-scroll'),
padding: const EdgeInsets.only(bottom: AppDimens.spaceXl),
children: [
Padding(
padding: const EdgeInsets.symmetric(
horizontal: AppDimens.pageHorizontal,
),
child: MineHeader(
_section(
MineHeader(
onLogin: _openLogin,
onEdit: () => _push(const AccountProfilePage()),
),
),
const SizedBox(height: AppDimens.spaceSm),
_section(_statsPanel()),
const SizedBox(height: AppDimens.spaceMd),
Padding(
padding: const EdgeInsets.symmetric(
horizontal: AppDimens.pageHorizontal,
),
child: MineVipBanner(
onOpen: () => _openDestination(MineDestination.vip),
),
),
const SizedBox(height: AppDimens.mineSectionGap),
Padding(
padding: const EdgeInsets.symmetric(
horizontal: AppDimens.pageHorizontal,
),
child: MineQuickActions(
onWallet: () => _openDestination(MineDestination.wallet),
onFavorites: () => _push(const FavoritesPage()),
onDownloads: () => _openDestination(MineDestination.downloads),
onHistory: () => _openDestination(MineDestination.history),
),
_section(
MineVipBanner(onOpen: () => _openDestination(MineDestination.vip)),
),
const SizedBox(height: AppDimens.mineSectionGap),
Padding(
padding: const EdgeInsets.symmetric(
horizontal: AppDimens.mineGridHorizontal,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
l10n.moreServices,
style: const TextStyle(
color: AppColors.textTertiary,
fontSize: AppDimens.mineSectionTitle,
),
),
const SizedBox(height: AppDimens.spaceSm),
MineServiceList(
onOpen: _openDestination,
onLanguage: _openLanguage,
languageName: _languageName(context),
),
],
child: MineActionGrid(
primaryActions: MinePrimaryActions(
onWallet: () => _openDestination(MineDestination.wallet),
onFavorites: () => unawaited(_openFavoritesPage()),
onDownloads: () => _openDestination(MineDestination.downloads),
onHistory: () => _openDestination(MineDestination.history),
),
serviceActions: MineServiceActions(
onOpen: _openDestination,
onLanguage: _openLanguage,
),
),
),
],
);
}
/// 语言设置行右侧展示的当前语言名。
String _languageName(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
final code = context.read<LocaleController>().locale?.languageCode;
return switch (code) {
'en' => l10n.english,
'id' => l10n.bahasaIndonesia,
_ => l10n.simplifiedChinese,
};
Widget _section(Widget child) {
return Padding(
padding: const EdgeInsets.symmetric(horizontal: AppDimens.pageHorizontal),
child: child,
);
}
Widget _statsPanel() {
return MineStatsSection(
watchRecordCount: logic.recentError == null
? logic.watchRecordTotal
: null,
actions: MineStatsActions(
onWallet: () => _openDestination(MineDestination.wallet),
onHistory: () => _openDestination(MineDestination.history),
onFavorites: () => unawaited(_openFavoritesPage()),
),
);
}
void _openDestination(MineDestination destination) {
@@ -269,6 +265,11 @@ class _MyPageState extends State<MyPage> {
if (mounted) unawaited(logic.refreshRecent());
}
Future<void> _openFavoritesPage() async {
await _push(const FavoritesPage());
if (mounted) unawaited(_favorites.load());
}
Future<void> _push(Widget page) {
return Navigator.of(
context,
@@ -373,56 +374,56 @@ class _LanguageSheet extends StatelessWidget {
type: MaterialType.transparency,
clipBehavior: Clip.antiAlias,
child: SafeArea(
top: false,
child: Padding(
padding: const EdgeInsets.fromLTRB(20, 14, 20, 20),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Expanded(
child: Text(
l10n.language,
style: const TextStyle(
color: AppColors.textPrimary,
fontSize: 20,
fontWeight: FontWeight.w700,
top: false,
child: Padding(
padding: const EdgeInsets.fromLTRB(20, 14, 20, 20),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Expanded(
child: Text(
l10n.language,
style: const TextStyle(
color: AppColors.textPrimary,
fontSize: 20,
fontWeight: FontWeight.w700,
),
),
),
),
IconButton(
tooltip: l10n.close,
onPressed: () => Navigator.pop(context),
visualDensity: VisualDensity.compact,
padding: EdgeInsets.zero,
constraints: const BoxConstraints(
minWidth: 32,
minHeight: 32,
IconButton(
tooltip: l10n.close,
onPressed: () => Navigator.pop(context),
visualDensity: VisualDensity.compact,
padding: EdgeInsets.zero,
constraints: const BoxConstraints(
minWidth: 32,
minHeight: 32,
),
icon: const Icon(Icons.close_rounded, size: 20),
),
icon: const Icon(Icons.close_rounded, size: 20),
),
],
),
for (final option in options)
ListTile(
key: option.$2,
contentPadding: const EdgeInsets.symmetric(horizontal: 4),
title: Text(option.$3),
trailing: selected?.languageCode == option.$1.languageCode
? const Icon(
Icons.check_rounded,
color: AppColors.textPrimary,
)
: null,
onTap: () => Navigator.pop(context, option.$1),
],
),
],
for (final option in options)
ListTile(
key: option.$2,
contentPadding: const EdgeInsets.symmetric(horizontal: 4),
title: Text(option.$3),
trailing: selected?.languageCode == option.$1.languageCode
? const Icon(
Icons.check_rounded,
color: AppColors.textPrimary,
)
: null,
onTap: () => Navigator.pop(context, option.$1),
),
],
),
),
),
),
),
);
}
}
@@ -0,0 +1,270 @@
// Author: fruit.com.cn
import 'package:flutter/material.dart';
import '../../../core/theme/app_colors.dart';
import '../../../core/theme/app_dimens.dart';
import '../../../l10n/app_localizations.dart';
import '../mine_types.dart';
const int _gridColumnCount = 4;
const double _gridMaxTextScale = 1.2;
/// 「我的」页统一操作宫格:常用入口与服务入口按 4×2 排列。
class MineActionGrid extends StatelessWidget {
const MineActionGrid({
super.key,
required this.primaryActions,
required this.serviceActions,
});
final MinePrimaryActions primaryActions;
final MineServiceActions serviceActions;
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
final items = [..._primaryItems(l10n), ..._serviceItems(l10n)];
return SizedBox(
height: AppDimens.mineGridHeight,
child: DecoratedBox(
key: const Key('mine-menu'),
decoration: BoxDecoration(
color: AppColors.mineGridSurface,
border: Border.all(color: AppColors.contentBorder),
borderRadius: BorderRadius.circular(AppDimens.mineGridRadius),
),
child: ClipRRect(
borderRadius: BorderRadius.circular(AppDimens.mineGridRadius),
child: MediaQuery.withClampedTextScaling(
maxScaleFactor: _gridMaxTextScale,
child: Column(
children: [
_row(items.take(_gridColumnCount).toList()),
const _MineHorizontalDivider(),
_row(items.skip(_gridColumnCount).toList()),
],
),
),
),
),
);
}
List<_MineActionItem> _primaryItems(AppLocalizations l10n) {
return [
_MineActionItem(
key: const Key('mine-wallet'),
icon: Icons.account_balance_wallet_outlined,
label: l10n.wallet,
onTap: primaryActions.onWallet,
),
_MineActionItem(
key: const Key('mine-favorites'),
icon: Icons.star_outline_rounded,
label: l10n.myFavorites,
onTap: primaryActions.onFavorites,
),
_MineActionItem(
key: const Key('mine-downloads'),
icon: Icons.download_for_offline_outlined,
label: l10n.offlineDownloads,
onTap: primaryActions.onDownloads,
),
_MineActionItem(
key: const Key('mine-history'),
icon: Icons.history_rounded,
label: l10n.watchHistory,
onTap: primaryActions.onHistory,
),
];
}
List<_MineActionItem> _serviceItems(AppLocalizations l10n) {
return [
_MineActionItem(
key: const Key('mine-help'),
icon: Icons.support_agent_outlined,
label: l10n.contactSupport,
onTap: () => serviceActions.onOpen(MineDestination.help),
),
_MineActionItem(
key: const Key('mine-language'),
icon: Icons.language_rounded,
label: l10n.language,
onTap: serviceActions.onLanguage,
),
_MineActionItem(
key: const Key('mine-settings'),
icon: Icons.settings_outlined,
label: l10n.settings,
onTap: () => serviceActions.onOpen(MineDestination.settings),
),
_MineActionItem(
key: const Key('mine-notices'),
icon: Icons.notifications_none_rounded,
label: l10n.notices,
onTap: () => serviceActions.onOpen(MineDestination.notices),
),
];
}
Widget _row(List<_MineActionItem> items) {
return SizedBox(
height: AppDimens.mineGridCellHeight,
child: Row(
children: [
for (var index = 0; index < items.length; index++) ...[
Expanded(child: _MineActionCell(item: items[index])),
if (index < items.length - 1) const _MineVerticalDivider(),
],
],
),
);
}
}
/// 宫格第一排的常用功能回调。
class MinePrimaryActions {
const MinePrimaryActions({
required this.onWallet,
required this.onFavorites,
required this.onDownloads,
required this.onHistory,
});
final VoidCallback onWallet;
final VoidCallback onFavorites;
final VoidCallback onDownloads;
final VoidCallback onHistory;
}
/// 宫格第二排的服务功能回调。
class MineServiceActions {
const MineServiceActions({required this.onOpen, required this.onLanguage});
final ValueChanged<MineDestination> onOpen;
final VoidCallback onLanguage;
}
class _MineActionItem {
const _MineActionItem({
required this.key,
required this.icon,
required this.label,
required this.onTap,
});
final Key key;
final IconData icon;
final String label;
final VoidCallback onTap;
Key get iconSurfaceKey =>
ValueKey('${(key as ValueKey<String>).value}-icon-surface');
}
class _MineActionCell extends StatelessWidget {
const _MineActionCell({required this.item});
final _MineActionItem item;
@override
Widget build(BuildContext context) {
return Material(
color: AppColors.transparent,
child: InkWell(
key: item.key,
onTap: item.onTap,
child: Semantics(
button: true,
label: item.label,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
_iconSurface(),
const SizedBox(height: AppDimens.spaceSm),
_label(),
],
),
),
),
);
}
Widget _iconSurface() {
return Container(
key: item.iconSurfaceKey,
width: AppDimens.mineGridIconSurface,
height: AppDimens.mineGridIconSurface,
decoration: BoxDecoration(
gradient: const RadialGradient(
center: Alignment(-0.35, -0.45),
radius: 0.95,
colors: [
AppColors.mineOutline,
AppColors.contentChip,
AppColors.mineGridIconSurface,
],
),
shape: BoxShape.circle,
border: Border.all(color: AppColors.glassBorder),
boxShadow: [
const BoxShadow(
color: AppColors.shadowSoft,
blurRadius: AppDimens.spaceSm,
offset: Offset(0, AppDimens.spaceXs),
),
BoxShadow(
color: AppColors.brandRed.withValues(alpha: 0.12),
blurRadius: AppDimens.spaceSm,
),
],
),
child: Icon(
item.icon,
color: AppColors.mineGridIconAccent,
size: AppDimens.mineGridIcon,
),
);
}
Widget _label() {
return Text(
item.label,
maxLines: 2,
overflow: TextOverflow.ellipsis,
textAlign: TextAlign.center,
style: const TextStyle(
color: AppColors.mineGridLabel,
fontSize: AppDimens.mineGridLabel,
fontWeight: FontWeight.w500,
height: AppDimens.mineGridLabelLineHeight,
),
);
}
}
class _MineVerticalDivider extends StatelessWidget {
const _MineVerticalDivider();
@override
Widget build(BuildContext context) {
return Container(
width: AppDimens.mineGridHairline,
color: AppColors.mineGridDivider,
);
}
}
class _MineHorizontalDivider extends StatelessWidget {
const _MineHorizontalDivider();
@override
Widget build(BuildContext context) {
return Container(
height: AppDimens.mineGridHairline,
color: AppColors.mineGridDivider,
);
}
}
+311 -303
View File
@@ -5,11 +5,12 @@ import 'package:flutter/material.dart';
import '../../../core/theme/app_colors.dart';
import '../../../core/theme/app_dimens.dart';
import '../../../l10n/app_localizations.dart';
import '../mine_types.dart';
const double _vipRadius = 14;
const double _vipMaxTextScale = 1.15;
const double _vipGradientMiddleStop = 0.48;
const double _vipGlowRadius = 0.9;
/// 「我的」页金色 VIP 卡:品牌行 + 立即开通 + 2×2 权益宫格。
/// 「我的」页高级 VIP 卡:品牌信息、会员徽章、开通按钮与横排权益。
class MineVipBanner extends StatelessWidget {
const MineVipBanner({super.key, required this.onOpen});
@@ -20,104 +21,21 @@ class MineVipBanner extends StatelessWidget {
final l10n = AppLocalizations.of(context)!;
return Container(
key: const Key('mine-vip'),
decoration: BoxDecoration(
gradient: const LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [AppColors.vipCardStart, AppColors.vipCardEnd],
),
borderRadius: BorderRadius.circular(_vipRadius),
),
decoration: _decoration(),
child: Material(
color: AppColors.transparent,
borderRadius: BorderRadius.circular(_vipRadius),
borderRadius: BorderRadius.circular(AppDimens.mineVipRadius),
clipBehavior: Clip.antiAlias,
child: InkWell(
onTap: onOpen,
child: Padding(
padding: const EdgeInsets.fromLTRB(
AppDimens.cardPadding,
AppDimens.spaceSm + 2,
AppDimens.cardPadding,
AppDimens.spaceSm + 2,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
child: MediaQuery.withClampedTextScaling(
maxScaleFactor: _vipMaxTextScale,
child: Stack(
children: [
Row(
children: [
const Icon(
Icons.diamond_outlined,
color: AppColors.onGold,
size: 24,
),
const SizedBox(width: AppDimens.spaceSm),
Expanded(
child: Text(
l10n.vipBrandName,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
color: AppColors.onGold,
fontSize: 18,
fontWeight: FontWeight.w400,
),
),
),
const SizedBox(width: AppDimens.spaceSm),
_openButton(l10n),
],
),
Transform.translate(
offset: const Offset(0, -7),
child: Text(
l10n.mineVipSubtitle,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: AppColors.onGold.withValues(alpha: 0.7),
fontSize: AppDimens.caption,
),
),
),
const SizedBox(height: AppDimens.mineVipBenefitRowGap),
Container(
height: 1,
color: AppColors.onGold.withValues(alpha: 0.15),
),
const SizedBox(height: AppDimens.mineVipBenefitRowGap),
Table(
defaultColumnWidth: const FlexColumnWidth(),
children: [
TableRow(
children: [
_benefit(
key: const Key('mine-vip-benefit-0'),
icon: Icons.play_circle_outline_rounded,
label: l10n.vipBenefitFree,
),
_benefit(
key: const Key('mine-vip-benefit-1'),
icon: Icons.ads_click_rounded,
label: l10n.vipBenefitNoAds,
),
],
),
TableRow(
children: [
_benefit(
key: const Key('mine-vip-benefit-2'),
icon: Icons.hd_outlined,
label: l10n.vipBenefitHd,
),
_benefit(
key: const Key('mine-vip-benefit-3'),
icon: Icons.download_for_offline_outlined,
label: l10n.vipBenefitFastCache,
),
],
),
],
const Positioned.fill(child: _VipAmbientGlow()),
Padding(
padding: const EdgeInsets.all(AppDimens.mineVipPadding),
child: _VipContent(l10n: l10n, onOpen: onOpen),
),
],
),
@@ -127,147 +45,227 @@ class MineVipBanner extends StatelessWidget {
);
}
Widget _openButton(AppLocalizations l10n) {
return TextButton(
key: const Key('mine-vip-open'),
onPressed: onOpen,
style: TextButton.styleFrom(
minimumSize: const Size(0, AppDimens.mineVipButtonHeight),
padding: const EdgeInsets.symmetric(horizontal: AppDimens.spaceMd),
backgroundColor: AppColors.onGold,
foregroundColor: AppColors.vipGoldStart,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(
AppDimens.mineVipButtonHeight / 2,
),
),
textStyle: const TextStyle(
fontSize: AppDimens.body,
fontWeight: FontWeight.w400,
),
BoxDecoration _decoration() {
return BoxDecoration(
gradient: const LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
AppColors.vipCardStart,
AppColors.vipCardMiddle,
AppColors.vipCardEnd,
],
stops: [0, _vipGradientMiddleStop, 1],
),
child: Text(l10n.vipOpenNow),
borderRadius: BorderRadius.circular(AppDimens.mineVipRadius),
border: Border.all(color: AppColors.vipCardBorder),
boxShadow: const [
BoxShadow(
color: AppColors.vipCardRedGlow,
blurRadius: AppDimens.spaceXl,
offset: Offset(0, AppDimens.spaceSm),
),
BoxShadow(
color: AppColors.shadowSoft,
blurRadius: AppDimens.spaceLg,
offset: Offset(0, AppDimens.spaceSm),
),
],
);
}
}
Widget _benefit({required Key key, required IconData icon, required String label}) {
return Padding(
key: key,
padding: const EdgeInsets.symmetric(vertical: AppDimens.mineVipBenefitRowGap),
child: Row(
class _VipContent extends StatelessWidget {
const _VipContent({required this.l10n, required this.onOpen});
final AppLocalizations l10n;
final VoidCallback onOpen;
@override
Widget build(BuildContext context) {
return Column(
mainAxisSize: MainAxisSize.min,
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(child: _VipCopy(l10n: l10n)),
const SizedBox(width: AppDimens.spaceSm),
_VipAction(l10n: l10n, onOpen: onOpen),
],
),
const SizedBox(height: AppDimens.spaceSm),
const Divider(height: 1, color: AppColors.vipBenefitBorder),
const SizedBox(height: AppDimens.spaceSm),
_VipBenefits(l10n: l10n),
],
);
}
}
class _VipCopy extends StatelessWidget {
const _VipCopy({required this.l10n});
final AppLocalizations l10n;
@override
Widget build(BuildContext context) {
return Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_VipPill(label: l10n.vipMembership),
const SizedBox(height: AppDimens.spaceSm),
Text(
l10n.vipBrandName,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
color: AppColors.vipCardText,
fontSize: AppDimens.mineVipTitleFont,
fontWeight: FontWeight.w700,
letterSpacing: -0.4,
),
),
const SizedBox(height: AppDimens.spaceXs),
Text(
l10n.mineVipSubtitle,
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
color: AppColors.vipCardMuted,
fontSize: AppDimens.mineVipSubtitleFont,
height: 1.3,
),
),
],
);
}
}
class _VipPill extends StatelessWidget {
const _VipPill({required this.label});
final String label;
@override
Widget build(BuildContext context) {
return Container(
padding: const EdgeInsets.symmetric(
horizontal: AppDimens.spaceSm,
vertical: AppDimens.spaceXs,
),
decoration: BoxDecoration(
color: AppColors.vipBadgeSurface,
border: Border.all(color: AppColors.vipBenefitBorder),
borderRadius: BorderRadius.circular(AppDimens.pillRadius),
),
child: Text(
label,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
color: AppColors.vipGoldStart,
fontSize: AppDimens.chipFont,
fontWeight: FontWeight.w700,
letterSpacing: 1.1,
),
),
);
}
}
class _VipAction extends StatelessWidget {
const _VipAction({required this.l10n, required this.onOpen});
final AppLocalizations l10n;
final VoidCallback onOpen;
@override
Widget build(BuildContext context) {
return SizedBox(
width: AppDimens.mineVipActionWidth,
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Container(
width: AppDimens.mineVipBenefitBox,
height: AppDimens.mineVipBenefitBox,
decoration: BoxDecoration(
border: Border.all(
color: AppColors.onGold.withValues(alpha: 0.6),
width: 1.2,
),
borderRadius: BorderRadius.circular(
AppDimens.mineVipBenefitBoxRadius,
),
),
child: Icon(
icon,
color: AppColors.onGold,
size: AppDimens.mineVipBenefitGlyph,
),
),
const SizedBox(width: AppDimens.spaceSm),
Expanded(
child: Text(
label,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
color: AppColors.onGold,
fontSize: AppDimens.mineVipBenefitFont,
),
),
),
const _VipEmblem(),
const SizedBox(height: AppDimens.spaceXs),
_VipOpenButton(label: l10n.vipOpenNow, onOpen: onOpen),
],
),
);
}
}
/// 快捷图标行:钱包 / 我的收藏 / 离线缓存 / 播放历史(设计稿的「奖励」暂不做)。
class MineQuickActions extends StatelessWidget {
const MineQuickActions({
super.key,
required this.onWallet,
required this.onFavorites,
required this.onDownloads,
required this.onHistory,
});
final VoidCallback onWallet;
final VoidCallback onFavorites;
final VoidCallback onDownloads;
final VoidCallback onHistory;
class _VipEmblem extends StatelessWidget {
const _VipEmblem();
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
return Row(
children: [
_action(
key: const Key('mine-wallet'),
icon: Icons.wallet_outlined,
label: l10n.wallet,
onTap: onWallet,
return Container(
key: const Key('mine-vip-emblem'),
width: AppDimens.mineVipEmblem,
height: AppDimens.mineVipEmblem,
decoration: BoxDecoration(
shape: BoxShape.circle,
gradient: const LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [AppColors.vipGoldStart, AppColors.vipGoldEnd],
),
_action(
key: const Key('mine-favorites'),
icon: Icons.star_border_rounded,
label: l10n.myFavorites,
onTap: onFavorites,
),
_action(
key: const Key('mine-downloads'),
icon: Icons.download_outlined,
label: l10n.offlineDownloads,
onTap: onDownloads,
),
_action(
key: const Key('mine-history'),
icon: Icons.history_rounded,
label: l10n.watchHistory,
onTap: onHistory,
),
],
border: Border.all(color: AppColors.vipCardText),
boxShadow: const [
BoxShadow(color: AppColors.vipCardGoldGlow, blurRadius: 18),
],
),
child: const Icon(
Icons.workspace_premium_rounded,
color: AppColors.vipCardStart,
size: AppDimens.mineVipEmblemIcon,
),
);
}
}
Widget _action({
required Key key,
required IconData icon,
required String label,
required VoidCallback onTap,
}) {
return Expanded(
child: InkWell(
key: key,
onTap: onTap,
borderRadius: BorderRadius.circular(10),
child: Padding(
padding: const EdgeInsets.symmetric(vertical: AppDimens.spaceSm),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Icon(icon, color: AppColors.textPrimary, size: AppDimens.mineQuickActionIcon),
const SizedBox(height: AppDimens.mineQuickActionGap),
Text(
class _VipOpenButton extends StatelessWidget {
const _VipOpenButton({required this.label, required this.onOpen});
final String label;
final VoidCallback onOpen;
@override
Widget build(BuildContext context) {
return SizedBox(
key: const Key('mine-vip-open'),
width: AppDimens.mineVipActionWidth,
height: AppDimens.mineVipButtonHeight,
child: DecoratedBox(
decoration: BoxDecoration(
gradient: const LinearGradient(
colors: [AppColors.vipButtonStart, AppColors.vipButtonEnd],
),
borderRadius: BorderRadius.circular(AppDimens.pillRadius),
boxShadow: const [
BoxShadow(color: AppColors.vipCardRedGlow, blurRadius: 14),
],
),
child: Material(
color: AppColors.transparent,
child: InkWell(
onTap: onOpen,
borderRadius: BorderRadius.circular(AppDimens.pillRadius),
child: Center(
child: Text(
label,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
color: AppColors.textPrimary,
fontSize: AppDimens.mineQuickActionLabelFont,
fontSize: AppDimens.body,
fontWeight: FontWeight.w700,
),
),
],
),
),
),
),
@@ -275,107 +273,117 @@ class MineQuickActions extends StatelessWidget {
}
}
/// 「更多服务」列表行:白图标 + 标题 + 可选值 + chevron,行间细分隔线。
class MineServiceList extends StatelessWidget {
const MineServiceList({
super.key,
required this.onOpen,
required this.onLanguage,
required this.languageName,
});
class _VipBenefits extends StatelessWidget {
const _VipBenefits({required this.l10n});
final ValueChanged<MineDestination> onOpen;
final VoidCallback onLanguage;
final String languageName;
final AppLocalizations l10n;
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
final rows = <Widget>[
_row(
key: const Key('mine-help'),
icon: Icons.headset_outlined,
label: l10n.contactSupport,
onTap: () => onOpen(MineDestination.help),
),
_divider(),
_row(
key: const Key('mine-language'),
icon: Icons.language_rounded,
label: l10n.language,
value: languageName,
onTap: onLanguage,
),
_divider(),
_row(
key: const Key('mine-settings'),
icon: Icons.settings_outlined,
label: l10n.settings,
onTap: () => onOpen(MineDestination.settings),
),
_divider(),
_row(
key: const Key('mine-notices'),
icon: Icons.notifications_none_rounded,
label: l10n.notices,
onTap: () => onOpen(MineDestination.notices),
),
final items = [
(Icons.all_inclusive_rounded, l10n.vipBenefitFree),
(Icons.block_rounded, l10n.vipBenefitNoAds),
(Icons.hd_outlined, l10n.vipBenefitHd),
(Icons.download_for_offline_outlined, l10n.vipBenefitFastCache),
];
return Column(key: const Key('mine-menu'), children: rows);
}
Widget _divider() => const Divider(
height: AppDimens.mineGridDividerWidth,
thickness: AppDimens.mineGridDividerWidth,
color: AppColors.contentBorder,
);
Widget _row({
required Key key,
required IconData icon,
required String label,
String? value,
required VoidCallback onTap,
}) {
return SizedBox(
height: AppDimens.mineServiceRowHeight,
child: InkWell(
key: key,
onTap: onTap,
child: Row(
children: [
Icon(icon, color: AppColors.textPrimary, size: AppDimens.mineServiceIcon),
const SizedBox(width: AppDimens.spaceMd),
Expanded(
child: Text(
label,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
color: AppColors.textPrimary,
fontSize: AppDimens.mineServiceTitleFont,
),
),
return Row(
key: const Key('mine-vip-benefits'),
crossAxisAlignment: CrossAxisAlignment.start,
children: [
for (var index = 0; index < items.length; index++)
Expanded(
child: _VipBenefit(
itemKey: Key('mine-vip-benefit-$index'),
icon: items[index].$1,
label: items[index].$2,
),
if (value != null && value.isNotEmpty) ...[
const SizedBox(width: AppDimens.spaceSm),
Text(
value,
style: const TextStyle(
color: AppColors.textTertiary,
fontSize: AppDimens.mineServiceValueFont,
),
),
],
);
}
}
class _VipBenefit extends StatelessWidget {
const _VipBenefit({
required this.itemKey,
required this.icon,
required this.label,
});
final Key itemKey;
final IconData icon;
final String label;
@override
Widget build(BuildContext context) {
return Column(
key: itemKey,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Container(
width: AppDimens.mineVipBenefitBox,
height: AppDimens.mineVipBenefitBox,
decoration: BoxDecoration(
color: AppColors.vipBenefitSurface,
border: Border.all(color: AppColors.vipBenefitBorder),
borderRadius: BorderRadius.circular(
AppDimens.mineVipBenefitBoxRadius,
),
),
child: Icon(
icon,
color: AppColors.vipGoldStart,
size: AppDimens.mineVipBenefitGlyph,
),
),
const SizedBox(height: AppDimens.mineVipBenefitRowGap),
Text(
label,
maxLines: 2,
overflow: TextOverflow.ellipsis,
textAlign: TextAlign.center,
style: const TextStyle(
color: AppColors.vipCardMuted,
fontSize: AppDimens.mineVipBenefitFont,
fontWeight: FontWeight.w500,
height: 1.15,
),
),
],
);
}
}
class _VipAmbientGlow extends StatelessWidget {
const _VipAmbientGlow();
@override
Widget build(BuildContext context) {
return Stack(
children: const [
Positioned.fill(
child: DecoratedBox(
decoration: BoxDecoration(
gradient: RadialGradient(
center: Alignment(0.85, -0.8),
radius: _vipGlowRadius,
colors: [AppColors.vipCardGoldGlow, AppColors.transparent],
),
),
),
),
Positioned.fill(
child: DecoratedBox(
decoration: BoxDecoration(
gradient: RadialGradient(
center: Alignment(-0.9, 1),
radius: _vipGlowRadius,
colors: [AppColors.vipCardRedGlow, AppColors.transparent],
),
],
const SizedBox(width: AppDimens.spaceXs),
const Icon(
Icons.chevron_right_rounded,
color: AppColors.textSecondary,
size: 22,
),
],
),
),
),
],
);
}
}
+218
View File
@@ -0,0 +1,218 @@
// Author: fruit.com.cn
// 绘制个人数据区统一的红色叠层质感图标。
import 'package:flutter/material.dart';
import '../../../core/theme/app_colors.dart';
import '../../../core/theme/app_dimens.dart';
const double _designSize = 48;
const double _depth = 2;
const double _edgeWidth = 0.8;
const double _ringWidth = 1.1;
const double _groundBlur = 3;
const double _sparkleWaist = 0.28;
const double _screenTilt = -0.12;
const double _bookmarkTilt = 0.1;
const Offset _artCenter = Offset(24, 24);
const Rect _groundBounds = Rect.fromLTWH(8, 41, 32, 4);
const LinearGradient _faceGradient = LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
AppColors.mineStatHighlight,
AppColors.brandRed,
AppColors.mineStatShade,
],
);
const LinearGradient _backGradient = LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [AppColors.brandRed, AppColors.mineStatDepth],
);
/// 个人数据的三种图标语义。
enum MineStatIconType { coins, history, favorites }
/// 无位图依赖的品牌红图标,统一亮面、厚度与高光语言。
class MineStatIcon extends StatelessWidget {
/// 根据数据类型绘制图标。
const MineStatIcon({super.key, required this.type});
final MineStatIconType type;
@override
Widget build(BuildContext context) {
return SizedBox.square(
dimension: AppDimens.mineStatsIcon,
child: DecoratedBox(
decoration: const BoxDecoration(
gradient: RadialGradient(
colors: [AppColors.mineStatGlow, AppColors.transparent],
),
),
child: CustomPaint(painter: _MineStatPainter(type)),
),
);
}
}
class _MineStatPainter extends CustomPainter {
const _MineStatPainter(this.type);
final MineStatIconType type;
@override
void paint(Canvas canvas, Size size) {
canvas.save();
canvas.scale(size.width / _designSize, size.height / _designSize);
canvas.drawOval(
_groundBounds,
Paint()
..color = AppColors.mineStatGlow
..maskFilter = const MaskFilter.blur(BlurStyle.normal, _groundBlur),
);
switch (type) {
case MineStatIconType.coins:
_coins(canvas);
case MineStatIconType.history:
_tilt(canvas, _screenTilt);
_screen(canvas);
case MineStatIconType.favorites:
_tilt(canvas, _bookmarkTilt);
_bookmark(canvas);
}
canvas.restore();
}
void _coins(Canvas canvas) {
const backBounds = Rect.fromLTWH(23, 6, 19, 19);
const frontBounds = Rect.fromLTWH(5, 15, 29, 29);
const innerCenter = Offset(19.5, 29.5);
const innerRadius = 11.3;
const stampRadius = 6.5;
const glintCenter = Offset(39, 33);
const double glintRadius = 3;
_surface(canvas, Path()..addOval(backBounds), backBounds, _backGradient);
_surface(canvas, Path()..addOval(frontBounds), frontBounds, _faceGradient);
canvas.drawCircle(
innerCenter,
innerRadius,
Paint()
..color = AppColors.mineStatEdge
..style = PaintingStyle.stroke
..strokeWidth = _ringWidth,
);
_sparkle(canvas, innerCenter, stampRadius);
_sparkle(canvas, glintCenter, glintRadius);
}
void _screen(Canvas canvas) {
const backBounds = Rect.fromLTWH(12, 6, 29, 26);
const frontBounds = Rect.fromLTWH(6, 12, 32, 27);
const innerBounds = Rect.fromLTWH(10, 16, 24, 19);
const outerRadius = Radius.circular(6);
const innerRadius = Radius.circular(3);
const playPoints = [Offset(19, 20), Offset(19, 31), Offset(28, 25.5)];
const reflectionStart = Offset(13, 14);
const reflectionEnd = Offset(26, 14);
final back = Path()
..addRRect(RRect.fromRectAndRadius(backBounds, outerRadius));
final front = Path()
..addRRect(RRect.fromRectAndRadius(frontBounds, outerRadius));
_surface(canvas, back, backBounds, _backGradient);
_surface(canvas, front, frontBounds, _faceGradient);
canvas.drawRRect(
RRect.fromRectAndRadius(innerBounds, innerRadius),
Paint()..shader = _backGradient.createShader(innerBounds),
);
canvas.drawPath(
_polygon(playPoints),
Paint()..color = AppColors.mineStatGlint,
);
_reflection(canvas, reflectionStart, reflectionEnd);
}
void _bookmark(Canvas canvas) {
const bounds = Rect.fromLTWH(12, 7, 23, 35);
const radius = Radius.circular(4);
const cutout = [Offset(11, 44), Offset(23.5, 34), Offset(36, 44)];
const rearOffset = Offset(5, -3);
const stampCenter = Offset(23.5, 21);
const double stampRadius = 6;
const reflectionStart = Offset(17, 10);
const reflectionEnd = Offset(28, 10);
final cover = Path()..addRRect(RRect.fromRectAndRadius(bounds, radius));
final front = Path.combine(
PathOperation.difference,
cover,
_polygon(cutout),
);
_surface(
canvas,
front.shift(rearOffset),
bounds.shift(rearOffset),
_backGradient,
);
_surface(canvas, front, bounds, _faceGradient);
_sparkle(canvas, stampCenter, stampRadius);
_reflection(canvas, reflectionStart, reflectionEnd);
}
void _surface(Canvas canvas, Path path, Rect bounds, Gradient gradient) {
canvas.save();
canvas.translate(0, _depth);
canvas.drawPath(path, Paint()..color = AppColors.mineStatDepth);
canvas.restore();
canvas.drawPath(path, Paint()..shader = gradient.createShader(bounds));
canvas.drawPath(
path,
Paint()
..color = AppColors.mineStatEdge
..style = PaintingStyle.stroke
..strokeJoin = StrokeJoin.round
..strokeWidth = _edgeWidth,
);
}
void _sparkle(Canvas canvas, Offset center, double radius) {
final waist = radius * _sparkleWaist;
final points = [
center + Offset(0, -radius),
center + Offset(waist, -waist),
center + Offset(radius, 0),
center + Offset(waist, waist),
center + Offset(0, radius),
center + Offset(-waist, waist),
center + Offset(-radius, 0),
center + Offset(-waist, -waist),
];
canvas.drawPath(_polygon(points), Paint()..color = AppColors.mineStatGlint);
}
Path _polygon(List<Offset> points) {
return Path()..addPolygon(points, true);
}
void _reflection(Canvas canvas, Offset start, Offset end) {
canvas.drawLine(
start,
end,
Paint()
..color = AppColors.mineStatEdge
..strokeCap = StrokeCap.round
..strokeWidth = _ringWidth,
);
}
void _tilt(Canvas canvas, double angle) {
canvas.translate(_artCenter.dx, _artCenter.dy);
canvas.rotate(angle);
canvas.translate(-_artCenter.dx, -_artCenter.dy);
}
@override
bool shouldRepaint(covariant _MineStatPainter oldDelegate) {
return oldDelegate.type != type;
}
}
+203 -64
View File
@@ -1,91 +1,230 @@
// Author: fruit.com.cn
// 展示可点击的金币、观看记录与收藏三列个人数据。
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:provider/provider.dart';
import '../../../core/data/services/auth_controller.dart';
import '../../../core/data/services/favorite_controller.dart';
import '../../../core/data/services/wallet_controller.dart';
import '../../../core/theme/app_colors.dart';
import '../../../core/theme/app_dimens.dart';
import '../../../l10n/app_localizations.dart';
import 'mine_stat_icon.dart';
class MineStatsPanel extends StatelessWidget {
const MineStatsPanel({
const int _labelMaxLines = 2;
const double _dividerTop = 36;
/// 三项个人数据入口的现有页面回调。
class MineStatsActions {
/// 绑定钱包、观看记录与收藏页面。
const MineStatsActions({
required this.onWallet,
required this.onHistory,
required this.onFavorites,
});
final VoidCallback onWallet;
final VoidCallback onHistory;
final VoidCallback onFavorites;
}
/// 将共享的账号、钱包和收藏状态绑定到个人数据区。
class MineStatsSection extends StatelessWidget {
/// 观看记录由我的页逻辑提供,其余状态沿用全局 Provider。
const MineStatsSection({
super.key,
required this.followingCount,
required this.watchRecordCount,
required this.coinBalance,
required this.actions,
});
final int? followingCount;
final int? watchRecordCount;
final MineStatsActions actions;
@override
Widget build(BuildContext context) {
final signedIn = context.watch<AuthController>().isSignedIn;
final wallet = context.watch<WalletController>();
final favorites = context.watch<FavoriteController>();
return MineStatsPanel(
coinBalance: signedIn && wallet.error == null
? wallet.snapshot?.wallet.coinBalance
: null,
watchRecordCount: watchRecordCount,
favoriteCount: favorites.loaded && favorites.error == null
? favorites.total
: null,
actions: actions,
);
}
}
/// 头像与会员卡之间的个人数据,未知值与真实零值明确区分。
class MineStatsPanel extends StatelessWidget {
/// 使用真实服务端总数与共享钱包余额构建数据区。
const MineStatsPanel({
super.key,
required this.coinBalance,
required this.watchRecordCount,
required this.favoriteCount,
required this.actions,
});
final int? coinBalance;
final int? watchRecordCount;
final int? favoriteCount;
final MineStatsActions actions;
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
return Container(
return Row(
key: const Key('mine-stats'),
padding: const EdgeInsets.all(AppDimens.minePanelPadding),
decoration: BoxDecoration(
color: AppColors.minePanelSurface,
borderRadius: BorderRadius.circular(AppDimens.mineGridRadius),
),
child: Row(
children: [
_stat(
key: const Key('mine-stat-following'),
value: followingCount,
label: l10n.followingCountLabel,
l10n: l10n,
),
_stat(
key: const Key('mine-stat-watch-records'),
value: watchRecordCount,
label: l10n.watchRecordsCountLabel,
l10n: l10n,
),
_stat(
key: const Key('mine-stat-coins'),
value: coinBalance,
label: l10n.coinBalance,
l10n: l10n,
),
],
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_tile(
type: MineStatIconType.coins,
value: coinBalance,
label: l10n.coinBalance,
onTap: actions.onWallet,
),
_divider(),
_tile(
type: MineStatIconType.history,
value: watchRecordCount,
label: l10n.watchRecordsCountLabel,
onTap: actions.onHistory,
),
_divider(),
_tile(
type: MineStatIconType.favorites,
value: favoriteCount,
label: l10n.myFavorites,
onTap: actions.onFavorites,
),
],
);
}
Widget _tile({
required MineStatIconType type,
required int? value,
required String label,
required VoidCallback onTap,
}) {
return Expanded(
child: _MineStatTile(
type: type,
value: value,
label: label,
onTap: onTap,
),
);
}
Widget _stat({
required Key key,
required int? value,
required String label,
required AppLocalizations l10n,
}) {
return Expanded(
child: Column(
key: key,
children: [
Text(
value?.toString() ?? l10n.dataUnavailable,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
color: AppColors.textPrimary,
fontSize: AppDimens.mineStatsValueFont,
fontWeight: FontWeight.w700,
),
),
const SizedBox(height: AppDimens.spaceXs),
Text(
label,
maxLines: 1,
overflow: TextOverflow.ellipsis,
textAlign: TextAlign.center,
style: const TextStyle(
color: AppColors.textTertiary,
fontSize: AppDimens.mineStatsLabelFont,
),
),
],
Widget _divider() {
return Padding(
padding: const EdgeInsets.only(top: _dividerTop),
child: Container(
width: AppDimens.mineStatsDividerWidth,
height: AppDimens.mineStatsDividerHeight,
color: AppColors.contentBorder,
),
);
}
}
class _MineStatTile extends StatelessWidget {
const _MineStatTile({
required this.type,
required this.value,
required this.label,
required this.onTap,
});
final MineStatIconType type;
final int? value;
final String label;
final VoidCallback onTap;
String get _key => switch (type) {
MineStatIconType.coins => 'mine-stat-coins',
MineStatIconType.history => 'mine-stat-watch-records',
MineStatIconType.favorites => 'mine-stat-favorites',
};
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
final formatted = value == null
? l10n.dataUnavailable
: NumberFormat.decimalPattern(l10n.localeName).format(value);
return Semantics(
button: true,
label: label,
value: formatted,
onTap: onTap,
excludeSemantics: true,
child: Material(
color: AppColors.transparent,
child: InkWell(
key: ValueKey(_key),
onTap: onTap,
excludeFromSemantics: true,
borderRadius: BorderRadius.circular(AppDimens.innerRadius),
child: ConstrainedBox(
constraints: const BoxConstraints(
minHeight: AppDimens.mineStatsMinHeight,
),
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: AppDimens.spaceXs,
vertical: AppDimens.spaceSm,
),
child: _content(formatted),
),
),
),
),
);
}
Widget _content(String formatted) {
return Column(
mainAxisSize: MainAxisSize.min,
children: [
MineStatIcon(key: ValueKey('$_key-icon'), type: type),
const SizedBox(height: AppDimens.spaceXs),
FittedBox(
fit: BoxFit.scaleDown,
child: Text(
formatted,
key: ValueKey('$_key-value'),
maxLines: 1,
style: const TextStyle(
fontFamily: 'Outfit',
color: AppColors.textPrimary,
fontSize: AppDimens.mineStatsValueFont,
fontWeight: FontWeight.w600,
fontFeatures: [FontFeature.tabularFigures()],
height: AppDimens.mineStatsValueLineHeight,
),
),
),
const SizedBox(height: AppDimens.spaceXs),
Text(
label,
maxLines: _labelMaxLines,
overflow: TextOverflow.ellipsis,
textAlign: TextAlign.center,
style: const TextStyle(
color: AppColors.textTertiary,
fontSize: AppDimens.mineStatsLabelFont,
height: AppDimens.mineStatsLabelLineHeight,
),
),
],
);
}
}
@@ -155,12 +155,12 @@ class _DramaInfoSheetState extends State<DramaInfoSheet> {
);
}
/// 视觉上是个小圆钮,点按区域仍是 40pt,避免太小点不中。
/// 视觉上是个小圆钮,点按区域为 44pt。
Widget _closeButton(AppLocalizations l10n) {
return SizedBox(
key: const Key('drama-info-close'),
width: 40,
height: 40,
width: AppDimens.tapTarget,
height: AppDimens.tapTarget,
child: Center(
child: Semantics(
button: true,
Loaded 100 of 132 files, more files were not shown because too many files have changed in this diff. Show more