(Annotated region) (#352)

*  (Annotated region)

Move annatated region in _CupertinoBottomSheetContainer and made overlayStyle depend on transitionBackgroundColor luminance

*  (OverlayStyle)

remove computed overlayStyle in showCupertinoModalBottomSheet function

@@ -18,6 +18,7 @@ import 'package:flutter/material.dart'
         Colors,
         Colors,
         MaterialLocalizations,
         MaterialLocalizations,
         Theme,
         Theme,
+        ThemeData,
         debugCheckHasMaterialLocalizations;
         debugCheckHasMaterialLocalizations;
 import 'package:flutter/services.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter/widgets.dart';
@@ -30,6 +31,13 @@ const Radius _kDefaultTopRadius = Radius.circular(12);
 const BoxShadow _kDefaultBoxShadow =
 const BoxShadow _kDefaultBoxShadow =
     BoxShadow(blurRadius: 10, color: Colors.black12, spreadRadius: 5);
     BoxShadow(blurRadius: 10, color: Colors.black12, spreadRadius: 5);
 
 
+SystemUiOverlayStyle overlayStyleFromColor(Color color) {
+  final brightness = ThemeData.estimateBrightnessForColor(color);
+  return brightness == Brightness.dark
+      ? SystemUiOverlayStyle.light
+      : SystemUiOverlayStyle.dark;
+}
+
 /// Cupertino Bottom Sheet Container
 /// Cupertino Bottom Sheet Container
 ///
 ///
 /// Clip the child widget to rectangle with top rounded corners and adds
 /// Clip the child widget to rectangle with top rounded corners and adds
@@ -40,17 +48,20 @@ class _CupertinoBottomSheetContainer extends StatelessWidget {
   final Color? backgroundColor;
   final Color? backgroundColor;
   final Radius topRadius;
   final Radius topRadius;
   final BoxShadow? shadow;
   final BoxShadow? shadow;
+  final SystemUiOverlayStyle? overlayStyle;
 
 
   const _CupertinoBottomSheetContainer({
   const _CupertinoBottomSheetContainer({
     Key? key,
     Key? key,
     required this.child,
     required this.child,
     this.backgroundColor,
     this.backgroundColor,
     required this.topRadius,
     required this.topRadius,
+    this.overlayStyle,
     this.shadow,
     this.shadow,
   }) : super(key: key);
   }) : super(key: key);
 
 
   @override
   @override
   Widget build(BuildContext context) {
   Widget build(BuildContext context) {
+    final scopedOverlayStyle = overlayStyle;
     final topSafeAreaPadding = MediaQuery.of(context).padding.top;
     final topSafeAreaPadding = MediaQuery.of(context).padding.top;
     final topPadding = _kPreviousPageVisibleOffset + topSafeAreaPadding;
     final topPadding = _kPreviousPageVisibleOffset + topSafeAreaPadding;
 
 
@@ -58,7 +69,7 @@ class _CupertinoBottomSheetContainer extends StatelessWidget {
     BoxShadow(blurRadius: 10, color: Colors.black12, spreadRadius: 5);
     BoxShadow(blurRadius: 10, color: Colors.black12, spreadRadius: 5);
     final backgroundColor = this.backgroundColor ??
     final backgroundColor = this.backgroundColor ??
         CupertinoTheme.of(context).scaffoldBackgroundColor;
         CupertinoTheme.of(context).scaffoldBackgroundColor;
-    return Padding(
+    Widget bottomSheetContainer = Padding(
       padding: EdgeInsets.only(top: topPadding),
       padding: EdgeInsets.only(top: topPadding),
       child: ClipRRect(
       child: ClipRRect(
         borderRadius: BorderRadius.vertical(top: topRadius),
         borderRadius: BorderRadius.vertical(top: topRadius),
@@ -77,6 +88,13 @@ class _CupertinoBottomSheetContainer extends StatelessWidget {
         ),
         ),
       ),
       ),
     );
     );
+    if (scopedOverlayStyle != null) {
+      bottomSheetContainer = AnnotatedRegion<SystemUiOverlayStyle>(
+        value: scopedOverlayStyle,
+        child: bottomSheetContainer,
+      );
+    }
+    return bottomSheetContainer;
   }
   }
 }
 }
 
 
@@ -111,7 +129,6 @@ Future<T?> showCupertinoModalBottomSheet<T>({
   final barrierLabel = hasMaterialLocalizations
   final barrierLabel = hasMaterialLocalizations
       ? MaterialLocalizations.of(context).modalBarrierDismissLabel
       ? MaterialLocalizations.of(context).modalBarrierDismissLabel
       : '';
       : '';
-
   final result =
   final result =
       await Navigator.of(context, rootNavigator: useRootNavigator).push(
       await Navigator.of(context, rootNavigator: useRootNavigator).push(
     CupertinoModalBottomSheetRoute<T>(
     CupertinoModalBottomSheetRoute<T>(
@@ -121,6 +138,7 @@ Future<T?> showCupertinoModalBottomSheet<T>({
               backgroundColor: backgroundColor,
               backgroundColor: backgroundColor,
               topRadius: topRadius,
               topRadius: topRadius,
               shadow: shadow,
               shadow: shadow,
+              overlayStyle: overlayStyle,
             ),
             ),
         secondAnimationController: secondAnimation,
         secondAnimationController: secondAnimation,
         expanded: expand,
         expanded: expand,
@@ -154,6 +172,9 @@ class CupertinoModalBottomSheetRoute<T> extends ModalSheetRoute<T> {
   // Background color behind all routes
   // Background color behind all routes
   // Black by default
   // Black by default
   final Color? transitionBackgroundColor;
   final Color? transitionBackgroundColor;
+  @Deprecated(
+    'Will be ignored. OverlayStyle is computed from luminance of transitionBackgroundColor',
+  )
   final SystemUiOverlayStyle? overlayStyle;
   final SystemUiOverlayStyle? overlayStyle;
 
 
   CupertinoModalBottomSheetRoute({
   CupertinoModalBottomSheetRoute({
@@ -230,7 +251,6 @@ class CupertinoModalBottomSheetRoute<T> extends ModalSheetRoute<T> {
       animationCurve: previousRouteAnimationCurve,
       animationCurve: previousRouteAnimationCurve,
       topRadius: topRadius,
       topRadius: topRadius,
       backgroundColor: transitionBackgroundColor ?? Colors.black,
       backgroundColor: transitionBackgroundColor ?? Colors.black,
-      overlayStyle: overlayStyle,
     );
     );
   }
   }
 }
 }
@@ -240,7 +260,6 @@ class _CupertinoModalTransition extends StatelessWidget {
   final Radius topRadius;
   final Radius topRadius;
   final Curve? animationCurve;
   final Curve? animationCurve;
   final Color backgroundColor;
   final Color backgroundColor;
-  final SystemUiOverlayStyle? overlayStyle;
 
 
   final Widget body;
   final Widget body;
 
 
@@ -251,7 +270,6 @@ class _CupertinoModalTransition extends StatelessWidget {
     required this.topRadius,
     required this.topRadius,
     this.backgroundColor = Colors.black,
     this.backgroundColor = Colors.black,
     this.animationCurve,
     this.animationCurve,
-    this.overlayStyle,
   }) : super(key: key);
   }) : super(key: key);
 
 
   @override
   @override
@@ -268,50 +286,47 @@ class _CupertinoModalTransition extends StatelessWidget {
       curve: animationCurve ?? Curves.easeOut,
       curve: animationCurve ?? Curves.easeOut,
     );
     );
 
 
-    return AnnotatedRegion<SystemUiOverlayStyle>(
-      value: overlayStyle ?? SystemUiOverlayStyle.light,
-      child: AnimatedBuilder(
-        animation: curvedAnimation,
-        child: body,
-        builder: (context, child) {
-          final progress = curvedAnimation.value;
-          final yOffset = progress * paddingTop;
-          final scale = 1 - progress / 10;
-          final radius = progress == 0
-              ? 0.0
-              : (1 - progress) * startRoundCorner + progress * topRadius.x;
-          return Stack(
-            children: <Widget>[
-              Container(color: backgroundColor),
-              Transform.translate(
-                offset: Offset(0, yOffset),
-                child: Transform.scale(
-                  scale: scale,
-                  alignment: Alignment.topCenter,
-                  child: ClipRRect(
-                    borderRadius: BorderRadius.circular(radius),
-                    child: CupertinoUserInterfaceLevel(
-                      data: CupertinoUserInterfaceLevelData.elevated,
-                      child: Builder(
-                        builder: (context) => CupertinoTheme(
-                          data: createPreviousRouteTheme(
-                            context,
-                            curvedAnimation,
-                          ),
-                          child: CupertinoUserInterfaceLevel(
-                            data: CupertinoUserInterfaceLevelData.base,
-                            child: child!,
-                          ),
+    return AnimatedBuilder(
+      animation: curvedAnimation,
+      child: body,
+      builder: (context, child) {
+        final progress = curvedAnimation.value;
+        final yOffset = progress * paddingTop;
+        final scale = 1 - progress / 10;
+        final radius = progress == 0
+            ? 0.0
+            : (1 - progress) * startRoundCorner + progress * topRadius.x;
+        return Stack(
+          children: <Widget>[
+            Container(color: backgroundColor),
+            Transform.translate(
+              offset: Offset(0, yOffset),
+              child: Transform.scale(
+                scale: scale,
+                alignment: Alignment.topCenter,
+                child: ClipRRect(
+                  borderRadius: BorderRadius.circular(radius),
+                  child: CupertinoUserInterfaceLevel(
+                    data: CupertinoUserInterfaceLevelData.elevated,
+                    child: Builder(
+                      builder: (context) => CupertinoTheme(
+                        data: createPreviousRouteTheme(
+                          context,
+                          curvedAnimation,
+                        ),
+                        child: CupertinoUserInterfaceLevel(
+                          data: CupertinoUserInterfaceLevelData.base,
+                          child: child!,
                         ),
                         ),
                       ),
                       ),
                     ),
                     ),
                   ),
                   ),
                 ),
                 ),
               ),
               ),
-            ],
-          );
-        },
-      ),
+            ),
+          ],
+        );
+      },
     );
     );
   }
   }
 
 
@@ -390,11 +405,13 @@ class CupertinoScaffoldInheirted extends InheritedWidget {
   final AnimationController? animation;
   final AnimationController? animation;
 
 
   final Radius? topRadius;
   final Radius? topRadius;
+  final Color transitionBackgroundColor;
 
 
   const CupertinoScaffoldInheirted({
   const CupertinoScaffoldInheirted({
     this.animation,
     this.animation,
     required super.child,
     required super.child,
     this.topRadius,
     this.topRadius,
+    required this.transitionBackgroundColor,
   }) : super();
   }) : super();
 
 
   @override
   @override
@@ -440,6 +457,9 @@ class CupertinoScaffold extends StatefulWidget {
     Duration? duration,
     Duration? duration,
     RouteSettings? settings,
     RouteSettings? settings,
     BoxShadow? shadow,
     BoxShadow? shadow,
+    @Deprecated(
+      'Will be ignored. OverlayStyle is computed from luminance of transitionBackgroundColor',
+    )
     SystemUiOverlayStyle? overlayStyle,
     SystemUiOverlayStyle? overlayStyle,
   }) async {
   }) async {
     assert(debugCheckHasMediaQuery(context));
     assert(debugCheckHasMediaQuery(context));
@@ -451,6 +471,9 @@ class CupertinoScaffold extends StatefulWidget {
       barrierLabel = MaterialLocalizations.of(context).modalBarrierDismissLabel;
       barrierLabel = MaterialLocalizations.of(context).modalBarrierDismissLabel;
     }
     }
     final topRadius = CupertinoScaffold.of(context)!.topRadius;
     final topRadius = CupertinoScaffold.of(context)!.topRadius;
+    final transitionBackgroundColor =
+        CupertinoScaffold.of(context)!.transitionBackgroundColor;
+    final overlayStyle = overlayStyleFromColor(transitionBackgroundColor);
     final result = await Navigator.of(context, rootNavigator: useRootNavigator)
     final result = await Navigator.of(context, rootNavigator: useRootNavigator)
         .push(CupertinoModalBottomSheetRoute<T>(
         .push(CupertinoModalBottomSheetRoute<T>(
       closeProgressThreshold: closeProgressThreshold,
       closeProgressThreshold: closeProgressThreshold,
@@ -461,6 +484,7 @@ class CupertinoScaffold extends StatefulWidget {
         backgroundColor: backgroundColor,
         backgroundColor: backgroundColor,
         topRadius: topRadius ?? _kDefaultTopRadius,
         topRadius: topRadius ?? _kDefaultTopRadius,
         shadow: shadow,
         shadow: shadow,
+        overlayStyle: overlayStyle,
       ),
       ),
       expanded: expand,
       expanded: expand,
       barrierLabel: barrierLabel,
       barrierLabel: barrierLabel,
@@ -473,7 +497,6 @@ class CupertinoScaffold extends StatefulWidget {
       previousRouteAnimationCurve: previousRouteAnimationCurve,
       previousRouteAnimationCurve: previousRouteAnimationCurve,
       duration: duration,
       duration: duration,
       settings: settings,
       settings: settings,
-      overlayStyle: overlayStyle,
     ));
     ));
     return result;
     return result;
   }
   }
@@ -495,12 +518,12 @@ class _CupertinoScaffoldState extends State<CupertinoScaffold>
     return CupertinoScaffoldInheirted(
     return CupertinoScaffoldInheirted(
       animation: animationController,
       animation: animationController,
       topRadius: widget.topRadius,
       topRadius: widget.topRadius,
+      transitionBackgroundColor: widget.transitionBackgroundColor,
       child: _CupertinoModalTransition(
       child: _CupertinoModalTransition(
         secondaryAnimation: animationController,
         secondaryAnimation: animationController,
         body: widget.body,
         body: widget.body,
         topRadius: widget.topRadius,
         topRadius: widget.topRadius,
         backgroundColor: widget.transitionBackgroundColor,
         backgroundColor: widget.transitionBackgroundColor,
-        overlayStyle: widget.overlayStyle,
       ),
       ),
     );
     );
   }
   }