read page

jiangtian616 · Nov 5, 2024 · 2ab22f5 · 2ab22f5
1 parent 082780f
commit 2ab22f5
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 20 deletions.
diff --git a/lib/src/pages/read/layout/base/base_layout.dart b/lib/src/pages/read/layout/base/base_layout.dart
@@ -48,19 +48,21 @@ abstract class BaseLayout extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    if (!readPageState.readyToShow) {
-      return Center(child: Container(color: UIConfig.readPageBackGroundColor));
-    }
+    return FutureBuilder(future: logic.readPageLogic.delayInitCompleter.future, builder: (context, snapshot) {
+      if (snapshot.connectionState == ConnectionState.done) {
+        return GetBuilder<BaseLayoutLogic>(
+          id: BaseLayoutLogic.pageId,
+          global: false,
+          init: logic,
+          builder: (_) => ScrollConfiguration(
+            behavior: readSetting.showScrollBar.isTrue ? UIConfig.scrollBehaviourWithScrollBarWithMouse : UIConfig.scrollBehaviourWithoutScrollBarWithMouse,
+            child: buildBody(context),
+          ),
+        );
+      }
 
-    return GetBuilder<BaseLayoutLogic>(
-      id: BaseLayoutLogic.pageId,
-      global: false,
-      init: logic,
-      builder: (_) => ScrollConfiguration(
-        behavior: readSetting.showScrollBar.isTrue ? UIConfig.scrollBehaviourWithScrollBarWithMouse : UIConfig.scrollBehaviourWithoutScrollBarWithMouse,
-        child: buildBody(context),
-      ),
-    );
+      return Center(child: Container(color: UIConfig.readPageBackGroundColor));
+    });
   }
 
   Widget buildBody(BuildContext context);

diff --git a/lib/src/pages/read/read_page_logic.dart b/lib/src/pages/read/read_page_logic.dart
@@ -87,10 +87,19 @@ class ReadPageLogic extends GetxController {
 
   final int normalPriority = 10000;
 
+  bool inited = false;
+  Completer<void> delayInitCompleter = Completer<void>();
+
   @override
   void onReady() {
     super.onReady();
 
+    Timer(const Duration(milliseconds: 120), () {
+      if (inited && !delayInitCompleter.isCompleted) {
+        delayInitCompleter.complete();
+      }
+    });
+
     /// Turn page by volume keys. The reason for not use [KeyboardListener]: https://github.com/flutter/flutter/issues/71144
     listen2VolumeKeys();
 
@@ -169,10 +178,10 @@ class ReadPageLogic extends GetxController {
       (_) => updateSafely([layoutId]),
     );
 
-    Timer(const Duration(milliseconds: 120), () {
-      state.readyToShow = true;
-      updateSafely([layoutId]);
-    });
+    inited = true;
+    if (!delayInitCompleter.isCompleted) {
+      delayInitCompleter.complete();
+    }
   }
 
   @override
@@ -441,7 +450,7 @@ class ReadPageLogic extends GetxController {
   }
 
   void tapLeftRegion() {
-    if (!state.readyToShow) {
+    if (!inited) {
       return;
     }
 
@@ -461,7 +470,7 @@ class ReadPageLogic extends GetxController {
   }
 
   void tapRightRegion() {
-    if (!state.readyToShow) {
+    if (!inited) {
       return;
     }
     if (readSetting.disablePageTurningOnTap.isTrue) {

diff --git a/lib/src/pages/read/read_page_state.dart b/lib/src/pages/read/read_page_state.dart
@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:battery_plus/battery_plus.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
@@ -21,8 +23,6 @@ class ReadPageState with ScrollStatusListerState {
   late List<GalleryThumbnail?> thumbnails;
   late List<GalleryImage?> images;
 
-  bool readyToShow = false;
-
   late List<LoadingState> parseImageHrefsStates;
   late List<LoadingState> parseImageUrlStates;
   late List<Size?> imageContainerSizes;