Added magnification to reader and Fixed category bug (#142)

Suwayomi · Mar 7, 2023 · 86eeeac · 86eeeac
1 parent 84f0fe8
commit 86eeeac
Show file tree

Hide file tree

Showing 19 changed files with 445 additions and 131 deletions.
diff --git a/lib/src/constants/app_constants.dart b/lib/src/constants/app_constants.dart
@@ -6,7 +6,21 @@
 
 import 'package:flutter/material.dart';
 
-Duration kDuration = const Duration(milliseconds: 500);
-Duration kLongDuration = const Duration(seconds: 2);
+const Duration kDuration = Duration(milliseconds: 500);
+const Duration kLongDuration = Duration(seconds: 2);
 
-Curve kCurve = Curves.easeIn;
+const Curve kCurve = Curves.easeIn;
+const Size kMagnifierSize = Size(77.37, 37.9);
+const MagnifierDecoration kMagnifierDecoration = MagnifierDecoration(
+  shape: RoundedRectangleBorder(
+      borderRadius: BorderRadius.all(Radius.circular(40))),
+  shadows: <BoxShadow>[
+    BoxShadow(
+        blurRadius: 1.5,
+        offset: Offset(0, 2),
+        spreadRadius: 0.75,
+        color: Color.fromARGB(25, 0, 0, 0))
+  ],
+);
+
+const kDebounceDuration = Duration(milliseconds: 500);
diff --git a/lib/src/constants/app_sizes.dart b/lib/src/constants/app_sizes.dart
@@ -4,9 +4,12 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+import 'dart:math';
+
 import 'package:flutter/material.dart';
 
 import '../utils/extensions/custom_extensions.dart';
+import 'app_constants.dart';
 import 'db_keys.dart';
 
 const kTabSize = Size.fromHeight(kAppBarBottomHeight);
@@ -19,6 +22,31 @@ Size kCalculateAppBarBottomSize(List<bool> checks) {
   return Size.fromHeight(kAppBarBottomHeight * multiplier);
 }
 
+Offset kMagnifierPosition(Offset position, Size size, double multiplier) =>
+    Offset(
+      max(
+        min(
+          position.dx - (kMagnifierSize.width * multiplier * .5),
+          size.width - (kMagnifierSize.width * multiplier * .5),
+        ),
+        -(kMagnifierSize.width * multiplier * .5),
+      ),
+      max(
+        min(
+          position.dy - (kMagnifierSize.height * multiplier),
+          size.height - (kMagnifierSize.height * multiplier * 1.25),
+        ),
+        -(kMagnifierSize.height * multiplier * .5),
+      ),
+    );
+
+Offset kMagnifierOffset(Offset position, Size size, double multiplier) {
+  return Offset(
+    0,
+    max(0, min(position.dy, (kMagnifierSize.height * multiplier))) * .5,
+  );
+}
+
 /// Constant sizes to be used in the app (paddings, gaps, rounded corners etc.)
 enum KEdgeInsets {
   a8(EdgeInsets.all(8)),

diff --git a/lib/src/constants/db_keys.dart b/lib/src/constants/db_keys.dart
@@ -18,6 +18,7 @@ enum DBKeys {
   basicCredentials(null),
   readerMode(ReaderMode.webtoon),
   readerPadding(0.0),
+  readerMagnifierSize(1.0),
   readerNavigationLayout(ReaderNavigationLayout.disabled),
   invertTap(false),
   showNSFW(true),

diff --git a/lib/src/features/library/presentation/category/edit_category_screen.dart b/lib/src/features/library/presentation/category/edit_category_screen.dart
@@ -40,7 +40,8 @@ class EditCategoryScreen extends HookConsumerWidget {
       body: categoryList.showUiWhenData(
         context,
         (data) {
-          if (data.isBlank || data.isSingletonList) {
+          if (data.isBlank ||
+              (data.isSingletonList && data?.firstOrNull?.id == 0)) {
             return Emoticons(
               text: context.l10n!.noCategoriesFound,
               button: TextButton(
@@ -49,18 +50,20 @@ class EditCategoryScreen extends HookConsumerWidget {
               ),
             );
           } else {
+            final isDefaultInCategoryList = data!.first.id == 0;
             return RefreshIndicator(
               child: ListView.builder(
-                itemCount: data!.length,
+                itemCount: data.length,
                 itemBuilder: (context, index) {
                   final category = data[index];
                   if (category.id == 0) {
                     return const SizedBox.shrink();
                   } else {
                     return CategoryTile(
                       key: ValueKey(category.id),
-                      minOrderIndex: 1,
-                      maxOrderIndex: data.length - 1,
+                      maxOrderIndex: isDefaultInCategoryList
+                          ? data.length - 1
+                          : data.length,
                       category: category,
                     );
                   }

diff --git a/lib/src/features/library/presentation/category/widgets/category_tile.dart b/lib/src/features/library/presentation/category/widgets/category_tile.dart
@@ -20,12 +20,10 @@ class CategoryTile extends HookConsumerWidget {
   const CategoryTile({
     super.key,
     required this.category,
-    required this.minOrderIndex,
     required this.maxOrderIndex,
   });
 
   final Category category;
-  final int minOrderIndex;
   final int maxOrderIndex;
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -44,7 +42,7 @@ class CategoryTile extends HookConsumerWidget {
               children: [
                 IconButton(
                   visualDensity: VisualDensity.compact,
-                  onPressed: order <= minOrderIndex
+                  onPressed: order <= 1
                       ? null
                       : () => ref
                           .read(categoryControllerProvider.notifier)

diff --git a/lib/src/features/manga_book/domain/manga/manga_model.dart b/lib/src/features/manga_book/domain/manga/manga_model.dart
@@ -63,6 +63,11 @@ class MangaMeta with _$MangaMeta {
       fromJson: MangaMeta.fromJsonToDouble,
     )
         double? readerPadding,
+    @JsonKey(
+      name: "flutter_readerMagnifierSize",
+      fromJson: MangaMeta.fromJsonToDouble,
+    )
+        double? readerMagnifierSize,
   }) = _MangaMeta;
 
   static bool? fromJsonToBool(dynamic val) => val != null && val is String
@@ -80,6 +85,7 @@ enum MangaMetaKeys {
   readerNavigationLayout("flutter_readerNavigationLayout"),
   readerMode("flutter_readerMode"),
   readerPadding("flutter_readerPadding"),
+  readerMagnifierSize("flutter_readerMagnifierSize"),
   ;
 
   const MangaMetaKeys(this.key);

diff --git a/lib/src/features/manga_book/domain/manga/manga_model.freezed.dart b/lib/src/features/manga_book/domain/manga/manga_model.freezed.dart
@@ -727,6 +727,9 @@ mixin _$MangaMeta {
   ReaderMode? get readerMode => throw _privateConstructorUsedError;
   @JsonKey(name: "flutter_readerPadding", fromJson: MangaMeta.fromJsonToDouble)
   double? get readerPadding => throw _privateConstructorUsedError;
+  @JsonKey(
+      name: "flutter_readerMagnifierSize", fromJson: MangaMeta.fromJsonToDouble)
+  double? get readerMagnifierSize => throw _privateConstructorUsedError;
 
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
   @JsonKey(ignore: true)
@@ -747,7 +750,9 @@ abstract class $MangaMetaCopyWith<$Res> {
       @JsonKey(name: "flutter_readerMode")
           ReaderMode? readerMode,
       @JsonKey(name: "flutter_readerPadding", fromJson: MangaMeta.fromJsonToDouble)
-          double? readerPadding});
+          double? readerPadding,
+      @JsonKey(name: "flutter_readerMagnifierSize", fromJson: MangaMeta.fromJsonToDouble)
+          double? readerMagnifierSize});
 }
 
 /// @nodoc
@@ -767,6 +772,7 @@ class _$MangaMetaCopyWithImpl<$Res, $Val extends MangaMeta>
     Object? readerNavigationLayout = freezed,
     Object? readerMode = freezed,
     Object? readerPadding = freezed,
+    Object? readerMagnifierSize = freezed,
   }) {
     return _then(_value.copyWith(
       invertTap: freezed == invertTap
@@ -785,6 +791,10 @@ class _$MangaMetaCopyWithImpl<$Res, $Val extends MangaMeta>
           ? _value.readerPadding
           : readerPadding // ignore: cast_nullable_to_non_nullable
               as double?,
+      readerMagnifierSize: freezed == readerMagnifierSize
+          ? _value.readerMagnifierSize
+          : readerMagnifierSize // ignore: cast_nullable_to_non_nullable
+              as double?,
     ) as $Val);
   }
 }
@@ -804,7 +814,9 @@ abstract class _$$_MangaMetaCopyWith<$Res> implements $MangaMetaCopyWith<$Res> {
       @JsonKey(name: "flutter_readerMode")
           ReaderMode? readerMode,
       @JsonKey(name: "flutter_readerPadding", fromJson: MangaMeta.fromJsonToDouble)
-          double? readerPadding});
+          double? readerPadding,
+      @JsonKey(name: "flutter_readerMagnifierSize", fromJson: MangaMeta.fromJsonToDouble)
+          double? readerMagnifierSize});
 }
 
 /// @nodoc
@@ -822,6 +834,7 @@ class __$$_MangaMetaCopyWithImpl<$Res>
     Object? readerNavigationLayout = freezed,
     Object? readerMode = freezed,
     Object? readerPadding = freezed,
+    Object? readerMagnifierSize = freezed,
   }) {
     return _then(_$_MangaMeta(
       invertTap: freezed == invertTap
@@ -840,6 +853,10 @@ class __$$_MangaMetaCopyWithImpl<$Res>
           ? _value.readerPadding
           : readerPadding // ignore: cast_nullable_to_non_nullable
               as double?,
+      readerMagnifierSize: freezed == readerMagnifierSize
+          ? _value.readerMagnifierSize
+          : readerMagnifierSize // ignore: cast_nullable_to_non_nullable
+              as double?,
     ));
   }
 }
@@ -855,7 +872,9 @@ class _$_MangaMeta implements _MangaMeta {
       @JsonKey(name: "flutter_readerMode")
           this.readerMode,
       @JsonKey(name: "flutter_readerPadding", fromJson: MangaMeta.fromJsonToDouble)
-          this.readerPadding});
+          this.readerPadding,
+      @JsonKey(name: "flutter_readerMagnifierSize", fromJson: MangaMeta.fromJsonToDouble)
+          this.readerMagnifierSize});
 
   factory _$_MangaMeta.fromJson(Map<String, dynamic> json) =>
       _$$_MangaMetaFromJson(json);
@@ -874,10 +893,14 @@ class _$_MangaMeta implements _MangaMeta {
   @override
   @JsonKey(name: "flutter_readerPadding", fromJson: MangaMeta.fromJsonToDouble)
   final double? readerPadding;
+  @override
+  @JsonKey(
+      name: "flutter_readerMagnifierSize", fromJson: MangaMeta.fromJsonToDouble)
+  final double? readerMagnifierSize;
 
   @override
   String toString() {
-    return 'MangaMeta(invertTap: $invertTap, readerNavigationLayout: $readerNavigationLayout, readerMode: $readerMode, readerPadding: $readerPadding)';
+    return 'MangaMeta(invertTap: $invertTap, readerNavigationLayout: $readerNavigationLayout, readerMode: $readerMode, readerPadding: $readerPadding, readerMagnifierSize: $readerMagnifierSize)';
   }
 
   @override
@@ -892,13 +915,15 @@ class _$_MangaMeta implements _MangaMeta {
             (identical(other.readerMode, readerMode) ||
                 other.readerMode == readerMode) &&
             (identical(other.readerPadding, readerPadding) ||
-                other.readerPadding == readerPadding));
+                other.readerPadding == readerPadding) &&
+            (identical(other.readerMagnifierSize, readerMagnifierSize) ||
+                other.readerMagnifierSize == readerMagnifierSize));
   }
 
   @JsonKey(ignore: true)
   @override
   int get hashCode => Object.hash(runtimeType, invertTap,
-      readerNavigationLayout, readerMode, readerPadding);
+      readerNavigationLayout, readerMode, readerPadding, readerMagnifierSize);
 
   @JsonKey(ignore: true)
   @override
@@ -923,7 +948,9 @@ abstract class _MangaMeta implements MangaMeta {
       @JsonKey(name: "flutter_readerMode")
           final ReaderMode? readerMode,
       @JsonKey(name: "flutter_readerPadding", fromJson: MangaMeta.fromJsonToDouble)
-          final double? readerPadding}) = _$_MangaMeta;
+          final double? readerPadding,
+      @JsonKey(name: "flutter_readerMagnifierSize", fromJson: MangaMeta.fromJsonToDouble)
+          final double? readerMagnifierSize}) = _$_MangaMeta;
 
   factory _MangaMeta.fromJson(Map<String, dynamic> json) =
       _$_MangaMeta.fromJson;
@@ -943,6 +970,10 @@ abstract class _MangaMeta implements MangaMeta {
   @JsonKey(name: "flutter_readerPadding", fromJson: MangaMeta.fromJsonToDouble)
   double? get readerPadding;
   @override
+  @JsonKey(
+      name: "flutter_readerMagnifierSize", fromJson: MangaMeta.fromJsonToDouble)
+  double? get readerMagnifierSize;
+  @override
   @JsonKey(ignore: true)
   _$$_MangaMetaCopyWith<_$_MangaMeta> get copyWith =>
       throw _privateConstructorUsedError;

diff --git a/lib/src/features/manga_book/domain/manga/manga_model.g.dart b/lib/src/features/manga_book/domain/manga/manga_model.g.dart
diff --git a/...rc/features/manga_book/presentation/manga_details/widgets/edit_manga_category_dialog.dart b/...rc/features/manga_book/presentation/manga_details/widgets/edit_manga_category_dialog.dart
@@ -12,6 +12,7 @@ import '../../../../../constants/app_sizes.dart';
 import '../../../../../utils/extensions/custom_extensions.dart';
 import '../../../../../widgets/async_buttons/async_checkbox_list_tile.dart';
 import '../../../../../widgets/pop_button.dart';
+import '../../../../library/domain/category/category_model.dart';
 import '../../../../library/presentation/category/controller/edit_category_controller.dart';
 import '../../../data/manga_book_repository.dart';
 import '../controller/manga_details_controller.dart';
@@ -58,10 +59,8 @@ class EditMangaCategoryDialog extends HookConsumerWidget {
                     context,
                     (selectedCategoryList) => Column(
                       children: [
-                        for (int index = 1; index < data!.length; index++)
-                          if (data[index].id == 0)
-                            const SizedBox.shrink()
-                          else
+                        for (Category category in data!)
+                          if (category.id != 0)
                             AsyncCheckboxListTile(
                               onChanged: (value) async {
                                 await AsyncValue.guard(
@@ -70,22 +69,22 @@ class EditMangaCategoryDialog extends HookConsumerWidget {
                                           .read(mangaBookRepositoryProvider)
                                           .addMangaToCategory(
                                             mangaId,
-                                            "${data[index].id!}",
+                                            "${category.id!}",
                                           )
                                       : ref
                                           .read(mangaBookRepositoryProvider)
                                           .removeMangaFromCategory(
                                             mangaId,
-                                            "${data[index].id!}",
+                                            "${category.id!}",
                                           ),
                                 );
                                 await ref.read(provider.notifier).refresh();
                               },
                               value: selectedCategoryList?.containsKey(
-                                    "${data[index].id}",
+                                    "${category.id}",
                                   ) ??
                                   false,
-                              title: Text(data[index].name ?? ""),
+                              title: Text(category.name ?? ""),
                             ),
                       ],
                     ),