Merge commit '7012942ce50a2de8c8a481595d8bca6e7a02c4de' into feat/buttons_and_fields

This commit is contained in:
Jacques 2024-02-05 13:02:47 +01:00
commit 078574c214
4 changed files with 69 additions and 46 deletions

View file

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

View file

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

View file

@ -19,6 +19,7 @@ class AuthTextField extends AuthField {
this.onChange, this.onChange,
this.hidden, this.hidden,
this.onPassChanged, this.onPassChanged,
this.textFieldDecoration,
}) { }) {
textController = textController =
textEditingController ?? TextEditingController(text: value); textEditingController ?? TextEditingController(text: value);
@ -32,6 +33,7 @@ class AuthTextField extends AuthField {
final Function(String value)? onChange; final Function(String value)? onChange;
final bool? hidden; final bool? hidden;
final Function(bool value)? onPassChanged; final Function(bool value)? onPassChanged;
final InputDecoration? textFieldDecoration;
@override @override
Widget build() { Widget build() {
@ -55,9 +57,12 @@ class AuthTextField extends AuthField {
} }
} }
return TextFormField( return Padding(
padding: const EdgeInsets.all(8.0),
child: TextFormField(
style: textStyle, style: textStyle,
decoration: InputDecoration( decoration: textFieldDecoration ??
InputDecoration(
label: label, label: label,
hintText: hintText, hintText: hintText,
suffix: suffix, suffix: suffix,
@ -78,6 +83,7 @@ class AuthTextField extends AuthField {
return null; return null;
}, },
),
); );
} }
} }

View file

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