Skip to content

Commit 1e02daa

Browse files
author
GhostenEditor
committed
fix(ui): 继续观看部分显示调整
Closes #243
1 parent ad756e2 commit 1e02daa

File tree

6 files changed

+53
-27
lines changed

6 files changed

+53
-27
lines changed

lib/pages/components/image_card.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class ImageCard extends StatelessWidget {
4242
spacing: 4,
4343
children: [
4444
ConstrainedBox(
45-
constraints: constraints.deflate(const EdgeInsets.symmetric(vertical: 21)).copyWith(minHeight: 0),
45+
constraints: constraints.deflate(const EdgeInsets.symmetric(vertical: 33)).copyWith(minHeight: 0),
4646
child: Material(
4747
color: Theme.of(context).colorScheme.surfaceContainerHighest,
4848
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(6)),

lib/pages/media/components/channel.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ class _MediaGridChannelState<T> extends State<MediaGridChannel<T>> {
276276
showNoMoreItemsIndicatorAsGridChild: false,
277277
gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
278278
maxCrossAxisExtent: 120,
279-
childAspectRatio: 0.5,
279+
childAspectRatio: 0.485,
280280
mainAxisSpacing: 16,
281281
crossAxisSpacing: 16,
282282
),

lib/pages/media/movie_list.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class _MovieListPageState extends State<MovieListPage> {
6161
),
6262
MediaChannel(
6363
label: AppLocalizations.of(context)!.watchNow,
64-
height: 230,
64+
height: 262,
6565
future: Api.movieNextToPlayQueryAll(),
6666
more: IconButton(
6767
style: IconButton.styleFrom(
@@ -90,13 +90,13 @@ class _MovieListPageState extends State<MovieListPage> {
9090
limit: 8,
9191
),
9292
).then((data) => data.data),
93-
height: 230,
93+
height: 262,
9494
builder: (context, item, index) => _buildMediaCard(context, item, width: 120, height: 180),
9595
loadingBuilder: (context) => const ImageCardPlaceholder(width: 120, height: 180),
9696
),
9797
MediaChannel(
9898
label: AppLocalizations.of(context)!.tagNewAdd,
99-
height: 230,
99+
height: 262,
100100
future: Api.movieQueryAll(
101101
const MediaSearchQuery(
102102
sort: SortConfig(type: SortType.createAt, direction: SortDirection.desc),
@@ -108,7 +108,7 @@ class _MovieListPageState extends State<MovieListPage> {
108108
),
109109
MediaChannel(
110110
label: AppLocalizations.of(context)!.tagNewRelease,
111-
height: 230,
111+
height: 262,
112112
future: Api.movieQueryAll(
113113
const MediaSearchQuery(
114114
sort: SortConfig(type: SortType.createAt, direction: SortDirection.desc),

lib/pages/media/tv_list.dart

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class _TVListPageState extends State<TVListPage> {
6161
),
6262
MediaChannel(
6363
label: AppLocalizations.of(context)!.watchNow,
64-
height: 160,
64+
height: 183,
6565
future: Api.tvSeriesNextToPlayQueryAll(),
6666
builder: _buildRecentMediaCard,
6767
more: IconButton(
@@ -90,13 +90,13 @@ class _TVListPageState extends State<TVListPage> {
9090
limit: 8,
9191
),
9292
).then((data) => data.data),
93-
height: 230,
93+
height: 262,
9494
builder: (context, item, index) => _buildMediaCard(context, item, width: 120, height: 180),
9595
loadingBuilder: (context) => const ImageCardPlaceholder(width: 120, height: 180),
9696
),
9797
MediaChannel(
9898
label: AppLocalizations.of(context)!.tagNewAdd,
99-
height: 230,
99+
height: 262,
100100
future: Api.tvSeriesQueryAll(
101101
const MediaSearchQuery(
102102
sort: SortConfig(type: SortType.createAt, direction: SortDirection.desc),
@@ -108,7 +108,7 @@ class _TVListPageState extends State<TVListPage> {
108108
),
109109
MediaChannel(
110110
label: AppLocalizations.of(context)!.tagNewRelease,
111-
height: 230,
111+
height: 262,
112112
future: Api.tvSeriesQueryAll(
113113
const MediaSearchQuery(
114114
sort: SortConfig(type: SortType.createAt, direction: SortDirection.desc),
@@ -132,8 +132,21 @@ class _TVListPageState extends State<TVListPage> {
132132
return ImageCard(
133133
item.poster,
134134
width: 180,
135-
height: 102,
136-
title: Text(item.displayRecentTitle()),
135+
height: 114,
136+
title: Column(
137+
crossAxisAlignment: CrossAxisAlignment.start,
138+
children: [
139+
if (item.seriesTitle != null)
140+
Text(
141+
item.seriesTitle!,
142+
style: Theme.of(context).textTheme.labelMedium!.copyWith(fontWeight: FontWeight.bold),
143+
),
144+
Text(
145+
'S${item.season} E${item.episode} - ${item.displayTitle()}',
146+
style: Theme.of(context).textTheme.labelSmall,
147+
),
148+
],
149+
),
137150
subtitle: Row(
138151
mainAxisAlignment: MainAxisAlignment.spaceBetween,
139152
children: [

lib/pages_tv/media/tv_list.dart

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,20 @@ class _TVListPageState extends State<TVListPage> {
244244
return MediaGridItem(
245245
imageWidth: width,
246246
imageHeight: height,
247-
title: Text(item.displayRecentTitle()),
247+
title: Column(
248+
crossAxisAlignment: CrossAxisAlignment.start,
249+
children: [
250+
if (item.seriesTitle != null)
251+
Text(
252+
item.seriesTitle!,
253+
style: Theme.of(context).textTheme.titleSmall!.copyWith(fontWeight: FontWeight.bold),
254+
),
255+
Text(
256+
'S${item.season} E${item.episode} - ${item.displayTitle()}',
257+
style: Theme.of(context).textTheme.labelMedium!.copyWith(fontWeight: FontWeight.bold),
258+
),
259+
],
260+
),
248261
subtitle: Row(
249262
mainAxisAlignment: MainAxisAlignment.spaceBetween,
250263
children: [

pubspec.lock

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ packages:
3636
dependency: transitive
3737
description:
3838
name: bloc
39-
sha256: e18b8e7825e9921d67a6d256dba0b6015ece8a577eb0a411845c46a352994d78
39+
sha256: a2cebb899f91d36eeeaa55c7b20b5915db5a9df1b8fd4a3c9c825e22e474537d
4040
url: "https://pub.dev"
4141
source: hosted
42-
version: "9.0.1"
42+
version: "9.1.0"
4343
bluetooth:
4444
dependency: "direct main"
4545
description:
@@ -366,26 +366,26 @@ packages:
366366
dependency: transitive
367367
description:
368368
name: leak_tracker
369-
sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
369+
sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
370370
url: "https://pub.dev"
371371
source: hosted
372-
version: "11.0.2"
372+
version: "10.0.9"
373373
leak_tracker_flutter_testing:
374374
dependency: transitive
375375
description:
376376
name: leak_tracker_flutter_testing
377-
sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
377+
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
378378
url: "https://pub.dev"
379379
source: hosted
380-
version: "3.0.10"
380+
version: "3.0.9"
381381
leak_tracker_testing:
382382
dependency: transitive
383383
description:
384384
name: leak_tracker_testing
385-
sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
385+
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
386386
url: "https://pub.dev"
387387
source: hosted
388-
version: "3.0.2"
388+
version: "3.0.1"
389389
lints:
390390
dependency: transitive
391391
description:
@@ -487,10 +487,10 @@ packages:
487487
dependency: transitive
488488
description:
489489
name: path_provider_android
490-
sha256: "993381400e94d18469750e5b9dcb8206f15bc09f9da86b9e44a9b0092a0066db"
490+
sha256: "3b4c1fc3aa55ddc9cd4aa6759984330d5c8e66aa7702a6223c61540dc6380c37"
491491
url: "https://pub.dev"
492492
source: hosted
493-
version: "2.2.18"
493+
version: "2.2.19"
494494
path_provider_foundation:
495495
dependency: transitive
496496
description:
@@ -844,10 +844,10 @@ packages:
844844
dependency: transitive
845845
description:
846846
name: test_api
847-
sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
847+
sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
848848
url: "https://pub.dev"
849849
source: hosted
850-
version: "0.7.6"
850+
version: "0.7.4"
851851
typed_data:
852852
dependency: transitive
853853
description:
@@ -932,10 +932,10 @@ packages:
932932
dependency: transitive
933933
description:
934934
name: vector_math
935-
sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
935+
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
936936
url: "https://pub.dev"
937937
source: hosted
938-
version: "2.2.0"
938+
version: "2.1.4"
939939
video_player:
940940
dependency: "direct main"
941941
description:

0 commit comments

Comments
 (0)