Merge pull request #37 from jamesblasco/scroll_top

Support scroll to top when tapped on the status bar

@@ -98,7 +98,8 @@ class _MyHomePageState extends State<MyHomePage> {
   Widget build(BuildContext context) {
   Widget build(BuildContext context) {
     print(MediaQuery.of(context).size.height);
     print(MediaQuery.of(context).size.height);
     return Material(
     return Material(
-      child: CupertinoPageScaffold(
+      child: Scaffold(
+        body: CupertinoPageScaffold(
           backgroundColor: Colors.white,
           backgroundColor: Colors.white,
           navigationBar: CupertinoNavigationBar(
           navigationBar: CupertinoNavigationBar(
             transitionBetweenRoutes: false,
             transitionBetweenRoutes: false,
@@ -110,6 +111,7 @@ class _MyHomePageState extends State<MyHomePage> {
           ),
           ),
           child: SizedBox.expand(
           child: SizedBox.expand(
             child: SingleChildScrollView(
             child: SingleChildScrollView(
+              primary: true,
               child: SafeArea(
               child: SafeArea(
                 bottom: false,
                 bottom: false,
                 child: Column(
                 child: Column(
@@ -238,12 +240,16 @@ class _MyHomePageState extends State<MyHomePage> {
                                   NestedScrollModal(
                                   NestedScrollModal(
                                       scrollController: scrollController),
                                       scrollController: scrollController),
                             )),
                             )),
+                    SizedBox(
+                      height: 60,
+                    )
                   ],
                   ],
                 ),
                 ),
               ),
               ),
             ),
             ),
           ),
           ),
         ),
         ),
+      ),
     );
     );
   }
   }
 
 

@@ -10,6 +10,7 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter/widgets.dart';
+import 'package:modal_bottom_sheet/src/utils/primary_scroll_status_bar.dart';
 
 
 const Duration _bottomSheetDuration = Duration(milliseconds: 400);
 const Duration _bottomSheetDuration = Duration(milliseconds: 400);
 const double _minFlingVelocity = 500.0;
 const double _minFlingVelocity = 500.0;
@@ -334,7 +335,9 @@ class _ModalBottomSheetState extends State<ModalBottomSheet>
       curve: widget.animationCurve ?? Curves.linear,
       curve: widget.animationCurve ?? Curves.linear,
     );
     );
 
 
-    return AnimatedBuilder(
+    return PrimaryScrollStatusBarHandler(
+      scrollController: _scrollController,
+      child: AnimatedBuilder(
         animation: widget.animationController,
         animation: widget.animationController,
         builder: (context, _) => ClipRect(
         builder: (context, _) => ClipRect(
           child: CustomSingleChildLayout(
           child: CustomSingleChildLayout(
@@ -347,19 +350,21 @@ class _ModalBottomSheetState extends State<ModalBottomSheet>
                     child: AnimatedBuilder(
                     child: AnimatedBuilder(
                       animation: bounceAnimation,
                       animation: bounceAnimation,
                       builder: (context, _) => CustomSingleChildLayout(
                       builder: (context, _) => CustomSingleChildLayout(
-                      delegate: _CustomBottomSheetLayout(bounceAnimation.value),
+                        delegate:
+                            _CustomBottomSheetLayout(bounceAnimation.value),
                         child: GestureDetector(
                         child: GestureDetector(
                             onVerticalDragUpdate: (details) =>
                             onVerticalDragUpdate: (details) =>
                                 _handleDragUpdate(details.primaryDelta),
                                 _handleDragUpdate(details.primaryDelta),
                             onVerticalDragEnd: (details) =>
                             onVerticalDragEnd: (details) =>
                                 _handleDragEnd(details.primaryVelocity),
                                 _handleDragEnd(details.primaryVelocity),
                             child: NotificationListener<ScrollNotification>(
                             child: NotificationListener<ScrollNotification>(
-                          onNotification: (ScrollNotification notification) {
+                              onNotification:
+                                  (ScrollNotification notification) {
                                 _handleScrollUpdate(notification);
                                 _handleScrollUpdate(notification);
                                 return false;
                                 return false;
                               },
                               },
-                          child: child,
-                        ),
+                              child: RepaintBoundary(child: child),
+                            )),
                       ),
                       ),
                     ),
                     ),
                   ),
                   ),

@@ -99,6 +99,7 @@ class _ModalBottomSheetState<T> extends State<_ModalBottomSheet<T>> {
             builder: widget.route.builder,
             builder: widget.route.builder,
             enableDrag: widget.enableDrag,
             enableDrag: widget.enableDrag,
             bounce: widget.bounce,
             bounce: widget.bounce,
+            scrollController: widget.scrollController,
             animationCurve: widget.animationCurve,
             animationCurve: widget.animationCurve,
           ),
           ),
         );
         );

@@ -10,8 +10,8 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart'
 import 'package:flutter/material.dart'
     show
     show
         Colors,
         Colors,
-        Theme,
         MaterialLocalizations,
         MaterialLocalizations,
+        Theme,
         debugCheckHasMaterialLocalizations;
         debugCheckHasMaterialLocalizations;
 import 'package:flutter/services.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter/widgets.dart';
@@ -99,8 +99,9 @@ Future<T> showCupertinoModalBottomSheet<T>({
       ? MaterialLocalizations.of(context).modalBarrierDismissLabel
       ? MaterialLocalizations.of(context).modalBarrierDismissLabel
       : '';
       : '';
 
 
-  final result = await Navigator.of(context, rootNavigator: useRootNavigator)
-      .push(CupertinoModalBottomSheetRoute<T>(
+  final result =
+      await Navigator.of(context, rootNavigator: useRootNavigator).push(
+    CupertinoModalBottomSheetRoute<T>(
         builder: builder,
         builder: builder,
         containerBuilder: (context, _, child) => _CupertinoBottomSheetContainer(
         containerBuilder: (context, _, child) => _CupertinoBottomSheetContainer(
               child: child,
               child: child,
@@ -122,8 +123,8 @@ Future<T> showCupertinoModalBottomSheet<T>({
         previousRouteAnimationCurve: previousRouteAnimationCurve,
         previousRouteAnimationCurve: previousRouteAnimationCurve,
         duration: duration,
         duration: duration,
         settings: settings,
         settings: settings,
-    transitionBackgroundColor: transitionBackgroundColor ?? Colors.black
-  ));
+        transitionBackgroundColor: transitionBackgroundColor ?? Colors.black),
+  );
   return result;
   return result;
 }
 }
 
 
@@ -151,6 +152,7 @@ class CupertinoModalBottomSheetRoute<T> extends ModalBottomSheetRoute<T> {
     @required bool expanded,
     @required bool expanded,
     Duration duration,
     Duration duration,
     RouteSettings settings,
     RouteSettings settings,
+    ScrollController scrollController,
     this.transitionBackgroundColor,
     this.transitionBackgroundColor,
     this.topRadius = _default_top_radius,
     this.topRadius = _default_top_radius,
     this.previousRouteAnimationCurve,
     this.previousRouteAnimationCurve,
@@ -158,6 +160,7 @@ class CupertinoModalBottomSheetRoute<T> extends ModalBottomSheetRoute<T> {
         assert(isDismissible != null),
         assert(isDismissible != null),
         assert(enableDrag != null),
         assert(enableDrag != null),
         super(
         super(
+          scrollController: scrollController,
           containerBuilder: containerBuilder,
           containerBuilder: containerBuilder,
           builder: builder,
           builder: builder,
           bounce: bounce,
           bounce: bounce,
@@ -195,6 +198,7 @@ class CupertinoModalBottomSheetRoute<T> extends ModalBottomSheetRoute<T> {
         ),
         ),
         child: child,
         child: child,
         animation: secondaryAnimation,
         animation: secondaryAnimation,
+
     );
     );
   }
   }
 
 
@@ -266,14 +270,16 @@ class _CupertinoModalTransition extends StatelessWidget {
                       borderRadius: BorderRadius.circular(radius),
                       borderRadius: BorderRadius.circular(radius),
                       child: child),
                       child: child),
                 ),
                 ),
-                )
+              ),
             ],
             ],
           );
           );
         },
         },
-        ));
+      ),
+    );
   }
   }
 }
 }
 
 
+
 class _CupertinoScaffold extends InheritedWidget {
 class _CupertinoScaffold extends InheritedWidget {
   final AnimationController animation;
   final AnimationController animation;
 
 

+import 'package:flutter/widgets.dart';
+
+/// Creates a primary scroll controller that will
+/// scroll to the top when tapped on the status bar
+///
+class PrimaryScrollStatusBarHandler extends StatefulWidget {
+  final ScrollController scrollController;
+  final Widget child;
+
+  const PrimaryScrollStatusBarHandler(
+      {Key key, this.child, this.scrollController})
+      : super(key: key);
+  @override
+  _PrimaryScrollWidgetState createState() => _PrimaryScrollWidgetState();
+}
+
+class _PrimaryScrollWidgetState extends State<PrimaryScrollStatusBarHandler> {
+  ScrollController controller;
+
+  @override
+  void initState() {
+    controller = widget.scrollController ?? ScrollController();
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return PrimaryScrollController(
+      controller: controller,
+      child: Stack(
+        fit: StackFit.expand,
+        children: [
+          widget.child,
+          Positioned(
+            top: 0,
+            left: 0,
+            right: 0,
+            height: MediaQuery.of(context).padding.top,
+            child: Builder(
+              builder: (context) => GestureDetector(
+                behavior: HitTestBehavior.opaque,
+                onTap: () => _handleStatusBarTap(context),
+                // iOS accessibility automatically adds scroll-to-top to the clock in the status bar
+                excludeFromSemantics: true,
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  void _handleStatusBarTap(BuildContext context) {
+    final controller = PrimaryScrollController.of(context);
+    if (controller.hasClients) {
+      controller.animateTo(
+        0.0,
+        duration: const Duration(milliseconds: 300),
+        curve: Curves.linear, // TODO(ianh): Use a more appropriate curve.
+      );
+    }
+  }
+}