From 9f4996154812a6b0558f2a1b5b8514878deea915 Mon Sep 17 00:00:00 2001 From: Jacques Doeleman Date: Thu, 29 Sep 2022 16:29:38 +0200 Subject: [PATCH] Fixed some pull request comments Removed referemces to next_shell and removed some references image picker and removed a useless file --- README.md | 2 +- example/lib/example_pages/check_page.dart | 2 +- example/lib/form_example.dart | 1 - example/pubspec.lock | 16 ---------- example/test/widget_test.dart | 30 ------------------- lib/flutter_form.dart | 1 + lib/src/form.dart | 3 +- .../input_carousel/input_carousel.dart | 3 +- .../input/input_types/input_email.dart | 2 +- .../input_number_picker.dart | 2 +- .../input_types/input_password/password.dart | 2 +- .../input/input_types/input_plain_text.dart | 2 +- .../input_slider/input_slider.dart | 2 +- lib/{next_shell => utils}/form.dart | 0 lib/{next_shell => utils}/providers.dart | 2 +- .../translation_service.dart | 2 +- pubspec.yaml | 6 +--- test/flutter_form_test.dart | 1 - 18 files changed, 13 insertions(+), 66 deletions(-) delete mode 100644 example/test/widget_test.dart rename lib/{next_shell => utils}/form.dart (100%) rename lib/{next_shell => utils}/providers.dart (75%) rename lib/{next_shell => utils}/translation_service.dart (94%) diff --git a/README.md b/README.md index 4eeb803..325c1fa 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Flutter Image Picker +# Flutter Form Flutter Form is a package you can use to create a single or multi page form with premade or custom inputfields. diff --git a/example/lib/example_pages/check_page.dart b/example/lib/example_pages/check_page.dart index 04c2d7d..8dce2ff 100644 --- a/example/lib/example_pages/check_page.dart +++ b/example/lib/example_pages/check_page.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter_form/next_shell/form.dart'; +import 'package:flutter_form/flutter_form.dart'; class CheckPageExample { CheckPage showCheckpage( diff --git a/example/lib/form_example.dart b/example/lib/form_example.dart index d729ad2..0d7c025 100644 --- a/example/lib/form_example.dart +++ b/example/lib/form_example.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:flutter_form/flutter_form.dart'; -import 'package:flutter_form/next_shell/form.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:form_example/example_pages/age_page.dart'; import 'package:form_example/example_pages/carousel_page.dart'; diff --git a/example/pubspec.lock b/example/pubspec.lock index 5df93a1..c0b7486 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -50,13 +50,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.5" - equatable: - dependency: transitive - description: - name: equatable - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.5" fake_async: dependency: transitive description: @@ -156,15 +149,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.3" - shell_model: - dependency: transitive - description: - path: "packages/shell_model" - ref: dbf7155ab18e79b5ff1da73f31c7fe3b06c4c82a - resolved-ref: dbf7155ab18e79b5ff1da73f31c7fe3b06c4c82a - url: "git@bitbucket.org:iconicadevs/next_shell.git" - source: git - version: "0.0.3" sky_engine: dependency: transitive description: flutter diff --git a/example/test/widget_test.dart b/example/test/widget_test.dart deleted file mode 100644 index 28e6211..0000000 --- a/example/test/widget_test.dart +++ /dev/null @@ -1,30 +0,0 @@ -// // This is a basic Flutter widget test. -// // -// // To perform an interaction with a widget in your test, use the WidgetTester -// // utility in the flutter_test package. For example, you can send tap and scroll -// // gestures. You can also use WidgetTester to find child widgets in the widget -// // tree, read text, and verify that the values of widget properties are correct. - -// import 'package:flutter/material.dart'; -// import 'package:flutter_test/flutter_test.dart'; - -// import 'package:example/main.dart'; - -// void main() { -// testWidgets('Counter increments smoke test', (WidgetTester tester) async { -// // Build our app and trigger a frame. -// await tester.pumpWidget(const FormsExample()); - -// // Verify that our counter starts at 0. -// expect(find.text('0'), findsOneWidget); -// expect(find.text('1'), findsNothing); - -// // Tap the '+' icon and trigger a frame. -// await tester.tap(find.byIcon(Icons.add)); -// await tester.pump(); - -// // Verify that our counter has incremented. -// expect(find.text('0'), findsNothing); -// expect(find.text('1'), findsOneWidget); -// }); -// } diff --git a/lib/flutter_form.dart b/lib/flutter_form.dart index edbdbd1..5c1a1cb 100644 --- a/lib/flutter_form.dart +++ b/lib/flutter_form.dart @@ -1,3 +1,4 @@ export 'src/form.dart'; export 'src/widgets/input/abstractions.dart'; export 'src/widgets/input/input_types/input_types.dart'; +export 'utils/form.dart'; diff --git a/lib/src/form.dart b/lib/src/form.dart index 50b1cc5..bcefc97 100644 --- a/lib/src/form.dart +++ b/lib/src/form.dart @@ -1,8 +1,7 @@ import 'package:flutter/material.dart'; +import 'package:flutter_form/utils/translation_service.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import '../flutter_form.dart'; -import '../next_shell/form.dart'; -import '../next_shell/translation_service.dart'; import 'utils/form_page_controller.dart'; import 'utils/formstate.dart' as fs; 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 bea21f4..2e9867d 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 @@ -1,9 +1,8 @@ import 'package:flutter/material.dart'; +import 'package:flutter_form/utils/translation_service.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_form/flutter_form.dart'; -import 'package:flutter_form/next_shell/translation_service.dart'; - import 'carousel_form.dart'; /// Input for a carousel of items used in a [FlutterForm]. diff --git a/lib/src/widgets/input/input_types/input_email.dart b/lib/src/widgets/input/input_types/input_email.dart index e23c9b6..f635442 100644 --- a/lib/src/widgets/input/input_types/input_email.dart +++ b/lib/src/widgets/input/input_types/input_email.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; +import 'package:flutter_form/utils/translation_service.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:flutter_form/next_shell/translation_service.dart'; import '../../../../flutter_form.dart'; 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 f48a5a6..b9bb8c3 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 @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; +import 'package:flutter_form/utils/translation_service.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import '../../../../../flutter_form.dart'; -import 'package:flutter_form/next_shell/translation_service.dart'; import 'numberpicker.dart'; diff --git a/lib/src/widgets/input/input_types/input_password/password.dart b/lib/src/widgets/input/input_types/input_password/password.dart index 9ef1df1..834a54d 100644 --- a/lib/src/widgets/input/input_types/input_password/password.dart +++ b/lib/src/widgets/input/input_types/input_password/password.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; +import 'package:flutter_form/utils/translation_service.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import '../../../../../flutter_form.dart'; -import 'package:flutter_form/next_shell/translation_service.dart'; /// Generates a [TextFormField] for passwords. It requires a [FlutterFormInputController] /// as the [controller] parameter and an optional [Widget] as [label] 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 0489977..a8d44f3 100644 --- a/lib/src/widgets/input/input_types/input_plain_text.dart +++ b/lib/src/widgets/input/input_types/input_plain_text.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; +import 'package:flutter_form/utils/translation_service.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import '../../../../flutter_form.dart'; -import 'package:flutter_form/next_shell/translation_service.dart'; /// Input for plain text input used in a [FlutterForm]. /// 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 9c7446b..49a476b 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 @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_form/src/widgets/input/input_types/input_slider/slider.dart'; +import 'package:flutter_form/utils/translation_service.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:flutter_form/next_shell/translation_service.dart'; import '../../../../../flutter_form.dart'; diff --git a/lib/next_shell/form.dart b/lib/utils/form.dart similarity index 100% rename from lib/next_shell/form.dart rename to lib/utils/form.dart diff --git a/lib/next_shell/providers.dart b/lib/utils/providers.dart similarity index 75% rename from lib/next_shell/providers.dart rename to lib/utils/providers.dart index 6a58a6f..ed46630 100644 --- a/lib/next_shell/providers.dart +++ b/lib/utils/providers.dart @@ -1,4 +1,4 @@ -import 'package:flutter_form/next_shell/translation_service.dart'; +import 'package:flutter_form/utils/translation_service.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; /// Provides the [ShellTranslationService] diff --git a/lib/next_shell/translation_service.dart b/lib/utils/translation_service.dart similarity index 94% rename from lib/next_shell/translation_service.dart rename to lib/utils/translation_service.dart index 9798630..2432901 100644 --- a/lib/next_shell/translation_service.dart +++ b/lib/utils/translation_service.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter_form/next_shell/providers.dart'; +import 'package:flutter_form/utils/providers.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; abstract class TranslationService { diff --git a/pubspec.yaml b/pubspec.yaml index 98320fa..6cf096c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,11 +16,7 @@ dependencies: sdk: flutter flutter_riverpod: ^1.0.4 localization: ^2.1.0 - shell_model: - git: - url: git@bitbucket.org:iconicadevs/next_shell.git - ref: dbf7155ab18e79b5ff1da73f31c7fe3b06c4c82a - path: packages/shell_model + sliding_up_panel: ^2.0.0+1 uuid: ^3.0.6 diff --git a/test/flutter_form_test.dart b/test/flutter_form_test.dart index bb7f740..a665afd 100644 --- a/test/flutter_form_test.dart +++ b/test/flutter_form_test.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:flutter_form/flutter_form.dart'; -import 'package:flutter_form/next_shell/form.dart'; import 'package:flutter_test/flutter_test.dart'; void main() {