Update version code.

android/app/build.gradle

@@ -67,7 +67,6 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId = "com.github.wgh136.venera"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
@@ -125,6 +124,6 @@ flutter {
 }
 
 dependencies {
-    implementation "androidx.activity:activity-ktx:1.9.2"
+    implementation "androidx.activity:activity-ktx:1.10.1"
     implementation 'androidx.documentfile:documentfile:1.0.1'
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip

android/settings.gradle

@@ -18,7 +18,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version '8.3.2' apply false
+    id "com.android.application" version '8.9.0' apply false
     id "org.jetbrains.kotlin.android" version "1.8.10" apply false
 }
 

assets/translation.json

@@ -378,7 +378,13 @@
     "Page": "页面",
     "Jump": "跳转",
     "Copy Image": "复制图片",
-    "A valid WebDav directory URL": "有效的WebDav目录URL"
+    "A valid WebDav directory URL": "有效的WebDav目录URL",
+    "Shut Down": "关闭",
+    "Uploading data...": "正在上传数据...",
+    "Pages": "页数",
+    "Long press zoom position": "长按缩放位置",
+    "Press position": "按压位置",
+    "Screen center": "屏幕中心"
   },
   "zh_TW": {
     "Home": "首頁",
@@ -759,6 +765,12 @@
     "Page": "頁面",
     "Jump": "跳轉",
     "Copy Image": "複製圖片",
-    "A valid WebDav directory URL": "有效的WebDav目錄URL"
+    "A valid WebDav directory URL": "有效的WebDav目錄URL",
+    "Shut Down": "關閉",
+    "Uploading data...": "正在上傳數據...",
+    "Pages": "頁數",
+    "Long press zoom position": "長按縮放位置",
+    "Press position": "按壓位置",
+    "Screen center": "螢幕中心"
   }
 }

lib/components/layout.dart

@@ -163,3 +163,29 @@ class SliverLazyToBoxAdapter extends StatelessWidget {
     ]);
   }
 }
+
+class SliverAnimatedVisibility extends StatelessWidget {
+  const SliverAnimatedVisibility({
+    super.key,
+    required this.visible,
+    required this.child,
+  });
+
+  final bool visible;
+
+  final Widget child;
+
+  @override
+  Widget build(BuildContext context) {
+    var child = visible ? this.child : const SizedBox.shrink();
+
+    return SliverToBoxAdapter(
+      child: AnimatedSize(
+        duration: const Duration(milliseconds: 200),
+        curve: Curves.easeInOut,
+        alignment: Alignment.topCenter,
+        child: child,
+      ),
+    );
+  }
+}

lib/components/window_frame.dart

@@ -82,10 +82,7 @@ class _WindowFrameState extends State<WindowFrame> {
         return;
       }
     }
-    windowManager.close().then((_) {
-      // Make sure the app exits when the window is closed.
     exit(0);
-    });
   }
 
   @override
@@ -570,7 +567,6 @@ class _VirtualWindowFrameState extends State<VirtualWindowFrame>
         boxShadow: <BoxShadow>[
           BoxShadow(
             color: Colors.black.toOpacity(_isFocused ? 0.4 : 0.2),
-                offset: Offset(0.0, 2),
             blurRadius: 4,
           )
         ],

lib/foundation/app.dart

@@ -13,7 +13,7 @@ export "widget_utils.dart";
 export "context.dart";
 
 class _App {
-  final version = "1.3.4";
+  final version = "1.3.5";
 
   bool get isAndroid => Platform.isAndroid;
 
@@ -47,6 +47,7 @@ class _App {
 
   late String dataPath;
   late String cachePath;
+  String? externalStoragePath;
 
   final rootNavigatorKey = GlobalKey<NavigatorState>();
 
@@ -77,6 +78,9 @@ class _App {
   Future<void> init() async {
     cachePath = (await getApplicationCacheDirectory()).path;
     dataPath = (await getApplicationSupportDirectory()).path;
+    if (isAndroid) {
+      externalStoragePath = (await getExternalStorageDirectory())!.path;
+    }
   }
 
   Future<void> initComponents() async {

lib/foundation/appdata.dart

@@ -161,6 +161,7 @@ class Settings with ChangeNotifier {
     'cacheSize': 2048, // in MB
     'downloadThreads': 5,
     'enableLongPressToZoom': true,
+    'longPressZoomPosition': "press", // press, center
     'checkUpdateOnStart': false,
     'limitImageWidth': true,
     'webdav': [], // empty means not configured

lib/foundation/comic_source/models.dart

@@ -342,7 +342,8 @@ class ComicChapters {
     } else if (groupedChapters.isNotEmpty) {
       return ComicChapters.grouped(groupedChapters);
     } else {
-      throw ArgumentError("Empty chapter list");
+      // return a empty list.
+      return ComicChapters(chapters);
     }
   }
 

lib/foundation/local.dart

@@ -461,6 +461,10 @@ class LocalManager with ChangeNotifier {
     if (comic != null) {
       return Directory(FilePath.join(path, comic.directory));
     }
+    const comicDirectoryMaxLength = 128;
+    if (name.length > comicDirectoryMaxLength) {
+      name = name.substring(0, comicDirectoryMaxLength);
+    }
     var dir = findValidDirectoryName(path, name);
     return Directory(FilePath.join(path, dir)).create().then((value) => value);
   }

lib/foundation/log.dart

@@ -1,7 +1,9 @@
 import 'dart:io';
 
 import 'package:flutter/foundation.dart';
+import 'package:venera/foundation/app.dart';
 import 'package:venera/utils/ext.dart';
+import 'package:venera/utils/io.dart';
 
 class LogItem {
   final LogLevel level;
@@ -28,9 +30,6 @@ class Log {
 
   static bool ignoreLimitation = false;
 
-  /// only for debug
-  static const String? logFile = null;
-
   static void printWarning(String text) {
     debugPrint('\x1B[33m$text\x1B[0m');
   }
@@ -39,7 +38,20 @@ class Log {
     debugPrint('\x1B[31m$text\x1B[0m');
   }
 
+  static IOSink? _file;
+
   static void addLog(LogLevel level, String title, String content) {
+    if (_file == null) {
+      Directory dir;
+      if (App.isAndroid) {
+        dir = Directory(App.externalStoragePath!);
+      } else {
+        dir = Directory(App.dataPath);
+      }
+      var file = dir.joinFile("logs.txt");
+      _file = file.openWrite();
+    }
+
     if (!ignoreLimitation && content.length > maxLogLength) {
       content = "${content.substring(0, maxLogLength)}...";
     }
@@ -62,8 +74,8 @@ class Log {
     }
 
     _logs.add(newLog);
-    if(logFile != null) {
+    if(_file != null) {
-      File(logFile!).writeAsString(newLog.toString(), mode: FileMode.append);
+      _file!.write(newLog.toString());
     }
     if (_logs.length > maxLogNumber) {
       var res = _logs.remove(

lib/main.dart

@@ -35,8 +35,14 @@ void main(List<String> args) {
           }
           await windowManager.setMinimumSize(const Size(500, 600));
           var placement = await WindowPlacement.loadFromFile();
+          if (App.isLinux) {
+            await windowManager.show();
+            await placement.applyToWindow();
+          } else {
             await placement.applyToWindow();
             await windowManager.show();
+          }
+
           WindowPlacement.loop();
         });
       }

lib/pages/comic_details_page/comic_page.dart

@@ -461,7 +461,8 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
     if (comic.tags.isEmpty &&
         comic.uploader == null &&
         comic.uploadTime == null &&
-        comic.uploadTime == null) {
+        comic.uploadTime == null &&
+        comic.maxPage == null) {
       return const SliverPadding(padding: EdgeInsets.zero);
     }
 
@@ -625,6 +626,13 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
                 buildTag(text: formatTime(comic.updateTime!)),
               ],
             ),
+          if (comic.maxPage != null)
+            buildWrap(
+              children: [
+                buildTag(text: 'Pages'.tl, isTitle: true),
+                buildTag(text: comic.maxPage.toString()),
+              ],
+            ),
           const SizedBox(height: 12),
           const Divider(),
         ],

lib/pages/comic_details_page/comments_page.dart

@@ -99,7 +99,11 @@ class _CommentsPageState extends State<CommentsPage> {
       return Column(
         children: [
           Expanded(
-            child: ListView.builder(
+            child: SmoothScrollProvider(
+              builder: (context, controller, physics) {
+                return ListView.builder(
+                  controller: controller,
+                  physics: physics,
                   primary: false,
                   padding: EdgeInsets.zero,
                   itemCount: _comments!.length + 2,
@@ -156,6 +160,8 @@ class _CommentsPageState extends State<CommentsPage> {
                       showAvatar: showAvatar,
                     );
                   },
+                );
+              },
             ),
           ),
           buildBottom(context)

lib/pages/home_page.dart

@@ -52,7 +52,7 @@ class _SearchBar extends StatelessWidget {
   Widget build(BuildContext context) {
     return SliverToBoxAdapter(
       child: Container(
-        height: 52,
+        height: App.isMobile ? 52 : 46,
         width: double.infinity,
         margin: const EdgeInsets.symmetric(horizontal: 8, vertical: 8),
         child: Material(

lib/pages/reader/images.dart

@@ -343,10 +343,19 @@ class _GalleryModeState extends State<_GalleryMode>
     }
     var photoViewController = photoViewControllers[reader.page]!;
     double target = photoViewController.getInitialScale!.call()! * 1.75;
-    var size = MediaQuery.of(context).size;
+    var size = reader.size;
+    Offset zoomPosition;
+    if (appdata.settings['longPressZoomPosition'] != 'center') {
+      zoomPosition = Offset(
+        size.width / 2 - location.dx,
+        size.height / 2 - location.dy,
+      );
+    } else {
+      zoomPosition = Offset(0, 0);
+    }
     photoViewController.animateScale?.call(
       target,
-      Offset(size.width / 2 - location.dx, size.height / 2 - location.dy),
+      zoomPosition,
     );
     isLongPressing = true;
   }
@@ -608,6 +617,13 @@ class _ContinuousModeState extends State<_ContinuousMode>
   }
 
   bool onScaleUpdate([double? scale]) {
+    if (prepareToNextChapter || prepareToPrevChapter) {
+      setState(() {
+        prepareToPrevChapter = false;
+        prepareToNextChapter = false;
+      });
+      context.readerScaffold.setFloatingButton(0);
+    }
     var isZoomedIn = (scale ?? photoViewController.scale) != 1.0;
     if (isZoomedIn != this.isZoomedIn) {
       setState(() {
@@ -731,7 +747,7 @@ class _ContinuousModeState extends State<_ContinuousMode>
         }
         Offset offset;
         var sp = scrollController.position;
-        if (sp.pixels < sp.minScrollExtent || sp.pixels > sp.maxScrollExtent) {
+        if (sp.pixels <= sp.minScrollExtent || sp.pixels >= sp.maxScrollExtent) {
           offset = Offset(value.dx, value.dy);
         } else {
           if (reader.mode == ReaderMode.continuousTopToBottom) {
@@ -759,7 +775,10 @@ class _ContinuousModeState extends State<_ContinuousMode>
           delayedSetIsScrolling(false);
         }
 
-        if (notification is ScrollUpdateNotification) {
+        var scale = photoViewController.scale ?? 1.0;
+
+        if (notification is ScrollUpdateNotification &&
+            (scale - 1).abs() < 0.05) {
           if (!scrollController.hasClients) return false;
           if (scrollController.position.pixels <=
                   scrollController.position.minScrollExtent &&
@@ -800,8 +819,8 @@ class _ContinuousModeState extends State<_ContinuousMode>
       },
       child: widget,
     );
-    var width = MediaQuery.of(context).size.width;
+    var width = reader.size.width;
-    var height = MediaQuery.of(context).size.height;
+    var height = reader.size.height;
     if (appdata.settings['limitImageWidth'] &&
         width / height > 0.7 &&
         reader.mode == ReaderMode.continuousTopToBottom) {
@@ -882,9 +901,19 @@ class _ContinuousModeState extends State<_ContinuousMode>
       return;
     }
     double target = photoViewController.getInitialScale!.call()! * 1.75;
+    var size = reader.size;
+    Offset zoomPosition;
+    if (appdata.settings['longPressZoomPosition'] != 'center') {
+      zoomPosition = Offset(
+        size.width / 2 - location.dx,
+        size.height / 2 - location.dy,
+      );
+    } else {
+      zoomPosition = Offset(0, 0);
+    }
     photoViewController.animateScale?.call(
       target,
-      Offset(0, 0),
+      zoomPosition,
     );
     onScaleUpdate(target);
     isLongPressing = true;

lib/pages/reader/reader.dart

@@ -309,6 +309,13 @@ class _ReaderState extends State<Reader>
     }
     return chapter == maxChapter;
   }
+
+  /// Get the size of the reader.
+  /// The size is not always the same as the size of the screen.
+  Size get size {
+    var renderBox = context.findRenderObject() as RenderBox;
+    return renderBox.size;
+  }
 }
 
 abstract mixin class _ImagePerPageHandler {
@@ -363,8 +370,24 @@ abstract mixin class _VolumeListener {
 
   bool toPrevPage();
 
+  bool toNextChapter();
+
+  bool toPrevChapter();
+
   VolumeListener? volumeListener;
 
+  void onDown() {
+    if (!toNextPage()) {
+      toNextChapter();
+    }
+  }
+
+  void onUp() {
+    if (!toPrevPage()) {
+      toPrevChapter();
+    }
+  }
+
   void handleVolumeEvent() {
     if (!App.isAndroid) {
       // Currently only support Android
@@ -374,8 +397,8 @@ abstract mixin class _VolumeListener {
       volumeListener?.cancel();
     }
     volumeListener = VolumeListener(
-      onDown: toNextPage,
+      onDown: onDown,
-      onUp: toPrevPage,
+      onUp: onUp,
     )..listen();
   }
 

lib/pages/settings/reader.dart

@@ -48,6 +48,7 @@ class _ReaderSettingsState extends State<ReaderSettings> {
             "continuousTopToBottom": "Continuous (Top to Bottom)".tl,
           },
           onChanged: () {
+            setState(() {});
             var readerMode = appdata.settings['readerMode'];
             if (readerMode?.toLowerCase().startsWith('continuous') ?? false) {
               appdata.settings['readerScreenPicNumberForLandscape'] = 1;
@@ -68,22 +69,12 @@ class _ReaderSettingsState extends State<ReaderSettings> {
             widget.onChanged?.call("autoPageTurningInterval");
           },
         ).toSliver(),
-        SliverToBoxAdapter(
+        SliverAnimatedVisibility(
-          child: AbsorbPointer(
+          visible: appdata.settings['readerMode']!.startsWith('gallery'),
-            absorbing: (appdata.settings['readerMode']
-                    ?.toLowerCase()
-                    .startsWith('continuous') ??
-                false),
-            child: AnimatedOpacity(
-              opacity: (appdata.settings['readerMode']
-                          ?.toLowerCase()
-                          .startsWith('continuous') ??
-                      false)
-                  ? 0.5
-                  : 1.0,
-              duration: Duration(milliseconds: 300),
           child: _SliderSetting(
-                title: "The number of pic in screen for landscape (Only Gallery Mode)".tl,
+            title:
+                "The number of pic in screen for landscape (Only Gallery Mode)"
+                    .tl,
             settingsIndex: "readerScreenPicNumberForLandscape",
             interval: 1,
             min: 1,
@@ -93,24 +84,12 @@ class _ReaderSettingsState extends State<ReaderSettings> {
             },
           ),
         ),
-          ),
+        SliverAnimatedVisibility(
-        ),
+          visible: appdata.settings['readerMode']!.startsWith('gallery'),
-        SliverToBoxAdapter(
-          child: AbsorbPointer(
-            absorbing: (appdata.settings['readerMode']
-                ?.toLowerCase()
-                .startsWith('continuous') ??
-                false),
-            child: AnimatedOpacity(
-              opacity: (appdata.settings['readerMode']
-                  ?.toLowerCase()
-                  .startsWith('continuous') ??
-                  false)
-                  ? 0.5
-                  : 1.0,
-              duration: Duration(milliseconds: 300),
           child: _SliderSetting(
-                title: "The number of pic in screen for portrait (Only Gallery Mode)".tl,
+            title:
+                "The number of pic in screen for portrait (Only Gallery Mode)"
+                    .tl,
             settingsIndex: "readerScreenPicNumberForPortrait",
             interval: 1,
             min: 1,
@@ -120,15 +99,25 @@ class _ReaderSettingsState extends State<ReaderSettings> {
             },
           ),
         ),
-          ),
-        ),
         _SwitchSetting(
           title: 'Long press to zoom'.tl,
           settingKey: 'enableLongPressToZoom',
           onChanged: () {
+            setState(() {});
             widget.onChanged?.call('enableLongPressToZoom');
           },
         ).toSliver(),
+        SliverAnimatedVisibility(
+          visible: appdata.settings['enableLongPressToZoom'] == true,
+          child: SelectSetting(
+            title: "Long press zoom position".tl,
+            settingKey: "longPressZoomPosition",
+            optionTranslation: {
+              "press": "Press position".tl,
+              "center": "Screen center".tl,
+            },
+          ),
+        ),
         _SwitchSetting(
           title: 'Limit image width'.tl,
           subtitle: 'When using Continuous(Top to Bottom) mode'.tl,

lib/utils/data_sync.dart

@@ -1,4 +1,6 @@
 import 'package:flutter/foundation.dart';
+import 'package:venera/components/components.dart';
+import 'package:venera/components/window_frame.dart';
 import 'package:venera/foundation/app.dart';
 import 'package:venera/foundation/appdata.dart';
 import 'package:venera/foundation/comic_source/comic_source.dart';
@@ -10,6 +12,7 @@ import 'package:venera/utils/data.dart';
 import 'package:venera/utils/ext.dart';
 import 'package:webdav_client/webdav_client.dart' hide File;
 import 'package:rhttp/rhttp.dart' as rhttp;
+import 'package:venera/utils/translations.dart';
 
 import 'io.dart';
 
@@ -20,6 +23,10 @@ class DataSync with ChangeNotifier {
     }
     LocalFavoritesManager().addListener(onDataChanged);
     ComicSourceManager().addListener(onDataChanged);
+    Future.delayed(const Duration(seconds: 1), () {
+      var controller = WindowFrame.of(App.rootContext);
+      controller.addCloseListener(_handleWindowClose);
+    });
   }
 
   void onDataChanged() {
@@ -28,6 +35,28 @@ class DataSync with ChangeNotifier {
     }
   }
 
+  bool _handleWindowClose() {
+    if (_isUploading) {
+      _showWindowCloseDialog();
+      return false;
+    }
+    return true;
+  }
+
+  void _showWindowCloseDialog() async {
+    showLoadingDialog(
+      App.rootContext,
+      cancelButtonText: "Shut Down".tl,
+      onCancel: () => exit(0),
+      barrierDismissible: false,
+      message: "Uploading data...".tl,
+    );
+    while (_isUploading) {
+      await Future.delayed(const Duration(milliseconds: 50));
+    }
+    exit(0);
+  }
+
   static DataSync? instance;
 
   factory DataSync() => instance ?? (instance = DataSync._());
@@ -100,6 +129,7 @@ class DataSync with ChangeNotifier {
           rhttp.ClientSettings(
             proxySettings:
                 proxy == null ? null : rhttp.ProxySettings.proxy(proxy),
+            userAgent: "venera v${App.version}",
           ),
         ),
       );
@@ -172,6 +202,7 @@ class DataSync with ChangeNotifier {
           rhttp.ClientSettings(
             proxySettings:
                 proxy == null ? null : rhttp.ProxySettings.proxy(proxy),
+            userAgent: "venera v${App.version}",
           ),
         ),
       );

lib/utils/io.dart

@@ -1,4 +1,3 @@
-import 'dart:convert';
 import 'dart:io';
 import 'dart:isolate';
 
@@ -132,25 +131,28 @@ extension DirectoryExtension on Directory {
 }
 
 /// Sanitize the file name. Remove invalid characters and trim the file name.
-String sanitizeFileName(String fileName) {
+String sanitizeFileName(String fileName, {String? dir, int? maxLength}) {
   if (fileName.endsWith('.')) {
     fileName = fileName.substring(0, fileName.length - 1);
   }
-  const maxLength = 255;
+  var maxLength = 255;
+  if (dir != null) {
+    if (!dir.endsWith('/') && !dir.endsWith('\\')) {
+      dir = "$dir/";
+    }
+    maxLength -= dir.length;
+  }
   final invalidChars = RegExp(r'[<>:"/\\|?*]');
   final sanitizedFileName = fileName.replaceAll(invalidChars, ' ');
   var trimmedFileName = sanitizedFileName.trim();
   if (trimmedFileName.isEmpty) {
     throw Exception('Invalid File Name: Empty length.');
   }
-  while (true) {
+  if (maxLength <= 0) {
-    final bytes = utf8.encode(trimmedFileName);
+    throw Exception('Invalid File Name: Max length is less than 0.');
-    if (bytes.length > maxLength) {
-      trimmedFileName =
-          trimmedFileName.substring(0, trimmedFileName.length - 1);
-    } else {
-      break;
   }
+  if (trimmedFileName.length > maxLength) {
+    trimmedFileName = trimmedFileName.substring(0, maxLength);
   }
   return trimmedFileName;
 }

linux/my_application.cc

@@ -80,6 +80,7 @@ static void my_application_activate(GApplication* application) {
   gtk_window_set_default_size(window, 1280, 720);
   GdkVisual* visual;
   gtk_widget_set_app_paintable(GTK_WIDGET(window), TRUE);
+  gtk_window_set_decorated(window, FALSE);
   visual = gdk_screen_get_rgba_visual(screen);
   if (visual != NULL && gdk_screen_is_composited(screen)) {
     gtk_widget_set_visual(GTK_WIDGET(window), visual);

pubspec.lock

@@ -433,8 +433,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "690a03a954f1603e0149cfd479c8961b88f21336"
+      ref: fe182cdf40e5fa6230f451bc1d643b860f610d13
-      resolved-ref: "690a03a954f1603e0149cfd479c8961b88f21336"
+      resolved-ref: fe182cdf40e5fa6230f451bc1d643b860f610d13
       url: "https://github.com/venera-app/flutter_saf"
     source: git
     version: "0.0.1"

pubspec.yaml

@@ -2,7 +2,7 @@ name: venera
 description: "A comic app."
 publish_to: 'none'
 
-version: 1.3.4+134
+version: 1.3.5+135
 
 environment:
   sdk: '>=3.6.0 <4.0.0'
@@ -72,7 +72,7 @@ dependencies:
   flutter_saf:
     git: 
       url: https://github.com/venera-app/flutter_saf
-      ref: 690a03a954f1603e0149cfd479c8961b88f21336
+      ref: fe182cdf40e5fa6230f451bc1d643b860f610d13
   dynamic_color: ^1.7.0
   shimmer_animation: ^2.1.0
   flutter_memory_info: ^0.0.1