Merge commit '7012942ce50a2de8c8a481595d8bca6e7a02c4de' into feat/buttons_and_fields

lib/src/auth_screen.dart

@@ -19,6 +19,8 @@ class AuthScreen extends StatefulWidget {
     this.customBackgroundColor,
     this.nextButtonBuilder,
     this.previousButtonBuilder,
+    this.titleWidget,
+    this.loginButton,
     super.key,
   }) : assert(steps.length > 0, 'At least one step is required');
 
@@ -35,6 +37,8 @@ class AuthScreen extends StatefulWidget {
   final Color? customBackgroundColor;
   final Widget Function(Future<void> Function(), String)? nextButtonBuilder;
   final Widget? Function(VoidCallback, String)? previousButtonBuilder;
+  final Widget? titleWidget;
+  final Widget? loginButton;
 
   @override
   State<AuthScreen> createState() => _AuthScreenState();
@@ -113,38 +117,40 @@ class _AuthScreenState extends State<AuthScreen> {
           children: <Widget>[
             for (AuthStep step in widget.steps)
               Column(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                // mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
+                  // Text(widget.title),
+                  if (widget.titleWidget != null) widget.titleWidget!,
+                  const SizedBox(height: 40),
                   Flexible(
-                    child: Center(
+                    child: ListView(
-                      child: ListView(
+                      physics: const ClampingScrollPhysics(),
-                        physics: const ClampingScrollPhysics(),
+                      shrinkWrap: true,
-                        shrinkWrap: true,
+                      padding: const EdgeInsets.symmetric(
-                        padding: const EdgeInsets.symmetric(
+                        vertical: 8.0,
-                          vertical: 8.0,
+                        horizontal: 30.0,
-                          horizontal: 30.0,
-                        ),
-                        children: [
-                          for (AuthField field in step.fields)
-                            Align(
-                              child: Column(
-                                crossAxisAlignment: CrossAxisAlignment.start,
-                                children: [
-                                  if (field.title != null) ...[
-                                    field.title!,
-                                  ],
-                                  field.build(),
-                                ],
-                              ),
-                            )
-                        ],
                       ),
+                      children: [
+                        for (AuthField field in step.fields)
+                          Align(
+                            child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                if (field.title != null) ...[
+                                  field.title!,
+                                ],
+                                field.build(),
+                              ],
+                            ),
+                          )
+                      ],
                     ),
                   ),
+                  const Spacer(),
                   Padding(
                     padding: const EdgeInsets.only(
                       top: 15.0,
-                      bottom: 30.0,
+                      // bottom: 30.0,
                       left: 30.0,
                       right: 30.0,
                     ),
@@ -208,7 +214,12 @@ class _AuthScreenState extends State<AuthScreen> {
                             ),
                       ],
                     ),
-                  )
+                  ),
+                  if (widget.loginButton != null)
+                    Padding(
+                      padding: const EdgeInsets.all(8.0),
+                      child: widget.loginButton!,
+                    ),
                 ],
               ),
           ],

lib/src/config/registration_options.dart

@@ -18,6 +18,8 @@ class RegistrationOptions {
     this.nextButtonBuilder,
     this.previousButtonBuilder,
     this.backgroundColor,
+    this.titleWidget,
+    this.loginButton,
   });
 
   final RegistrationTranslations registrationTranslations;
@@ -31,6 +33,8 @@ class RegistrationOptions {
   final Widget? Function(VoidCallback onPressed, String label)?
       previousButtonBuilder;
   final Color? backgroundColor;
+  Widget? titleWidget;
+  Widget? loginButton;
 
   static List<AuthStep> getDefaultSteps({
     TextEditingController? emailController,

lib/src/model/auth_text_field.dart

@@ -19,6 +19,7 @@ class AuthTextField extends AuthField {
     this.onChange,
     this.hidden,
     this.onPassChanged,
+    this.textFieldDecoration,
   }) {
     textController =
         textEditingController ?? TextEditingController(text: value);
@@ -32,6 +33,7 @@ class AuthTextField extends AuthField {
   final Function(String value)? onChange;
   final bool? hidden;
   final Function(bool value)? onPassChanged;
+  final InputDecoration? textFieldDecoration;
 
   @override
   Widget build() {
@@ -55,29 +57,33 @@ class AuthTextField extends AuthField {
       }
     }
 
-    return TextFormField(
+    return Padding(
-      style: textStyle,
+      padding: const EdgeInsets.all(8.0),
-      decoration: InputDecoration(
+      child: TextFormField(
-        label: label,
+        style: textStyle,
-        hintText: hintText,
+        decoration: textFieldDecoration ??
-        suffix: suffix,
+            InputDecoration(
-      ),
+              label: label,
-      controller: textController,
+              hintText: hintText,
-      obscureText: hidden ?? obscureText,
+              suffix: suffix,
-      onChanged: (v) {
+            ),
-        value = v;
+        controller: textController,
-        onChange?.call(value);
+        obscureText: hidden ?? obscureText,
-      },
+        onChanged: (v) {
-      validator: (value) {
+          value = v;
-        for (var validator in validators) {
+          onChange?.call(value);
-          var output = validator(value);
+        },
-          if (output != null) {
+        validator: (value) {
-            return output;
+          for (var validator in validators) {
+            var output = validator(value);
+            if (output != null) {
+              return output;
+            }
           }
-        }
 
-        return null;
+          return null;
-      },
+        },
+      ),
     );
   }
 }

lib/src/registration_screen.dart

@@ -53,6 +53,8 @@ class RegistrationScreen extends StatelessWidget {
       nextButtonBuilder: registrationOptions.nextButtonBuilder,
       previousButtonBuilder: registrationOptions.previousButtonBuilder,
       customBackgroundColor: registrationOptions.backgroundColor,
+      titleWidget: registrationOptions.titleWidget,
+      loginButton: registrationOptions.loginButton,
     );
   }
 }