default reading mode

add default reading mode ,prbuild
appdevelpo · Dec 2, 2023 · b6610ed · b6610ed
1 parent f673f83
commit b6610ed
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 13 deletions.
diff --git a/.github/workflows/prbuild.yml b/.github/workflows/prbuild.yml
@@ -77,5 +77,5 @@ jobs:
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:
-          path: "build/windows/runner/Miru-App"
+          path: "build/windows/x64/runner/Miru-App"
           name: Miru-pr-${{ github.event.pull_request.number }}-windows.zip
diff --git a/assets/i18n/en.json b/assets/i18n/en.json
@@ -102,6 +102,7 @@
     "extension-log-subtitle": "Used for debugging extensions",
     "skip-interval": "Skip Interval",
     "skip-interval-subtitle": "Skipping interval for builtin video player",
+    "default-reader-mode": "Default reader mode",
     "about": "About",
     "official-site": "Official Website",
     "official-site-training": "Visit",

diff --git a/lib/controllers/watch/comic_controller.dart b/lib/controllers/watch/comic_controller.dart
@@ -6,6 +6,7 @@ import 'package:miru_app/data/services/database_service.dart';
 import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
 import 'dart:async';
 import 'package:extended_image/extended_image.dart';
+import 'package:miru_app/utils/miru_storage.dart';
 
 class ComicController extends ReaderController<ExtensionMangaWatch> {
   ComicController({
@@ -17,8 +18,15 @@ class ComicController extends ReaderController<ExtensionMangaWatch> {
     required super.runtime,
     required super.cover,
   });
-
+  Map<String, MangaReadMode> readmode = {
+    'standard': MangaReadMode.standard,
+    'rightToLeft': MangaReadMode.rightToLeft,
+    'webTonn': MangaReadMode.webTonn,
+  };
+  final String setting = MiruStorage.getSetting(SettingKey.readingMode);
   final readType = MangaReadMode.standard.obs;
+
+  // MangaReadMode
   // 当前页码
   final currentPage = 0.obs;
   bool timerCancel = false;
@@ -100,13 +108,15 @@ class ComicController extends ReaderController<ExtensionMangaWatch> {
   }
 
   _initSetting() async {
-    readType.value = await DatabaseService.getMnagaReaderType(super.detailUrl);
+    readType.value = readmode[setting] ?? MangaReadMode.standard;
+    readType.value = await DatabaseService.getMnagaReaderType(
+        super.detailUrl, readType.value);
   }
 
-  double mapValue(double value) {
-    double mappedValue = ((value - 0) * (1 - (-1))) / (2.5 - 0) + (-1);
-    return mappedValue;
-  }
+  // double mapValue(double value) {
+  //   double mappedValue = ((value - 0) * (1 - (-1))) / (2.5 - 0) + (-1);
+  //   return mappedValue;
+  // }
 
   _jumpPage(int page) {
     if (readType.value == MangaReadMode.webTonn) {
@@ -186,7 +196,6 @@ class ComicController extends ReaderController<ExtensionMangaWatch> {
       );
     }
     pageController.value.dispose();
-
     timerCancel = true;
     super.onClose();
   }

diff --git a/lib/data/services/database_service.dart b/lib/data/services/database_service.dart
@@ -221,9 +221,10 @@ class DatabaseService {
   }
 
   // 获取漫画阅读模式
-  static Future<MangaReadMode> getMnagaReaderType(String url) {
+  static Future<MangaReadMode> getMnagaReaderType(
+      String url, MangaReadMode defaultMode) {
     return db.mangaSettings.filter().urlEqualTo(url).findFirst().then(
-          (value) => value?.readMode ?? MangaReadMode.standard,
+          (value) => value?.readMode ?? defaultMode,
         );
   }
 

diff --git a/lib/utils/miru_storage.dart b/lib/utils/miru_storage.dart
@@ -118,6 +118,7 @@ class MiruStorage {
     await _initSetting(SettingKey.keyJ, -10.0);
     await _initSetting(SettingKey.arrowLeft, -2.0);
     await _initSetting(SettingKey.arrowRight, 2.0);
+    await _initSetting(SettingKey.readingMode, "standard");
   }
 
   static _initSetting(String key, dynamic value) async {
@@ -149,6 +150,7 @@ class SettingKey {
   static String skipInterval = 'SkipInterval';
   static String keyI = 'KeyI';
   static String keyJ = 'KeyJ';
-  static String arrowLeft = 'arrowleft';
-  static String arrowRight = 'arrowright';
+  static String arrowLeft = 'Arrowleft';
+  static String arrowRight = 'Arrowright';
+  static String readingMode = 'ReadingMode';
 }
diff --git a/lib/views/pages/settings_page.dart b/lib/views/pages/settings_page.dart
@@ -246,6 +246,31 @@ class _SettingsPageState extends State<SettingsPage> {
           },
         ),
         const SizedBox(height: 8),
+        SettingsRadiosTile(
+          icon: const PlatformWidget(
+            androidWidget: Icon(Icons.chrome_reader_mode),
+            desktopWidget:
+                Icon(fluent.FluentIcons.reading_mode_solid, size: 24),
+          ),
+          title: 'settings.default-reader-mode'.i18n,
+          itemNameValue: () {
+            final map = {
+              'comic-settings.standard'.i18n: 'standard',
+              'comic-settings.right-to-left'.i18n: 'rightToLeft',
+              'comic-settings.web-tonn'.i18n: 'webTonn',
+            };
+            return map;
+          }(),
+          buildSubtitle: () =>
+              '${MiruStorage.getSetting(SettingKey.readingMode)}'.i18n,
+          applyValue: (value) {
+            MiruStorage.setSetting(SettingKey.readingMode, value);
+          },
+          buildGroupValue: () {
+            return MiruStorage.getSetting(SettingKey.readingMode);
+          },
+        ),
+        const SizedBox(height: 8),
         SettingsRadiosTile(
           icon: const PlatformWidget(
             androidWidget: Icon(Icons.play_arrow),
@@ -301,7 +326,7 @@ class _SettingsPageState extends State<SettingsPage> {
           fluent.Expander(
             header: Row(
               children: [
-                Icon(fluent.FluentIcons.keyboard_classic, size: 24),
+                const Icon(fluent.FluentIcons.keyboard_classic, size: 24),
                 const SizedBox(width: 16),
                 Column(
                   crossAxisAlignment: CrossAxisAlignment.start,