merge: 合并 K31-C 频道选中态主题色
This commit is contained in:
commit
cfc41efddc
2 files changed
+11
-10
No files matched your search
@@ -255,12 +255,10 @@ class _HomeBrowseViewState extends State<HomeBrowseView> {
|
|||||||
required bool selected,
|
required bool selected,
|
||||||
required bool overImage,
|
required bool overImage,
|
||||||
}) {
|
}) {
|
||||||
final color = overImage
|
final color = selected
|
||||||
? (selected ? Colors.white : Colors.white70)
|
? AppColors.blue
|
||||||
: (selected ? AppColors.onSurface : AppColors.muted);
|
: (overImage ? Colors.white70 : AppColors.muted);
|
||||||
final underlineColor = selected
|
final underlineColor = selected ? AppColors.blue : Colors.transparent;
|
||||||
? (overImage ? Colors.white : AppColors.blue)
|
|
||||||
: Colors.transparent;
|
|
||||||
return Semantics(
|
return Semantics(
|
||||||
button: true,
|
button: true,
|
||||||
selected: selected,
|
selected: selected,
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import 'package:fruitshorts/core/data/models/watch_progress.dart';
|
|||||||
import 'package:fruitshorts/core/data/repositories/favorite_repository.dart';
|
import 'package:fruitshorts/core/data/repositories/favorite_repository.dart';
|
||||||
import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
|
import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
|
||||||
import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
|
import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
|
||||||
|
import 'package:fruitshorts/core/theme/app_colors.dart';
|
||||||
import 'package:fruitshorts/pages/player/player_view.dart';
|
import 'package:fruitshorts/pages/player/player_view.dart';
|
||||||
import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
|
import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
|
||||||
import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
|
import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
|
||||||
@@ -53,19 +54,21 @@ void main() {
|
|||||||
) async {
|
) async {
|
||||||
await _pumpApp(tester);
|
await _pumpApp(tester);
|
||||||
|
|
||||||
// 悬浮在轮播图上:选中白色下划线,未选中透明占位。
|
// 选中态用主题色,未选中保留白色文字与透明占位。
|
||||||
expect(_underlineColor(tester, 'hot'), Colors.white);
|
expect(_underlineColor(tester, 'hot'), AppColors.blue);
|
||||||
expect(_underlineColor(tester, 'free'), Colors.transparent);
|
expect(_underlineColor(tester, 'free'), Colors.transparent);
|
||||||
expect(_labelStyle(tester, 'hot').fontWeight, FontWeight.w800);
|
expect(_labelStyle(tester, 'hot').fontWeight, FontWeight.w800);
|
||||||
expect(_labelStyle(tester, 'free').fontWeight, FontWeight.w600);
|
expect(_labelStyle(tester, 'free').fontWeight, FontWeight.w600);
|
||||||
expect(_labelStyle(tester, 'hot').color, Colors.white);
|
expect(_labelStyle(tester, 'hot').color, AppColors.blue);
|
||||||
expect(_labelStyle(tester, 'free').color, Colors.white70);
|
expect(_labelStyle(tester, 'free').color, Colors.white70);
|
||||||
|
|
||||||
await tester.tap(find.byKey(const Key('home-channel-free')));
|
await tester.tap(find.byKey(const Key('home-channel-free')));
|
||||||
await tester.pumpAndSettle();
|
await tester.pumpAndSettle();
|
||||||
|
|
||||||
expect(_underlineColor(tester, 'hot'), Colors.transparent);
|
expect(_underlineColor(tester, 'hot'), Colors.transparent);
|
||||||
expect(_underlineColor(tester, 'free'), Colors.white);
|
expect(_underlineColor(tester, 'free'), AppColors.blue);
|
||||||
|
expect(_labelStyle(tester, 'free').color, AppColors.blue);
|
||||||
|
expect(_labelStyle(tester, 'hot').color, Colors.white70);
|
||||||
expect(_labelStyle(tester, 'free').fontWeight, FontWeight.w800);
|
expect(_labelStyle(tester, 'free').fontWeight, FontWeight.w800);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user