fix: wrong current page

aayush2622 · aayush2622 · commit bf0459d02fe6 · 2025-03-08T00:17:13.000+05:30
diff --git a/lib/Screens/Manga/MangaReader/Reader.dart b/lib/Screens/Manga/MangaReader/Reader.dart
@@ -1,7 +1,12 @@
+import 'dart:io';
+
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:dartotsu/Widgets/ScrollConfig.dart';
+import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:get/get.dart';
+import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
 import '../../../DataClass/Chapter.dart';
 import '../../../DataClass/Media.dart';
 import '../../../Api/Sources/Eval/dart/model/page.dart';
@@ -29,14 +34,37 @@ class MediaReader extends StatefulWidget {
 }
 
 class MediaReaderState extends State<MediaReader> {
-  var showControls = true.obs;
-  final focusNode = FocusNode();
+  late final FocusNode focusNode = FocusNode();
+  late final ItemScrollController itemScrollController = ItemScrollController();
+  late final ItemPositionsListener itemPositionsListener = ItemPositionsListener.create();
+  late final PageController pageController = PageController();
+
+  final showControls = true.obs;
+  final currentPage = 1.obs;
+  final transformationController = TransformationController();
+  double currentScale = 1.0;
 
   @override
   void initState() {
     super.initState();
     focusNode.requestFocus();
+    itemPositionsListener.itemPositions.addListener(_updateCurrentPage);
     pageController.addListener(_onPageChanged);
+    if (Platform.isAndroid || Platform.isIOS) {
+      SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky);
+    }
+  }
+
+  @override
+  void dispose() {
+    focusNode.dispose();
+    itemPositionsListener.itemPositions.removeListener(_updateCurrentPage);
+    pageController.removeListener(_onPageChanged);
+    if (Platform.isAndroid || Platform.isIOS) {
+      SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
+    }
+
+    super.dispose();
   }
 
   @override
@@ -51,67 +79,46 @@ class MediaReaderState extends State<MediaReader> {
       focusNode: focusNode,
       child: GestureDetector(
         onTap: () => showControls.value = !showControls.value,
-        child: Stack(
-          alignment: Alignment.center,
-          children: [
-            InteractiveViewer(
-              minScale: 0.5,
-              maxScale: 4,
-              child: _buildLTRMode(),
-            ),
-            _buildOverlay(),
-          ],
+        onDoubleTap: _toggleZoom,
+        child: Listener(
+          onPointerSignal: (event) {
+            if (event is PointerScrollEvent && HardwareKeyboard.instance.isControlPressed) {
+              _zoomOnScroll(event.scrollDelta.dy);
+            }
+          },
+          child: Stack(
+            alignment: Alignment.center,
+            children: [
+              InteractiveViewer(
+                transformationController: transformationController,
+                minScale: 0.5,
+                maxScale: 4,
+                panEnabled: true,
+                scaleEnabled: Platform.isAndroid || Platform.isIOS,
+                child: _buildUPDMode(),
+              ),
+              _buildOverlay(),
+            ],
+          ),
         ),
       ),
     );
   }
 
-  var currentPage = 1;
-
-  void _onPageChanged() {
-    final page = (pageController.page?.round() ?? 0) + 1;
-    if (page != currentPage) {
-      setState(() => currentPage = page);
-    }
-  }
-
-  ScrollController scrollController = ScrollController();
-
   Widget _buildUPDMode() {
     return ScrollConfig(
       context,
-      child: ListView.builder(
-        reverse: true,
-        controller: scrollController,
+      child: ScrollablePositionedList.builder(
         itemCount: widget.pages.length,
+        itemScrollController: itemScrollController,
+        itemPositionsListener: itemPositionsListener,
         itemBuilder: (context, index) {
-          final page = widget.pages[index];
-          return Center(
-            child: ConstrainedBox(
-              constraints:
-                  BoxConstraints(maxWidth: MediaQuery.of(context).size.width),
-              child: CachedNetworkImage(
-                imageUrl: page.url,
-                fit: BoxFit.fitWidth,
-                placeholder: (context, url) => SizedBox(
-                  height: MediaQuery.of(context).size.height / 2,
-                  child: Center(child: CircularProgressIndicator()),
-                ),
-                errorWidget: (context, url, error) => Center(
-                    child: Text(
-                  'Failed to load image: $error',
-                  style: TextStyle(color: Colors.red),
-                )),
-              ),
-            ),
-          );
+          return _buildPageImage(widget.pages[index]);
         },
       ),
     );
   }
 
-  final PageController pageController = PageController();
-
   Widget _buildLTRMode() {
     return ScrollConfig(
       context,
@@ -121,30 +128,86 @@ class MediaReaderState extends State<MediaReader> {
         reverse: true,
         itemCount: widget.pages.length,
         itemBuilder: (context, index) {
-          final page = widget.pages[index];
-          return Center(
-            child: ConstrainedBox(
-              constraints:
-                  BoxConstraints(maxWidth: MediaQuery.of(context).size.width),
-              child: CachedNetworkImage(
-                imageUrl: page.url,
-                fit: BoxFit.fitWidth,
-                placeholder: (context, url) => SizedBox(
-                  height: MediaQuery.of(context).size.height / 2,
-                  child: Center(child: CircularProgressIndicator()),
-                ),
-                errorWidget: (context, url, error) => Center(
-                  child: Text('Failed to load image: $error',
-                      style: TextStyle(color: Colors.red)),
+          return _buildPageImage(widget.pages[index]);
+        },
+      ),
+    );
+  }
+
+  Widget _buildPageImage(PageUrl page) {
+    return Center(
+      child: ConstrainedBox(
+        constraints: BoxConstraints(maxWidth: MediaQuery.of(context).size.width),
+        child: CachedNetworkImage(
+          imageUrl: page.url,
+          fit: BoxFit.fitWidth,
+          errorWidget: (context, url, error) => Center(
+            child: Text('Failed to load image', style: TextStyle(color: Colors.red)),
+          ),
+          progressIndicatorBuilder: (context, url, downloadProgress) {
+            return SizedBox(
+              height: MediaQuery.of(context).size.height / 2,
+              width: double.infinity,
+              child: Center(
+                child: CircularProgressIndicator(
+                  value: downloadProgress.progress,
                 ),
               ),
-            ),
-          );
-        },
+            );
+          },
+        ),
       ),
     );
   }
 
+  void _onPageChanged() {
+    final page = (pageController.page?.round() ?? 0) + 1;
+    if (page != currentPage.value) {
+      currentPage.value = page;
+    }
+  }
+
+  void _updateCurrentPage() {
+    final positions = itemPositionsListener.itemPositions.value;
+
+    int mostVisiblePage = currentPage.value;
+    double maxVisibleFraction = 0;
+
+    for (final position in positions) {
+      final visibleFraction = _calculateVisibleFraction(position);
+
+      if (visibleFraction > maxVisibleFraction) {
+        maxVisibleFraction = visibleFraction;
+        mostVisiblePage = position.index + 1;
+      }
+    }
+
+    if (mostVisiblePage != currentPage.value && maxVisibleFraction >= 0.6) {
+      currentPage.value = mostVisiblePage;
+    }
+  }
+
+  double _calculateVisibleFraction(ItemPosition position) {
+    final viewportHeight = MediaQuery.of(context).size.height;
+    final itemTop = position.itemLeadingEdge * viewportHeight;
+    final itemBottom = position.itemTrailingEdge * viewportHeight;
+    final visibleTop = itemTop.clamp(0, viewportHeight);
+    final visibleBottom = itemBottom.clamp(0, viewportHeight);
+
+    return (visibleBottom - visibleTop) / (itemBottom - itemTop);
+  }
+
+  void _toggleZoom() {
+    currentScale = (currentScale < 2.0) ? 2.0 : 1.0;
+    transformationController.value = Matrix4.identity()..scale(currentScale);
+  }
+
+  void _zoomOnScroll(double scrollDelta) {
+    final zoomFactor = (scrollDelta < 0) ? 1.1 : 0.9;
+    currentScale = (currentScale * zoomFactor).clamp(1, 4.0);
+    transformationController.value = Matrix4.identity()..scale(currentScale);
+  }
+
   Widget _buildOverlay() {
     return Obx(() {
       return Positioned.fill(
diff --git a/lib/Screens/Manga/MangaReader/ReaderController.dart b/lib/Screens/Manga/MangaReader/ReaderController.dart
@@ -222,15 +222,19 @@ class _ReaderControllerState extends State<ReaderController> {
             ],
           ),
         ),
-        Center(
-          child: Text(
-            "${widget.reader.currentPage}/${pages.length}",
-            style: const TextStyle(
-              color: Colors.white,
-              fontSize: 14,
-              fontWeight: FontWeight.bold,
-            ),
-          ),
+        Obx(
+          () {
+            return Center(
+              child: Text(
+                "${widget.reader.currentPage}/${pages.length}",
+                style: const TextStyle(
+                  color: Colors.white,
+                  fontSize: 14,
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+            );
+          },
         ),
       ],
     );
diff --git a/pubspec.lock b/pubspec.lock
@@ -1430,6 +1430,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.2.0"
+  scrollable_positioned_list:
+    dependency: "direct main"
+    description:
+      name: scrollable_positioned_list
+      sha256: "1b54d5f1329a1e263269abc9e2543d90806131aa14fe7c6062a8054d57249287"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.8"
   share_plus:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -59,6 +59,7 @@ dependencies:
   expandable_page_view: ^1.0.17
   carousel_slider: ^5.0.0
   flutter_staggered_grid_view: ^0.7.0
+  scrollable_positioned_list: ^0.3.8
 
   # Platform Specific
   media_kit: ^1.1.11
