bugfix: Fix flex overflow, add own padding and alignment option for buttons

Closes: #14
This commit is contained in:
CodeThomnics 2024-02-14 20:04:22 +01:00
parent 44871bf44e
commit 0f28c7084e
3 changed files with 86 additions and 94 deletions

View file

@ -16,6 +16,7 @@ class AuthScreen extends StatefulWidget {
required this.previousBtnTitle,
required this.onFinish,
this.customAppBar,
this.buttonMainAxisAlignment,
this.customBackgroundColor,
this.nextButtonBuilder,
this.previousButtonBuilder,
@ -38,6 +39,7 @@ class AuthScreen extends StatefulWidget {
final String nextBtnTitle;
final String previousBtnTitle;
final AppBar? customAppBar;
final MainAxisAlignment? buttonMainAxisAlignment;
final Color? customBackgroundColor;
final Widget Function(Future<void> Function()? onPressed, String label,
int step, bool enabled)? nextButtonBuilder;
@ -170,7 +172,7 @@ class _AuthScreenState extends State<AuthScreen> {
),
),
],
Expanded(
Flexible(
flex: widget.formFlex ?? 3,
child: Column(
children: [
@ -191,33 +193,22 @@ class _AuthScreenState extends State<AuthScreen> {
],
),
),
Padding(
padding: EdgeInsets.only(
top: 15.0,
bottom: 30.0,
left: widget.previousButtonBuilder == null &&
widget.steps.first != widget.steps[i]
? 30.0
: 0.0,
right: widget.nextButtonBuilder == null &&
widget.previousButtonBuilder == null
? 30.0
: 0.0,
),
child: Column(
Column(
children: [
Row(
mainAxisAlignment:
(widget.previousButtonBuilder != null &&
widget.buttonMainAxisAlignment != null
? widget.buttonMainAxisAlignment!
: (widget.previousButtonBuilder != null &&
widget.previousButtonBuilder?.call(
onPrevious,
widget.previousBtnTitle,
i,
) ==
null)
? MainAxisAlignment.spaceAround
? MainAxisAlignment.start
: widget.steps.first != widget.steps[i]
? MainAxisAlignment.spaceBetween
? MainAxisAlignment.center
: MainAxisAlignment.end,
children: [
if (widget.previousButtonBuilder == null) ...[
@ -231,8 +222,7 @@ class _AuthScreenState extends State<AuthScreen> {
size: 18,
),
Padding(
padding:
const EdgeInsets.only(left: 4.0),
padding: const EdgeInsets.only(left: 4.0),
child: Text(widget.previousBtnTitle),
),
],
@ -288,7 +278,6 @@ class _AuthScreenState extends State<AuthScreen> {
),
],
),
),
],
),
],

View file

@ -17,6 +17,7 @@ class RegistrationOptions {
this.customAppbarBuilder,
this.nextButtonBuilder,
this.previousButtonBuilder,
this.buttonMainAxisAlignment,
this.backgroundColor,
this.titleWidget,
this.loginButton,
@ -32,6 +33,7 @@ class RegistrationOptions {
int step, bool enabled)? nextButtonBuilder;
final Widget? Function(VoidCallback onPressed, String label, int step)?
previousButtonBuilder;
final MainAxisAlignment? buttonMainAxisAlignment;
final Color? backgroundColor;
Widget? titleWidget;
Widget? loginButton;

View file

@ -52,6 +52,7 @@ class RegistrationScreen extends StatelessWidget {
previousBtnTitle: translations.previousStepBtn,
nextButtonBuilder: registrationOptions.nextButtonBuilder,
previousButtonBuilder: registrationOptions.previousButtonBuilder,
buttonMainAxisAlignment: registrationOptions.buttonMainAxisAlignment,
customBackgroundColor: registrationOptions.backgroundColor,
titleWidget: registrationOptions.titleWidget,
loginButton: registrationOptions.loginButton,