Showing
3 changed files
with
19 additions
and
17 deletions
| @@ -80,7 +80,6 @@ class GetModalBottomSheetRoute<T> extends PopupRoute<T> { | @@ -80,7 +80,6 @@ class GetModalBottomSheetRoute<T> extends PopupRoute<T> { | ||
| 80 | elevation: | 80 | elevation: |
| 81 | elevation ?? sheetTheme?.modalElevation ?? sheetTheme?.elevation, | 81 | elevation ?? sheetTheme?.modalElevation ?? sheetTheme?.elevation, |
| 82 | shape: shape, | 82 | shape: shape, |
| 83 | - | ||
| 84 | clipBehavior: clipBehavior, | 83 | clipBehavior: clipBehavior, |
| 85 | isScrollControlled: isScrollControlled, | 84 | isScrollControlled: isScrollControlled, |
| 86 | enableDrag: enableDrag, | 85 | enableDrag: enableDrag, |
| @@ -154,7 +153,8 @@ class _GetModalBottomSheetState<T> extends State<_GetModalBottomSheet<T>> { | @@ -154,7 +153,8 @@ class _GetModalBottomSheetState<T> extends State<_GetModalBottomSheet<T>> { | ||
| 154 | child: CustomSingleChildLayout( | 153 | child: CustomSingleChildLayout( |
| 155 | delegate: _GetModalBottomSheetLayout( | 154 | delegate: _GetModalBottomSheetLayout( |
| 156 | animationValue, widget.isScrollControlled), | 155 | animationValue, widget.isScrollControlled), |
| 157 | - child: widget.isPersistent == false ? BottomSheet( | 156 | + child: widget.isPersistent == false |
| 157 | + ? BottomSheet( | ||
| 158 | animationController: widget.route._animationController, | 158 | animationController: widget.route._animationController, |
| 159 | onClosing: () { | 159 | onClosing: () { |
| 160 | if (widget.route.isCurrent) { | 160 | if (widget.route.isCurrent) { |
| @@ -167,9 +167,11 @@ class _GetModalBottomSheetState<T> extends State<_GetModalBottomSheet<T>> { | @@ -167,9 +167,11 @@ class _GetModalBottomSheetState<T> extends State<_GetModalBottomSheet<T>> { | ||
| 167 | shape: widget.shape, | 167 | shape: widget.shape, |
| 168 | clipBehavior: widget.clipBehavior, | 168 | clipBehavior: widget.clipBehavior, |
| 169 | enableDrag: widget.enableDrag, | 169 | enableDrag: widget.enableDrag, |
| 170 | - ) : Scaffold( | 170 | + ) |
| 171 | + : Scaffold( | ||
| 171 | bottomSheet: BottomSheet( | 172 | bottomSheet: BottomSheet( |
| 172 | - animationController: widget.route._animationController, | 173 | + animationController: |
| 174 | + widget.route._animationController, | ||
| 173 | onClosing: () { | 175 | onClosing: () { |
| 174 | // if (widget.route.isCurrent) { | 176 | // if (widget.route.isCurrent) { |
| 175 | // Navigator.pop(context); | 177 | // Navigator.pop(context); |
| @@ -182,8 +184,7 @@ class _GetModalBottomSheetState<T> extends State<_GetModalBottomSheet<T>> { | @@ -182,8 +184,7 @@ class _GetModalBottomSheetState<T> extends State<_GetModalBottomSheet<T>> { | ||
| 182 | clipBehavior: widget.clipBehavior, | 184 | clipBehavior: widget.clipBehavior, |
| 183 | enableDrag: widget.enableDrag, | 185 | enableDrag: widget.enableDrag, |
| 184 | ), | 186 | ), |
| 185 | - ) | ||
| 186 | - ), | 187 | + )), |
| 187 | ), | 188 | ), |
| 188 | ); | 189 | ); |
| 189 | }, | 190 | }, |
| @@ -257,7 +258,8 @@ class _GetPerModalBottomSheetState<T> | @@ -257,7 +258,8 @@ class _GetPerModalBottomSheetState<T> | ||
| 257 | child: CustomSingleChildLayout( | 258 | child: CustomSingleChildLayout( |
| 258 | delegate: _GetModalBottomSheetLayout( | 259 | delegate: _GetModalBottomSheetLayout( |
| 259 | animationValue, widget.isScrollControlled), | 260 | animationValue, widget.isScrollControlled), |
| 260 | - child: widget.isPersistent == false ? BottomSheet( | 261 | + child: widget.isPersistent == false |
| 262 | + ? BottomSheet( | ||
| 261 | animationController: widget.route._animationController, | 263 | animationController: widget.route._animationController, |
| 262 | onClosing: () { | 264 | onClosing: () { |
| 263 | if (widget.route.isCurrent) { | 265 | if (widget.route.isCurrent) { |
| @@ -270,9 +272,11 @@ class _GetPerModalBottomSheetState<T> | @@ -270,9 +272,11 @@ class _GetPerModalBottomSheetState<T> | ||
| 270 | shape: widget.shape, | 272 | shape: widget.shape, |
| 271 | clipBehavior: widget.clipBehavior, | 273 | clipBehavior: widget.clipBehavior, |
| 272 | enableDrag: widget.enableDrag, | 274 | enableDrag: widget.enableDrag, |
| 273 | - ) : Scaffold( | 275 | + ) |
| 276 | + : Scaffold( | ||
| 274 | bottomSheet: BottomSheet( | 277 | bottomSheet: BottomSheet( |
| 275 | - animationController: widget.route._animationController, | 278 | + animationController: |
| 279 | + widget.route._animationController, | ||
| 276 | onClosing: () { | 280 | onClosing: () { |
| 277 | // if (widget.route.isCurrent) { | 281 | // if (widget.route.isCurrent) { |
| 278 | // Navigator.pop(context); | 282 | // Navigator.pop(context); |
| @@ -285,8 +289,7 @@ class _GetPerModalBottomSheetState<T> | @@ -285,8 +289,7 @@ class _GetPerModalBottomSheetState<T> | ||
| 285 | clipBehavior: widget.clipBehavior, | 289 | clipBehavior: widget.clipBehavior, |
| 286 | enableDrag: widget.enableDrag, | 290 | enableDrag: widget.enableDrag, |
| 287 | ), | 291 | ), |
| 288 | - ) | ||
| 289 | - ), | 292 | + )), |
| 290 | ), | 293 | ), |
| 291 | ); | 294 | ); |
| 292 | }, | 295 | }, |
| @@ -26,4 +26,3 @@ abstract class RxInterface<T> { | @@ -26,4 +26,3 @@ abstract class RxInterface<T> { | ||
| 26 | /// Calls [callback] with current value, when the value changes. | 26 | /// Calls [callback] with current value, when the value changes. |
| 27 | StreamSubscription<T> listen(ValueCallback<T> callback); | 27 | StreamSubscription<T> listen(ValueCallback<T> callback); |
| 28 | } | 28 | } |
| 29 | - |
| @@ -32,7 +32,7 @@ void testController<T>( | @@ -32,7 +32,7 @@ void testController<T>( | ||
| 32 | void Function(T) onInit, | 32 | void Function(T) onInit, |
| 33 | void Function(T) onReady, | 33 | void Function(T) onReady, |
| 34 | void Function(T) onClose, | 34 | void Function(T) onClose, |
| 35 | - }) { | 35 | +}) { |
| 36 | test(description, () { | 36 | test(description, () { |
| 37 | onInit(controller); | 37 | onInit(controller); |
| 38 | SchedulerBinding.instance.addPostFrameCallback((f) { | 38 | SchedulerBinding.instance.addPostFrameCallback((f) { |
| @@ -47,7 +47,7 @@ Future<T> testGetX<T extends DisposableInterface>( | @@ -47,7 +47,7 @@ Future<T> testGetX<T extends DisposableInterface>( | ||
| 47 | String description, { | 47 | String description, { |
| 48 | @required GetX<T> widget, | 48 | @required GetX<T> widget, |
| 49 | @required void Function(T controller) test, | 49 | @required void Function(T controller) test, |
| 50 | - }) async { | 50 | +}) async { |
| 51 | T controller; | 51 | T controller; |
| 52 | testWidgets(description, (tester) async { | 52 | testWidgets(description, (tester) async { |
| 53 | provideMockedNetworkImages(() async { | 53 | provideMockedNetworkImages(() async { |
| @@ -63,7 +63,7 @@ Future<T> testGetBuilder<T extends GetxController>( | @@ -63,7 +63,7 @@ Future<T> testGetBuilder<T extends GetxController>( | ||
| 63 | String description, { | 63 | String description, { |
| 64 | @required GetBuilder<T> widget, | 64 | @required GetBuilder<T> widget, |
| 65 | @required void Function(T controller) test, | 65 | @required void Function(T controller) test, |
| 66 | - }) async { | 66 | +}) async { |
| 67 | T controller; | 67 | T controller; |
| 68 | testWidgets(description, (tester) async { | 68 | testWidgets(description, (tester) async { |
| 69 | provideMockedNetworkImages(() async { | 69 | provideMockedNetworkImages(() async { |
| @@ -80,7 +80,7 @@ Future<T> testObx<T extends GetxController>( | @@ -80,7 +80,7 @@ Future<T> testObx<T extends GetxController>( | ||
| 80 | @required T controller, | 80 | @required T controller, |
| 81 | @required Obx Function(T controller) widget, | 81 | @required Obx Function(T controller) widget, |
| 82 | @required void Function(T controller) test, | 82 | @required void Function(T controller) test, |
| 83 | - }) async { | 83 | +}) async { |
| 84 | testWidgets(description, (tester) async { | 84 | testWidgets(description, (tester) async { |
| 85 | provideMockedNetworkImages(() async { | 85 | provideMockedNetworkImages(() async { |
| 86 | await tester.pumpWidget(GetMaterialApp(home: widget(controller))); | 86 | await tester.pumpWidget(GetMaterialApp(home: widget(controller))); |
| @@ -102,7 +102,7 @@ void getTest( | @@ -102,7 +102,7 @@ void getTest( | ||
| 102 | bool semanticsEnabled = true, | 102 | bool semanticsEnabled = true, |
| 103 | TestVariant<Object> variant = const DefaultTestVariant(), | 103 | TestVariant<Object> variant = const DefaultTestVariant(), |
| 104 | dynamic tags, | 104 | dynamic tags, |
| 105 | - }) { | 105 | +}) { |
| 106 | assert(variant != null); | 106 | assert(variant != null); |
| 107 | assert(variant.values.isNotEmpty); | 107 | assert(variant.values.isNotEmpty); |
| 108 | 108 |
-
Please register or login to post a comment