diff --git a/packages/data_importer/pubspec.yaml b/packages/data_importer/pubspec.yaml index 6e8c492bae4..126f90dbb79 100644 --- a/packages/data_importer/pubspec.yaml +++ b/packages/data_importer/pubspec.yaml @@ -4,8 +4,8 @@ version: 1.0.0 publish_to: none environment: - sdk: ">=2.16.0 <3.0.0" - flutter: ">=2.5.0" + sdk: ">=2.17.0 <3.0.0" + flutter: ">=3.0.0" dependencies: flutter: diff --git a/packages/data_importer_shared/pubspec.yaml b/packages/data_importer_shared/pubspec.yaml index a563c1ee934..4f24bcbe9e2 100644 --- a/packages/data_importer_shared/pubspec.yaml +++ b/packages/data_importer_shared/pubspec.yaml @@ -3,7 +3,8 @@ description: A starting point for Dart libraries or applications. publish_to: none environment: - sdk: '>=2.16.0 <3.0.0' + sdk: ">=2.17.0 <3.0.0" + flutter: ">=3.0.0" dev_dependencies: flutter_lints: ^1.0.0 diff --git a/packages/smooth_app/lib/cards/category_cards/null_cache.dart b/packages/smooth_app/lib/cards/category_cards/null_cache.dart index c5a16e87c30..59bf77b8c92 100644 --- a/packages/smooth_app/lib/cards/category_cards/null_cache.dart +++ b/packages/smooth_app/lib/cards/category_cards/null_cache.dart @@ -4,13 +4,9 @@ import 'package:smooth_app/cards/category_cards/abstract_cache.dart'; /// Empty image cache: the url was null, there is not much we can display. class NullCache extends AbstractCache { const NullCache({ - final double? width, - final double? height, - }) : super( - null, - width: width, - height: height, - ); + super.width, + super.height, + }) : super(null); @override Widget build(BuildContext context) => getDefaultUnknown(); diff --git a/packages/smooth_app/lib/cards/category_cards/raster_cache.dart b/packages/smooth_app/lib/cards/category_cards/raster_cache.dart index 76f1f5c6014..8a9fe9ed612 100644 --- a/packages/smooth_app/lib/cards/category_cards/raster_cache.dart +++ b/packages/smooth_app/lib/cards/category_cards/raster_cache.dart @@ -6,16 +6,11 @@ import 'package:smooth_app/cards/category_cards/raster_async_asset.dart'; /// Widget that displays a png/jpeg from network (and cache while waiting). class RasterCache extends AbstractCache { const RasterCache( - final String iconUrl, { - final double? width, - final double? height, - final bool displayAssetWhileWaiting = true, - }) : super( - iconUrl, - width: width, - height: height, - displayAssetWhileWaiting: displayAssetWhileWaiting, - ); + super.iconUrl, { + super.width, + super.height, + super.displayAssetWhileWaiting = true, + }); @override Widget build(BuildContext context) { diff --git a/packages/smooth_app/lib/cards/category_cards/svg_cache.dart b/packages/smooth_app/lib/cards/category_cards/svg_cache.dart index b7624bfa3a8..4f6664ec3b3 100644 --- a/packages/smooth_app/lib/cards/category_cards/svg_cache.dart +++ b/packages/smooth_app/lib/cards/category_cards/svg_cache.dart @@ -7,17 +7,12 @@ import 'package:smooth_app/cards/category_cards/svg_async_asset.dart'; /// Widget that displays a svg from network (and cache while waiting). class SvgCache extends AbstractCache { const SvgCache( - final String? iconUrl, { - final double? width, - final double? height, + super.iconUrl, { + super.width, + super.height, this.color, - final bool displayAssetWhileWaiting = true, - }) : super( - iconUrl, - width: width, - height: height, - displayAssetWhileWaiting: displayAssetWhileWaiting, - ); + super.displayAssetWhileWaiting = true, + }); final Color? color; diff --git a/packages/smooth_app/lib/data_models/product_list.dart b/packages/smooth_app/lib/data_models/product_list.dart index 4a7c993ccc2..61d9e4ad7d6 100644 --- a/packages/smooth_app/lib/data_models/product_list.dart +++ b/packages/smooth_app/lib/data_models/product_list.dart @@ -30,19 +30,28 @@ enum ProductListType { } extension ProductListTypeExtension on ProductListType { - static const Map _keys = { - ProductListType.HTTP_SEARCH_KEYWORDS: 'http/search/keywords', - ProductListType.HTTP_SEARCH_CATEGORY: 'http/search/category', - ProductListType.HTTP_USER_CONTRIBUTOR: 'http/user/contributor', - ProductListType.HTTP_USER_INFORMER: 'http/user/informer', - ProductListType.HTTP_USER_PHOTOGRAPHER: 'http/user/photographer', - ProductListType.HTTP_USER_TO_BE_COMPLETED: 'http/user/to_be_completed', - ProductListType.SCAN_SESSION: 'scan_session', - ProductListType.HISTORY: 'history', - ProductListType.USER: 'user', - }; - - String get key => _keys[this]!; + String get key { + switch (this) { + case ProductListType.HTTP_SEARCH_KEYWORDS: + return 'http/search/keywords'; + case ProductListType.HTTP_SEARCH_CATEGORY: + return 'http/search/category'; + case ProductListType.SCAN_SESSION: + return 'scan_session'; + case ProductListType.HTTP_USER_CONTRIBUTOR: + return 'http/user/contributor'; + case ProductListType.HTTP_USER_INFORMER: + return 'http/user/informer'; + case ProductListType.HTTP_USER_PHOTOGRAPHER: + return 'http/user/photographer'; + case ProductListType.HTTP_USER_TO_BE_COMPLETED: + return 'http/user/to_be_completed'; + case ProductListType.HISTORY: + return 'history'; + case ProductListType.USER: + return 'user'; + } + } } class ProductList { diff --git a/packages/smooth_app/lib/generic_lib/dialogs/smooth_alert_dialog.dart b/packages/smooth_app/lib/generic_lib/dialogs/smooth_alert_dialog.dart index 7d56c0f63d0..88a904e8989 100644 --- a/packages/smooth_app/lib/generic_lib/dialogs/smooth_alert_dialog.dart +++ b/packages/smooth_app/lib/generic_lib/dialogs/smooth_alert_dialog.dart @@ -123,10 +123,9 @@ class SmoothActionButtonsBar extends StatelessWidget { const SmoothActionButtonsBar({ this.positiveAction, this.negativeAction, - Key? key, - }) : assert(positiveAction != null || negativeAction != null, - 'At least one action must be passed!'), - super(key: key); + super.key, + }) : assert(positiveAction != null || negativeAction != null, + 'At least one action must be passed!'); const SmoothActionButtonsBar.single({ required SmoothActionButton action, diff --git a/packages/smooth_app/lib/generic_lib/smooth_html_widget.dart b/packages/smooth_app/lib/generic_lib/smooth_html_widget.dart index b5ffffeb660..8c27cdae561 100644 --- a/packages/smooth_app/lib/generic_lib/smooth_html_widget.dart +++ b/packages/smooth_app/lib/generic_lib/smooth_html_widget.dart @@ -4,8 +4,11 @@ import 'package:fwfh_selectable_text/fwfh_selectable_text.dart'; import 'package:smooth_app/helpers/launch_url_helper.dart'; class SmoothHtmlWidget extends StatelessWidget { - const SmoothHtmlWidget(this.htmlString, - {this.textStyle, this.isSelectable = true}); + const SmoothHtmlWidget( + this.htmlString, { + this.textStyle, + this.isSelectable = true, + }); final String htmlString; final TextStyle? textStyle; diff --git a/packages/smooth_app/lib/generic_lib/widgets/smooth_error_card.dart b/packages/smooth_app/lib/generic_lib/widgets/smooth_error_card.dart index c83bea7cccd..aa234f0a7c2 100644 --- a/packages/smooth_app/lib/generic_lib/widgets/smooth_error_card.dart +++ b/packages/smooth_app/lib/generic_lib/widgets/smooth_error_card.dart @@ -7,9 +7,12 @@ import 'package:smooth_app/generic_lib/widgets/smooth_card.dart'; import 'package:smooth_app/helpers/extension_on_text_helper.dart'; class SmoothErrorCard extends StatefulWidget { - const SmoothErrorCard( - {Key? key, required this.errorMessage, required this.tryAgainFunction}) - : super(key: key); + const SmoothErrorCard({ + super.key, + required this.errorMessage, + required this.tryAgainFunction, + }); + final String errorMessage; final void Function() tryAgainFunction; diff --git a/packages/smooth_app/lib/generic_lib/widgets/smooth_text_form_field.dart b/packages/smooth_app/lib/generic_lib/widgets/smooth_text_form_field.dart index 8eb61fe0cab..67ae4fb9823 100644 --- a/packages/smooth_app/lib/generic_lib/widgets/smooth_text_form_field.dart +++ b/packages/smooth_app/lib/generic_lib/widgets/smooth_text_form_field.dart @@ -8,7 +8,7 @@ enum TextFieldTypes { class SmoothTextFormField extends StatefulWidget { const SmoothTextFormField({ - Key? key, + super.key, required this.type, required this.controller, this.enabled, @@ -21,7 +21,7 @@ class SmoothTextFormField extends StatefulWidget { this.textInputType, this.onChanged, this.autofocus, - }) : super(key: key); + }); final TextFieldTypes type; final TextEditingController? controller; diff --git a/packages/smooth_app/lib/helpers/data_importer/smooth_app_data_importer.dart b/packages/smooth_app/lib/helpers/data_importer/smooth_app_data_importer.dart index 3d9ae830083..b8d12d98415 100644 --- a/packages/smooth_app/lib/helpers/data_importer/smooth_app_data_importer.dart +++ b/packages/smooth_app/lib/helpers/data_importer/smooth_app_data_importer.dart @@ -113,10 +113,8 @@ enum SmoothAppDataImporterStatus { required, /// No migration started (call [_checkStatus] to update) - notStarted, -} + notStarted; -extension SmoothAppDataImporterStatusExtension on SmoothAppDataImporterStatus { String printableLabel(AppLocalizations appLocalizations) { switch (this) { case SmoothAppDataImporterStatus.alreadyDone: diff --git a/packages/smooth_app/lib/pages/preferences/user_preferences_dev_mode.dart b/packages/smooth_app/lib/pages/preferences/user_preferences_dev_mode.dart index 5d7519d08d9..9076340dc46 100644 --- a/packages/smooth_app/lib/pages/preferences/user_preferences_dev_mode.dart +++ b/packages/smooth_app/lib/pages/preferences/user_preferences_dev_mode.dart @@ -246,7 +246,7 @@ class UserPreferencesDevMode extends AbstractUserPreferences { ), subtitle: Text( appLocalizations - .dev_mode_scan_mode_subtitle(DevModeScanModeExtension.fromIndex( + .dev_mode_scan_mode_subtitle(DevModeScanMode.fromIndex( userPreferences.getDevModeIndex( userPreferencesEnumScanMode, ), @@ -281,7 +281,7 @@ class UserPreferencesDevMode extends AbstractUserPreferences { if (scanMode != null) { await userPreferences.setDevModeIndex( userPreferencesEnumScanMode, - scanMode.index, + scanMode.idx, ); setState(() {}); } @@ -427,32 +427,24 @@ enum DevModeScanMode { PREPROCESS_FULL_IMAGE, PREPROCESS_HALF_IMAGE, SCAN_FULL_IMAGE, - SCAN_HALF_IMAGE, -} - -extension DevModeScanModeExtension on DevModeScanMode { - static const DevModeScanMode defaultScanMode = - DevModeScanMode.SCAN_FULL_IMAGE; - - static const Map _labels = { - DevModeScanMode.CAMERA_ONLY: 'Only camera stream, no scanning', - DevModeScanMode.PREPROCESS_FULL_IMAGE: - 'Camera stream and full image preprocessing, no scanning', - DevModeScanMode.PREPROCESS_HALF_IMAGE: - 'Camera stream and half image preprocessing, no scanning', - DevModeScanMode.SCAN_FULL_IMAGE: 'Full image scanning', - DevModeScanMode.SCAN_HALF_IMAGE: 'Half image scanning', - }; + SCAN_HALF_IMAGE; - static const Map _indices = { - DevModeScanMode.CAMERA_ONLY: 4, - DevModeScanMode.PREPROCESS_FULL_IMAGE: 3, - DevModeScanMode.PREPROCESS_HALF_IMAGE: 2, - DevModeScanMode.SCAN_FULL_IMAGE: 0, - DevModeScanMode.SCAN_HALF_IMAGE: 1, - }; + static DevModeScanMode get defaultScanMode => DevModeScanMode.SCAN_FULL_IMAGE; - String get label => _labels[this]!; + String get label { + switch (this) { + case DevModeScanMode.CAMERA_ONLY: + return 'Only camera stream, no scanning'; + case DevModeScanMode.PREPROCESS_FULL_IMAGE: + return 'Camera stream and full image preprocessing, no scanning'; + case DevModeScanMode.PREPROCESS_HALF_IMAGE: + return 'Camera stream and half image preprocessing, no scanning'; + case DevModeScanMode.SCAN_FULL_IMAGE: + return 'Full image scanning'; + case DevModeScanMode.SCAN_HALF_IMAGE: + return 'Half image scanning'; + } + } String localizedLabel(AppLocalizations appLocalizations) { switch (this) { @@ -469,7 +461,20 @@ extension DevModeScanModeExtension on DevModeScanMode { } } - int get index => _indices[this]!; + int get idx { + switch (this) { + case DevModeScanMode.CAMERA_ONLY: + return 4; + case DevModeScanMode.PREPROCESS_FULL_IMAGE: + return 3; + case DevModeScanMode.PREPROCESS_HALF_IMAGE: + return 2; + case DevModeScanMode.SCAN_FULL_IMAGE: + return 0; + case DevModeScanMode.SCAN_HALF_IMAGE: + return 1; + } + } static DevModeScanMode fromIndex(final int? index) { if (index == null) { diff --git a/packages/smooth_app/lib/pages/product/add_new_product_page.dart b/packages/smooth_app/lib/pages/product/add_new_product_page.dart index 4440f8442ba..4fc0c68d9f5 100644 --- a/packages/smooth_app/lib/pages/product/add_new_product_page.dart +++ b/packages/smooth_app/lib/pages/product/add_new_product_page.dart @@ -25,9 +25,7 @@ const List _SORTED_IMAGE_FIELD_LIST = [ ]; class AddNewProductPage extends StatefulWidget { - const AddNewProductPage( - this.barcode, - ); + const AddNewProductPage(this.barcode); final String barcode; diff --git a/packages/smooth_app/lib/pages/product/edit_ingredients_page.dart b/packages/smooth_app/lib/pages/product/edit_ingredients_page.dart index c61e761bea6..8fc3e35f9ed 100644 --- a/packages/smooth_app/lib/pages/product/edit_ingredients_page.dart +++ b/packages/smooth_app/lib/pages/product/edit_ingredients_page.dart @@ -20,9 +20,9 @@ import 'package:smooth_app/pages/product/common/product_refresher.dart'; /// ingredients. class EditIngredientsPage extends StatefulWidget { const EditIngredientsPage({ - Key? key, + super.key, required this.product, - }) : super(key: key); + }); final Product product; diff --git a/packages/smooth_app/lib/pages/product/nutrition_page_loaded.dart b/packages/smooth_app/lib/pages/product/nutrition_page_loaded.dart index 4505b38e465..b345dfe1c43 100644 --- a/packages/smooth_app/lib/pages/product/nutrition_page_loaded.dart +++ b/packages/smooth_app/lib/pages/product/nutrition_page_loaded.dart @@ -19,7 +19,10 @@ import 'package:smooth_app/pages/product/nutrition_container.dart'; /// Actual nutrition page, with data already loaded. class NutritionPageLoaded extends StatefulWidget { - const NutritionPageLoaded(this.product, this.orderedNutrients); + const NutritionPageLoaded( + this.product, + this.orderedNutrients, + ); final Product product; final OrderedNutrients orderedNutrients; diff --git a/packages/smooth_app/lib/pages/product/simple_input_page.dart b/packages/smooth_app/lib/pages/product/simple_input_page.dart index 964559f40f6..b9c627f55de 100644 --- a/packages/smooth_app/lib/pages/product/simple_input_page.dart +++ b/packages/smooth_app/lib/pages/product/simple_input_page.dart @@ -12,7 +12,7 @@ import 'package:smooth_app/pages/product/simple_input_page_helpers.dart'; /// Simple input page: we have a list of terms, we add, we remove, we save. class SimpleInputPage extends StatefulWidget { - const SimpleInputPage(this.helper) : super(); + const SimpleInputPage(this.helper); final AbstractSimpleInputPageHelper helper; diff --git a/packages/smooth_app/lib/pages/question_page.dart b/packages/smooth_app/lib/pages/question_page.dart index 5ae7f464fce..05b4afec6d7 100644 --- a/packages/smooth_app/lib/pages/question_page.dart +++ b/packages/smooth_app/lib/pages/question_page.dart @@ -379,8 +379,11 @@ class _QuestionPageState extends State } class CongratsWidget extends StatelessWidget { - const CongratsWidget(this._anonymousAnnotationList, {Key? key}) - : super(key: key); + const CongratsWidget( + this._anonymousAnnotationList, { + super.key, + }); + final Map _anonymousAnnotationList; @override diff --git a/packages/smooth_app/lib/pages/scan/camera_controller.dart b/packages/smooth_app/lib/pages/scan/camera_controller.dart index 46bacdd593e..5ee3827e3ec 100644 --- a/packages/smooth_app/lib/pages/scan/camera_controller.dart +++ b/packages/smooth_app/lib/pages/scan/camera_controller.dart @@ -14,16 +14,13 @@ import 'package:smooth_app/data_models/user_preferences.dart'; class SmoothCameraController extends CameraController { SmoothCameraController( this.preferences, - CameraDescription description, - ResolutionPreset resolutionPreset, { - ImageFormatGroup? imageFormatGroup, + super.description, + super.resolutionPreset, { + super.imageFormatGroup, }) : _state = _CameraState.notInitialized, _hasAPendingResume = false, super( - description, - resolutionPreset, enableAudio: false, - imageFormatGroup: imageFormatGroup, ); final UserPreferences preferences; @@ -303,10 +300,8 @@ enum CameraFocusPointAlgorithm { // Quicker algorithm, but may not work on old / Samsung devices newAlgorithm, // Old algorithm, which let more time between each focuses - oldAlgorithm, -} + oldAlgorithm; -extension CameraFocusPointAlgorithmExtension on CameraFocusPointAlgorithm { FocusPointMode get mode { switch (this) { case CameraFocusPointAlgorithm.newAlgorithm: diff --git a/packages/smooth_app/lib/pages/scan/camera_image_cropper.dart b/packages/smooth_app/lib/pages/scan/camera_image_cropper.dart index b55634092b1..5358e45ed62 100644 --- a/packages/smooth_app/lib/pages/scan/camera_image_cropper.dart +++ b/packages/smooth_app/lib/pages/scan/camera_image_cropper.dart @@ -16,13 +16,13 @@ import 'package:typed_data/typed_buffers.dart'; /// * left01: .5, top01: .5, width01: .5, height01: ..5 the bottom right rect class CameraImageCropper extends AbstractCameraImageGetter { CameraImageCropper( - final CameraImage cameraImage, - final CameraDescription cameraDescription, { + super.cameraImage, + super.cameraDescription, { required this.left01, required this.top01, required this.width01, required this.height01, - }) : super(cameraImage, cameraDescription) { + }) { _computeCropParameters(); } diff --git a/packages/smooth_app/lib/pages/scan/camera_image_full_getter.dart b/packages/smooth_app/lib/pages/scan/camera_image_full_getter.dart index ac7704efa3f..4d1231b9ce0 100644 --- a/packages/smooth_app/lib/pages/scan/camera_image_full_getter.dart +++ b/packages/smooth_app/lib/pages/scan/camera_image_full_getter.dart @@ -11,9 +11,9 @@ import 'package:smooth_app/pages/scan/abstract_camera_image_getter.dart'; /// Use CameraController with imageFormatGroup: ImageFormatGroup.yuv420 class CameraImageFullGetter extends AbstractCameraImageGetter { CameraImageFullGetter( - final CameraImage cameraImage, - final CameraDescription cameraDescription, - ) : super(cameraImage, cameraDescription); + super.cameraImage, + super.cameraDescription, + ); @override Size getSize() => Size( diff --git a/packages/smooth_app/lib/pages/scan/inherited_data_manager.dart b/packages/smooth_app/lib/pages/scan/inherited_data_manager.dart index becd3e84a15..745adbb1f6b 100644 --- a/packages/smooth_app/lib/pages/scan/inherited_data_manager.dart +++ b/packages/smooth_app/lib/pages/scan/inherited_data_manager.dart @@ -2,9 +2,9 @@ import 'package:flutter/material.dart'; class InheritedDataManager extends StatefulWidget { const InheritedDataManager({ - Key? key, + super.key, required this.child, - }) : super(key: key); + }); final Widget child; diff --git a/packages/smooth_app/lib/pages/scan/lifecycle_manager.dart b/packages/smooth_app/lib/pages/scan/lifecycle_manager.dart index a4715082e02..c76c8d00641 100644 --- a/packages/smooth_app/lib/pages/scan/lifecycle_manager.dart +++ b/packages/smooth_app/lib/pages/scan/lifecycle_manager.dart @@ -19,8 +19,8 @@ class LifeCycleManager extends StatefulWidget { this.onStart, this.onVisible, this.onInvisible, - Key? key, - }) : super(key: key); + super.key, + }); final Function() onResume; final Function() onPause; diff --git a/packages/smooth_app/lib/pages/scan/ml_kit_scan_page.dart b/packages/smooth_app/lib/pages/scan/ml_kit_scan_page.dart index 058a579028c..587a19bfcde 100644 --- a/packages/smooth_app/lib/pages/scan/ml_kit_scan_page.dart +++ b/packages/smooth_app/lib/pages/scan/ml_kit_scan_page.dart @@ -25,8 +25,8 @@ import 'package:smooth_app/widgets/screen_visibility.dart'; class MLKitScannerPage extends LifecycleAwareStatefulWidget { const MLKitScannerPage({ - Key? key, - }) : super(key: key); + super.key, + }); @override MLKitScannerPageState createState() => MLKitScannerPageState(); @@ -241,7 +241,7 @@ class MLKitScannerPageState extends LifecycleAwareState // If the controller is initialized update the UI. _barcodeDecoder ??= MLKitScanDecoder( camera: _camera!, - scanMode: DevModeScanModeExtension.fromIndex( + scanMode: DevModeScanMode.fromIndex( _userPreferences.getDevModeIndex( UserPreferencesDevMode.userPreferencesEnumScanMode, ), diff --git a/packages/smooth_app/lib/pages/scan/scan_flash_toggle.dart b/packages/smooth_app/lib/pages/scan/scan_flash_toggle.dart index 5cc99b76627..ea855a05576 100644 --- a/packages/smooth_app/lib/pages/scan/scan_flash_toggle.dart +++ b/packages/smooth_app/lib/pages/scan/scan_flash_toggle.dart @@ -7,7 +7,7 @@ import 'package:smooth_app/generic_lib/design_constants.dart'; import 'package:smooth_app/helpers/camera_helper.dart'; class ScannerFlashToggleWidget extends StatelessWidget { - const ScannerFlashToggleWidget({Key? key}) : super(key: key); + const ScannerFlashToggleWidget(); @override Widget build(BuildContext context) { diff --git a/packages/smooth_app/lib/pages/scan/scan_header.dart b/packages/smooth_app/lib/pages/scan/scan_header.dart index d94f6a25f8e..4c2b2dc213e 100644 --- a/packages/smooth_app/lib/pages/scan/scan_header.dart +++ b/packages/smooth_app/lib/pages/scan/scan_header.dart @@ -7,7 +7,9 @@ import 'package:smooth_app/pages/scan/scan_page_helper.dart'; import 'package:smooth_app/widgets/ranking_floating_action_button.dart'; class ScanHeader extends StatelessWidget { - const ScanHeader({Key? key}) : super(key: key); + const ScanHeader({ + super.key, + }); static const Duration _duration = Duration(milliseconds: 50); static const double _visibleOpacity = 0.8; diff --git a/packages/smooth_app/lib/pages/scan/scan_visor.dart b/packages/smooth_app/lib/pages/scan/scan_visor.dart index d5741d2888d..ae15e6d8114 100644 --- a/packages/smooth_app/lib/pages/scan/scan_visor.dart +++ b/packages/smooth_app/lib/pages/scan/scan_visor.dart @@ -7,7 +7,9 @@ import 'package:smooth_app/pages/scan/scan_flash_toggle.dart'; /// This Widget is a [StatefulWidget], as it uses a [GlobalKey] to allow an /// external access class ScannerVisorWidget extends StatefulWidget { - const ScannerVisorWidget({Key? key}) : super(key: key); + const ScannerVisorWidget({ + super.key, + }); @override State createState() => ScannerVisorWidgetState(); diff --git a/packages/smooth_app/lib/pages/user_management/forgot_password_page.dart b/packages/smooth_app/lib/pages/user_management/forgot_password_page.dart index 425bd3e0e68..ecaaa769786 100644 --- a/packages/smooth_app/lib/pages/user_management/forgot_password_page.dart +++ b/packages/smooth_app/lib/pages/user_management/forgot_password_page.dart @@ -10,7 +10,7 @@ import 'package:smooth_app/generic_lib/widgets/smooth_card.dart'; import 'package:smooth_app/generic_lib/widgets/smooth_text_form_field.dart'; class ForgotPasswordPage extends StatefulWidget { - const ForgotPasswordPage({Key? key}) : super(key: key); + const ForgotPasswordPage(); @override State createState() => _ForgotPasswordPageState(); diff --git a/packages/smooth_app/lib/pages/user_management/login_page.dart b/packages/smooth_app/lib/pages/user_management/login_page.dart index 8924a3ff372..03f2073be1b 100644 --- a/packages/smooth_app/lib/pages/user_management/login_page.dart +++ b/packages/smooth_app/lib/pages/user_management/login_page.dart @@ -13,7 +13,7 @@ import 'package:smooth_app/pages/user_management/forgot_password_page.dart'; import 'package:smooth_app/pages/user_management/sign_up_page.dart'; class LoginPage extends StatefulWidget { - const LoginPage({Key? key}) : super(key: key); + const LoginPage(); @override State createState() => _LoginPageState(); diff --git a/packages/smooth_app/lib/widgets/lifecycle_aware_widget.dart b/packages/smooth_app/lib/widgets/lifecycle_aware_widget.dart index 7ed8f223ff0..d826ac4a739 100644 --- a/packages/smooth_app/lib/widgets/lifecycle_aware_widget.dart +++ b/packages/smooth_app/lib/widgets/lifecycle_aware_widget.dart @@ -13,7 +13,7 @@ abstract class LifecycleAwareStatefulWidget extends StatefulWidget { } class _LifecycleAwareStatefulElement extends StatefulElement { - _LifecycleAwareStatefulElement(StatefulWidget widget) : super(widget); + _LifecycleAwareStatefulElement(super.widget); @override LifecycleAwareState get state => diff --git a/packages/smooth_app/lib/widgets/screen_visibility.dart b/packages/smooth_app/lib/widgets/screen_visibility.dart index 0e37b57dba1..7223f3dd6ad 100644 --- a/packages/smooth_app/lib/widgets/screen_visibility.dart +++ b/packages/smooth_app/lib/widgets/screen_visibility.dart @@ -5,8 +5,8 @@ import 'package:visibility_detector/visibility_detector.dart'; class ScreenVisibilityDetector extends StatefulWidget { const ScreenVisibilityDetector({ required this.child, - Key? key, - }) : super(key: key); + super.key, + }); final Widget child; @@ -39,7 +39,7 @@ class _ScreenVisibilityDetectorState extends State { } class ScreenVisibility extends ValueNotifier { - ScreenVisibility(bool value) : super(value); + ScreenVisibility(super.value); bool get isVisible => value; diff --git a/packages/smooth_app/pubspec.lock b/packages/smooth_app/pubspec.lock index e513a521116..10fba3ce57b 100644 --- a/packages/smooth_app/pubspec.lock +++ b/packages/smooth_app/pubspec.lock @@ -251,7 +251,7 @@ packages: name: device_frame url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.1.0" device_info_plus: dependency: "direct main" description: @@ -297,12 +297,10 @@ packages: device_preview: dependency: "direct main" description: - path: device_preview - ref: HEAD - resolved-ref: "73c91514e5ab092bb7f911acc8a447e07e751120" - url: "https://github.com/monkeydaichan/flutter_device_preview.git" - source: git - version: "1.0.0" + name: device_preview + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" fake_async: dependency: transitive description: @@ -460,7 +458,7 @@ packages: name: freezed_annotation url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "2.0.3" fuchsia_remote_debug_protocol: dependency: transitive description: flutter diff --git a/packages/smooth_app/pubspec.yaml b/packages/smooth_app/pubspec.yaml index 3d146980c46..5da826a6a0b 100644 --- a/packages/smooth_app/pubspec.yaml +++ b/packages/smooth_app/pubspec.yaml @@ -4,21 +4,19 @@ version: 0.0.0+600 publish_to: "none" environment: - sdk: ">=2.15.1 <3.0.0" + sdk: ">=2.17.0 <3.0.0" + flutter: ">=3.0.0" dependencies: - flutter_lints: ^2.0.1 - carousel_slider: ^4.1.1 - cupertino_icons: ^1.0.5 - # Using a fork with fixes for flutter 3 until they are applied to the package - device_preview: - git: - url: https://github.com/monkeydaichan/flutter_device_preview.git - path: device_preview flutter: sdk: flutter flutter_localizations: sdk: flutter + flutter_lints: ^2.0.1 + + carousel_slider: ^4.1.1 + cupertino_icons: ^1.0.5 + device_preview: ^1.1.0 flutter_svg: ^1.1.0 flutter_map: ^1.0.0 flutter_widget_from_html_core: any @@ -36,7 +34,7 @@ dependencies: url: 'https://github.com/M123-dev/matomo-tracker.git' ref: 'fix-event-sending' modal_bottom_sheet: ^2.0.1 - openfoodfacts: ^1.18.1 + openfoodfacts: ^1.18.2 # openfoodfacts: # path: ../../../openfoodfacts-dart package_info_plus: ^1.4.2