Skip to content

Commit 6384c60

Browse files
aayush2622aayush2622
committed
feat switch to bridge
1 parent 1af0428 commit 6384c60

File tree

140 files changed

+541
-19524
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+541
-19524
lines changed

‎lib/Adaptor/Chapter/ChapterAdaptor.dart

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import 'package:dartotsu/Functions/Function.dart';
22
import 'package:dartotsu/Screens/Manga/MangaReader/Reader.dart';
3+
import 'package:dartotsu_extension_bridge/ExtensionManager.dart';
4+
import 'package:dartotsu_extension_bridge/Models/DEpisode.dart';
5+
import 'package:dartotsu_extension_bridge/Models/Source.dart';
36
import 'package:flutter/material.dart';
47
import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
58

69
import '../../Animation/ScaleAnimation.dart';
7-
import '../../Api/Sources/Model/Source.dart';
8-
import '../../Api/Sources/Search/get_pages.dart';
9-
import '../../DataClass/Chapter.dart';
1010
import '../../DataClass/Media.dart';
1111
import '../../Widgets/CustomBottomDialog.dart';
1212
import 'ChapterCompactViewHolder.dart';
@@ -15,7 +15,7 @@ import 'ChapterListViewHolder.dart';
1515
class ChapterAdaptor extends StatefulWidget {
1616
final int type;
1717
final Source source;
18-
final List<Chapter> chapterList;
18+
final List<DEpisode> chapterList;
1919
final Media mediaData;
2020
final VoidCallback? onEpisodeClick;
2121

@@ -33,7 +33,7 @@ class ChapterAdaptor extends StatefulWidget {
3333
}
3434

3535
class ChapterAdaptorState extends State<ChapterAdaptor> {
36-
late List<Chapter> chapterList;
36+
late List<DEpisode> chapterList;
3737

3838
@override
3939
void initState() {
@@ -153,7 +153,7 @@ class ChapterAdaptorState extends State<ChapterAdaptor> {
153153

154154
Future<void> onChapterClick(
155155
BuildContext context,
156-
Chapter chapter,
156+
DEpisode chapter,
157157
Source source,
158158
Media mediaData,
159159
VoidCallback? onChapterClick,
@@ -169,7 +169,7 @@ Future<void> onChapterClick(
169169
),
170170
);
171171

172-
final pages = await getPagesList(source: source, mangaId: chapter.link!);
172+
final pages = await currentSourceMethods(source).getPageList(chapter);
173173
if (context.mounted) {
174174
onChapterClick?.call();
175175
Navigator.pop(context);
@@ -178,7 +178,7 @@ Future<void> onChapterClick(
178178
MediaReader(
179179
media: mediaData,
180180
currentChapter: chapter,
181-
pages: pages!,
181+
pages: pages,
182182
source: source,
183183
),
184184
);

‎lib/Adaptor/Chapter/ChapterCompactViewHolder.dart

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
import 'package:dartotsu/Functions/string_extensions.dart';
2+
import 'package:dartotsu_extension_bridge/Models/DEpisode.dart';
23
import 'package:flutter/material.dart';
34

4-
import '../../DataClass/Chapter.dart';
55
import '../../DataClass/Media.dart';
66
import '../Episode/Widget/HandleProgress.dart';
77

88
class ChapterCompactView extends StatelessWidget {
9-
final Chapter chapter;
9+
final DEpisode chapter;
1010
final Media mediaData;
1111
final bool isWatched;
1212

1313
ChapterCompactView({
1414
super.key,
1515
required this.chapter,
1616
required this.mediaData,
17-
}) : isWatched = (mediaData.userProgress != null &&
18-
mediaData.userProgress! > 0)
19-
? mediaData.userProgress!.toDouble() >= chapter.number.toDouble()
20-
: false;
17+
}) : isWatched =
18+
(mediaData.userProgress != null && mediaData.userProgress! > 0)
19+
? mediaData.userProgress!.toDouble() >=
20+
chapter.episodeNumber.toDouble()
21+
: false;
2122

2223
@override
2324
Widget build(BuildContext context) {
@@ -42,13 +43,13 @@ class ChapterCompactView extends StatelessWidget {
4243
child: handleProgress(
4344
context: context,
4445
mediaId: mediaData.id,
45-
ep: chapter.number,
46+
ep: chapter.episodeNumber,
4647
width: 162,
4748
),
4849
),
4950
Center(
5051
child: Text(
51-
chapter.number,
52+
chapter.episodeNumber,
5253
style: Theme.of(context).textTheme.bodyLarge?.copyWith(
5354
fontWeight: FontWeight.bold,
5455
fontSize: 16,

‎lib/Adaptor/Chapter/ChapterListViewHolder.dart

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import 'package:dartotsu/Functions/string_extensions.dart';
22
import 'package:flutter/material.dart';
3-
4-
import '../../DataClass/Chapter.dart';
3+
import 'package:dartotsu_extension_bridge/Models/DEpisode.dart';
54
import '../../DataClass/Media.dart';
65
import '../../Screens/Detail/Tabs/Watch/Manga/Widget/DateFormat.dart';
76

87
class ChapterListView extends StatelessWidget {
9-
final Chapter chapter;
8+
final DEpisode chapter;
109
final Media mediaData;
1110
final bool isWatched;
1211

@@ -17,7 +16,7 @@ class ChapterListView extends StatelessWidget {
1716
}) : isWatched =
1817
(mediaData.userProgress != null && mediaData.userProgress! > 0)
1918
? mediaData.userProgress!.toString().toDouble() >=
20-
chapter.number.toDouble()
19+
chapter.episodeNumber.toDouble()
2120
: false;
2221

2322
@override
@@ -55,16 +54,15 @@ class ChapterListView extends StatelessWidget {
5554
mainAxisAlignment: MainAxisAlignment.center,
5655
children: [
5756
Text(
58-
chapter.title ?? '',
57+
chapter.name ?? '',
5958
maxLines: 1,
6059
style: const TextStyle(
6160
fontFamily: 'Poppins',
6261
fontWeight: FontWeight.bold,
6362
overflow: TextOverflow.ellipsis,
6463
),
6564
),
66-
if (chapter.mChapter?.scanlator != null &&
67-
chapter.mChapter?.scanlator != '')
65+
if (chapter.scanlator != null && chapter.scanlator != '')
6866
const SizedBox(height: 4),
6967
_buildDescription(theme, context),
7068
],
@@ -84,24 +82,24 @@ class ChapterListView extends StatelessWidget {
8482

8583
Widget _buildDescription(ColorScheme theme, BuildContext context) {
8684
final List<TextSpan> spans = [];
87-
if (chapter.date != null) {
85+
if (chapter.dateUpload != null) {
8886
spans.add(
8987
TextSpan(
90-
text: dateFormat(chapter.date, context: context),
88+
text: dateFormat(chapter.dateUpload, context: context),
9189
),
9290
);
9391
}
94-
if (chapter.date != null && chapter.mChapter?.scanlator != null) {
92+
if (chapter.dateUpload != null && chapter.scanlator != null) {
9593
spans.add(
9694
const TextSpan(
9795
text: ' • ',
9896
),
9997
);
10098
}
101-
if (chapter.mChapter?.scanlator != null) {
99+
if (chapter.scanlator != null) {
102100
spans.add(
103101
TextSpan(
104-
text: chapter.mChapter?.scanlator?.replaceAll('_', ' ') ?? '',
102+
text: chapter.scanlator?.replaceAll('_', ' ') ?? '',
105103
),
106104
);
107105
}

‎lib/Adaptor/Episode/EpisodeAdaptor.dart

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import 'package:dartotsu/Api/Sources/Eval/dart/model/video.dart';
2-
import 'package:dartotsu/Api/Sources/Search/getVideo.dart';
31
import 'package:dartotsu/Functions/Function.dart';
2+
import 'package:dartotsu_extension_bridge/ExtensionManager.dart';
3+
import 'package:dartotsu_extension_bridge/Models/DEpisode.dart';
4+
import 'package:dartotsu_extension_bridge/Models/Source.dart';
5+
import 'package:dartotsu_extension_bridge/Models/Video.dart';
46
import 'package:flutter/material.dart';
57
import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
68
import 'package:get/get.dart';
79

810
import '../../Animation/ScaleAnimation.dart';
9-
import '../../Api/Sources/Model/Source.dart';
10-
import '../../DataClass/Episode.dart';
1111
import '../../DataClass/Media.dart';
1212
import '../../Screens/Anime/Player/Player.dart';
1313
import '../../Widgets/CustomBottomDialog.dart';
@@ -18,7 +18,7 @@ import 'EpisodeListViewHolder.dart';
1818
class EpisodeAdaptor extends StatefulWidget {
1919
final int type;
2020
final Source source;
21-
final List<Episode> episodeList;
21+
final List<DEpisode> episodeList;
2222
final Media mediaData;
2323
final VoidCallback? onEpisodeClick;
2424

@@ -36,7 +36,7 @@ class EpisodeAdaptor extends StatefulWidget {
3636
}
3737

3838
class EpisodeAdaptorState extends State<EpisodeAdaptor> {
39-
late List<Episode> episodeList;
39+
late List<DEpisode> episodeList;
4040

4141
@override
4242
void initState() {
@@ -208,7 +208,7 @@ class EpisodeAdaptorState extends State<EpisodeAdaptor> {
208208

209209
void onEpisodeClick(
210210
BuildContext context,
211-
Episode episode,
211+
DEpisode episode,
212212
Source source,
213213
Media mediaData,
214214
VoidCallback? onEpisodeClick,
@@ -217,7 +217,7 @@ void onEpisodeClick(
217217
title: 'Select Source',
218218
viewList: [
219219
FutureBuilder<List<Video>>(
220-
future: getVideo(source: source, url: episode.link!),
220+
future: currentSourceMethods(source).getVideoList(episode),
221221
builder: (context, snapshot) {
222222
if (snapshot.connectionState == ConnectionState.waiting) {
223223
return const Center(child: CircularProgressIndicator());
@@ -283,7 +283,7 @@ void onEpisodeClick(
283283
children: [
284284
Expanded(
285285
child: Text(
286-
item.quality,
286+
item.title ?? item.quality,
287287
style: const TextStyle(
288288
fontSize: 16,
289289
fontWeight: FontWeight.bold,

‎lib/Adaptor/Episode/EpisodeCompactViewHolder.dart

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
import 'package:dartotsu/Functions/string_extensions.dart';
2+
import 'package:dartotsu_extension_bridge/Models/DEpisode.dart';
23
import 'package:flutter/material.dart';
34
import 'package:provider/provider.dart';
45

5-
import '../../DataClass/Episode.dart';
66
import '../../DataClass/Media.dart';
77
import '../../Theme/Colors.dart';
88
import '../../Theme/ThemeProvider.dart';
99
import 'Widget/HandleProgress.dart';
1010

1111
class EpisodeCompactView extends StatelessWidget {
12-
final Episode episode;
12+
final DEpisode episode;
1313
final Media mediaData;
1414
final bool isWatched;
1515

1616
EpisodeCompactView({
1717
super.key,
1818
required this.episode,
1919
required this.mediaData,
20-
}) : isWatched = (mediaData.userProgress != null &&
21-
mediaData.userProgress! > 0)
22-
? mediaData.userProgress!.toDouble() >= episode.number.toDouble()
23-
: false;
20+
}) : isWatched =
21+
(mediaData.userProgress != null && mediaData.userProgress! > 0)
22+
? mediaData.userProgress!.toDouble() >=
23+
episode.episodeNumber.toDouble()
24+
: false;
2425

2526
@override
2627
Widget build(BuildContext context) {
@@ -47,7 +48,7 @@ class EpisodeCompactView extends StatelessWidget {
4748
child: handleProgress(
4849
context: context,
4950
mediaId: mediaData.id,
50-
ep: episode.number,
51+
ep: episode.episodeNumber,
5152
width: double.infinity,
5253
),
5354
),
@@ -60,7 +61,7 @@ class EpisodeCompactView extends StatelessWidget {
6061
),
6162
Center(
6263
child: Text(
63-
episode.number,
64+
episode.episodeNumber,
6465
style: Theme.of(context).textTheme.bodyLarge?.copyWith(
6566
fontWeight: FontWeight.bold,
6667
fontSize: 16,

‎lib/Adaptor/Episode/EpisodeGridViewHolder.dart

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
11
import 'package:dartotsu/Functions/string_extensions.dart';
22
import 'package:dartotsu/Theme/ThemeProvider.dart';
33
import 'package:dartotsu/Widgets/CachedNetworkImage.dart';
4+
import 'package:dartotsu_extension_bridge/Models/DEpisode.dart';
45
import 'package:flutter/material.dart';
56
import 'package:provider/provider.dart';
67

7-
import '../../DataClass/Episode.dart';
88
import '../../DataClass/Media.dart';
99
import '../../Theme/Colors.dart';
1010
import 'Widget/HandleProgress.dart';
1111

1212
class EpisodeCardView extends StatelessWidget {
13-
final Episode episode;
13+
final DEpisode episode;
1414
final Media mediaData;
1515
final bool isWatched;
1616

1717
EpisodeCardView({
1818
super.key,
1919
required this.episode,
2020
required this.mediaData,
21-
}) : isWatched = (mediaData.userProgress != null &&
22-
mediaData.userProgress! > 0)
23-
? mediaData.userProgress!.toDouble() >= episode.number.toDouble()
24-
: false;
21+
}) : isWatched =
22+
(mediaData.userProgress != null && mediaData.userProgress! > 0)
23+
? mediaData.userProgress!.toDouble() >=
24+
episode.episodeNumber.toDouble()
25+
: false;
2526

2627
@override
2728
Widget build(BuildContext context) {
@@ -51,7 +52,7 @@ class EpisodeCardView extends StatelessWidget {
5152
handleProgress(
5253
context: context,
5354
mediaId: mediaData.id,
54-
ep: episode.number,
55+
ep: episode.episodeNumber,
5556
width: double.infinity,
5657
)
5758
],
@@ -78,7 +79,7 @@ class EpisodeCardView extends StatelessWidget {
7879
child: Padding(
7980
padding: const EdgeInsets.only(right: 8, bottom: 0),
8081
child: Text(
81-
episode.number.toString(),
82+
episode.episodeNumber.toString(),
8283
style: TextStyle(
8384
fontFamily: 'Poppins',
8485
fontWeight: FontWeight.bold,
@@ -96,7 +97,7 @@ class EpisodeCardView extends StatelessWidget {
9697
child: cachedNetworkImage(
9798
width: double.infinity,
9899
height: 120,
99-
imageUrl: episode.thumb ?? '',
100+
imageUrl: episode.thumbnail ?? '',
100101
fit: BoxFit.cover,
101102
placeholder: (context, url) => Container(
102103
color: Colors.white12,
@@ -119,9 +120,9 @@ class EpisodeCardView extends StatelessWidget {
119120
crossAxisAlignment: CrossAxisAlignment.start,
120121
mainAxisSize: MainAxisSize.min,
121122
children: [
122-
if (episode.title != null)
123+
if (episode.name != null)
123124
Text(
124-
episode.title!,
125+
episode.name!,
125126
maxLines: 3,
126127
overflow: TextOverflow.ellipsis,
127128
style: const TextStyle(

0 commit comments

Comments
 (0)