Skip to content

Commit 3b96f21

Browse files
committed
Merge branch 'master' into release
2 parents b22ab79 + 73b392b commit 3b96f21

File tree

5 files changed

+34
-23
lines changed

5 files changed

+34
-23
lines changed

RELEASE_NOTES.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
- Fixed issue with MAL updater for dub entries.
2+
- Added sub or dub indicator in MAL updater dialog.
13
- Fixed MAL syncing bug.
24
- Improve loading speed in splash screen.
3-
- Fixed issue with new feed not properly caching.
5+
- Fixed issue with news feed not properly caching.
46
- Improved user experience.
57
- Fixed an issue with ads.

lib/src/components/animelist/animelist.controller.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ class AnimelistController extends MomentumController<AnimelistModel> {
8888
model.update(loadingUserAnimeDetails: false);
8989
}
9090

91-
AnimeEntry getAnimeItem(int malId) {
91+
AnimeEntry getAnimeItem(String slug) {
9292
try {
93-
return model.list.firstWhere((x) => x.malId == malId);
93+
return model.list.firstWhere((x) => x.slug == slug);
9494
} on Exception {
9595
return AnimeEntry();
9696
}

lib/src/widgets/listing/anime.item-integration.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class AnimeItemIntegrationAction extends StatelessWidget {
6060
),
6161
onPressed: () {
6262
Momentum.controller<AnimelistController>(context).getUserAnimeDetails(item);
63-
showMalUpdater(context, item.malId);
63+
showMalUpdater(context, item.slug);
6464
},
6565
),
6666
),

lib/src/widgets/listing/anime.item.dart

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,9 @@ class AnimeItem extends StatelessWidget {
3333
final switchWidget = ButtonSwith(
3434
value: following,
3535
loading: topicLoading,
36-
onChanged: (value) {
37-
Momentum.controller<AnimelistController>(context).toggleTopic(
38-
item,
39-
flagEntry: true,
40-
);
36+
onChanged: (value) async {
37+
final controller = Momentum.controller<AnimelistController>(context);
38+
await controller.toggleTopic(item, flagEntry: true);
4139
},
4240
);
4341
return TextButton(
@@ -182,7 +180,7 @@ class _AnimeEntryType extends StatelessWidget {
182180
child: TextBadge(
183181
item.type.toUpperCase(),
184182
size: 8,
185-
color: item.type == 'sub' ? Colors.green : Colors.purple,
183+
color: item.isSub ? Colors.green : Colors.purple,
186184
),
187185
);
188186
}

lib/src/widgets/syncing/mal-updater.dart

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
import 'package:flutter/material.dart';
22
import 'package:momentum/momentum.dart';
33
import 'package:quantz/src/widgets/icon_button.dart';
4+
import 'package:quantz/src/widgets/index.dart';
45
import '../../components/animelist/index.dart';
56
import '../../data/mal-user.animelist.dart';
67

78
import '../../data/response.all_anime.dart';
89
import '../button.dart';
910

10-
showMalUpdater(BuildContext context, int malId) {
11+
showMalUpdater(BuildContext context, String slug) {
1112
showDialog(
1213
barrierDismissible: false,
1314
context: context,
1415
builder: (context) {
1516
return WillPopScope(
1617
onWillPop: () async => false,
17-
child: _MalUpdater(malId: malId),
18+
child: _MalUpdater(slug: slug),
1819
);
1920
},
2021
);
@@ -23,10 +24,10 @@ showMalUpdater(BuildContext context, int malId) {
2324
class _MalUpdater extends StatefulWidget {
2425
const _MalUpdater({
2526
Key? key,
26-
required this.malId,
27+
required this.slug,
2728
}) : super(key: key);
2829

29-
final int malId;
30+
final String slug;
3031

3132
@override
3233
__MalUpdaterState createState() => __MalUpdaterState();
@@ -40,7 +41,7 @@ class __MalUpdaterState extends State<_MalUpdater> {
4041
AnimelistController get animelistController => _animelistController!;
4142

4243
AnimeEntry get anime {
43-
return animelistController.getAnimeItem(widget.malId);
44+
return animelistController.getAnimeItem(widget.slug);
4445
}
4546

4647
String get latestEpisode {
@@ -89,14 +90,24 @@ class __MalUpdaterState extends State<_MalUpdater> {
8990
return Column(
9091
mainAxisSize: MainAxisSize.min,
9192
children: [
92-
Text(
93-
anime.displayTitle,
94-
style: TextStyle(
95-
fontSize: 18,
96-
fontWeight: FontWeight.bold,
97-
),
98-
maxLines: 99,
99-
textAlign: TextAlign.center,
93+
Row(
94+
mainAxisAlignment: MainAxisAlignment.center,
95+
children: [
96+
Text(
97+
anime.displayTitle,
98+
style: TextStyle(
99+
fontSize: 18,
100+
fontWeight: FontWeight.bold,
101+
),
102+
maxLines: 99,
103+
textAlign: TextAlign.center,
104+
),
105+
SizedBox(width: 8),
106+
TextBadge(
107+
anime.type.toUpperCase(),
108+
color: anime.isSub ? Colors.green : Colors.purple,
109+
),
110+
],
100111
),
101112
SizedBox(height: 12),
102113
Row(

0 commit comments

Comments
 (0)