internal/flutter_login_widget
5
0
Fork 0
mirror of https://github.com/Iconica-Development/flutter_login_widget.git synced 2025-05-19 05:33:45 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #26 from Iconica-Development/feat/login-flexible

Browse source 
feat: add title spacer on login screen
This commit is contained in:
Freek van de Ven 2024-02-15 14:40:56 +01:00 committed by GitHub
commit 0c0c83f571
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 131 additions and 131 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -1,3 +1,6 @@
## 5.1.3
* Added title spacer
## 5.1.2
* Removed bottom padding from password text field

3
lib/src/config/spacer_options.dart
View file

@ -10,6 +10,7 @@ class LoginSpacerOptions {
this.spacerAfterForm,
this.spacerAfterButton,
this.formFlexValue = 1,
this.titleSpacer = 1,
});
/// Flex value for the spacer before the title.
@ -33,4 +34,6 @@ class LoginSpacerOptions {
/// Flex value for the form. Defaults to 1. Use this when also using the
/// other spacer options.
final int formFlexValue;
final int titleSpacer;
}

254
lib/src/widgets/email_password_login.dart
View file

@ -74,57 +74,56 @@ class _EmailPasswordLoginFormState extends State<EmailPasswordLoginForm> {
var theme = Theme.of(context);
var options = widget.options;
return CustomScrollView(
physics: MediaQuery.of(context).viewInsets.bottom == 0
? const NeverScrollableScrollPhysics()
: null,
physics: const ScrollPhysics(),
slivers: [
SliverFillRemaining(
fillOverscroll: true,
hasScrollBody: false,
fillOverscroll: true,
child: Column(
children: [
if (options.spacers.spacerBeforeTitle != null) ...[
Spacer(flex: options.spacers.spacerBeforeTitle!),
],
if (options.title != null) ...[
const SizedBox(
height: 60,
Expanded(
flex: options.spacers.titleSpacer,
child: Column(
children: [
if (options.spacers.spacerBeforeTitle != null) ...[
Spacer(flex: options.spacers.spacerBeforeTitle!),
],
if (options.title != null) ...[
Align(
alignment: Alignment.topCenter,
child: _wrapWithDefaultStyle(
options.title,
theme.textTheme.headlineSmall,
),
),
],
if (options.spacers.spacerAfterTitle != null) ...[
Spacer(flex: options.spacers.spacerAfterTitle!),
],
if (options.subtitle != null) ...[
Align(
alignment: Alignment.topCenter,
child: _wrapWithDefaultStyle(
options.subtitle,
theme.textTheme.titleSmall,
),
),
],
if (options.spacers.spacerAfterSubtitle != null) ...[
Spacer(flex: options.spacers.spacerAfterSubtitle!),
],
if (options.image != null) ...[
Padding(
padding: const EdgeInsets.all(16),
child: options.image,
),
],
if (options.spacers.spacerAfterImage != null) ...[
Spacer(flex: options.spacers.spacerAfterImage!),
],
],
),
Align(
alignment: Alignment.topCenter,
child: _wrapWithDefaultStyle(
options.title,
theme.textTheme.headlineSmall,
),
),
],
if (options.spacers.spacerAfterTitle != null) ...[
Spacer(flex: options.spacers.spacerAfterTitle!),
],
if (options.subtitle != null) ...[
const SizedBox(
height: 10,
),
Align(
alignment: Alignment.topCenter,
child: _wrapWithDefaultStyle(
options.subtitle,
theme.textTheme.titleSmall,
),
),
],
if (options.spacers.spacerAfterSubtitle != null) ...[
Spacer(flex: options.spacers.spacerAfterSubtitle!),
],
if (options.image != null) ...[
Padding(
padding: const EdgeInsets.all(16),
child: options.image,
),
],
if (options.spacers.spacerAfterImage != null) ...[
Spacer(flex: options.spacers.spacerAfterImage!),
],
),
Expanded(
flex: options.spacers.formFlexValue,
child: ConstrainedBox(
@ -133,101 +132,96 @@ class _EmailPasswordLoginFormState extends State<EmailPasswordLoginForm> {
),
child: Form(
key: _formKey,
child: Align(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
options.emailInputContainerBuilder(
TextFormField(
onChanged: _updateCurrentEmail,
validator:
widget.options.validations.validateEmail,
initialValue: options.initialEmail,
keyboardType: TextInputType.emailAddress,
textInputAction: TextInputAction.next,
style: options.emailTextStyle,
decoration: options.emailDecoration,
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
options.emailInputContainerBuilder(
TextFormField(
onChanged: _updateCurrentEmail,
validator: widget.options.validations.validateEmail,
initialValue: options.initialEmail,
keyboardType: TextInputType.emailAddress,
textInputAction: TextInputAction.next,
style: options.emailTextStyle,
decoration: options.emailDecoration,
),
),
options.passwordInputContainerBuilder(
TextFormField(
obscureText: _obscurePassword,
onChanged: _updateCurrentPassword,
validator:
widget.options.validations.validatePassword,
initialValue: options.initialPassword,
keyboardType: TextInputType.visiblePassword,
textInputAction: TextInputAction.done,
style: options.passwordTextStyle,
onFieldSubmitted: (_) async => _handleLogin(),
decoration: options.passwordDecoration.copyWith(
suffixIcon: options.showObscurePassword
? IconButton(
onPressed: () {
setState(() {
_obscurePassword = !_obscurePassword;
});
},
icon: Icon(
_obscurePassword
? Icons.visibility
: Icons.visibility_off,
),
)
: null,
),
),
options.passwordInputContainerBuilder(
TextFormField(
obscureText: _obscurePassword,
onChanged: _updateCurrentPassword,
validator:
widget.options.validations.validatePassword,
initialValue: options.initialPassword,
keyboardType: TextInputType.visiblePassword,
textInputAction: TextInputAction.done,
style: options.passwordTextStyle,
onFieldSubmitted: (_) async => _handleLogin(),
decoration: options.passwordDecoration.copyWith(
suffixIcon: options.showObscurePassword
? IconButton(
onPressed: () {
setState(() {
_obscurePassword =
!_obscurePassword;
});
},
icon: Icon(
_obscurePassword
? Icons.visibility
: Icons.visibility_off,
),
)
: null,
),
),
),
if (widget.onForgotPassword != null) ...[
Align(
alignment: Alignment.topRight,
child: options.forgotPasswordButtonBuilder(
context,
() {
widget.onForgotPassword?.call(_currentEmail);
},
false,
() {},
options,
),
),
],
if (options.spacers.spacerAfterForm != null) ...[
Spacer(flex: options.spacers.spacerAfterForm!),
],
const SizedBox(height: 8),
AnimatedBuilder(
animation: _formValid,
builder: (context, _) => options.loginButtonBuilder(
),
if (widget.onForgotPassword != null) ...[
Align(
alignment: Alignment.topRight,
child: options.forgotPasswordButtonBuilder(
context,
_handleLogin,
!_formValid.value,
() {
_formKey.currentState?.validate();
},
options,
),
),
if (widget.onRegister != null) ...[
options.registrationButtonBuilder(
context,
() async {
widget.onRegister?.call(
_currentEmail,
_currentPassword,
);
widget.onForgotPassword?.call(_currentEmail);
},
false,
() {},
options,
),
],
if (options.spacers.spacerAfterButton != null) ...[
Spacer(flex: options.spacers.spacerAfterButton!),
],
),
],
),
if (options.spacers.spacerAfterForm != null) ...[
Spacer(flex: options.spacers.spacerAfterForm!),
],
AnimatedBuilder(
animation: _formValid,
builder: (context, _) => options.loginButtonBuilder(
context,
_handleLogin,
!_formValid.value,
() {
_formKey.currentState?.validate();
},
options,
),
),
if (widget.onRegister != null) ...[
options.registrationButtonBuilder(
context,
() async {
widget.onRegister?.call(
_currentEmail,
_currentPassword,
);
},
false,
() {},
options,
),
],
if (options.spacers.spacerAfterButton != null) ...[
Spacer(flex: options.spacers.spacerAfterButton!),
],
],
),
),
),

2
pubspec.yaml
View file

@ -1,6 +1,6 @@
name: flutter_login
description: Flutter Login Component
version: 5.1.2
version: 5.1.3
environment:
sdk: ">=2.18.1 <3.0.0"