From f2d1fb52629991f33417de630233a5d25b7af9d5 Mon Sep 17 00:00:00 2001 From: mike doornenbal Date: Wed, 7 Aug 2024 10:50:04 +0200 Subject: [PATCH] fix: rename carouselController --- CHANGELOG.md | 1 + .../inputs/carousel/carousel_controller.dart | 6 ++--- lib/src/inputs/carousel/carousel_slider.dart | 8 +++--- .../inputs/date_picker/date_picker_field.dart | 26 ++++++++++--------- 4 files changed, 22 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 083bdc4..0d45a07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## 3.6.0 * Added style parameter to `FlutterFormInputMultiLine` * Upgrade flutter_iconica_analysis to 7.0.0 +* Changed the name of the `CarouselController` to `FlutterInputCarouselController` ## 3.5.0 * Added `selectableTimePredicate` to the `DateTimeInputField` constructor diff --git a/lib/src/inputs/carousel/carousel_controller.dart b/lib/src/inputs/carousel/carousel_controller.dart index 441b475..769cdb4 100644 --- a/lib/src/inputs/carousel/carousel_controller.dart +++ b/lib/src/inputs/carousel/carousel_controller.dart @@ -9,8 +9,8 @@ import "package:flutter_input_library/src/inputs/carousel/carousel_options.dart" import "package:flutter_input_library/src/inputs/carousel/carousel_state.dart"; import "package:flutter_input_library/src/inputs/carousel/carousel_utils.dart"; -abstract class CarouselController { - factory CarouselController() => CarouselControllerImpl(); +abstract class FlutterInputCarouselController { + factory FlutterInputCarouselController() => CarouselControllerImpl(); bool get ready; Future get onReady; @@ -28,7 +28,7 @@ abstract class CarouselController { void stopAutoPlay(); } -class CarouselControllerImpl implements CarouselController { +class CarouselControllerImpl implements FlutterInputCarouselController { final Completer _readyCompleter = Completer(); CarouselState? _state; diff --git a/lib/src/inputs/carousel/carousel_slider.dart b/lib/src/inputs/carousel/carousel_slider.dart index db1ab66..0f364ef 100644 --- a/lib/src/inputs/carousel/carousel_slider.dart +++ b/lib/src/inputs/carousel/carousel_slider.dart @@ -26,25 +26,25 @@ class CarouselSlider extends StatefulWidget { CarouselSlider({ required this.items, required this.options, - CarouselController? carouselController, + FlutterInputCarouselController? carouselController, super.key, }) : itemBuilder = null, itemCount = items != null ? items.length : 0, _carouselController = carouselController != null ? carouselController as CarouselControllerImpl - : CarouselController() as CarouselControllerImpl; + : FlutterInputCarouselController() as CarouselControllerImpl; /// The on demand item builder constructor/ CarouselSlider.builder({ required this.itemCount, required this.itemBuilder, required this.options, - CarouselController? carouselController, + FlutterInputCarouselController? carouselController, super.key, }) : items = null, _carouselController = carouselController != null ? carouselController as CarouselControllerImpl - : CarouselController() as CarouselControllerImpl; + : FlutterInputCarouselController() as CarouselControllerImpl; /// [CarouselOptions] to create a [CarouselState] with. final CarouselOptions options; diff --git a/lib/src/inputs/date_picker/date_picker_field.dart b/lib/src/inputs/date_picker/date_picker_field.dart index dfcd9d8..eba2e6d 100644 --- a/lib/src/inputs/date_picker/date_picker_field.dart +++ b/lib/src/inputs/date_picker/date_picker_field.dart @@ -100,16 +100,18 @@ class _DateInputFieldState extends State { var userInput = ""; switch (inputType) { case FlutterFormDateTimeType.date: - var unformatted = await showDatePicker( - initialDate: initialDate, - context: context, - firstDate: firstDate, - lastDate: lastDate, - selectableDayPredicate: widget.selectableDayPredicate, - ); - userInput = unformatted != null - ? widget.dateFormat.format(unformatted) - : userInput; + if (context.mounted) { + var unformatted = await showDatePicker( + initialDate: initialDate, + context: context, + firstDate: firstDate, + lastDate: lastDate, + selectableDayPredicate: widget.selectableDayPredicate, + ); + userInput = unformatted != null + ? widget.dateFormat.format(unformatted) + : userInput; + } case FlutterFormDateTimeType.dateTime: await getInputFromUser(FlutterFormDateTimeType.date) @@ -152,6 +154,7 @@ class _DateInputFieldState extends State { } case FlutterFormDateTimeType.time: + var locale = MaterialLocalizations.of(context); if (context.mounted) { userInput = await showTimePicker( initialEntryMode: widget.timePickerEntryMode, @@ -165,8 +168,7 @@ class _DateInputFieldState extends State { ).then( (value) => value == null ? "" - : MaterialLocalizations.of(context) - .formatTimeOfDay(value, alwaysUse24HourFormat: true), + : locale.formatTimeOfDay(value, alwaysUse24HourFormat: true), ); } }