Skip to content

Commit 8bc6dd7

Browse files
committed
fix: fixed mistaking manhwa as anime
1 parent 5936d40 commit 8bc6dd7

File tree

3 files changed

+52
-343
lines changed

3 files changed

+52
-343
lines changed

lib/widgets/history/tap_history_cards.dart

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import 'package:anymex/controllers/service_handler/service_handler.dart';
12
import 'package:anymex/controllers/settings/methods.dart';
23
import 'package:anymex/models/Media/media.dart';
34
import 'package:anymex/screens/anime/details_page.dart';
@@ -39,7 +40,12 @@ class RecentlyOpenedAnimeCard extends StatelessWidget {
3940

4041
return AnymexOnTap(
4142
onTap: () {
42-
if (media.type != "MANGA") {
43+
if (serviceHandler.serviceType.value == ServicesType.simkl) {
44+
navigate(() =>
45+
AnimeDetailsPage(media: media, tag: media.createdAt.toString()));
46+
return;
47+
}
48+
if (media.type == "ANIME") {
4349
navigate(() =>
4450
AnimeDetailsPage(media: media, tag: media.createdAt.toString()));
4551
} else {

lib/widgets/non_widgets/settings_sheet.dart

Lines changed: 45 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import 'package:anymex/screens/profile/profile_page.dart';
55
import 'package:anymex/screens/settings/settings.dart';
66
import 'package:anymex/screens/local_source/local_source_view.dart';
77
import 'package:anymex/utils/function.dart';
8+
import 'package:anymex/widgets/custom_widgets/anymex_bottomsheet.dart';
89
import 'package:anymex/widgets/helper/tv_wrapper.dart';
910
import 'package:anymex/widgets/custom_widgets/custom_text.dart';
1011
import 'package:anymex/widgets/non_widgets/snackbar.dart';
@@ -21,12 +22,9 @@ class SettingsSheet extends StatelessWidget {
2122
final serviceHandler = Get.find<ServiceHandler>();
2223

2324
static void show(BuildContext context) {
24-
showModalBottomSheet(
25-
context: context,
26-
isScrollControlled: true,
27-
backgroundColor: Theme.of(context).colorScheme.surface,
28-
builder: (context) => SettingsSheet(),
29-
);
25+
AnymexSheet(
26+
customWidget: SettingsSheet(),
27+
).show(context);
3028
}
3129

3230
void showServiceSelector(BuildContext context) {
@@ -55,49 +53,46 @@ class SettingsSheet extends StatelessWidget {
5553
},
5654
];
5755

58-
showModalBottomSheet(
59-
context: context,
60-
isScrollControlled: true,
61-
backgroundColor: Theme.of(context).colorScheme.surface,
62-
builder: (context) => Padding(
63-
padding: const EdgeInsets.all(20.0),
64-
child: Column(
65-
mainAxisSize: MainAxisSize.min,
66-
children: [
67-
const AnymexText(
68-
text: "Select Service",
69-
size: 16,
70-
variant: TextVariant.semiBold,
71-
),
72-
...services.map((service) => ListTile(
73-
leading: service['icon'] != null
74-
? Image.asset(
75-
color: Theme.of(context).colorScheme.primary,
76-
'assets/images/${service['icon']}',
77-
width: 30,
78-
)
79-
: Icon(
80-
Icons.extension,
81-
size: 30,
82-
color: Theme.of(context).colorScheme.primary,
83-
),
84-
title: AnymexText(
85-
text: service['name'] as String,
86-
variant: TextVariant.semiBold,
87-
color: serviceHandler.serviceType.value == service['type']
88-
? Theme.of(context).colorScheme.primary
89-
: null,
90-
),
91-
onTap: () {
92-
serviceHandler
93-
.changeService(service['type'] as ServicesType);
94-
Navigator.pop(context);
95-
},
96-
)),
97-
],
56+
AnymexSheet.custom(
57+
Padding(
58+
padding: const EdgeInsets.all(20.0),
59+
child: Column(
60+
mainAxisSize: MainAxisSize.min,
61+
children: [
62+
const AnymexText(
63+
text: "Select Service",
64+
size: 16,
65+
variant: TextVariant.semiBold,
66+
),
67+
...services.map((service) => ListTile(
68+
leading: service['icon'] != null
69+
? Image.asset(
70+
color: Theme.of(context).colorScheme.primary,
71+
'assets/images/${service['icon']}',
72+
width: 30,
73+
)
74+
: Icon(
75+
Icons.extension,
76+
size: 30,
77+
color: Theme.of(context).colorScheme.primary,
78+
),
79+
title: AnymexText(
80+
text: service['name'] as String,
81+
variant: TextVariant.semiBold,
82+
color: serviceHandler.serviceType.value == service['type']
83+
? Theme.of(context).colorScheme.primary
84+
: null,
85+
),
86+
onTap: () {
87+
serviceHandler
88+
.changeService(service['type'] as ServicesType);
89+
Get.back();
90+
},
91+
)),
92+
],
93+
),
9894
),
99-
),
100-
);
95+
context);
10196
}
10297

10398
@override
@@ -119,6 +114,8 @@ class SettingsSheet extends StatelessWidget {
119114
borderRadius: BorderRadius.circular(50),
120115
child: CachedNetworkImage(
121116
fit: BoxFit.cover,
117+
width: 45,
118+
height: 45,
122119
errorWidget: (context, url, error) =>
123120
const Icon(IconlyBold.profile),
124121
imageUrl:

0 commit comments

Comments
 (0)