imp: revert messages.userHint if provided

NearHuscarl · Mar 15, 2022 · fc1b98f · fc1b98f
1 parent feecdf0
commit fc1b98f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -89,7 +89,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "3.0.0"
+    version: "3.1.0"
   flutter_signin_button:
     dependency: "direct main"
     description:
@@ -142,6 +142,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.12.11"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.3"
   meta:
     dependency: transitive
     description:
@@ -230,7 +237,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.3"
+    version: "0.4.8"
   typed_data:
     dependency: transitive
     description:

diff --git a/lib/src/providers/login_messages.dart b/lib/src/providers/login_messages.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 
 class LoginMessages with ChangeNotifier {
   LoginMessages({
-    this.userHint = defaultUserHint,
+    this.userHint,
     this.passwordHint = defaultPasswordHint,
     this.confirmPasswordHint = defaultConfirmPasswordHint,
     this.forgotPasswordButton = defaultForgotPasswordButton,
@@ -38,7 +38,6 @@ class LoginMessages with ChangeNotifier {
     this.recoverCodePasswordDescription = defaultRecoverCodePasswordDescription,
   });
 
-  static const defaultUserHint = 'Email';
   static const defaultPasswordHint = 'Password';
   static const defaultConfirmPasswordHint = 'Confirm Password';
   static const defaultForgotPasswordButton = 'Forgot Password?';
@@ -80,8 +79,8 @@ class LoginMessages with ChangeNotifier {
   static const defaultConfirmSignupSuccess = 'Account confirmed.';
 
   /// Hint text of the userHint [TextField]
-  /// By default is Email
-  final String userHint;
+  /// Default will be selected based on userType
+  final String? userHint;
 
   /// Additional signup form button's label
   final String additionalSignUpSubmitButton;

diff --git a/lib/src/widgets/cards/login_card.dart b/lib/src/widgets/cards/login_card.dart
@@ -284,7 +284,8 @@ class _LoginCardState extends State<_LoginCard> with TickerProviderStateMixin {
       width: width,
       loadingController: widget.loadingController,
       interval: _nameTextFieldLoadingAnimationInterval,
-      labelText: TextFieldUtils.getLabelText(widget.userType),
+      labelText:
+          messages.userHint ?? TextFieldUtils.getLabelText(widget.userType),
       autofillHints: _isSubmitting
           ? null
           : [TextFieldUtils.getAutofillHints(widget.userType)],