Remove reader bottomsheet

lib/src/constants/enum.dart

@@ -102,6 +102,7 @@ enum MangaSort {
 
 enum ChapterSort {
   source,
+  uploadDate,
   fetchedDate;
 
   String toLocale(BuildContext context) {
@@ -110,6 +111,8 @@ enum ChapterSort {
         return context.l10n!.chapterSortSource;
       case ChapterSort.fetchedDate:
         return context.l10n!.chapterSortFetchedDate;
+      case ChapterSort.uploadDate:
+        return context.l10n!.chapterSortUploadDate;
     }
   }
 }

lib/src/features/library/presentation/library/controller/library_controller.dart

@@ -47,7 +47,8 @@ class CategoryMangaListWithQueryAndFilter
     final mangaFilterDownloaded =
         ref.watch(libraryMangaFilterDownloadedProvider);
     final mangaFilterCompleted = ref.watch(libraryMangaFilterCompletedProvider);
-    final sortedBy = ref.watch(libraryMangaSortProvider);
+    final MangaSort sortedBy =
+        ref.watch(libraryMangaSortProvider) ?? DBKeys.mangaSort.initial;
     final sortedDirection =
         ref.watch(libraryMangaSortDirectionProvider).ifNull(true);
 
@@ -89,8 +90,6 @@ class CategoryMangaListWithQueryAndFilter
         case MangaSort.lastRead:
           return (m2.lastReadAt ?? 0).compareTo(m1.lastReadAt ?? 0) *
               sortDirToggle;
-        default:
-          return 0;
       }
     }
 

lib/src/features/manga_book/domain/manga/manga_model.dart

@@ -35,6 +35,7 @@ class Manga with _$Manga {
     @JsonKey(fromJson: MangaStatus.fromJson, toJson: MangaStatus.toJson)
         MangaStatus? status,
     String? thumbnailUrl,
+    int? thumbnailUrlLastFetched,
     String? title,
     int? unreadCount,
     int? lastFetchedAt,

lib/src/features/manga_book/domain/manga/manga_model.freezed.dart

@@ -39,6 +39,7 @@ mixin _$Manga {
   @JsonKey(fromJson: MangaStatus.fromJson, toJson: MangaStatus.toJson)
   MangaStatus? get status => throw _privateConstructorUsedError;
   String? get thumbnailUrl => throw _privateConstructorUsedError;
+  int? get thumbnailUrlLastFetched => throw _privateConstructorUsedError;
   String? get title => throw _privateConstructorUsedError;
   int? get unreadCount => throw _privateConstructorUsedError;
   int? get lastFetchedAt => throw _privateConstructorUsedError;
@@ -76,6 +77,7 @@ abstract class $MangaCopyWith<$Res> {
       @JsonKey(fromJson: MangaStatus.fromJson, toJson: MangaStatus.toJson)
           MangaStatus? status,
       String? thumbnailUrl,
+      int? thumbnailUrlLastFetched,
       String? title,
       int? unreadCount,
       int? lastFetchedAt,
@@ -119,6 +121,7 @@ class _$MangaCopyWithImpl<$Res, $Val extends Manga>
     Object? sourceId = freezed,
     Object? status = freezed,
     Object? thumbnailUrl = freezed,
+    Object? thumbnailUrlLastFetched = freezed,
     Object? title = freezed,
     Object? unreadCount = freezed,
     Object? lastFetchedAt = freezed,
@@ -199,6 +202,10 @@ class _$MangaCopyWithImpl<$Res, $Val extends Manga>
           ? _value.thumbnailUrl
           : thumbnailUrl // ignore: cast_nullable_to_non_nullable
               as String?,
+      thumbnailUrlLastFetched: freezed == thumbnailUrlLastFetched
+          ? _value.thumbnailUrlLastFetched
+          : thumbnailUrlLastFetched // ignore: cast_nullable_to_non_nullable
+              as int?,
       title: freezed == title
           ? _value.title
           : title // ignore: cast_nullable_to_non_nullable
@@ -289,6 +296,7 @@ abstract class _$$_MangaCopyWith<$Res> implements $MangaCopyWith<$Res> {
       @JsonKey(fromJson: MangaStatus.fromJson, toJson: MangaStatus.toJson)
           MangaStatus? status,
       String? thumbnailUrl,
+      int? thumbnailUrlLastFetched,
       String? title,
       int? unreadCount,
       int? lastFetchedAt,
@@ -331,6 +339,7 @@ class __$$_MangaCopyWithImpl<$Res> extends _$MangaCopyWithImpl<$Res, _$_Manga>
     Object? sourceId = freezed,
     Object? status = freezed,
     Object? thumbnailUrl = freezed,
+    Object? thumbnailUrlLastFetched = freezed,
     Object? title = freezed,
     Object? unreadCount = freezed,
     Object? lastFetchedAt = freezed,
@@ -411,6 +420,10 @@ class __$$_MangaCopyWithImpl<$Res> extends _$MangaCopyWithImpl<$Res, _$_Manga>
           ? _value.thumbnailUrl
           : thumbnailUrl // ignore: cast_nullable_to_non_nullable
               as String?,
+      thumbnailUrlLastFetched: freezed == thumbnailUrlLastFetched
+          ? _value.thumbnailUrlLastFetched
+          : thumbnailUrlLastFetched // ignore: cast_nullable_to_non_nullable
+              as int?,
       title: freezed == title
           ? _value.title
           : title // ignore: cast_nullable_to_non_nullable
@@ -462,6 +475,7 @@ class _$_Manga implements _Manga {
       @JsonKey(fromJson: MangaStatus.fromJson, toJson: MangaStatus.toJson)
           this.status,
       this.thumbnailUrl,
+      this.thumbnailUrlLastFetched,
       this.title,
       this.unreadCount,
       this.lastFetchedAt,
@@ -519,6 +533,8 @@ class _$_Manga implements _Manga {
   @override
   final String? thumbnailUrl;
   @override
+  final int? thumbnailUrlLastFetched;
+  @override
   final String? title;
   @override
   final int? unreadCount;
@@ -533,7 +549,7 @@ class _$_Manga implements _Manga {
 
   @override
   String toString() {
-    return 'Manga(artist: $artist, author: $author, description: $description, downloadCount: $downloadCount, chapterCount: $chapterCount, lastReadAt: $lastReadAt, lastChapterRead: $lastChapterRead, freshData: $freshData, genre: $genre, inLibrary: $inLibrary, id: $id, inLibraryAt: $inLibraryAt, initialized: $initialized, realUrl: $realUrl, source: $source, sourceId: $sourceId, status: $status, thumbnailUrl: $thumbnailUrl, title: $title, unreadCount: $unreadCount, lastFetchedAt: $lastFetchedAt, chaptersLastFetchedAt: $chaptersLastFetchedAt, url: $url, meta: $meta)';
+    return 'Manga(artist: $artist, author: $author, description: $description, downloadCount: $downloadCount, chapterCount: $chapterCount, lastReadAt: $lastReadAt, lastChapterRead: $lastChapterRead, freshData: $freshData, genre: $genre, inLibrary: $inLibrary, id: $id, inLibraryAt: $inLibraryAt, initialized: $initialized, realUrl: $realUrl, source: $source, sourceId: $sourceId, status: $status, thumbnailUrl: $thumbnailUrl, thumbnailUrlLastFetched: $thumbnailUrlLastFetched, title: $title, unreadCount: $unreadCount, lastFetchedAt: $lastFetchedAt, chaptersLastFetchedAt: $chaptersLastFetchedAt, url: $url, meta: $meta)';
   }
 
   @override
@@ -570,6 +586,9 @@ class _$_Manga implements _Manga {
             (identical(other.status, status) || other.status == status) &&
             (identical(other.thumbnailUrl, thumbnailUrl) ||
                 other.thumbnailUrl == thumbnailUrl) &&
+            (identical(
+                    other.thumbnailUrlLastFetched, thumbnailUrlLastFetched) ||
+                other.thumbnailUrlLastFetched == thumbnailUrlLastFetched) &&
             (identical(other.title, title) || other.title == title) &&
             (identical(other.unreadCount, unreadCount) ||
                 other.unreadCount == unreadCount) &&
@@ -603,6 +622,7 @@ class _$_Manga implements _Manga {
         sourceId,
         status,
         thumbnailUrl,
+        thumbnailUrlLastFetched,
         title,
         unreadCount,
         lastFetchedAt,
@@ -646,6 +666,7 @@ abstract class _Manga implements Manga {
       @JsonKey(fromJson: MangaStatus.fromJson, toJson: MangaStatus.toJson)
           final MangaStatus? status,
       final String? thumbnailUrl,
+      final int? thumbnailUrlLastFetched,
       final String? title,
       final int? unreadCount,
       final int? lastFetchedAt,
@@ -693,6 +714,8 @@ abstract class _Manga implements Manga {
   @override
   String? get thumbnailUrl;
   @override
+  int? get thumbnailUrlLastFetched;
+  @override
   String? get title;
   @override
   int? get unreadCount;

lib/src/features/manga_book/presentation/manga_details/controller/manga_details_controller.dart

@@ -97,7 +97,8 @@ AsyncValue<List<Chapter>?> mangaChapterListWithFilter(
   final chapterFilterDownloaded =
       ref.watch(mangaChapterFilterDownloadedProvider);
   final chapterFilterBookmark = ref.watch(mangaChapterFilterBookmarkedProvider);
-  final sortedBy = ref.watch(mangaChapterSortProvider);
+  final ChapterSort sortedBy = ref.watch(mangaChapterSortProvider) ??
+      DBKeys.chapterSortDirection.initial;
   final sortedDirection =
       ref.watch(mangaChapterSortDirectionProvider).ifNull(true);
 
@@ -126,8 +127,9 @@ AsyncValue<List<Chapter>?> mangaChapterListWithFilter(
         return (m1.fetchedAt ?? 0).compareTo(m2.fetchedAt ?? 0) * sortDirToggle;
       case ChapterSort.source:
         return (m1.index ?? 0).compareTo(m2.index ?? 0) * sortDirToggle;
-      default:
-        return 0;
+      case ChapterSort.uploadDate:
+        return (m1.uploadDate ?? 0).compareTo(m2.uploadDate ?? 0) *
+            sortDirToggle;
     }
   }
 

lib/src/features/manga_book/presentation/manga_details/widgets/manga_chapter_sort.dart

@@ -17,10 +17,10 @@ class MangaChapterSort extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return ListView(
-      children: const [
-        Divider(height: .5),
-        MangaChapterSortTile(sortType: ChapterSort.source),
-        MangaChapterSortTile(sortType: ChapterSort.fetchedDate),
+      children: [
+        const Divider(height: .5),
+        for (ChapterSort chapterSort in ChapterSort.values)
+          MangaChapterSortTile(sortType: chapterSort),
       ],
     );
   }