Skip to content

Commit 2c5e715

Browse files
aayush2622aayush2622
committed
feat: some shit
1 parent 7ccf0f8 commit 2c5e715

24 files changed

+163
-653
lines changed

‎lib/Adaptor/Episode/EpisodeAdaptor.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ class EpisodeAdaptorState extends State<EpisodeAdaptor> {
5959
child: Container(
6060
constraints: const BoxConstraints(maxHeight: double.infinity),
6161
child: ListView.builder(
62+
physics: const NeverScrollableScrollPhysics(),
6263
shrinkWrap: true,
6364
itemCount: episodeList.length,
6465
itemBuilder: (context, index) {

‎lib/Screens/Extensions/ExtensionItem.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ class _ExtensionListTileWidgetState
8585
),
8686
),
8787
title: Text(widget.source.name!),
88-
titleTextStyle: const TextStyle(
88+
titleTextStyle: TextStyle(
89+
color: theme.onSurface,
8990
fontFamily: 'Poppins',
9091
fontWeight: FontWeight.bold,
9192
fontSize: 15.0,

‎lib/Screens/Extensions/ExtensionList.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ class _ExtensionScreenState extends ConsumerState<Extension> {
4747
}
4848
Future<void> _refreshData() async {
4949
if (widget.isManga) {
50-
await ref.refresh(fetchMangaSourcesListProvider(id: null, reFresh: true).future);
50+
return await ref.refresh(fetchMangaSourcesListProvider(id: null, reFresh: true).future);
5151
} else {
52-
await ref.refresh(fetchAnimeSourcesListProvider(id: null, reFresh: true).future);
52+
return await ref.refresh(fetchAnimeSourcesListProvider(id: null, reFresh: true).future);
5353
}
5454
}
5555
@override

‎lib/Screens/Info/Tabs/Watch/Anime/AnimeParser.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ class AnimeParser extends BaseParser {
7777
}
7878

7979
Episode MChapterToEpisode(MChapter chapter, MManga? selectedMedia) {
80-
var episodeNumber = ChapterRecognition()
81-
.parseChapterNumber(selectedMedia?.name ?? '', chapter.name ?? '');
80+
var episodeNumber = ChapterRecognition.parseChapterNumber(selectedMedia?.name ?? '', chapter.name ?? '');
8281
return Episode(
8382
number: episodeNumber != -1 ? episodeNumber.toString() : chapter.name ?? '',
8483
link: chapter.url,

‎lib/Screens/Info/Tabs/Watch/BaseParser.dart

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,16 @@ abstract class BaseParser extends GetxController {
1818
var source = Rxn<Source>(null);
1919

2020

21-
void saveSelected(int id , Selected data) {
21+
void saveSelected(int id, Selected data) {
2222
PrefManager.setCustomVal("Selected-$id", data);
2323
}
2424

2525
Selected loadSelected(media mediaData) {
2626
return PrefManager.getCustomVal("Selected-${mediaData.id}") ?? Selected();
2727
}
2828

29-
Future<void> searchMedia(Source source, media mediaData, {Function(MManga response)? onFinish}) async {
29+
Future<void> searchMedia(Source source, media mediaData,
30+
{Function(MManga response)? onFinish}) async {
3031
selectedMedia.value = null;
3132
var saved = _loadShowResponse(source, mediaData);
3233
if (saved != null) {
@@ -53,20 +54,20 @@ abstract class BaseParser extends GetxController {
5354

5455
List<MManga> sortedResults = media!.list.isNotEmpty
5556
? (media.list
56-
..sort((a, b) {
57-
final aRatio = ratio(
58-
a.name!.toLowerCase(), mediaData.mainName().toLowerCase());
59-
final bRatio = ratio(
60-
b.name!.toLowerCase(), mediaData.mainName().toLowerCase());
61-
return bRatio.compareTo(aRatio);
62-
}))
57+
..sort((a, b) {
58+
final aRatio = ratio(
59+
a.name!.toLowerCase(), mediaData.mainName().toLowerCase());
60+
final bRatio = ratio(
61+
b.name!.toLowerCase(), mediaData.mainName().toLowerCase());
62+
return bRatio.compareTo(aRatio);
63+
}))
6364
: [];
6465
sortedResults.firstOrNull;
6566
response = sortedResults.firstOrNull;
6667

6768
if (response == null ||
6869
ratio(response.name!.toLowerCase(),
69-
mediaData.mainName().toLowerCase()) <
70+
mediaData.mainName().toLowerCase()) <
7071
100) {
7172
status.value = "Searching : ${mediaData.nameRomaji}";
7273
final mediaFuture = search(
@@ -78,13 +79,13 @@ abstract class BaseParser extends GetxController {
7879
final media = await mediaFuture;
7980
List<MManga> sortedRomajiResults = media!.list.isNotEmpty
8081
? (media.list
81-
..sort((a, b) {
82-
final aRatio = ratio(
83-
a.name!.toLowerCase(), mediaData.nameRomaji.toLowerCase());
84-
final bRatio = ratio(
85-
b.name!.toLowerCase(), mediaData.nameRomaji.toLowerCase());
86-
return bRatio.compareTo(aRatio);
87-
}))
82+
..sort((a, b) {
83+
final aRatio = ratio(
84+
a.name!.toLowerCase(), mediaData.nameRomaji.toLowerCase());
85+
final bRatio = ratio(
86+
b.name!.toLowerCase(), mediaData.nameRomaji.toLowerCase());
87+
return bRatio.compareTo(aRatio);
88+
}))
8889
: [];
8990
var closestRomaji = sortedRomajiResults.firstOrNull;
9091
if (response == null) {
@@ -99,7 +100,7 @@ abstract class BaseParser extends GetxController {
99100
}
100101
}
101102
}
102-
if (response == null){
103+
if (response == null) {
103104
for (var synonym in mediaData.synonyms) {
104105
if (_isEnglish(synonym)) {
105106
status.value = "Searching : $synonym";
@@ -113,14 +114,17 @@ abstract class BaseParser extends GetxController {
113114
List<MManga> sortedResults = media!.list.isNotEmpty
114115
? (media.list
115116
..sort((a, b) {
116-
final aRatio = ratio(a.name!.toLowerCase(), synonym.toLowerCase());
117-
final bRatio = ratio(b.name!.toLowerCase(), synonym.toLowerCase());
117+
final aRatio = ratio(
118+
a.name!.toLowerCase(), synonym.toLowerCase());
119+
final bRatio = ratio(
120+
b.name!.toLowerCase(), synonym.toLowerCase());
118121
return bRatio.compareTo(aRatio);
119122
}))
120123
: [];
121124
var closest = sortedResults.firstOrNull;
122125
if (closest != null) {
123-
if (ratio(closest.name!.toLowerCase(), synonym.toLowerCase()) > 90) {
126+
if (ratio(closest.name!.toLowerCase(), synonym.toLowerCase()) >
127+
90) {
124128
response = closest;
125129
break;
126130
}
@@ -150,19 +154,18 @@ abstract class BaseParser extends GetxController {
150154
_saveShowResponse(media mediaData, MManga response, Source source,
151155
{bool selected = false}) {
152156
status.value =
153-
selected ? "Selected : ${response.name}" : "Found : ${response.name}";
157+
selected ? "Selected : ${response.name}" : "Found : ${response.name}";
154158
var show = ShowResponse(
155159
name: response.name!,
156160
link: response.link!,
157161
coverUrl: response.imageUrl!);
158162
PrefManager.setCustomVal<ShowResponse>(
159163
"${source.name}_${mediaData.id}_source", show);
160-
}
164+
}
161165

162-
Future<void> wrongTitle(
163-
BuildContext context,
166+
Future<void> wrongTitle(BuildContext context,
164167
media mediaData,
165-
Function(MManga)? onChange) async {
168+
Function(MManga)? onChange,) async {
166169
var dialog = WrongTitleDialog(
167170
source: source.value!,
168171
mediaData: mediaData,

‎lib/Screens/Info/Tabs/Watch/Functions/ParseChapterNumber.dart

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
class ChapterRecognition {
2-
final _numberPattern = r"([0-9]+)(\.[0-9]+)?(\.?[a-z]+)?";
2+
static const _numberPattern = r"([0-9]+)(\.[0-9]+)?(\.?[a-z]+)?";
33

4-
final _unwanted =
4+
static final _unwanted =
55
RegExp(r"\b(?:v|ver|vol|version|volume|season|s)[^a-z]?[0-9]+");
66

7-
final _unwantedWhiteSpace = RegExp(r"\s(?=extra|special|omake)");
7+
static final _unwantedWhiteSpace = RegExp(r"\s(?=extra|special|omake)");
88

9-
dynamic parseChapterNumber(String mangaTitle, String chapterName) {
9+
static dynamic parseChapterNumber(String mangaTitle, String chapterName) {
1010
var name = chapterName.toLowerCase();
1111

1212
name = name.replaceAll(mangaTitle.toLowerCase(), "").trim();
@@ -16,7 +16,7 @@ class ChapterRecognition {
1616
name = name.replaceAll(_unwantedWhiteSpace, "");
1717

1818
name = name.replaceAll(_unwanted, "");
19-
final numberPat = "*$_numberPattern";
19+
const numberPat = "*$_numberPattern";
2020
const ch = r"(?<=ch\.)";
2121
var match = RegExp("$ch $numberPat").firstMatch(name);
2222
if (match != null) {
@@ -31,19 +31,19 @@ class ChapterRecognition {
3131
return 0;
3232
}
3333

34-
dynamic _convertToIntIfWhole(double value) {
34+
static dynamic _convertToIntIfWhole(double value) {
3535
return value % 1 == 0 ? value.toInt() : value;
3636
}
3737

38-
double _getChapterNumberFromMatch(Match match) {
38+
static double _getChapterNumberFromMatch(Match match) {
3939
final initial = double.parse(match.group(1)!);
4040
final subChapterDecimal = match.group(2);
4141
final subChapterAlpha = match.group(3);
4242
final addition = _checkForDecimal(subChapterDecimal, subChapterAlpha);
4343
return initial + addition;
4444
}
4545

46-
double _checkForDecimal(String? decimal, String? alpha) {
46+
static double _checkForDecimal(String? decimal, String? alpha) {
4747
if (decimal != null && decimal.isNotEmpty) {
4848
return double.parse(decimal);
4949
}
@@ -67,7 +67,7 @@ class ChapterRecognition {
6767
return 0.0;
6868
}
6969

70-
double _parseAlphaPostFix(String alpha) {
70+
static double _parseAlphaPostFix(String alpha) {
7171
final number = alpha.codeUnitAt(0) - ('a'.codeUnitAt(0) - 1);
7272
if (number >= 10) return 0.0;
7373
return number / 10.0;

0 commit comments

Comments
 (0)