Merge pull request #207 from v7lin/master

fix: android edge to edge & clean: dart analysis

@@ -7,15 +7,15 @@ import 'package:modal_bottom_sheet/modal_bottom_sheet.dart';
 class AvatarBottomSheet extends StatelessWidget {
 class AvatarBottomSheet extends StatelessWidget {
   final Widget child;
   final Widget child;
   final Animation<double> animation;
   final Animation<double> animation;
+  final SystemUiOverlayStyle? overlayStyle;
 
 
-  const AvatarBottomSheet(
-      {Key? key, required this.child, required this.animation})
+  const AvatarBottomSheet({Key? key, required  this.child, required this.animation, this.overlayStyle})
       : super(key: key);
       : super(key: key);
 
 
   @override
   @override
   Widget build(BuildContext context) {
   Widget build(BuildContext context) {
     return AnnotatedRegion<SystemUiOverlayStyle>(
     return AnnotatedRegion<SystemUiOverlayStyle>(
-      value: SystemUiOverlayStyle.light,
+      value: overlayStyle ?? SystemUiOverlayStyle.light,
       child: Column(
       child: Column(
         mainAxisSize: MainAxisSize.min,
         mainAxisSize: MainAxisSize.min,
         crossAxisAlignment: CrossAxisAlignment.start,
         crossAxisAlignment: CrossAxisAlignment.start,
@@ -89,6 +89,7 @@ Future<T?> showAvatarModalBottomSheet<T>({
   bool isDismissible = true,
   bool isDismissible = true,
   bool enableDrag = true,
   bool enableDrag = true,
   Duration? duration,
   Duration? duration,
+  SystemUiOverlayStyle? overlayStyle,
 }) async {
 }) async {
   assert(debugCheckHasMediaQuery(context));
   assert(debugCheckHasMediaQuery(context));
   assert(debugCheckHasMaterialLocalizations(context));
   assert(debugCheckHasMaterialLocalizations(context));
@@ -98,6 +99,7 @@ Future<T?> showAvatarModalBottomSheet<T>({
     containerBuilder: (_, animation, child) => AvatarBottomSheet(
     containerBuilder: (_, animation, child) => AvatarBottomSheet(
       child: child,
       child: child,
       animation: animation,
       animation: animation,
+      overlayStyle: overlayStyle,
     ),
     ),
     bounce: bounce,
     bounce: bounce,
     secondAnimationController: secondAnimation,
     secondAnimationController: secondAnimation,

@@ -14,6 +14,7 @@ class BarBottomSheet extends StatelessWidget {
   final Clip? clipBehavior;
   final Clip? clipBehavior;
   final double? elevation;
   final double? elevation;
   final ShapeBorder? shape;
   final ShapeBorder? shape;
+  final SystemUiOverlayStyle? overlayStyle;
 
 
   const BarBottomSheet({
   const BarBottomSheet({
     Key? key,
     Key? key,
@@ -22,12 +23,13 @@ class BarBottomSheet extends StatelessWidget {
     this.clipBehavior,
     this.clipBehavior,
     this.shape,
     this.shape,
     this.elevation,
     this.elevation,
+    this.overlayStyle,
   }) : super(key: key);
   }) : super(key: key);
 
 
   @override
   @override
   Widget build(BuildContext context) {
   Widget build(BuildContext context) {
     return AnnotatedRegion<SystemUiOverlayStyle>(
     return AnnotatedRegion<SystemUiOverlayStyle>(
-      value: SystemUiOverlayStyle.light,
+      value: overlayStyle ?? SystemUiOverlayStyle.light,
       child: Column(
       child: Column(
           mainAxisSize: MainAxisSize.min,
           mainAxisSize: MainAxisSize.min,
           crossAxisAlignment: CrossAxisAlignment.center,
           crossAxisAlignment: CrossAxisAlignment.center,
@@ -89,6 +91,7 @@ Future<T?> showBarModalBottomSheet<T>({
   Widget? topControl,
   Widget? topControl,
   Duration? duration,
   Duration? duration,
   RouteSettings? settings,
   RouteSettings? settings,
+  SystemUiOverlayStyle? overlayStyle,
 }) async {
 }) async {
   assert(debugCheckHasMediaQuery(context));
   assert(debugCheckHasMediaQuery(context));
   assert(debugCheckHasMaterialLocalizations(context));
   assert(debugCheckHasMaterialLocalizations(context));
@@ -103,6 +106,7 @@ Future<T?> showBarModalBottomSheet<T>({
       clipBehavior: clipBehavior,
       clipBehavior: clipBehavior,
       shape: shape,
       shape: shape,
       elevation: elevation,
       elevation: elevation,
+      overlayStyle: overlayStyle,
     ),
     ),
     secondAnimationController: secondAnimation,
     secondAnimationController: secondAnimation,
     expanded: expand,
     expanded: expand,

@@ -91,6 +91,7 @@ Future<T?> showCupertinoModalBottomSheet<T>({
   RouteSettings? settings,
   RouteSettings? settings,
   Color? transitionBackgroundColor,
   Color? transitionBackgroundColor,
   BoxShadow? shadow,
   BoxShadow? shadow,
+  SystemUiOverlayStyle? overlayStyle,
 }) async {
 }) async {
   assert(debugCheckHasMediaQuery(context));
   assert(debugCheckHasMediaQuery(context));
   final hasMaterialLocalizations =
   final hasMaterialLocalizations =
@@ -126,7 +127,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,
+        overlayStyle: overlayStyle),
   );
   );
   return result;
   return result;
 }
 }
@@ -141,6 +143,7 @@ class CupertinoModalBottomSheetRoute<T> extends ModalBottomSheetRoute<T> {
   // Background color behind all routes
   // Background color behind all routes
   // Black by default
   // Black by default
   final Color? transitionBackgroundColor;
   final Color? transitionBackgroundColor;
+  final SystemUiOverlayStyle? overlayStyle;
 
 
   CupertinoModalBottomSheetRoute({
   CupertinoModalBottomSheetRoute({
     required WidgetBuilder builder,
     required WidgetBuilder builder,
@@ -164,6 +167,7 @@ class CupertinoModalBottomSheetRoute<T> extends ModalBottomSheetRoute<T> {
     this.transitionBackgroundColor,
     this.transitionBackgroundColor,
     this.topRadius = _kDefaultTopRadius,
     this.topRadius = _kDefaultTopRadius,
     this.previousRouteAnimationCurve,
     this.previousRouteAnimationCurve,
+    this.overlayStyle,
   }) : super(
   }) : super(
           closeProgressThreshold: closeProgressThreshold,
           closeProgressThreshold: closeProgressThreshold,
           scrollController: scrollController,
           scrollController: scrollController,
@@ -215,6 +219,7 @@ class CupertinoModalBottomSheetRoute<T> extends ModalBottomSheetRoute<T> {
       animationCurve: previousRouteAnimationCurve,
       animationCurve: previousRouteAnimationCurve,
       topRadius: topRadius,
       topRadius: topRadius,
       backgroundColor: transitionBackgroundColor ?? Colors.black,
       backgroundColor: transitionBackgroundColor ?? Colors.black,
+      overlayStyle: overlayStyle,
     );
     );
   }
   }
 }
 }
@@ -224,6 +229,7 @@ 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;
 
 
@@ -234,6 +240,7 @@ 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
@@ -251,7 +258,7 @@ class _CupertinoModalTransition extends StatelessWidget {
     );
     );
 
 
     return AnnotatedRegion<SystemUiOverlayStyle>(
     return AnnotatedRegion<SystemUiOverlayStyle>(
-      value: SystemUiOverlayStyle.light,
+      value: overlayStyle ?? SystemUiOverlayStyle.light,
       child: AnimatedBuilder(
       child: AnimatedBuilder(
         animation: curvedAnimation,
         animation: curvedAnimation,
         child: body,
         child: body,
@@ -312,12 +319,14 @@ class CupertinoScaffold extends StatefulWidget {
   final Widget body;
   final Widget body;
   final Radius topRadius;
   final Radius topRadius;
   final Color transitionBackgroundColor;
   final Color transitionBackgroundColor;
+  final SystemUiOverlayStyle? overlayStyle;
 
 
   const CupertinoScaffold({
   const CupertinoScaffold({
     Key? key,
     Key? key,
     required this.body,
     required this.body,
     this.topRadius = _kDefaultTopRadius,
     this.topRadius = _kDefaultTopRadius,
     this.transitionBackgroundColor = Colors.black,
     this.transitionBackgroundColor = Colors.black,
+    this.overlayStyle,
   }) : super(key: key);
   }) : super(key: key);
 
 
   @override
   @override
@@ -339,6 +348,7 @@ class CupertinoScaffold extends StatefulWidget {
     Duration? duration,
     Duration? duration,
     RouteSettings? settings,
     RouteSettings? settings,
     BoxShadow? shadow,
     BoxShadow? shadow,
+    SystemUiOverlayStyle? overlayStyle,
   }) async {
   }) async {
     assert(debugCheckHasMediaQuery(context));
     assert(debugCheckHasMediaQuery(context));
     final isCupertinoApp =
     final isCupertinoApp =
@@ -371,6 +381,7 @@ class CupertinoScaffold extends StatefulWidget {
       previousRouteAnimationCurve: previousRouteAnimationCurve,
       previousRouteAnimationCurve: previousRouteAnimationCurve,
       duration: duration,
       duration: duration,
       settings: settings,
       settings: settings,
+      overlayStyle: overlayStyle,
     ));
     ));
     return result;
     return result;
   }
   }
@@ -380,8 +391,6 @@ class _CupertinoScaffoldState extends State<CupertinoScaffold>
     with TickerProviderStateMixin {
     with TickerProviderStateMixin {
   late AnimationController animationController;
   late AnimationController animationController;
 
 
-  SystemUiOverlayStyle? lastStyle;
-
   @override
   @override
   void initState() {
   void initState() {
     animationController =
     animationController =
@@ -404,6 +413,7 @@ class _CupertinoScaffoldState extends State<CupertinoScaffold>
         body: widget.body,
         body: widget.body,
         topRadius: widget.topRadius,
         topRadius: widget.topRadius,
         backgroundColor: widget.transitionBackgroundColor,
         backgroundColor: widget.transitionBackgroundColor,
+        overlayStyle: widget.overlayStyle,
       ),
       ),
     );
     );
   }
   }