V0.4.2 (Suwayomi#122)

* updated Download screen UI * updated Packages * updated kotlin
tachimanga · Feb 17, 2023 · bb4c9e3 · bb4c9e3
1 parent a7e50fb
commit bb4c9e3
Show file tree

Hide file tree

Showing 49 changed files with 360 additions and 184 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.7.21'
+    ext.kotlin_version = '1.8.10'
     repositories {
         google()
         mavenCentral()

diff --git a/assets/locales/en_US.json b/assets/locales/en_US.json
@@ -137,6 +137,8 @@
     "missingExtension": "Missing Extensions",
     "missingTrackers": "Missing Trackers",
     "more": "More",
+    "moveToBottom": "Move to Bottom",
+    "moveToTop": "Move to top",
     "newUpdateAvailable": "New update available",
     "noCategoriesFound": "You don't have any Categories. \nTap the Plus button to create one for organizing your library",
     "noCategoriesFoundAlt": "You don't have any Categories. \nCreate one in settings for organizing your library",
@@ -156,6 +158,7 @@
     },
     "nsfw18": "18+",
     "numSelected": "{num} Selected",
+    "obsolete": "Obsolete",
     "page": "Page: {number}",
     "password": "Password",
     "pause": "Pause",

diff --git a/assets/locales/pt_PT.json b/assets/locales/pt_PT.json
@@ -137,6 +137,8 @@
     "missingExtension": "Extensões em falta",
     "missingTrackers": "Rasteadores em falta",
     "more": "Mais",
+    "moveToBottom": "Mover para baixo",
+    "moveToTop": "Mover para cima",
     "newUpdateAvailable": "Nova atualização disponível",
     "noCategoriesFound": "Não tem nenhuma categoria. \nToque no no botão mais para criar uma categoria para organizar a sua biblioteca",
     "noCategoriesFoundAlt": "Não tem nenhuma categoria. \nCria uma nas definições para organizar a sua biblioteca",
@@ -156,6 +158,7 @@
     },
     "nsfw18": "18+",
     "numSelected": "{num} Selecionado",
+    "obsolete": "Obsoleta",
     "page": "Página: {number}",
     "password": "Senha",
     "pause": "Pausa",

diff --git a/lib/src/constants/endpoints.dart b/lib/src/constants/endpoints.dart
@@ -79,6 +79,9 @@ abstract class DownloaderUrl {
   static String chapter(int mangaId, int chapterIndex) =>
       "/download/$mangaId/chapter/$chapterIndex";
 
+  static String reorderDownload(int mangaId, int chapterIndex, int to) =>
+      "/download/$mangaId/chapter/$chapterIndex/reorder/$to";
+
   static const String downloads = "/downloads";
 }
 

diff --git a/lib/src/features/browse_center/presentation/extension/controller/extension_controller.dart b/lib/src/features/browse_center/presentation/extension/controller/extension_controller.dart
@@ -32,11 +32,11 @@ AsyncValue<Map<String, List<Extension>>> extensionMap(ExtensionMapRef ref) {
   final extensionMap = <String, List<Extension>>{};
   final extensionListData = ref.watch(extensionProvider);
   final extensionList = [...?extensionListData.valueOrNull];
-  final showNsfw = ref.watch(showNSFWProvider) ?? true;
+  final showNsfw = ref.watch(showNSFWProvider).ifNull(true);
   for (final e in extensionList) {
-    if (!showNsfw && (e.isNsfw ?? false)) continue;
-    if (e.installed ?? false) {
-      if (e.hasUpdate ?? false) {
+    if (!showNsfw && (e.isNsfw.ifNull())) continue;
+    if (e.installed.ifNull()) {
+      if (e.hasUpdate.ifNull()) {
         extensionMap.update(
           "update",
           (value) => [...value, e],

diff --git a/lib/src/features/browse_center/presentation/extension/controller/extension_controller.g.dart b/lib/src/features/browse_center/presentation/extension/controller/extension_controller.g.dart
diff --git a/...atures/browse_center/presentation/extension/widgets/extension_language_filter_dialog.dart b/...atures/browse_center/presentation/extension/widgets/extension_language_filter_dialog.dart
@@ -40,7 +40,7 @@ class ExtensionLanguageFilterDialog extends ConsumerWidget {
                         {...?enabledLanguages, languageCodes[index]}.toList(),
                       );
                 } else {
-                  if (!(enabledLanguagesIndex?.isNegative ?? true)) {
+                  if (!((enabledLanguagesIndex?.isNegative).ifNull(true))) {
                     ref.read(extensionLanguageFilterProvider.notifier).update(
                           [...?enabledLanguages]
                             ..removeAt(enabledLanguagesIndex!),

diff --git a/lib/src/features/browse_center/presentation/extension/widgets/extension_list_tile.dart b/lib/src/features/browse_center/presentation/extension/widgets/extension_list_tile.dart
@@ -42,7 +42,10 @@ class ExtensionListTile extends HookConsumerWidget {
           isLoading: isLoading.value,
         ),
       ),
-      title: Text(extension.name ?? ""),
+      title: Text(
+        extension.name ?? "",
+        overflow: TextOverflow.ellipsis,
+      ),
       subtitle: Text.rich(
         TextSpan(
           text: (extension.lang) != null
@@ -55,7 +58,7 @@ class ExtensionListTile extends HookConsumerWidget {
                 text: "${extension.versionName ?? ""} ",
                 style: const TextStyle(fontWeight: FontWeight.normal),
               ),
-            if (extension.isNsfw ?? false)
+            if (extension.isNsfw.ifNull())
               TextSpan(
                 text: LocaleKeys.nsfw18.tr(),
                 style: const TextStyle(
@@ -66,65 +69,79 @@ class ExtensionListTile extends HookConsumerWidget {
           ],
         ),
       ),
-      trailing: (extension.installed ?? false)
-          ? TextButton(
-              onPressed: isLoading.value
-                  ? null
-                  : () async {
-                      try {
-                        isLoading.value = true;
-                        (await AsyncValue.guard(() async {
-                          if (extension.pkgName.isBlank) {
-                            throw LocaleKeys.error_extension.tr();
-                          }
-                          await (extension.hasUpdate ?? false
-                              ? repository.updateExtension(extension.pkgName!)
-                              : repository
-                                  .uninstallExtension(extension.pkgName!));
-
-                          await refresh();
-                        }))
-                            .showToastOnError(ref.read(toastProvider(context)));
-                        isLoading.value = false;
-                      } catch (e) {
-                        //
-                      }
-                    },
+      trailing: extension.obsolete.ifNull()
+          ? OutlinedButton(
+              onPressed: extension.installed.ifNull()
+                  ? () => repository.uninstallExtension(extension.pkgName!)
+                  : null,
               child: Text(
-                extension.hasUpdate ?? false
-                    ? isLoading.value
-                        ? LocaleKeys.updating.tr()
-                        : LocaleKeys.update.tr()
-                    : isLoading.value
-                        ? LocaleKeys.uninstalling.tr()
-                        : LocaleKeys.uninstall.tr(),
+                LocaleKeys.obsolete.tr(),
+                style: const TextStyle(color: Colors.redAccent),
               ),
             )
-          : TextButton(
-              onPressed: isLoading.value
-                  ? null
-                  : () async {
-                      try {
-                        isLoading.value = true;
-                        (await AsyncValue.guard(() async {
-                          if (extension.pkgName.isBlank) {
-                            throw LocaleKeys.error_extension.tr();
+          : extension.installed.ifNull()
+              ? TextButton(
+                  onPressed: isLoading.value
+                      ? null
+                      : () async {
+                          try {
+                            isLoading.value = true;
+                            (await AsyncValue.guard(() async {
+                              if (extension.pkgName.isBlank) {
+                                throw LocaleKeys.error_extension.tr();
+                              }
+                              await (extension.hasUpdate.ifNull()
+                                  ? repository
+                                      .updateExtension(extension.pkgName!)
+                                  : repository
+                                      .uninstallExtension(extension.pkgName!));
+
+                              await refresh();
+                            }))
+                                .showToastOnError(
+                                    ref.read(toastProvider(context)));
+                            isLoading.value = false;
+                          } catch (e) {
+                            //
                           }
-                          await repository.installExtension(extension.pkgName!);
-                          await refresh();
-                        }))
-                            .showToastOnError(ref.read(toastProvider(context)));
-                        isLoading.value = false;
-                      } catch (e) {
-                        //
-                      }
-                    },
-              child: Text(
-                isLoading.value
-                    ? LocaleKeys.installing.tr()
-                    : LocaleKeys.install.tr(),
-              ),
-            ),
+                        },
+                  child: Text(
+                    extension.hasUpdate.ifNull()
+                        ? isLoading.value
+                            ? LocaleKeys.updating.tr()
+                            : LocaleKeys.update.tr()
+                        : isLoading.value
+                            ? LocaleKeys.uninstalling.tr()
+                            : LocaleKeys.uninstall.tr(),
+                  ),
+                )
+              : TextButton(
+                  onPressed: isLoading.value
+                      ? null
+                      : () async {
+                          try {
+                            isLoading.value = true;
+                            (await AsyncValue.guard(() async {
+                              if (extension.pkgName.isBlank) {
+                                throw LocaleKeys.error_extension.tr();
+                              }
+                              await repository
+                                  .installExtension(extension.pkgName!);
+                              await refresh();
+                            }))
+                                .showToastOnError(
+                                    ref.read(toastProvider(context)));
+                            isLoading.value = false;
+                          } catch (e) {
+                            //
+                          }
+                        },
+                  child: Text(
+                    isLoading.value
+                        ? LocaleKeys.installing.tr()
+                        : LocaleKeys.install.tr(),
+                  ),
+                ),
     );
   }
 }
diff --git a/lib/src/features/browse_center/presentation/global_search/widgets/source_quick_search.dart b/lib/src/features/browse_center/presentation/global_search/widgets/source_quick_search.dart
@@ -63,7 +63,7 @@ class SourceQuickSearch extends ConsumerWidget {
                           height: 192,
                           child: MangaCoverGridTile(
                             manga: i,
-                            showDarkOverlay: i.inLibrary ?? false,
+                            showDarkOverlay: i.inLibrary.ifNull(),
                             onPressed: i.id != null
                                 ? () => context.push(Routes.getManga(i.id!))
                                 : null,

diff --git a/lib/src/features/browse_center/presentation/source/widgets/source_language_filter.dart b/lib/src/features/browse_center/presentation/source/widgets/source_language_filter.dart
@@ -40,7 +40,7 @@ class SourceLanguageFilter extends ConsumerWidget {
                         {...?enabledLanguages, languageCodes[index]}.toList(),
                       );
                 } else {
-                  if (!(enabledLanguagesIndex?.isNegative ?? true)) {
+                  if (!((enabledLanguagesIndex?.isNegative).ifNull(true))) {
                     ref.read(sourceLanguageFilterProvider.notifier).update(
                           [...?enabledLanguages]
                             ..removeAt(enabledLanguagesIndex!),

diff --git a/lib/src/features/browse_center/presentation/source/widgets/source_list_tile.dart b/lib/src/features/browse_center/presentation/source/widgets/source_list_tile.dart
@@ -44,7 +44,7 @@ class SourceListTile extends ConsumerWidget {
       subtitle: (source.lang?.displayName).isNotBlank
           ? Text(source.lang?.displayName ?? "")
           : null,
-      trailing: (source.supportsLatest ?? false)
+      trailing: (source.supportsLatest.ifNull())
           ? TextButton(
               onPressed: () async {
                 ref.read(sourceLastUsedProvider.notifier).update(source.id);

diff --git a/lib/src/features/browse_center/presentation/source_manga_list/source_manga_list_screen.dart b/lib/src/features/browse_center/presentation/source_manga_list/source_manga_list_screen.dart
@@ -60,7 +60,7 @@ class SourceMangaListScreen extends HookConsumerWidget {
         data: (recentChaptersPage) {
           try {
             if (recentChaptersPage != null) {
-              if (recentChaptersPage.hasNextPage ?? false) {
+              if (recentChaptersPage.hasNextPage.ifNull()) {
                 controller.appendPage(
                   [...?recentChaptersPage.mangaList],
                   pageKey + 1,
@@ -158,7 +158,7 @@ class SourceMangaListScreen extends HookConsumerWidget {
                         );
                       },
                     ),
-                    if (data?.supportsLatest ?? false)
+                    if ((data?.supportsLatest).ifNull())
                       SourceTypeSelectableChip(
                         value: SourceType.latest,
                         groupValue: sourceType,

diff --git a/lib/src/features/browse_center/presentation/source_manga_list/widgets/filter_to_widget.dart b/lib/src/features/browse_center/presentation/source_manga_list/widgets/filter_to_widget.dart
@@ -43,7 +43,7 @@ class FilterToWidget extends StatelessWidget {
             initialText: text.state,
           ),
           checkBox: (checkbox) => CheckboxListTile(
-            value: checkbox.state ?? false,
+            value: checkbox.state.ifNull(),
             title: Text(checkbox.name ?? ""),
             onChanged: (value) =>
                 onChangedFilterCopyWith(checkbox.copyWith(state: value)),
@@ -66,7 +66,7 @@ class FilterToWidget extends StatelessWidget {
               for (int i = 0; i < (sort.values?.length ?? 0); i++)
                 SortListTile(
                   key: ValueKey("${sort.name}-$i"),
-                  ascending: sort.state?.ascending ?? true,
+                  ascending: (sort.state?.ascending).ifNull(true),
                   title: Text(sort.values != null ? sort.values![i] : ""),
                   selected: i == sort.state?.index,
                   onChanged: (value) {

diff --git a/...features/browse_center/presentation/source_manga_list/widgets/source_manga_grid_view.dart b/...features/browse_center/presentation/source_manga_list/widgets/source_manga_grid_view.dart
@@ -12,6 +12,7 @@ import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 import '../../../../../constants/app_sizes.dart';
 import '../../../../../i18n/locale_keys.g.dart';
 import '../../../../../routes/router_config.dart';
+import '../../../../../utils/extensions/custom_extensions.dart';
 import '../../../../../widgets/emoticons.dart';
 import '../../../../../widgets/manga_cover/grid/manga_cover_grid_tile.dart';
 import '../../../../manga_book/domain/manga/manga_model.dart';
@@ -42,7 +43,7 @@ class SourceMangaGridView extends StatelessWidget {
         ),
         itemBuilder: (context, item, index) => MangaCoverGridTile(
           manga: item.copyWith(source: source),
-          showDarkOverlay: item.inLibrary ?? false,
+          showDarkOverlay: item.inLibrary.ifNull(),
           onPressed: () {
             if (item.id != null) {
               context.push(Routes.getManga(item.id!));

diff --git a/lib/src/features/library/presentation/category/widgets/edit_category_dialog.dart b/lib/src/features/library/presentation/category/widgets/edit_category_dialog.dart
@@ -36,7 +36,7 @@ class EditCategoryDialog extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final categoryName = useTextEditingController(text: category?.name);
-    final defaultCategory = useState(category?.defaultCategory ?? false);
+    final defaultCategory = useState((category?.defaultCategory).ifNull());
     return AlertDialog(
       title: Text(
         category == null

diff --git a/lib/src/features/library/presentation/library/controller/library_controller.dart b/lib/src/features/library/presentation/library/controller/library_controller.dart
@@ -32,7 +32,7 @@ bool genreMatches(List<String>? mangaGenreList, List<String>? queryGenreList) {
   Set<String>? mangaSet = mangaGenreList?.map((e) => e.toLowerCase()).toSet();
   Set<String>? querySet =
       queryGenreList?.map((e) => e.toLowerCase().trim()).toSet();
-  return mangaSet?.containsAll(querySet ?? <String>{}) ?? true;
+  return (mangaSet?.containsAll(querySet ?? <String>{})).ifNull(true);
 }
 
 @riverpod
@@ -48,7 +48,7 @@ class CategoryMangaListWithQueryAndFilter
     final mangaFilterCompleted = ref.watch(libraryMangaFilterCompletedProvider);
     final sortedBy = ref.watch(libraryMangaSortProvider);
     final sortedDirection =
-        ref.watch(libraryMangaSortDirectionProvider) ?? true;
+        ref.watch(libraryMangaSortDirectionProvider).ifNull(true);
 
     bool applyMangaFilter(Manga manga) {
       if (mangaFilterUnread != null &&

diff --git a/lib/src/features/library/presentation/library/controller/library_controller.g.dart b/lib/src/features/library/presentation/library/controller/library_controller.g.dart
diff --git a/lib/src/features/library/presentation/library/widgets/library_manga_sort_tile.dart b/lib/src/features/library/presentation/library/widgets/library_manga_sort_tile.dart
@@ -9,6 +9,7 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 import '../../../../../constants/enum.dart';
+import '../../../../../utils/extensions/custom_extensions.dart';
 import '../../../../../widgets/sort_list_tile.dart';
 import '../controller/library_controller.dart';
 
@@ -25,10 +26,10 @@ class LibraryMangaSortTile extends ConsumerWidget {
     return SortListTile(
       selected: sortType == sortedBy,
       title: Text(sortType.toString().tr()),
-      ascending: sortedDirection ?? true,
+      ascending: sortedDirection.ifNull(true),
       onChanged: (bool? value) => ref
           .read(libraryMangaSortDirectionProvider.notifier)
-          .update(!(sortedDirection ?? false)),
+          .update(!(sortedDirection.ifNull())),
       onSelected: () =>
           ref.read(libraryMangaSortProvider.notifier).update(sortType),
     );

diff --git a/lib/src/features/manga_book/data/downloads/downloads_repository.dart b/lib/src/features/manga_book/data/downloads/downloads_repository.dart
@@ -41,6 +41,11 @@ class DownloadsRepository {
   Future<void> removeChapterFromDownloadQueue(int mangaId, int chapterIndex) =>
       dioClient.delete(DownloaderUrl.chapter(mangaId, chapterIndex));
 
+  Future<void> reorderDownload(int mangaId, int chapterIndex, int to) =>
+      dioClient.patch(
+        DownloaderUrl.reorderDownload(mangaId, chapterIndex, to),
+      );
+
   Pair<Stream<Downloads>, AsyncCallback> socketDownloads() {
     final url = (dioClient.dio.options.baseUrl.toWebSocket!);
     final channel =