Merge pull request #143 from miru-project/fix/comic-image-scaling

fix: comic image scaling
miru-project · Dec 13, 2023 · 798e8d1 · 798e8d1
2 parents 107a073 + 8bb091d
commit 798e8d1
Show file tree

Hide file tree

Showing 8 changed files with 131 additions and 383 deletions.
diff --git a/lib/controllers/watch/comic_controller.dart b/lib/controllers/watch/comic_controller.dart
@@ -108,6 +108,7 @@ class ComicController extends ReaderController<ExtensionMangaWatch> {
   }
 
   // 下一页
+  @override
   void nextPage() {
     if (readType.value != MangaReadMode.webTonn) {
       pageController.value.nextPage(
@@ -124,6 +125,7 @@ class ComicController extends ReaderController<ExtensionMangaWatch> {
   }
 
   // 上一页
+  @override
   void previousPage() {
     if (readType.value != MangaReadMode.webTonn) {
       pageController.value.previousPage(

diff --git a/lib/controllers/watch/reader_controller.dart b/lib/controllers/watch/reader_controller.dart
@@ -44,14 +44,16 @@ class ReaderController<T> extends GetxController {
     try {
       error.value = '';
       watchData.value = null;
-      watchData.value = await runtime.watch(
-        cuurentPlayUrl,
-      ) as T;
+      watchData.value = await runtime.watch(cuurentPlayUrl) as T;
     } catch (e) {
       error.value = e.toString();
     }
   }
 
+  void previousPage() {}
+
+  void nextPage() {}
+
   showControlPanel() {
     isShowControlPanel.value = true;
     _timer?.cancel();

diff --git a/lib/utils/layout.dart b/lib/utils/layout.dart
@@ -5,17 +5,17 @@ class LayoutUtils {
   static bool? _isTablet;
 
   // 获取当前宽度
-  static double get getWidth {
+  static double get width {
     return MediaQuery.of(currentContext).size.width;
   }
 
   // 获取当前高度
-  static double get getHeight {
+  static double get height {
     return MediaQuery.of(currentContext).size.height;
   }
 
   // 是否是平板
   static bool get isTablet {
-    return _isTablet ??= getWidth > 800;
+    return _isTablet ??= width > 800;
   }
 }
diff --git a/lib/views/pages/watch/reader/comic/comic_reader.dart b/lib/views/pages/watch/reader/comic/comic_reader.dart
@@ -1,14 +1,13 @@
-import 'dart:io';
-
 import 'package:fluent_ui/fluent_ui.dart';
 import 'package:get/get.dart';
 import 'package:miru_app/models/extension.dart';
 import 'package:miru_app/views/pages/watch/reader/comic/comic_reader_content.dart';
 import 'package:miru_app/views/pages/watch/reader/comic/comic_reader_settings.dart';
 import 'package:miru_app/controllers/watch/comic_controller.dart';
+import 'package:miru_app/views/widgets/platform_widget.dart';
 // import 'package:miru_app/views/pages/watch/reader/comic/comic_zoom.dart';
-import 'package:miru_app/views/widgets/watch/comic_view.dart';
 import 'package:miru_app/data/services/extension_service.dart';
+import 'package:miru_app/views/widgets/watch/reader_view.dart';
 import 'package:window_manager/window_manager.dart';
 
 class ComicReader extends StatefulWidget {
@@ -61,20 +60,13 @@ class _ComicReaderState extends State<ComicReader> {
 
   @override
   Widget build(BuildContext context) {
-    if (Platform.isAndroid) {
-      return ReaderView<ComicController>(
-        widget.title,
-        content: Center(
-          child: ComicReaderContent(widget.title),
-        ),
-        buildSettings: (context) => ComicReaderSettings(widget.title),
-      );
-    }
     return ReaderView<ComicController>(
       widget.title,
-      content: DragToMoveArea(
-        child: ComicReaderContent(widget.title),
-      ),
+      content: PlatformWidget(
+          androidWidget: ComicReaderContent(widget.title),
+          desktopWidget: DragToMoveArea(
+            child: ComicReaderContent(widget.title),
+          )),
       buildSettings: (context) => ComicReaderSettings(widget.title),
     );
   }