fixes (#353)

 import 'dart:async';
 import 'dart:async';
 
 
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide ModalBottomSheetRoute;
 import 'package:flutter/services.dart';
 import 'package:flutter/services.dart';
 
 
-import '../../modal_bottom_sheet.dart' as modal_bottom_sheet;
-
 const Radius kDefaultBarTopRadius = Radius.circular(15);
 const Radius kDefaultBarTopRadius = Radius.circular(15);
 
 
 class BarBottomSheet extends StatelessWidget {
 class BarBottomSheet extends StatelessWidget {
@@ -98,7 +96,7 @@ Future<T?> showBarModalBottomSheet<T>({
   assert(debugCheckHasMediaQuery(context));
   assert(debugCheckHasMediaQuery(context));
   assert(debugCheckHasMaterialLocalizations(context));
   assert(debugCheckHasMaterialLocalizations(context));
   final result = await Navigator.of(context, rootNavigator: useRootNavigator)
   final result = await Navigator.of(context, rootNavigator: useRootNavigator)
-      .push(modal_bottom_sheet.ModalSheetRoute<T>(
+      .push(ModalBottomSheetRoute<T>(
     builder: builder,
     builder: builder,
     bounce: bounce,
     bounce: bounce,
     closeProgressThreshold: closeProgressThreshold,
     closeProgressThreshold: closeProgressThreshold,

-import 'package:flutter/material.dart';
-import 'package:modal_bottom_sheet/modal_bottom_sheet.dart'
-    as modal_bottom_sheet;
 import 'dart:async';
 import 'dart:async';
 
 
+import 'package:flutter/material.dart' hide ModalBottomSheetRoute;
+import 'package:modal_bottom_sheet/modal_bottom_sheet.dart';
+
 /// Shows a modal material design bottom sheet.
 /// Shows a modal material design bottom sheet.
 Future<T?> showMaterialModalBottomSheet<T>({
 Future<T?> showMaterialModalBottomSheet<T>({
   required BuildContext context,
   required BuildContext context,
@@ -26,7 +26,7 @@ Future<T?> showMaterialModalBottomSheet<T>({
   assert(debugCheckHasMediaQuery(context));
   assert(debugCheckHasMediaQuery(context));
   assert(debugCheckHasMaterialLocalizations(context));
   assert(debugCheckHasMaterialLocalizations(context));
   final result = await Navigator.of(context, rootNavigator: useRootNavigator)
   final result = await Navigator.of(context, rootNavigator: useRootNavigator)
-      .push(modal_bottom_sheet.ModalSheetRoute<T>(
+      .push(ModalBottomSheetRoute<T>(
     builder: builder,
     builder: builder,
     closeProgressThreshold: closeProgressThreshold,
     closeProgressThreshold: closeProgressThreshold,
     containerBuilder: _materialContainerBuilder(
     containerBuilder: _materialContainerBuilder(
@@ -52,8 +52,7 @@ Future<T?> showMaterialModalBottomSheet<T>({
 }
 }
 
 
 //Default container builder is the Material Appearance
 //Default container builder is the Material Appearance
-modal_bottom_sheet.WidgetWithChildBuilder _materialContainerBuilder(
-    BuildContext context,
+WidgetWithChildBuilder _materialContainerBuilder(BuildContext context,
     {Color? backgroundColor,
     {Color? backgroundColor,
     double? elevation,
     double? elevation,
     ThemeData? theme,
     ThemeData? theme,

 import 'package:flutter/cupertino.dart';
 import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide ModalBottomSheetRoute;
 
 
-import '../modal_bottom_sheet.dart' as modal_bottom_sheet;
+import '../modal_bottom_sheet.dart';
+import 'bottom_sheet_route.dart';
 
 
 class MaterialWithModalsPageRoute<T> extends MaterialPageRoute<T> {
 class MaterialWithModalsPageRoute<T> extends MaterialPageRoute<T> {
   /// Construct a MaterialPageRoute whose contents are defined by [builder].
   /// Construct a MaterialPageRoute whose contents are defined by [builder].
@@ -19,7 +20,7 @@ class MaterialWithModalsPageRoute<T> extends MaterialPageRoute<T> {
             builder: builder,
             builder: builder,
             maintainState: maintainState);
             maintainState: maintainState);
 
 
-  modal_bottom_sheet.ModalSheetRoute? _nextModalRoute;
+  ModalBottomSheetRoute? _nextModalRoute;
 
 
   @override
   @override
   bool canTransitionTo(TransitionRoute<dynamic> nextRoute) {
   bool canTransitionTo(TransitionRoute<dynamic> nextRoute) {
@@ -28,12 +29,12 @@ class MaterialWithModalsPageRoute<T> extends MaterialPageRoute<T> {
         (nextRoute is CupertinoPageRoute && !nextRoute.fullscreenDialog) ||
         (nextRoute is CupertinoPageRoute && !nextRoute.fullscreenDialog) ||
         (nextRoute is MaterialWithModalsPageRoute &&
         (nextRoute is MaterialWithModalsPageRoute &&
             !nextRoute.fullscreenDialog) ||
             !nextRoute.fullscreenDialog) ||
-        (nextRoute is modal_bottom_sheet.ModalSheetRoute);
+        (nextRoute is ModalBottomSheetRoute);
   }
   }
 
 
   @override
   @override
   void didChangeNext(Route? nextRoute) {
   void didChangeNext(Route? nextRoute) {
-    if (nextRoute is modal_bottom_sheet.ModalSheetRoute) {
+    if (nextRoute is ModalBottomSheetRoute) {
       _nextModalRoute = nextRoute;
       _nextModalRoute = nextRoute;
     }
     }
 
 
@@ -41,6 +42,11 @@ class MaterialWithModalsPageRoute<T> extends MaterialPageRoute<T> {
   }
   }
 
 
   @override
   @override
+  void didPopNext(Route nextRoute) {
+    super.didPopNext(nextRoute);
+  }
+
+  @override
   bool didPop(T? result) {
   bool didPop(T? result) {
     _nextModalRoute = null;
     _nextModalRoute = null;
     return super.didPop(result);
     return super.didPop(result);