feat: update component dependencies

Iconica-Development · Jun 27, 2024 · 8455800 · 8455800
1 parent cffb71f
commit 8455800
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 4.1.0
+
+- Update to flutter_registration 2.1.0
+- Update flutter_form_wizard to 6.3.2
+- Update flutter_profile to 1.5.0
+
 ## 4.0.1
 
 - Fix registrationRepository not being passed to the registration screen.

diff --git a/lib/src/user_stories/flutter_user_userstory_go_router.dart b/lib/src/user_stories/flutter_user_userstory_go_router.dart
@@ -65,7 +65,7 @@ List<GoRoute> getAuthStoryRoutes(
                         SnackBar(
                           backgroundColor:
                               configuration.loginErrorSnackbarBackgroundColor ??
-                                  theme.colorScheme.onBackground,
+                                  theme.colorScheme.onSurface,
                           content: Column(
                             mainAxisSize: MainAxisSize.min,
                             children: [
@@ -74,7 +74,7 @@ List<GoRoute> getAuthStoryRoutes(
                                 style: configuration
                                         .loginErrorSnackbarTitleTextStyle ??
                                     theme.textTheme.titleSmall?.copyWith(
-                                      color: theme.colorScheme.background,
+                                      color: theme.colorScheme.surface,
                                     ),
                               ),
                               const SizedBox(height: 8),
@@ -83,7 +83,7 @@ List<GoRoute> getAuthStoryRoutes(
                                 style: configuration
                                         .loginErrorSnackbarMessageTextStyle ??
                                     theme.textTheme.bodySmall?.copyWith(
-                                      color: theme.colorScheme.background,
+                                      color: theme.colorScheme.surface,
                                       height: 1.3,
                                     ),
                                 textAlign: TextAlign.center,
@@ -230,13 +230,13 @@ List<GoRoute> getAuthStoryRoutes(
                               Text(
                                 result.requestPasswordError!.title,
                                 style: theme.textTheme.titleSmall?.copyWith(
-                                  color: theme.colorScheme.onBackground,
+                                  color: theme.colorScheme.onSurface,
                                 ),
                               ),
                               Text(
                                 result.requestPasswordError!.message,
                                 style: theme.textTheme.bodySmall?.copyWith(
-                                  color: theme.colorScheme.onBackground,
+                                  color: theme.colorScheme.onSurface,
                                   height: 1.3,
                                 ),
                                 textAlign: TextAlign.center,

diff --git a/lib/src/user_stories/flutter_user_userstory_navigator.dart b/lib/src/user_stories/flutter_user_userstory_navigator.dart
@@ -50,15 +50,15 @@ Widget _loginScreen(
                 SnackBar(
                   backgroundColor:
                       configuration.loginErrorSnackbarBackgroundColor ??
-                          theme.colorScheme.onBackground,
+                          theme.colorScheme.onSurface,
                   content: Column(
                     mainAxisSize: MainAxisSize.min,
                     children: [
                       Text(
                         result.loginError!.title,
                         style: configuration.loginErrorSnackbarTitleTextStyle ??
                             theme.textTheme.titleSmall?.copyWith(
-                              color: theme.colorScheme.background,
+                              color: theme.colorScheme.surface,
                             ),
                       ),
                       const SizedBox(height: 8),
@@ -67,7 +67,7 @@ Widget _loginScreen(
                         style:
                             configuration.loginErrorSnackbarMessageTextStyle ??
                                 theme.textTheme.bodySmall?.copyWith(
-                                  color: theme.colorScheme.background,
+                                  color: theme.colorScheme.surface,
                                   height: 1.3,
                                 ),
                         textAlign: TextAlign.center,
@@ -224,13 +224,13 @@ Widget _forgotPasswordScreen(
                       Text(
                         result.requestPasswordError!.title,
                         style: theme.textTheme.titleSmall?.copyWith(
-                          color: theme.colorScheme.onBackground,
+                          color: theme.colorScheme.onSurface,
                         ),
                       ),
                       Text(
                         result.requestPasswordError!.message,
                         style: theme.textTheme.bodySmall?.copyWith(
-                          color: theme.colorScheme.onBackground,
+                          color: theme.colorScheme.onSurface,
                           height: 1.3,
                         ),
                         textAlign: TextAlign.center,

diff --git a/lib/src/widgets/image_picker_input.dart b/lib/src/widgets/image_picker_input.dart
@@ -8,6 +8,7 @@ class FlutterFormInputImage extends FlutterFormInputWidget<Uint8List> {
   const FlutterFormInputImage({
     required super.controller,
     required this.imagePickerConfig,
+    required this.validationMessage,
     super.key,
     super.label,
     this.firstName,
@@ -16,16 +17,16 @@ class FlutterFormInputImage extends FlutterFormInputWidget<Uint8List> {
 
   final String? firstName;
   final String? lastName;
+  final String validationMessage;
   final ImagePickerConfig imagePickerConfig;
 
   @override
   Widget build(BuildContext context) {
     super.registerController(context);
 
-    var _ = getTranslator(context);
     return ImageFormField(
       onSaved: controller.onSaved,
-      validator: (value) => controller.onValidate(value, _),
+      validator: (value) => controller.onValidate(value, validationMessage),
       initialValue: controller.value,
       imagePickerConfig: imagePickerConfig,
     );
@@ -168,12 +169,16 @@ class FlutterFormInputImageController
   }
 
   @override
-  String? onValidate(
-    Uint8List? value,
-    String Function(String, {List<String>? params}) translator,
-  ) =>
-      null;
+  void Function(Uint8List? value)? onSubmit;
 
   @override
-  void Function(Uint8List? value)? onSubmit;
+  String? onValidate(Uint8List? value, String validationMessage) {
+    if (mandatory) {
+      if (value == null || value.isEmpty) {
+        return validationMessage;
+      }
+    }
+
+    return null;
+  }
 }
diff --git a/lib/src/widgets/onboarding.dart b/lib/src/widgets/onboarding.dart
@@ -72,6 +72,7 @@ class _OnboardingState extends State<Onboarding> {
                       FlutterFormInputImage(
                         firstName: 'mike',
                         lastName: 'van der velden',
+                        validationMessage: 'Please select an image',
                         controller: imageController,
                         imagePickerConfig: getImagePickerConfig(),
                       ),
@@ -85,6 +86,7 @@ class _OnboardingState extends State<Onboarding> {
                           border: OutlineInputBorder(),
                           contentPadding: EdgeInsets.symmetric(horizontal: 8),
                         ),
+                        validationMessage: 'Please enter your first name',
                       ),
                       const SizedBox(
                         height: 20,
@@ -102,6 +104,7 @@ class _OnboardingState extends State<Onboarding> {
                             border: OutlineInputBorder(),
                             contentPadding: EdgeInsets.symmetric(horizontal: 8),
                           ),
+                          validationMessage: 'Please enter your bio',
                         ),
                       ),
                     ],

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: flutter_user
 description: "Flutter Userstory for onboarding, login, and registration."
 publish_to: "none"
-version: 4.0.1
+version: 4.1.0
 
 environment:
   sdk: ">=3.2.5 <4.0.0"
@@ -22,19 +22,19 @@ dependencies:
   flutter_registration:
     git:
       url: https://github.com/Iconica-Development/flutter_registration
-      ref: 2.0.4
+      ref: 2.1.0
   flutter_form_wizard:
     git:
       url: https://github.com/Iconica-Development/flutter_form_wizard
-      ref: 6.2.5
+      ref: 6.3.2
   flutter_stepper:
     git:
       url: https://github.com/Iconica-Development/stepper
       ref: 2.2.0
   flutter_profile:
     git:
       url: https://github.com/Iconica-Development/flutter_profile
-      ref: 1.3.0
+      ref: 1.5.0
   flutter_image_picker:
     git:
       url: https://github.com/Iconica-Development/flutter_image_picker
@@ -47,6 +47,5 @@ dev_dependencies:
     git:
       url: https://github.com/Iconica-Development/flutter_iconica_analysis
       ref: 6.0.0
-
 flutter:
   uses-material-design: true