[Presentation] Lets just tap once to scroll to top

Wolfteam · Jan 24, 2024 · e2b0a1c · e2b0a1c
1 parent fd16411
commit e2b0a1c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/lib/presentation/desktop_tablet_scaffold.dart b/lib/presentation/desktop_tablet_scaffold.dart
@@ -162,7 +162,7 @@ class _NavigationRailState extends State<_NavigationRail> with ScrollToTopOnDoub
       return;
     }
 
-    scrollToTopOnTabDoubleTap(widget.tabController.index, realIndex, widget.scrollControllers);
+    scrollToTopOnTabTap(widget.tabController.index, realIndex, widget.scrollControllers);
     context.read<MainTabBloc>().add(MainTabEvent.goToTab(index: realIndex));
   }
 

diff --git a/lib/presentation/mobile_scaffold.dart b/lib/presentation/mobile_scaffold.dart
@@ -90,7 +90,7 @@ class _MobileScaffoldState extends State<MobileScaffold> with SingleTickerProvid
   }
 
   void _gotoTab(int newIndex) {
-    scrollToTopOnTabDoubleTap(widget.tabController.index, newIndex, widget.scrollControllers);
+    scrollToTopOnTabTap(widget.tabController.index, newIndex, widget.scrollControllers);
     context.read<MainTabBloc>().add(MainTabEvent.goToTab(index: newIndex));
   }
 }
diff --git a/lib/presentation/shared/mixins/scroll_to_top_on_double_tab_tap_mixin.dart b/lib/presentation/shared/mixins/scroll_to_top_on_double_tab_tap_mixin.dart
@@ -1,15 +1,10 @@
 import 'package:flutter/material.dart';
 
 mixin ScrollToTopOnDoubleTabTapMixin<T extends StatefulWidget> on State<T> {
-  DateTime? _tabPressedAt;
-
-  void scrollToTopOnTabDoubleTap(int currentIndex, int newIndex, List<ScrollController> scrollControllers) {
-    final DateTime now = DateTime.now();
+  void scrollToTopOnTabTap(int currentIndex, int newIndex, List<ScrollController> scrollControllers) {
     final bool sameTab = currentIndex == newIndex;
-    final bool diffExists = _tabPressedAt != null && now.difference(_tabPressedAt!).inMilliseconds < 200;
-    if (sameTab && diffExists) {
+    if (sameTab) {
       scrollControllers.elementAtOrNull(newIndex)?.animateTo(0, duration: const Duration(milliseconds: 500), curve: Curves.linear);
     }
-    _tabPressedAt = now;
   }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
           return;
         }
-        scrollToTopOnTabDoubleTap(widget.tabController.index, realIndex, widget.scrollControllers);
+        scrollToTopOnTabTap(widget.tabController.index, realIndex, widget.scrollControllers);
         context.read<MainTabBloc>().add(MainTabEvent.goToTab(index: realIndex));
       }
@@ Expand Down @@