From f40657c57e932395bb159b3795f3cc830ddb5a0c Mon Sep 17 00:00:00 2001 From: Thomas Klein Langenhorst Date: Tue, 28 Mar 2023 10:20:12 +0200 Subject: [PATCH 1/2] Bump `flutter_input_library` to version 2.0.0, remove unnecessary `riverpod` dependency --- CHANGELOG.md | 7 ++++++- example/ios/Runner.xcodeproj/project.pbxproj | 4 +++- example/pubspec.lock | 16 ++++------------ lib/src/form.dart | 10 ++++------ lib/src/widgets/input/abstractions.dart | 3 +-- .../input_carousel/input_carousel.dart | 6 ++---- .../input_date_picker/input_date_picker.dart | 6 ++---- .../widgets/input/input_types/input_email.dart | 6 ++---- .../input_number_picker/input_number_picker.dart | 6 ++---- .../input_password/input_password.dart | 6 ++---- .../input/input_types/input_plain_text.dart | 11 +++++------ .../input_types/input_slider/input_slider.dart | 6 ++---- .../input_types/input_switch/input_switch.dart | 6 ++---- lib/utils/providers.dart | 10 ---------- lib/utils/translation_service.dart | 6 ++---- pubspec.yaml | 6 ++---- 16 files changed, 41 insertions(+), 74 deletions(-) delete mode 100644 lib/utils/providers.dart diff --git a/CHANGELOG.md b/CHANGELOG.md index d87d01f..123daec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -70,4 +70,9 @@ ## 5.0.9 - January 18th 2023 -- `flutter_input_library` add initial time picker parameter \ No newline at end of file +- `flutter_input_library` add initial time picker parameter + +## 6.0.0 - march 28th 2023 + +- Bump `flutter_input_library` to version 2.0.0 +- Remove unnecessary `riverpod` dependency \ No newline at end of file diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index d9bd38c..fe3d67b 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -171,6 +171,7 @@ /* Begin PBXShellScriptBuildPhase section */ 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -185,6 +186,7 @@ }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); diff --git a/example/pubspec.lock b/example/pubspec.lock index 7fbf65f..faf7dee 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -68,16 +68,16 @@ packages: path: ".." relative: true source: path - version: "5.0.9" + version: "6.0.0" flutter_input_library: dependency: transitive description: path: "." - ref: "1.0.6" - resolved-ref: c55174c2a35071677b6dd5bfba1afe5c466103aa + ref: "2.0.0" + resolved-ref: "7b3a6dba90b85c108983fa8b94fa2e79aeb67316" url: "https://github.com/Iconica-Development/flutter_input_library" source: git - version: "1.0.6" + version: "2.0.0" flutter_lints: dependency: "direct dev" description: @@ -128,14 +128,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.0" - localization: - dependency: transitive - description: - name: localization - sha256: "01d892155364dc456e1141dd8003e43c98d457f2b51fe1b8984766bad2a3fd72" - url: "https://pub.dev" - source: hosted - version: "2.1.0" matcher: dependency: transitive description: diff --git a/lib/src/form.dart b/lib/src/form.dart index 045a257..3b295d2 100644 --- a/lib/src/form.dart +++ b/lib/src/form.dart @@ -3,8 +3,6 @@ // SPDX-License-Identifier: BSD-3-Clause import 'package:flutter/material.dart'; -import 'package:flutter_form_wizard/utils/translation_service.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import '../flutter_form.dart'; import 'utils/form_page_controller.dart'; import 'utils/formstate.dart' as fs; @@ -180,7 +178,7 @@ import 'utils/formstate.dart' as fs; /// ), /// ), /// ``` -class FlutterForm extends ConsumerStatefulWidget { +class FlutterForm extends StatefulWidget { const FlutterForm({ Key? key, required this.options, @@ -191,10 +189,10 @@ class FlutterForm extends ConsumerStatefulWidget { final FlutterFormController formController; @override - ConsumerState createState() => _FlutterFormState(); + State createState() => _FlutterFormState(); } -class _FlutterFormState extends ConsumerState { +class _FlutterFormState extends State { late FlutterFormController _formController; @override @@ -228,7 +226,7 @@ class _FlutterFormState extends ConsumerState { @override Widget build(BuildContext context) { - var _ = getTranslator(context, ref); + var _ = getTranslator(context); return Stack( children: [ diff --git a/lib/src/widgets/input/abstractions.dart b/lib/src/widgets/input/abstractions.dart index 9cc1132..62bf537 100644 --- a/lib/src/widgets/input/abstractions.dart +++ b/lib/src/widgets/input/abstractions.dart @@ -3,7 +3,6 @@ // SPDX-License-Identifier: BSD-3-Clause import 'package:flutter/material.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import '/src/utils/formstate.dart' as fs; /// Abstract class for the input widgets used in a [FlutterForm]. @@ -14,7 +13,7 @@ import '/src/utils/formstate.dart' as fs; /// label is a standard parameter to normally sets the label of the input. /// /// [registerController] should be called to register the given [controller] to the form page. -abstract class FlutterFormInputWidget extends ConsumerWidget { +abstract class FlutterFormInputWidget extends StatelessWidget { const FlutterFormInputWidget({ Key? key, required this.controller, diff --git a/lib/src/widgets/input/input_types/input_carousel/input_carousel.dart b/lib/src/widgets/input/input_types/input_carousel/input_carousel.dart index 3f5680b..db8d745 100644 --- a/lib/src/widgets/input/input_types/input_carousel/input_carousel.dart +++ b/lib/src/widgets/input/input_types/input_carousel/input_carousel.dart @@ -3,8 +3,6 @@ // SPDX-License-Identifier: BSD-3-Clause import 'package:flutter/material.dart'; -import 'package:flutter_form_wizard/utils/translation_service.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_form_wizard/flutter_form.dart'; import 'package:flutter_input_library/flutter_input_library.dart' as input; @@ -28,9 +26,9 @@ class FlutterFormInputCarousel extends FlutterFormInputWidget { final double height; @override - Widget build(BuildContext context, WidgetRef ref) { + Widget build(BuildContext context) { String Function(String, {List? params}) _ = - getTranslator(context, ref); + getTranslator(context); super.registerController(context); diff --git a/lib/src/widgets/input/input_types/input_date_picker/input_date_picker.dart b/lib/src/widgets/input/input_types/input_date_picker/input_date_picker.dart index bbb85df..8835215 100644 --- a/lib/src/widgets/input/input_types/input_date_picker/input_date_picker.dart +++ b/lib/src/widgets/input/input_types/input_date_picker/input_date_picker.dart @@ -4,8 +4,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_input_library/flutter_input_library.dart' as input; -import 'package:flutter_form_wizard/utils/translation_service.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:intl/intl.dart'; import '../../../../../flutter_form.dart'; @@ -41,9 +39,9 @@ class FlutterFormInputDateTime extends FlutterFormInputWidget { final IconData icon; @override - Widget build(BuildContext context, WidgetRef ref) { + Widget build(BuildContext context) { String Function(String, {List? params}) _ = - getTranslator(context, ref); + getTranslator(context); super.registerController(context); return input.FlutterFormInputDateTime( diff --git a/lib/src/widgets/input/input_types/input_email.dart b/lib/src/widgets/input/input_types/input_email.dart index a74115f..99346f1 100644 --- a/lib/src/widgets/input/input_types/input_email.dart +++ b/lib/src/widgets/input/input_types/input_email.dart @@ -3,9 +3,7 @@ // SPDX-License-Identifier: BSD-3-Clause import 'package:flutter/material.dart'; -import 'package:flutter_form_wizard/utils/translation_service.dart'; import 'package:flutter_input_library/flutter_input_library.dart' as input; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import '../../../../flutter_form.dart'; @@ -26,9 +24,9 @@ class FlutterFormInputEmail extends FlutterFormInputWidget { ); @override - Widget build(BuildContext context, WidgetRef ref) { + Widget build(BuildContext context) { String Function(String, {List? params}) _ = - getTranslator(context, ref); + getTranslator(context); super.registerController(context); diff --git a/lib/src/widgets/input/input_types/input_number_picker/input_number_picker.dart b/lib/src/widgets/input/input_types/input_number_picker/input_number_picker.dart index ef024d3..2d7ebc8 100644 --- a/lib/src/widgets/input/input_types/input_number_picker/input_number_picker.dart +++ b/lib/src/widgets/input/input_types/input_number_picker/input_number_picker.dart @@ -3,9 +3,7 @@ // SPDX-License-Identifier: BSD-3-Clause import 'package:flutter/material.dart'; -import 'package:flutter_form_wizard/utils/translation_service.dart'; import 'package:flutter_input_library/flutter_input_library.dart' as input; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import '../../../../../flutter_form.dart'; /// Input for a number used in a [FlutterForm]. @@ -29,9 +27,9 @@ class FlutterFormInputNumberPicker extends FlutterFormInputWidget { final int maxValue; @override - Widget build(BuildContext context, WidgetRef ref) { + Widget build(BuildContext context) { String Function(String, {List? params}) _ = - getTranslator(context, ref); + getTranslator(context); super.registerController(context); diff --git a/lib/src/widgets/input/input_types/input_password/input_password.dart b/lib/src/widgets/input/input_types/input_password/input_password.dart index cafce58..597d11e 100644 --- a/lib/src/widgets/input/input_types/input_password/input_password.dart +++ b/lib/src/widgets/input/input_types/input_password/input_password.dart @@ -3,9 +3,7 @@ // SPDX-License-Identifier: BSD-3-Clause import 'package:flutter/material.dart'; -import 'package:flutter_form_wizard/utils/translation_service.dart'; import 'package:flutter_input_library/flutter_input_library.dart' as input; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import '../../../../../flutter_form.dart'; /// Input for a password used in a [FlutterForm]. @@ -24,11 +22,11 @@ class FlutterFormInputPassword extends FlutterFormInputWidget { label: label); @override - Widget build(BuildContext context, WidgetRef ref) { + Widget build(BuildContext context) { super.registerController(context); String Function(String, {List? params}) _ = - getTranslator(context, ref); + getTranslator(context); return input.FlutterFormInputPassword( initialValue: controller.value, diff --git a/lib/src/widgets/input/input_types/input_plain_text.dart b/lib/src/widgets/input/input_types/input_plain_text.dart index 60ae2ef..7b67587 100644 --- a/lib/src/widgets/input/input_types/input_plain_text.dart +++ b/lib/src/widgets/input/input_types/input_plain_text.dart @@ -4,7 +4,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_input_library/flutter_input_library.dart' as input; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import '../../../../flutter_form.dart'; @@ -39,9 +38,9 @@ class FlutterFormInputPlainText extends FlutterFormInputWidget { final TextInputType? keyboardType; @override - Widget build(BuildContext context, WidgetRef ref) { + Widget build(BuildContext context) { String Function(String, {List? params}) _ = - getTranslator(context, ref); + getTranslator(context); super.registerController(context); @@ -75,7 +74,7 @@ class FlutterFormInputPlainText extends FlutterFormInputWidget { /// Hint can be set to set a hint inside the field. /// /// MaxCharacters can be set to set a maximum amount of characters. -class FlutterFormInputMultiLine extends ConsumerWidget { +class FlutterFormInputMultiLine extends StatelessWidget { const FlutterFormInputMultiLine({ Key? key, required this.controller, @@ -93,9 +92,9 @@ class FlutterFormInputMultiLine extends ConsumerWidget { final int? maxCharacters; @override - Widget build(BuildContext context, WidgetRef ref) { + Widget build(BuildContext context) { String Function(String, {List? params}) _ = - getTranslator(context, ref); + getTranslator(context); return input.FlutterFormInputMultiLine( label: label, diff --git a/lib/src/widgets/input/input_types/input_slider/input_slider.dart b/lib/src/widgets/input/input_types/input_slider/input_slider.dart index ec0d7ec..6a7e604 100644 --- a/lib/src/widgets/input/input_types/input_slider/input_slider.dart +++ b/lib/src/widgets/input/input_types/input_slider/input_slider.dart @@ -4,8 +4,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_input_library/flutter_input_library.dart' as input; -import 'package:flutter_form_wizard/utils/translation_service.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import '../../../../../flutter_form.dart'; @@ -31,9 +29,9 @@ class FlutterFormInputSlider extends FlutterFormInputWidget { final int maxValue; @override - Widget build(BuildContext context, WidgetRef ref) { + Widget build(BuildContext context) { String Function(String, {List? params}) _ = - getTranslator(context, ref); + getTranslator(context); super.registerController(context); diff --git a/lib/src/widgets/input/input_types/input_switch/input_switch.dart b/lib/src/widgets/input/input_types/input_switch/input_switch.dart index a2c0789..5e4360d 100644 --- a/lib/src/widgets/input/input_types/input_switch/input_switch.dart +++ b/lib/src/widgets/input/input_types/input_switch/input_switch.dart @@ -5,8 +5,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_form_wizard/flutter_form.dart'; import 'package:flutter_input_library/flutter_input_library.dart' as input; -import 'package:flutter_form_wizard/utils/translation_service.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; /// Input for a boolean switch. Used in a [FlutterForm]. /// @@ -24,9 +22,9 @@ class FlutterFormInputSwitch extends FlutterFormInputWidget { label: label); @override - Widget build(BuildContext context, WidgetRef ref) { + Widget build(BuildContext context) { String Function(String, {List? params}) _ = - getTranslator(context, ref); + getTranslator(context); super.registerController(context); diff --git a/lib/utils/providers.dart b/lib/utils/providers.dart deleted file mode 100644 index c77d8ff..0000000 --- a/lib/utils/providers.dart +++ /dev/null @@ -1,10 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Iconica -// -// SPDX-License-Identifier: BSD-3-Clause - -import 'package:flutter_form_wizard/utils/translation_service.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; - -/// Provides the [ShellTranslationService] -final translationServiceProvider = - Provider((ref) => ShellTranslationService()); diff --git a/lib/utils/translation_service.dart b/lib/utils/translation_service.dart index 0c92438..264c1f0 100644 --- a/lib/utils/translation_service.dart +++ b/lib/utils/translation_service.dart @@ -3,8 +3,6 @@ // SPDX-License-Identifier: BSD-3-Clause import 'package:flutter/material.dart'; -import 'package:flutter_form_wizard/utils/providers.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; abstract class TranslationService { TranslationService._(); @@ -35,9 +33,9 @@ class ShellTranslationService implements TranslationService { } } -Translator getTranslator(BuildContext context, WidgetRef ref) { +Translator getTranslator(BuildContext context) { try { - var translator = ref.read(translationServiceProvider).translate; + var translator = ShellTranslationService().translate; return ( String key, { List? params, diff --git a/pubspec.yaml b/pubspec.yaml index d138926..8660795 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_form_wizard description: A new Flutter package project. -version: 5.0.9 +version: 6.0.0 homepage: https://github.com/Iconica-Development/flutter_form_wizard publish_to: none @@ -14,13 +14,11 @@ dependencies: sdk: flutter flutter_localizations: sdk: flutter - flutter_riverpod: ^2.1.1 intl: ^0.17.0 - localization: ^2.1.0 flutter_input_library: git: url: https://github.com/Iconica-Development/flutter_input_library - ref: 1.0.6 + ref: 2.0.0 dev_dependencies: flutter_test: From ff0463120c365b0673d5b5f85d462b8c77f611de Mon Sep 17 00:00:00 2001 From: Thomas Klein Langenhorst Date: Tue, 28 Mar 2023 10:22:25 +0200 Subject: [PATCH 2/2] Fix: fix formatting --- .../input/input_types/input_carousel/input_carousel.dart | 3 +-- .../input_types/input_date_picker/input_date_picker.dart | 3 +-- lib/src/widgets/input/input_types/input_email.dart | 3 +-- .../input_number_picker/input_number_picker.dart | 3 +-- .../input/input_types/input_password/input_password.dart | 3 +-- lib/src/widgets/input/input_types/input_plain_text.dart | 6 ++---- .../input/input_types/input_slider/input_slider.dart | 3 +-- .../input/input_types/input_switch/input_switch.dart | 3 +-- 8 files changed, 9 insertions(+), 18 deletions(-) diff --git a/lib/src/widgets/input/input_types/input_carousel/input_carousel.dart b/lib/src/widgets/input/input_types/input_carousel/input_carousel.dart index db8d745..95840c0 100644 --- a/lib/src/widgets/input/input_types/input_carousel/input_carousel.dart +++ b/lib/src/widgets/input/input_types/input_carousel/input_carousel.dart @@ -27,8 +27,7 @@ class FlutterFormInputCarousel extends FlutterFormInputWidget { @override Widget build(BuildContext context) { - String Function(String, {List? params}) _ = - getTranslator(context); + String Function(String, {List? params}) _ = getTranslator(context); super.registerController(context); diff --git a/lib/src/widgets/input/input_types/input_date_picker/input_date_picker.dart b/lib/src/widgets/input/input_types/input_date_picker/input_date_picker.dart index 8835215..614995e 100644 --- a/lib/src/widgets/input/input_types/input_date_picker/input_date_picker.dart +++ b/lib/src/widgets/input/input_types/input_date_picker/input_date_picker.dart @@ -40,8 +40,7 @@ class FlutterFormInputDateTime extends FlutterFormInputWidget { @override Widget build(BuildContext context) { - String Function(String, {List? params}) _ = - getTranslator(context); + String Function(String, {List? params}) _ = getTranslator(context); super.registerController(context); return input.FlutterFormInputDateTime( diff --git a/lib/src/widgets/input/input_types/input_email.dart b/lib/src/widgets/input/input_types/input_email.dart index 99346f1..831851f 100644 --- a/lib/src/widgets/input/input_types/input_email.dart +++ b/lib/src/widgets/input/input_types/input_email.dart @@ -25,8 +25,7 @@ class FlutterFormInputEmail extends FlutterFormInputWidget { @override Widget build(BuildContext context) { - String Function(String, {List? params}) _ = - getTranslator(context); + String Function(String, {List? params}) _ = getTranslator(context); super.registerController(context); diff --git a/lib/src/widgets/input/input_types/input_number_picker/input_number_picker.dart b/lib/src/widgets/input/input_types/input_number_picker/input_number_picker.dart index 2d7ebc8..6fc7ecf 100644 --- a/lib/src/widgets/input/input_types/input_number_picker/input_number_picker.dart +++ b/lib/src/widgets/input/input_types/input_number_picker/input_number_picker.dart @@ -28,8 +28,7 @@ class FlutterFormInputNumberPicker extends FlutterFormInputWidget { @override Widget build(BuildContext context) { - String Function(String, {List? params}) _ = - getTranslator(context); + String Function(String, {List? params}) _ = getTranslator(context); super.registerController(context); diff --git a/lib/src/widgets/input/input_types/input_password/input_password.dart b/lib/src/widgets/input/input_types/input_password/input_password.dart index 597d11e..27733f7 100644 --- a/lib/src/widgets/input/input_types/input_password/input_password.dart +++ b/lib/src/widgets/input/input_types/input_password/input_password.dart @@ -25,8 +25,7 @@ class FlutterFormInputPassword extends FlutterFormInputWidget { Widget build(BuildContext context) { super.registerController(context); - String Function(String, {List? params}) _ = - getTranslator(context); + String Function(String, {List? params}) _ = getTranslator(context); return input.FlutterFormInputPassword( initialValue: controller.value, diff --git a/lib/src/widgets/input/input_types/input_plain_text.dart b/lib/src/widgets/input/input_types/input_plain_text.dart index 7b67587..1aff94b 100644 --- a/lib/src/widgets/input/input_types/input_plain_text.dart +++ b/lib/src/widgets/input/input_types/input_plain_text.dart @@ -39,8 +39,7 @@ class FlutterFormInputPlainText extends FlutterFormInputWidget { @override Widget build(BuildContext context) { - String Function(String, {List? params}) _ = - getTranslator(context); + String Function(String, {List? params}) _ = getTranslator(context); super.registerController(context); @@ -93,8 +92,7 @@ class FlutterFormInputMultiLine extends StatelessWidget { @override Widget build(BuildContext context) { - String Function(String, {List? params}) _ = - getTranslator(context); + String Function(String, {List? params}) _ = getTranslator(context); return input.FlutterFormInputMultiLine( label: label, diff --git a/lib/src/widgets/input/input_types/input_slider/input_slider.dart b/lib/src/widgets/input/input_types/input_slider/input_slider.dart index 6a7e604..6544cd8 100644 --- a/lib/src/widgets/input/input_types/input_slider/input_slider.dart +++ b/lib/src/widgets/input/input_types/input_slider/input_slider.dart @@ -30,8 +30,7 @@ class FlutterFormInputSlider extends FlutterFormInputWidget { @override Widget build(BuildContext context) { - String Function(String, {List? params}) _ = - getTranslator(context); + String Function(String, {List? params}) _ = getTranslator(context); super.registerController(context); diff --git a/lib/src/widgets/input/input_types/input_switch/input_switch.dart b/lib/src/widgets/input/input_types/input_switch/input_switch.dart index 5e4360d..915a3ad 100644 --- a/lib/src/widgets/input/input_types/input_switch/input_switch.dart +++ b/lib/src/widgets/input/input_types/input_switch/input_switch.dart @@ -23,8 +23,7 @@ class FlutterFormInputSwitch extends FlutterFormInputWidget { @override Widget build(BuildContext context) { - String Function(String, {List? params}) _ = - getTranslator(context); + String Function(String, {List? params}) _ = getTranslator(context); super.registerController(context);