Fix chaper order in reader

niuhuan · Mar 29, 2022 · 9709d88 · 9709d88
1 parent 7cdce44
commit 9709d88
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/lib/screens/comic_reader_screen.dart b/lib/screens/comic_reader_screen.dart
@@ -720,7 +720,9 @@ abstract class _ComicReaderState extends State<_ComicReader> {
     if (widget.chapter.series.isEmpty) {
       return false;
     }
-    widget.chapter.series.sort((a, b) => a.sort.compareTo(b.sort));
+    widget.chapter.series.sort(
+          (a, b) => int.parse(a.sort).compareTo(int.parse(b.sort)),
+    );
     int index = widget.chapter.series
         .map((e) => e.id)
         .toList()
@@ -730,7 +732,9 @@ abstract class _ComicReaderState extends State<_ComicReader> {
 
   void _onNextAction() {
     if (_hasNextEp()) {
-      widget.chapter.series.sort((a, b) => a.sort.compareTo(b.sort));
+      widget.chapter.series.sort(
+            (a, b) => int.parse(a.sort).compareTo(int.parse(b.sort)),
+      );
       final ids = widget.chapter.series.map((e) => e.id).toList();
       int index = ids.indexOf(widget.chapter.id);
       index++;
@@ -761,7 +765,9 @@ class _EpChooserState extends State<_EpChooser> {
     }
 
     var entries = widget.chapter.series;
-    entries.sort((a, b) => a.sort.compareTo(b.sort));
+    entries.sort(
+          (a, b) => int.parse(a.sort).compareTo(int.parse(b.sort)),
+    );
     var widgets = [
       Container(height: 20),
       ...entries.map((e) {

diff --git a/lib/screens/components/continue_read_button.dart b/lib/screens/components/continue_read_button.dart
@@ -21,7 +21,6 @@ class ContinueReadButton extends StatefulWidget {
 }
 
 class _ContinueReadButtonState extends State<ContinueReadButton> {
-
   @override
   Widget build(BuildContext context) {
     return FutureBuilder(
@@ -42,8 +41,9 @@ class _ContinueReadButtonState extends State<ContinueReadButton> {
               if (widget.album.series.isEmpty) {
                 widget.onChoose(widget.album.id, 0);
               } else {
-                widget.album.series
-                    .sort((a, b) => a.sort.compareTo(b.sort));
+                widget.album.series.sort(
+                  (a, b) => int.parse(a.sort).compareTo(int.parse(b.sort)),
+                );
                 widget.onChoose(widget.album.series[0].id, 0);
               }
             };