Skip to content

Commit 317b69b

Browse files
aayush2622aayush2622
committed
chore: random stuff
1 parent a9426be commit 317b69b

File tree

11 files changed

+87
-44
lines changed

11 files changed

+87
-44
lines changed

‎lib/Adaptor/Media/Widgets/MediaCard.dart

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
import 'package:flutter/material.dart';
22

3-
import '../../../Functions/Function.dart';
43
import '../../../Widgets/CachedNetworkImage.dart';
54

65
Widget MediaCard(
7-
BuildContext context, String title, Widget route, String imageUrl) {
6+
BuildContext context,
7+
String title,
8+
String imageUrl, {
9+
void Function()? onTap,
10+
}) {
811
double height = 72;
912
final theme = Theme.of(context).colorScheme;
1013
var screenWidth = MediaQuery.of(context).size.width;
@@ -13,7 +16,7 @@ Widget MediaCard(
1316
double radius = 10;
1417

1518
return GestureDetector(
16-
onTap: () => navigateToPage(context, route),
19+
onTap: onTap,
1720
child: Card(
1821
shape: RoundedRectangleBorder(
1922
borderRadius: BorderRadius.circular(radius),

‎lib/Api/Extensions/Screens/ExtensionsAnimeScreen.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import 'package:dantotsu/Api/Sources/Eval/dart/model/m_pages.dart';
22
import 'package:flutter/material.dart';
33
import 'package:get/get_rx/src/rx_types/rx_types.dart';
44

5+
import '../../../Adaptor/Media/Widgets/Chips.dart';
56
import '../../../Adaptor/Media/Widgets/MediaSection.dart';
67
import '../../../DataClass/Media.dart';
78
import '../../../Functions/Function.dart';
@@ -92,6 +93,8 @@ class ExtensionsAnimeScreen extends BaseAnimeScreen {
9293
SizedBox(height: 128),
9394
];
9495
}
96+
@override
97+
List<ChipData> get trendingChips => [];
9598

9699
@override
97100
int get refreshID => RefreshId.Extensions.animePage;

‎lib/Api/Extensions/Screens/ExtensionsMangaScreen.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import 'package:dantotsu/Api/Sources/Eval/dart/model/m_pages.dart';
22
import 'package:flutter/material.dart';
33
import 'package:get/get_rx/src/rx_types/rx_types.dart';
44

5+
import '../../../Adaptor/Media/Widgets/Chips.dart';
56
import '../../../Adaptor/Media/Widgets/MediaSection.dart';
67
import '../../../DataClass/Media.dart';
78
import '../../../Functions/Function.dart';
@@ -88,6 +89,8 @@ class ExtensionsMangaScreen extends BaseMangaScreen {
8889
SizedBox(height: 128),
8990
];
9091
}
92+
@override
93+
List<ChipData> get trendingChips => [];
9194

9295
@override
9396
int get refreshID => RefreshId.Extensions.mangaPage;

‎lib/Api/TypeFactory.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class TypeFactory {
2323
return factory(json) as T;
2424
}
2525

26-
static void registerAllTypes() {
26+
static void init() {
2727
_registerAnilistTypes();
2828
_registerMalTypes();
2929
_registerSimklTypes();

‎lib/Screens/Anime/AnimeScreen.dart

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -122,20 +122,7 @@ class AnimeScreenState extends State<AnimeScreen> {
122122
child: SlideInAnimation(
123123
child: Row(
124124
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
125-
children: [
126-
MediaCard(
127-
context,
128-
getString.genres.toUpperCase(),
129-
const Text(""),
130-
"https://s4.anilist.co/file/anilistcdn/media/anime/banner/16498-8jpFCOcDmneX.jpg",
131-
),
132-
MediaCard(
133-
context,
134-
getString.calendar.toUpperCase(),
135-
const CalendarScreen(),
136-
"https://s4.anilist.co/file/anilistcdn/media/anime/banner/125367-hGPJLSNfprO3.jpg",
137-
),
138-
],
125+
children: service.trendingCards(context),
139126
),
140127
),
141128
),

‎lib/Screens/Detail/Tabs/Info/InfoPage.dart

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,17 @@ class InfoPageState extends State<InfoPage> {
5252
if (widget.mediaData.synonyms.isNotEmpty) ..._buildSynonyms(theme),
5353
FollowerWidget(follower: widget.mediaData.users, type: type),
5454
if (widget.mediaData.genres.isNotEmpty)
55-
_buildWithPadding([GenreWidget(context, widget.mediaData)]),
55+
_buildWithPadding(
56+
[
57+
GenreWidget(
58+
context,
59+
widget.mediaData.genres,
60+
widget.mediaData.anime != null
61+
? SearchType.ANIME
62+
: SearchType.MANGA,
63+
),
64+
],
65+
),
5666
if (widget.mediaData.tags.isNotEmpty) ..._buildTags(theme),
5767
..._buildPrequelSection(),
5868
if (widget.mediaData.relations?.isNotEmpty ?? false)
@@ -231,15 +241,21 @@ class InfoPageState extends State<InfoPage> {
231241
MediaCard(
232242
context,
233243
getString.prequel,
234-
MediaInfoPage(prequel, prequelTag),
235244
prequel.banner ?? prequel.cover ?? 'https://bit.ly/31bsIHq',
245+
onTap: () => navigateToPage(
246+
context,
247+
MediaInfoPage(prequel, prequelTag),
248+
),
236249
),
237250
if (sequel != null)
238251
MediaCard(
239252
context,
240253
getString.sequel,
241-
MediaInfoPage(sequel, sequelTag),
242254
sequel.banner ?? sequel.cover ?? 'https://bit.ly/2ZGfcuG',
255+
onTap: () => navigateToPage(
256+
context,
257+
MediaInfoPage(sequel, sequelTag),
258+
),
243259
),
244260
],
245261
)
@@ -371,7 +387,8 @@ class InfoPageState extends State<InfoPage> {
371387
}
372388

373389
List<ChipData> _generateChips(List<String> labels) {
374-
var title = widget.mediaData.anime != null ? SearchType.ANIME : SearchType.MANGA;
390+
var title =
391+
widget.mediaData.anime != null ? SearchType.ANIME : SearchType.MANGA;
375392
return labels.map((label) {
376393
return ChipData(
377394
label: label,

‎lib/Screens/Detail/Tabs/Info/Widgets/GenreWidget.dart

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,15 @@ import 'package:flutter/material.dart';
33
import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
44
import 'package:dantotsu/Theme/LanguageSwitcher.dart';
55

6-
import '../../../../../DataClass/Media.dart';
76
import '../../../../../DataClass/SearchResults.dart';
87
import '../../../../../Widgets/GenreItem.dart';
98
import '../../../../Search/SearchScreen.dart';
109

11-
Widget GenreWidget(BuildContext context, Media media) {
10+
Widget GenreWidget(BuildContext context, List<String> genres, SearchType type) {
1211
final theme = Theme.of(context).colorScheme;
1312
final screenWidth = MediaQuery.of(context).size.width;
1413
var crossAxisCount = ((screenWidth) / 164).floor();
1514
if (crossAxisCount < 1) crossAxisCount = 1;
16-
var title = media.anime != null ? SearchType.ANIME : SearchType.MANGA;
17-
var genre = media.genres;
1815
return Padding(
1916
padding: const EdgeInsets.symmetric(vertical: 16.0),
2017
child: Column(
@@ -36,28 +33,28 @@ Widget GenreWidget(BuildContext context, Media media) {
3633
crossAxisSpacing: 16,
3734
crossAxisCount: crossAxisCount,
3835
children: List.generate(
39-
genre.length,
36+
genres.length,
4037
(index) {
4138
return GestureDetector(
4239
onTap: () => navigateToPage(
4340
context,
4441
SearchScreen(
45-
title: title,
42+
title: type,
4643
forceSearch: true,
4744
args: SearchResults(
48-
type: title,
45+
type: type,
4946
sort: "POPULARITY_DESC",
50-
genres: [genre[index]],
47+
genres: [genres[index]],
5148
),
5249
),
5350
),
54-
onLongPress: () => copyToClipboard(genre[index]),
51+
onLongPress: () => copyToClipboard(genres[index]),
5552
child: SizedBox(
5653
width: 154,
5754
height: 54,
5855
child: GenreItem(
5956
context,
60-
genre[index].toUpperCase(),
57+
genres[index].toUpperCase(),
6158
),
6259
),
6360
);

‎lib/Screens/Home/HomeScreen.dart

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,14 +289,26 @@ class HomeScreenState extends State<HomeScreen> {
289289
MediaCard(
290290
context,
291291
getString.list(getString.anime).toUpperCase(),
292-
MediaListScreen(anime: true, id: data.userid ?? 0),
293292
service.listImages.value[0] ?? 'https://bit.ly/31bsIHq',
293+
onTap: () => navigateToPage(
294+
context,
295+
MediaListScreen(
296+
anime: true,
297+
id: data.userid ?? 0,
298+
),
299+
),
294300
),
295301
MediaCard(
296302
context,
297303
getString.list(getString.manga).toUpperCase(),
298-
MediaListScreen(anime: false, id: data.userid ?? 0),
299304
service.listImages.value[1] ?? 'https://bit.ly/2ZGfcuG',
305+
onTap: () => navigateToPage(
306+
context,
307+
MediaListScreen(
308+
anime: false,
309+
id: data.userid ?? 0,
310+
),
311+
),
300312
),
301313
],
302314
);

‎lib/Screens/Manga/MangaScreen.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,14 @@ class MangaScreenState extends State<MangaScreen> {
127127
MediaCard(
128128
context,
129129
getString.genres,
130-
const Text(''),
131130
"https://s4.anilist.co/file/anilistcdn/media/manga/banner/105778-wk5qQ7zAaTGl.jpg",
131+
onTap: () {},
132132
),
133133
MediaCard(
134134
context,
135135
'TOP SCORE',
136-
const Text(''),
137136
"https://s4.anilist.co/file/anilistcdn/media/manga/banner/30002-3TuoSMl20fUX.jpg",
137+
onTap: () {},
138138
),
139139
],
140140
),

‎lib/Services/MediaService.dart

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,12 @@ abstract class MediaService {
6060
),
6161
);
6262
}
63-
}
64-
65-
void initializeMediaServices() {
66-
AnilistService();
67-
MalService();
68-
SimklService();
69-
ExtensionsService();
70-
}
63+
64+
static void init() {
65+
AnilistService();
66+
MalService();
67+
SimklService();
68+
ExtensionsService();
69+
}
70+
71+
}

0 commit comments

Comments
 (0)