Compare commits

..

20 commits

Author SHA1 Message Date
Tobias Leijs
9f66da6e2d feat: add support for biometric login 2025-04-17 09:44:14 +02:00
Freek van de Ven
e0b01d7f18 feat: add Semantics widget to standard inputs
This will add accessibility id and id to the inputfields and buttons so they can be accessed in appium for automated tests
2025-01-29 10:54:42 +01:00
Freek van de Ven
64a6755d04 feat: upgrade pinput from 2.3.0 to 5.0.1 2025-01-29 10:54:42 +01:00
Freek van de Ven
5276f38643 chore: update iconica linter 2025-01-29 10:54:42 +01:00
mike doornenbal
d173ba11fc fix: styling 2024-08-23 11:47:03 +02:00
Freek van de Ven
bd60fb05b0 chore: add component release workflow 2024-08-23 11:09:58 +02:00
Gorter-dev
f6c3e2479d
Merge pull request #42 from Iconica-Development/bugfix/forgotpassword_button
fix: forgotpassword button
2024-08-14 14:38:43 +02:00
mike doornenbal
ce0bc821b9 fix: forgotpassword button
added padding to the forgotpassword button
2024-08-14 14:31:37 +02:00
mike doornenbal
3bccff1e70 fix: default theme 2024-08-08 09:44:01 +02:00
Gorter-dev
469a62eede
Merge pull request #41 from Iconica-Development/chore/deploy
chore: ready the package for deployment to the pub server
2024-07-22 14:56:17 +02:00
Bart Ribbers
88fc643c42 chore: ready the package for deployment to the pub server 2024-07-11 18:13:55 +02:00
Bart Ribbers
2dd9103cc8 chore: add fvm configuration to gitignore 2024-07-11 18:13:55 +02:00
mike doornenbal
54e0a687cc
Merge pull request #39 from Iconica-Development/38-add-autofill-functionality-for-the-login-form
38 add autofill functionality for the login form
2024-06-26 09:48:07 +02:00
Tobias Leijs
0ebb84b7b6 chore: bump the version number to 7.1.0 2024-06-25 15:35:15 +02:00
Tobias Leijs
b57b238794 refactor: extract variables and widgets to shorten the widget tree 2024-06-25 15:34:04 +02:00
Tobias Leijs
bb65426298 feat: add AutoFillGroup to support native password managers 2024-06-25 15:09:04 +02:00
Bart Ribbers
fb80dbb196
Merge pull request #36 from Iconica-Development/feat/forgot-password-no-title
feat: get title and subtitle from the widget itself and don't provide defaults for them
2024-05-24 14:04:36 +02:00
Bart Ribbers
36543b3d3c chore: update version to 7.0.0 2024-05-24 13:09:28 +02:00
Bart Ribbers
102cb65444 feat(ForgotPasswordForm): don't provide a default title and description
Otherwise it wouldn't be possible to leave them empty
2024-05-24 13:09:17 +02:00
Bart Ribbers
907af2639d feat(EmailPasswordLoginForm): get title and subtitle from the widget rather than loginoptions
Previously the EmailPasswordLoginForm and the ForgotPasswordForm used
different ways to provide a title and subtitle/description. This is now
the same and the related fields are removed from LoginOptions
2024-05-24 13:08:27 +02:00
27 changed files with 747 additions and 631 deletions

14
.github/workflows/release.yml vendored Normal file
View file

@ -0,0 +1,14 @@
name: Iconica Standard Component Release Workflow
# Workflow Caller version: 1.0.0
on:
release:
types: [published]
workflow_dispatch:
jobs:
call-global-iconica-workflow:
uses: Iconica-Development/.github/.github/workflows/component-release.yml@master
secrets: inherit
permissions: write-all

4
.gitignore vendored
View file

@ -38,3 +38,7 @@ example/linux/
example/windows/ example/windows/
example/macos/ example/macos/
example/web/ example/web/
# FVM Version Cache
.fvm/
.fvmrc

View file

@ -1,3 +1,35 @@
## 7.3.0
* Added Biometrics support to the LoginOptions
## 7.2.0
* Added CustomSemantics widget that is used to wrap all the inputfields and buttons to make the component accessible for e2e testing.
* Upgraded pinput to 5.0.1 from 2.3.0
* Updated flutter_iconica_analysis to 7.0.0 with new rules
## 7.1.3
* Fixed forgotpassword description line height.
* Fixed default text.
## 7.1.2
* Added padding to the forgotpasswordRequestButton
## 7.1.1
* Changed default theme
## 7.1.0
* Added autofillgroup to support native password managers
## 7.0.0
* Removed `title` and `subtitle` parameters from `LoginOptions` in favour of passing them directly to the `EmailPasswordLoginForm` widget directly
## 6.1.0 ## 6.1.0
* Added 'suffixIconSize' and 'suffixIconPadding' to LoginOptions. * Added 'suffixIconSize' and 'suffixIconPadding' to LoginOptions.

View file

@ -9,6 +9,44 @@ A package facilitating the basic ingredients for creating functional yet customi
To use this package, add `flutter_login` as a dependency in your pubspec.yaml file. To use this package, add `flutter_login` as a dependency in your pubspec.yaml file.
### Biometrics authentication
You can use faceID or fingerprint by adding:
```dart
loginWithBiometrics: true,
triggerBiometricsAutomatically: true,
```
to the `LoginOptions` object. This will trigger the biometrics authentication immediately when the EmailPasswordLoginForm is shown.
For the full biometrics setup you can follow the instructions in the [local_auth](https://pub.dev/packages/local_auth) package.
You need to add the following permissions to your AndroidManifest.xml file:
```xml
<uses-permission android:name="android.permission.USE_BIOMETRIC"/>
```
```java
import io.flutter.embedding.android.FlutterFragmentActivity;
public class MainActivity extends FlutterFragmentActivity {
// ...
}
```
or MainActivity.kt:
```kotlin
import io.flutter.embedding.android.FlutterFragmentActivity
class MainActivity: FlutterFragmentActivity() {
// ...
}
```
to inherit from `FlutterFragmentActivity`.
## How to use ## How to use
```dart ```dart

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

BIN
assets/ios_fingerprint.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

3
example/.gitignore vendored
View file

@ -5,9 +5,11 @@
*.swp *.swp
.DS_Store .DS_Store
.atom/ .atom/
.build/
.buildlog/ .buildlog/
.history .history
.svn/ .svn/
.swiftpm/
migrate_working_dir/ migrate_working_dir/
# IntelliJ related # IntelliJ related
@ -32,6 +34,7 @@ migrate_working_dir/
.pub/ .pub/
/build/ /build/
.metadata .metadata
pubspec.lock
# Symbolication related # Symbolication related
app.*.symbols app.*.symbols

1
example/README.md Symbolic link
View file

@ -0,0 +1 @@
../README.md

View file

@ -1,29 +1,12 @@
# This file configures the analyzer, which statically analyzes Dart code to include: package:flutter_iconica_analysis/analysis_options.yaml
# check for errors, warnings, and lints.
#
# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
# invoked from the command line by running `flutter analyze`.
# The following line activates a set of recommended lints for Flutter apps, # https://dart-lang.github.io/linter/lints/index.html
# packages, and plugins designed to encourage good coding practices.
include: package:flutter_lints/flutter.yaml # Possible to overwrite the rules from the package
analyzer:
plugins:
exclude:
linter: linter:
# The lint rules applied to this project can be customized in the
# section below to disable rules from the `package:flutter_lints/flutter.yaml`
# included above or to enable additional rules. A list of all available lints
# and their documentation is published at
# https://dart-lang.github.io/linter/lints/index.html.
#
# Instead of disabling a lint rule for the entire project in the
# section below, it can also be suppressed for a single line of code
# or a specific dart file by using the `// ignore: name_of_lint` and
# `// ignore_for_file: name_of_lint` syntax on the line or in the file
# producing the lint.
rules: rules:
# avoid_print: false # Uncomment to disable the `avoid_print` rule
# prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule
# Additional information about this file can be found at
# https://dart.dev/guides/language/analysis-options

View file

@ -1,7 +1,7 @@
// ignore_for_file: avoid_print // ignore_for_file: avoid_print
import 'package:flutter/material.dart'; import "package:flutter/material.dart";
import 'package:flutter_login/flutter_login.dart'; import "package:flutter_login/flutter_login.dart";
final loginOptions = LoginOptions( final loginOptions = LoginOptions(
emailDecoration: const InputDecoration( emailDecoration: const InputDecoration(
@ -12,25 +12,27 @@ final loginOptions = LoginOptions(
prefixIcon: Icon(Icons.password), prefixIcon: Icon(Icons.password),
border: OutlineInputBorder(), border: OutlineInputBorder(),
), ),
title: const Text('Login Demo'),
image: const FlutterLogo( image: const FlutterLogo(
size: 200, size: 200,
), ),
biometricsOptions: const LoginBiometricsOptions(
loginWithBiometrics: true,
triggerBiometricsAutomatically: false,
),
requestForgotPasswordButtonBuilder: ( requestForgotPasswordButtonBuilder: (
context, context,
onPressed, onPressed,
isDisabled, isDisabled,
onDisabledPress, onDisabledPress,
translations, translations,
) { ) =>
return Opacity( Opacity(
opacity: isDisabled ? 0.5 : 1.0, opacity: isDisabled ? 0.5 : 1.0,
child: ElevatedButton( child: ElevatedButton(
onPressed: isDisabled ? onDisabledPress : onPressed, onPressed: isDisabled ? onDisabledPress : onPressed,
child: const Text('Send request'), child: const Text("Send request"),
),
), ),
);
},
); );
void main() { void main() {
@ -41,53 +43,46 @@ class LoginExample extends StatelessWidget {
const LoginExample({super.key}); const LoginExample({super.key});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) => MaterialApp(
return MaterialApp(
theme: ThemeData.dark(), theme: ThemeData.dark(),
home: const LoginScreen(), home: const LoginScreen(),
); );
} }
}
class LoginScreen extends StatelessWidget { class LoginScreen extends StatelessWidget {
const LoginScreen({super.key}); const LoginScreen({super.key});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) => Scaffold(
return Scaffold(
body: EmailPasswordLoginForm( body: EmailPasswordLoginForm(
title: const Text("Login Demo"),
options: loginOptions, options: loginOptions,
onLogin: (email, password) => print('$email:$password'), onLogin: (email, password) => print("$email:$password"),
onRegister: (email, password, ctx) => print('Register!'), onRegister: (email, password, ctx) => print("Register!"),
onForgotPassword: (email, ctx) { onForgotPassword: (email, ctx) async {
Navigator.of(context).push( await Navigator.of(context).push(
MaterialPageRoute( MaterialPageRoute(
builder: (context) { builder: (context) => const ForgotPasswordScreen(),
return const ForgotPasswordScreen();
},
), ),
); );
}, },
), ),
); );
} }
}
class ForgotPasswordScreen extends StatelessWidget { class ForgotPasswordScreen extends StatelessWidget {
const ForgotPasswordScreen({super.key}); const ForgotPasswordScreen({super.key});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) => Scaffold(
return Scaffold(
appBar: AppBar(), appBar: AppBar(),
body: ForgotPasswordForm( body: ForgotPasswordForm(
options: loginOptions, options: loginOptions,
title: const Text('Forgot password'), title: const Text("Forgot password"),
description: const Text('Hello world'), description: const Text("Hello world"),
onRequestForgotPassword: (email) { onRequestForgotPassword: (email) {
print('Forgot password email sent to $email'); print("Forgot password email sent to $email");
}, },
), ),
); );
} }
}

View file

@ -1,241 +0,0 @@
# Generated by pub
# See https://dart.dev/tools/pub/glossary#lockfile
packages:
async:
dependency: transitive
description:
name: async
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
url: "https://pub.dev"
source: hosted
version: "2.11.0"
boolean_selector:
dependency: transitive
description:
name: boolean_selector
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
url: "https://pub.dev"
source: hosted
version: "2.1.1"
characters:
dependency: transitive
description:
name: characters
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
url: "https://pub.dev"
source: hosted
version: "1.3.0"
clock:
dependency: transitive
description:
name: clock
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
url: "https://pub.dev"
source: hosted
version: "1.1.1"
collection:
dependency: transitive
description:
name: collection
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
url: "https://pub.dev"
source: hosted
version: "1.18.0"
fake_async:
dependency: transitive
description:
name: fake_async
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
url: "https://pub.dev"
source: hosted
version: "1.3.1"
flutter:
dependency: "direct main"
description: flutter
source: sdk
version: "0.0.0"
flutter_lints:
dependency: "direct dev"
description:
name: flutter_lints
sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04
url: "https://pub.dev"
source: hosted
version: "2.0.3"
flutter_login:
dependency: "direct main"
description:
path: ".."
relative: true
source: path
version: "6.0.0"
flutter_test:
dependency: "direct dev"
description: flutter
source: sdk
version: "0.0.0"
flutter_web_plugins:
dependency: transitive
description: flutter
source: sdk
version: "0.0.0"
leak_tracker:
dependency: transitive
description:
name: leak_tracker
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
url: "https://pub.dev"
source: hosted
version: "10.0.0"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
url: "https://pub.dev"
source: hosted
version: "2.0.1"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
url: "https://pub.dev"
source: hosted
version: "2.0.1"
lints:
dependency: transitive
description:
name: lints
sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
url: "https://pub.dev"
source: hosted
version: "2.1.1"
matcher:
dependency: transitive
description:
name: matcher
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
url: "https://pub.dev"
source: hosted
version: "0.12.16+1"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
url: "https://pub.dev"
source: hosted
version: "0.8.0"
meta:
dependency: transitive
description:
name: meta
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
url: "https://pub.dev"
source: hosted
version: "1.11.0"
path:
dependency: transitive
description:
name: path
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
url: "https://pub.dev"
source: hosted
version: "1.9.0"
pinput:
dependency: transitive
description:
name: pinput
sha256: "543da5bfdefd9e06914a12100f8c9156f84cef3efc14bca507c49e966c5b813b"
url: "https://pub.dev"
source: hosted
version: "2.3.0"
sky_engine:
dependency: transitive
description: flutter
source: sdk
version: "0.0.99"
smart_auth:
dependency: transitive
description:
name: smart_auth
sha256: a25229b38c02f733d0a4e98d941b42bed91a976cb589e934895e60ccfa674cf6
url: "https://pub.dev"
source: hosted
version: "1.1.1"
source_span:
dependency: transitive
description:
name: source_span
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
url: "https://pub.dev"
source: hosted
version: "1.10.0"
stack_trace:
dependency: transitive
description:
name: stack_trace
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
url: "https://pub.dev"
source: hosted
version: "1.11.1"
stream_channel:
dependency: transitive
description:
name: stream_channel
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
url: "https://pub.dev"
source: hosted
version: "2.1.2"
string_scanner:
dependency: transitive
description:
name: string_scanner
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
url: "https://pub.dev"
source: hosted
version: "1.2.0"
term_glyph:
dependency: transitive
description:
name: term_glyph
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
url: "https://pub.dev"
source: hosted
version: "1.2.1"
test_api:
dependency: transitive
description:
name: test_api
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
url: "https://pub.dev"
source: hosted
version: "0.6.1"
universal_platform:
dependency: transitive
description:
name: universal_platform
sha256: d315be0f6641898b280ffa34e2ddb14f3d12b1a37882557869646e0cc363d0cc
url: "https://pub.dev"
source: hosted
version: "1.0.0+1"
vector_math:
dependency: transitive
description:
name: vector_math
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
url: "https://pub.dev"
source: hosted
version: "2.1.4"
vm_service:
dependency: transitive
description:
name: vm_service
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
url: "https://pub.dev"
source: hosted
version: "13.0.0"
sdks:
dart: ">=3.2.0-0 <4.0.0"
flutter: ">=3.7.0"

View file

@ -1,14 +1,12 @@
name: example name: example
description: A new Flutter project. description: A new Flutter project.
# The following line prevents the package from being accidentally published to publish_to: "none"
# pub.dev using `flutter pub publish`. This is preferred for private packages.
publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 1.0.0+1 version: 1.0.0+1
environment: environment:
sdk: '>=2.18.1 <3.0.0' sdk: ">=2.18.1 <3.0.0"
dependencies: dependencies:
flutter: flutter:
@ -16,11 +14,12 @@ dependencies:
flutter_login: flutter_login:
path: ../ path: ../
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:
sdk: flutter sdk: flutter
flutter_lints: ^2.0.0 flutter_iconica_analysis:
hosted: https://forgejo.internal.iconica.nl/api/packages/internal/pub
version: ^7.0.0
flutter: flutter:
uses-material-design: true uses-material-design: true

View file

@ -0,0 +1,7 @@
import "package:flutter_test/flutter_test.dart";
void main() {
test("blank test", () {
expect(true, true);
});
}

View file

@ -1,11 +1,11 @@
/// ///
library flutter_login; library flutter_login;
export 'src/config/forgot_password_spacer_options.dart'; export "src/config/forgot_password_spacer_options.dart";
export 'src/config/login_options.dart'; export "src/config/login_options.dart";
export 'src/config/spacer_options.dart'; export "src/config/spacer_options.dart";
export 'src/service/login_validation.dart'; export "src/service/login_validation.dart";
export 'src/service/validation.dart'; export "src/service/validation.dart";
export 'src/widgets/email_password_login.dart'; export "src/widgets/email_password_login.dart";
export 'src/widgets/forgot_password_form.dart'; export "src/widgets/forgot_password_form.dart";
export 'src/widgets/mfa_widget.dart'; export "src/widgets/mfa_widget.dart";

View file

@ -1,4 +1,4 @@
import 'package:flutter/material.dart'; import "package:flutter/material.dart";
@immutable @immutable

View file

@ -1,24 +1,15 @@
import 'dart:async'; import "dart:async";
import 'package:flutter/material.dart'; import "package:flutter/material.dart";
import 'package:flutter_login/src/config/forgot_password_spacer_options.dart'; import "package:flutter_login/src/config/forgot_password_spacer_options.dart";
import 'package:flutter_login/src/config/spacer_options.dart'; import "package:flutter_login/src/config/spacer_options.dart";
import 'package:flutter_login/src/service/login_validation.dart'; import "package:flutter_login/src/service/login_validation.dart";
import 'package:flutter_login/src/service/validation.dart'; import "package:flutter_login/src/service/validation.dart";
@immutable @immutable
class LoginOptions { class LoginOptions {
const LoginOptions({ const LoginOptions({
this.image, this.image,
this.title = const Text(
'Log in',
style: TextStyle(
color: Color(0xff71C6D1),
fontWeight: FontWeight.w800,
fontSize: 24,
),
),
this.subtitle,
this.maxFormWidth, this.maxFormWidth,
this.emailTextStyle, this.emailTextStyle,
this.passwordTextStyle, this.passwordTextStyle,
@ -26,7 +17,7 @@ class LoginOptions {
this.passwordTextAlign, this.passwordTextAlign,
this.emailDecoration = const InputDecoration( this.emailDecoration = const InputDecoration(
contentPadding: EdgeInsets.symmetric(horizontal: 8), contentPadding: EdgeInsets.symmetric(horizontal: 8),
labelText: 'Email address', labelText: "Email address",
border: OutlineInputBorder(), border: OutlineInputBorder(),
focusedBorder: OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
@ -41,7 +32,7 @@ class LoginOptions {
), ),
this.passwordDecoration = const InputDecoration( this.passwordDecoration = const InputDecoration(
contentPadding: EdgeInsets.symmetric(horizontal: 8), contentPadding: EdgeInsets.symmetric(horizontal: 8),
labelText: 'Password', labelText: "Password",
border: OutlineInputBorder(), border: OutlineInputBorder(),
focusedBorder: OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
@ -54,14 +45,15 @@ class LoginOptions {
fontSize: 16, fontSize: 16,
), ),
), ),
this.initialEmail = '', this.initialEmail = "",
this.initialPassword = '', this.initialPassword = "",
this.spacers = const LoginSpacerOptions( this.spacers = const LoginSpacerOptions(
spacerBeforeTitle: 8, spacerBeforeTitle: 8,
spacerAfterTitle: 2, spacerAfterTitle: 2,
formFlexValue: 2, formFlexValue: 2,
), ),
this.translations = const LoginTranslations(), this.translations = const LoginTranslations(),
this.accessibilityIdentifiers = const LoginAccessibilityIdentifiers.empty(),
this.validationService, this.validationService,
this.loginButtonBuilder = _createLoginButton, this.loginButtonBuilder = _createLoginButton,
this.forgotPasswordButtonBuilder = _createForgotPasswordButton, this.forgotPasswordButtonBuilder = _createForgotPasswordButton,
@ -72,7 +64,7 @@ class LoginOptions {
this.passwordInputContainerBuilder = _createPasswordInputContainer, this.passwordInputContainerBuilder = _createPasswordInputContainer,
this.showObscurePassword = true, this.showObscurePassword = true,
this.forgotPasswordSpacerOptions = const ForgotPasswordSpacerOptions( this.forgotPasswordSpacerOptions = const ForgotPasswordSpacerOptions(
spacerAfterButton: 3, spacerAfterButton: 4,
spacerBeforeTitle: 1, spacerBeforeTitle: 1,
), ),
this.loginBackgroundColor = const Color(0xffFAF9F6), this.loginBackgroundColor = const Color(0xffFAF9F6),
@ -83,6 +75,7 @@ class LoginOptions {
this.forgotPasswordCustomAppBar, this.forgotPasswordCustomAppBar,
this.suffixIconSize, this.suffixIconSize,
this.suffixIconPadding, this.suffixIconPadding,
this.biometricsOptions = const LoginBiometricsOptions(),
}); });
/// Builds the login button. /// Builds the login button.
@ -106,12 +99,6 @@ class LoginOptions {
/// The image to display on the login screen. /// The image to display on the login screen.
final Widget? image; final Widget? image;
/// The title widget to display on the login screen.
final Widget? title;
/// The subtitle widget to display on the login screen.
final Widget? subtitle;
/// Option to modify the spacing between the title, subtitle, image, form, /// Option to modify the spacing between the title, subtitle, image, form,
/// and button. /// and button.
final LoginSpacerOptions spacers; final LoginSpacerOptions spacers;
@ -149,6 +136,12 @@ class LoginOptions {
/// Translations for various texts on the login screen. /// Translations for various texts on the login screen.
final LoginTranslations translations; final LoginTranslations translations;
/// Accessibility identifiers for the standard widgets in the component.
/// The inputfields and buttons have accessibility identifiers and their own
/// container so they are visible in the accessibility tree.
/// This is used for testing purposes.
final LoginAccessibilityIdentifiers accessibilityIdentifiers;
/// The validation service used for validating email and password inputs. /// The validation service used for validating email and password inputs.
final ValidationService? validationService; final ValidationService? validationService;
@ -172,17 +165,55 @@ class LoginOptions {
/// forgot password custom AppBar /// forgot password custom AppBar
final AppBar? forgotPasswordCustomAppBar; final AppBar? forgotPasswordCustomAppBar;
/// Options for enabling and customizing biometrics login
final LoginBiometricsOptions biometricsOptions;
} }
class LoginBiometricsOptions {
const LoginBiometricsOptions({
this.loginWithBiometrics = false,
this.triggerBiometricsAutomatically = false,
this.allowBiometricsAlternative = true,
this.onBiometricsSuccess,
this.onBiometricsError,
this.onBiometricsFail,
});
/// Ask the user to login with biometrics instead of email and password.
final bool loginWithBiometrics;
/// Allow the user to login with biometrics even if they have no biometrics
/// set up on their device. This will use their device native login methods.
final bool allowBiometricsAlternative;
/// Automatically open the native biometrics UI instead of waiting for the
/// user to press the biometrics button
final bool triggerBiometricsAutomatically;
/// The callback function to be called when the biometrics login is
/// successful.
final OptionalAsyncCallback? onBiometricsSuccess;
/// The callback function to be called when the biometrics login fails.
final OptionalAsyncCallback? onBiometricsFail;
/// The callback function to be called when the biometrics login errors.
final OptionalAsyncCallback? onBiometricsError;
}
/// Translations for all the texts in the component
class LoginTranslations { class LoginTranslations {
/// Provide your own translations to override the default english translations
const LoginTranslations({ const LoginTranslations({
this.emailEmpty = 'Email is required', this.emailEmpty = "Please enter your email address",
this.passwordEmpty = 'Password is required', this.passwordEmpty = "Please enter your password",
this.emailInvalid = 'Enter a valid email address', this.emailInvalid = "Please enter a valid email address",
this.loginButton = 'Login', this.loginButton = "Log in",
this.forgotPasswordButton = 'Forgot password?', this.forgotPasswordButton = "Forgot password?",
this.requestForgotPasswordButton = 'Send link', this.requestForgotPasswordButton = "Send link",
this.registrationButton = 'Create Account', this.registrationButton = "Create account",
this.biometricsLoginMessage = "Log in with biometrics",
}); });
final String emailInvalid; final String emailInvalid;
@ -192,6 +223,53 @@ class LoginTranslations {
final String forgotPasswordButton; final String forgotPasswordButton;
final String requestForgotPasswordButton; final String requestForgotPasswordButton;
final String registrationButton; final String registrationButton;
final String biometricsLoginMessage;
}
/// Accessibility identifiers for the standard widgets in the component.
class LoginAccessibilityIdentifiers {
/// Default [LoginAccessibilityIdentifiers] constructor where all the
/// identifiers are required. This is to ensure that apps automatically break
/// when new identifiers are added.
const LoginAccessibilityIdentifiers({
required this.emailTextFieldIdentifier,
required this.passwordTextFieldIdentifier,
required this.loginButtonIdentifier,
required this.forgotPasswordButtonIdentifier,
required this.requestForgotPasswordButtonIdentifier,
required this.registrationButtonIdentifier,
});
/// Empty [LoginAccessibilityIdentifiers] constructor where all the
/// identifiers are already set to their default values. You can override all
/// or some of the default values.
const LoginAccessibilityIdentifiers.empty({
this.emailTextFieldIdentifier = "email_text_field",
this.passwordTextFieldIdentifier = "password_text_field",
this.loginButtonIdentifier = "login_button",
this.forgotPasswordButtonIdentifier = "forgot_password_button",
this.requestForgotPasswordButtonIdentifier =
"request_forgot_password_button",
this.registrationButtonIdentifier = "registration_button",
});
/// Identifier for the email text field.
final String emailTextFieldIdentifier;
/// Identifier for the password text field.
final String passwordTextFieldIdentifier;
/// Identifier for the login button.
final String loginButtonIdentifier;
/// Identifier for the forgot password button.
final String forgotPasswordButtonIdentifier;
/// Identifier for the request forgot password button.
final String requestForgotPasswordButtonIdentifier;
/// Identifier for the registration button.
final String registrationButtonIdentifier;
} }
Widget _createEmailInputContainer(Widget child) => Padding( Widget _createEmailInputContainer(Widget child) => Padding(
@ -210,28 +288,26 @@ Widget _createLoginButton(
) => ) =>
Opacity( Opacity(
opacity: disabled ? 0.5 : 1.0, opacity: disabled ? 0.5 : 1.0,
child: InkWell( child: Row(
onTap: () async => children: [
Expanded(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 20),
child: FilledButton(
onPressed: () async =>
!disabled ? await onPressed() : await onDisabledPress(), !disabled ? await onPressed() : await onDisabledPress(),
child: Container( child: Padding(
height: 44, padding: const EdgeInsets.all(8),
width: 254,
decoration: const BoxDecoration(
color: Color(0xff71C6D1),
borderRadius: BorderRadius.all(Radius.circular(20)),
),
child: Center(
child: Text( child: Text(
options.translations.loginButton, options.translations.loginButton,
style: const TextStyle( style: Theme.of(context).textTheme.displayLarge,
fontWeight: FontWeight.w800,
fontSize: 20,
color: Colors.white,
), ),
), ),
), ),
), ),
), ),
],
),
); );
Widget _createForgotPasswordButton( Widget _createForgotPasswordButton(
@ -267,6 +343,8 @@ Widget _createRequestForgotPasswordButton(
) => ) =>
Opacity( Opacity(
opacity: disabled ? 0.5 : 1.0, opacity: disabled ? 0.5 : 1.0,
child: Padding(
padding: const EdgeInsets.only(top: 8),
child: InkWell( child: InkWell(
onTap: !disabled ? onPressed : onDisabledPress, onTap: !disabled ? onPressed : onDisabledPress,
child: Container( child: Container(
@ -288,6 +366,7 @@ Widget _createRequestForgotPasswordButton(
), ),
), ),
), ),
),
); );
Widget _createRegisterButton( Widget _createRegisterButton(
@ -303,12 +382,8 @@ Widget _createRegisterButton(
onPressed: !disabled ? onPressed : onDisabledPress, onPressed: !disabled ? onPressed : onDisabledPress,
child: Text( child: Text(
options.translations.registrationButton, options.translations.registrationButton,
style: const TextStyle( style: Theme.of(context).textTheme.displayMedium!.copyWith(
decoration: TextDecoration.underline, decoration: TextDecoration.underline,
decorationColor: Color(0xff71C6D1),
color: Color(0xff71C6D1),
fontSize: 18,
fontWeight: FontWeight.w800,
), ),
), ),
), ),

View file

@ -1,4 +1,4 @@
import 'package:flutter/material.dart'; import "package:flutter/material.dart";
@immutable @immutable
class LoginSpacerOptions { class LoginSpacerOptions {

View file

@ -0,0 +1,35 @@
import "package:flutter/services.dart";
import "package:flutter_login/src/config/login_options.dart";
import "package:local_auth/local_auth.dart";
class LocalAuthService {
final LocalAuthentication _localAuth = LocalAuthentication();
Future<void> authenticate(LoginOptions loginOptions) async {
var biometricsOptions = loginOptions.biometricsOptions;
try {
if (!await _localAuth.isDeviceSupported()) {
biometricsOptions.onBiometricsError?.call();
return;
}
var didAuthenticate = await _localAuth.authenticate(
localizedReason: loginOptions.translations.biometricsLoginMessage,
options: AuthenticationOptions(
biometricOnly: !biometricsOptions.allowBiometricsAlternative,
stickyAuth: true,
sensitiveTransaction: false,
),
);
if (didAuthenticate) {
biometricsOptions.onBiometricsSuccess?.call();
}
if (!didAuthenticate) {
biometricsOptions.onBiometricsFail?.call();
}
} on PlatformException catch (_) {
biometricsOptions.onBiometricsError?.call();
}
}
}

View file

@ -1,4 +1,4 @@
import 'package:flutter_login/flutter_login.dart'; import "package:flutter_login/flutter_login.dart";
class LoginValidationService implements ValidationService { class LoginValidationService implements ValidationService {
const LoginValidationService(this.options); const LoginValidationService(this.options);

View file

@ -0,0 +1,45 @@
import "dart:async";
import "dart:io";
import "package:flutter/foundation.dart";
import "package:flutter/material.dart";
class BiometricsButton extends StatelessWidget {
const BiometricsButton({
required this.onPressed,
super.key,
});
static const Size buttonSize = Size(40, 40);
final FutureOr<void> Function() onPressed;
@override
Widget build(BuildContext context) {
// handle unsupported platforms
if (kIsWeb || Platform.isLinux) return SizedBox(width: buttonSize.width);
Widget biometricsWidget;
if (Platform.isIOS || Platform.isMacOS) {
biometricsWidget = Image(
image: const AssetImage(
"assets/ios_fingerprint.png",
package: "flutter_login",
),
width: buttonSize.width,
height: buttonSize.height,
);
} else {
biometricsWidget = Icon(
Icons.fingerprint,
size: buttonSize.width,
);
}
return InkWell(
borderRadius: BorderRadius.circular(20),
onTap: onPressed,
child: biometricsWidget,
);
}
}

View file

@ -0,0 +1,36 @@
import "dart:io";
import "package:flutter/foundation.dart";
import "package:flutter/material.dart";
/// A wrapper that wraps a widget with a [Semantics] widget.
/// This is used for testing purposes to add a unique identifier to a widget.
/// The [identifier] should be unique
/// [container] is set to true to make sure the widget is always its own
/// accessibility element.
/// [excludeSemantics] is set to false to make sure that the widget can still
/// receive input.
class CustomSemantics extends StatelessWidget {
/// Creates a [CustomSemantics] widget.
/// The [identifier] should be unique for the specific screen.
const CustomSemantics({
required this.identifier,
required this.child,
super.key,
});
/// The widget that should be wrapped with a [Semantics] widget.
final Widget child;
/// Identifier for the widget that should be unique for the specific screen.
final String identifier;
@override
Widget build(BuildContext context) => Semantics(
excludeSemantics: false,
container: true,
label: kIsWeb || Platform.isIOS ? null : identifier,
identifier: identifier,
child: child,
);
}

View file

@ -1,11 +1,16 @@
import 'dart:async'; import "dart:async";
import 'package:flutter/material.dart'; import "package:flutter/material.dart";
import 'package:flutter_login/flutter_login.dart'; import "package:flutter_login/flutter_login.dart";
import "package:flutter_login/src/service/local_auth_service.dart";
import "package:flutter_login/src/widgets/biometrics_button.dart";
import "package:flutter_login/src/widgets/custom_semantics.dart";
class EmailPasswordLoginForm extends StatefulWidget { class EmailPasswordLoginForm extends StatefulWidget {
/// Constructs an [EmailPasswordLoginForm] widget. /// Constructs an [EmailPasswordLoginForm] widget.
/// ///
/// [title]: The title to display above the form.
/// [subtitle]: A subtitle to display below the title.
/// [onLogin]: Callback function for user login. /// [onLogin]: Callback function for user login.
/// [onForgotPassword]: Callback function for when the user /// [onForgotPassword]: Callback function for when the user
/// forgets their password. /// forgets their password.
@ -13,13 +18,19 @@ class EmailPasswordLoginForm extends StatefulWidget {
/// [options]: The options for configuring the login form. /// [options]: The options for configuring the login form.
const EmailPasswordLoginForm({ const EmailPasswordLoginForm({
required this.onLogin, required this.onLogin,
super.key, this.title,
this.subtitle,
this.onForgotPassword, this.onForgotPassword,
this.onRegister, this.onRegister,
this.options = const LoginOptions(), this.options = const LoginOptions(),
super.key,
}); });
final LoginOptions options; final LoginOptions options;
final Widget? title;
final Widget? subtitle;
final void Function(String email, BuildContext ctx)? onForgotPassword; final void Function(String email, BuildContext ctx)? onForgotPassword;
final FutureOr<void> Function( final FutureOr<void> Function(
String email, String email,
@ -37,8 +48,10 @@ class _EmailPasswordLoginFormState extends State<EmailPasswordLoginForm> {
final ValueNotifier<bool> _formValid = ValueNotifier(false); final ValueNotifier<bool> _formValid = ValueNotifier(false);
bool _obscurePassword = true; bool _obscurePassword = true;
String _currentEmail = ''; String _currentEmail = "";
String _currentPassword = ''; String _currentPassword = "";
final LocalAuthService _localAuthService = LocalAuthService();
void _updateCurrentEmail(String email) { void _updateCurrentEmail(String email) {
_currentEmail = email; _currentEmail = email;
@ -78,12 +91,125 @@ class _EmailPasswordLoginFormState extends State<EmailPasswordLoginForm> {
_currentEmail = widget.options.initialEmail; _currentEmail = widget.options.initialEmail;
_currentPassword = widget.options.initialPassword; _currentPassword = widget.options.initialPassword;
_validate(); _validate();
if (widget.options.biometricsOptions.loginWithBiometrics &&
widget.options.biometricsOptions.triggerBiometricsAutomatically) {
WidgetsBinding.instance.addPostFrameCallback((_) async {
await _localAuthService.authenticate(widget.options);
});
}
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
var theme = Theme.of(context);
var options = widget.options; var options = widget.options;
var emailTextFormField = CustomSemantics(
identifier: options.accessibilityIdentifiers.emailTextFieldIdentifier,
child: TextFormField(
autofillHints: const [
AutofillHints.email,
AutofillHints.username,
],
textAlign: options.emailTextAlign ?? TextAlign.start,
onChanged: _updateCurrentEmail,
validator: widget.options.validations.validateEmail,
initialValue: options.initialEmail,
keyboardType: TextInputType.emailAddress,
textInputAction: TextInputAction.next,
style: options.emailTextStyle,
decoration: options.emailDecoration,
),
);
var passwordTextFormField = CustomSemantics(
identifier: options.accessibilityIdentifiers.passwordTextFieldIdentifier,
child: TextFormField(
autofillHints: const [
AutofillHints.password,
],
textAlign: options.passwordTextAlign ?? TextAlign.start,
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(
padding: options.suffixIconPadding,
onPressed: () {
setState(() {
_obscurePassword = !_obscurePassword;
});
},
icon: Icon(
_obscurePassword ? Icons.visibility : Icons.visibility_off,
size: options.suffixIconSize,
),
)
: null,
),
),
);
var forgotPasswordButton = widget.onForgotPassword != null
? Align(
alignment: Alignment.topRight,
child: CustomSemantics(
identifier: options
.accessibilityIdentifiers.forgotPasswordButtonIdentifier,
child: options.forgotPasswordButtonBuilder(
context,
() => widget.onForgotPassword?.call(_currentEmail, context),
false,
() {},
options,
),
),
)
: const SizedBox(height: 16);
var loginButton = AnimatedBuilder(
animation: _formValid,
builder: (context, _) => CustomSemantics(
identifier: options.accessibilityIdentifiers.loginButtonIdentifier,
child: options.loginButtonBuilder(
context,
_handleLogin,
!_formValid.value,
() {
_formKey.currentState?.validate();
},
options,
),
),
);
var registrationButton = CustomSemantics(
identifier: options.accessibilityIdentifiers.registrationButtonIdentifier,
child: options.registrationButtonBuilder(
context,
() async {
widget.onRegister?.call(
_currentEmail,
_currentPassword,
context,
);
},
false,
() {},
options,
),
);
var biometricsButton = BiometricsButton(
onPressed: () async => LocalAuthService().authenticate(options),
);
return Scaffold( return Scaffold(
backgroundColor: options.loginBackgroundColor, backgroundColor: options.loginBackgroundColor,
body: CustomScrollView( body: CustomScrollView(
@ -96,16 +222,96 @@ class _EmailPasswordLoginFormState extends State<EmailPasswordLoginForm> {
children: [ children: [
Expanded( Expanded(
flex: options.spacers.titleSpacer, flex: options.spacers.titleSpacer,
child: LoginTitle(
options: options,
title: widget.title,
subtitle: widget.subtitle,
),
),
Expanded(
flex: options.spacers.formFlexValue,
child: ConstrainedBox(
constraints: BoxConstraints(
maxWidth: options.maxFormWidth ?? 300,
),
child: Form(
key: _formKey,
child: AutofillGroup(
child: Column( child: Column(
mainAxisSize: MainAxisSize.min,
children: [
options.emailInputContainerBuilder(
emailTextFormField,
),
options.passwordInputContainerBuilder(
passwordTextFormField,
),
forgotPasswordButton,
if (options.spacers.spacerAfterForm != null) ...[
Spacer(flex: options.spacers.spacerAfterForm!),
],
if (options
.biometricsOptions.loginWithBiometrics) ...[
Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
SizedBox(
width: BiometricsButton.buttonSize.width,
),
loginButton,
biometricsButton,
],
),
] else ...[
loginButton,
],
if (widget.onRegister != null) ...[
registrationButton,
],
if (options.spacers.spacerAfterButton != null) ...[
Spacer(flex: options.spacers.spacerAfterButton!),
],
],
),
),
),
),
),
],
),
),
],
),
);
}
}
class LoginTitle extends StatelessWidget {
const LoginTitle({
required this.options,
this.title,
this.subtitle,
super.key,
});
final LoginOptions options;
final Widget? title;
final Widget? subtitle;
@override
Widget build(BuildContext context) {
var theme = Theme.of(context);
return Column(
children: [ children: [
if (options.spacers.spacerBeforeTitle != null) ...[ if (options.spacers.spacerBeforeTitle != null) ...[
Spacer(flex: options.spacers.spacerBeforeTitle!), Spacer(flex: options.spacers.spacerBeforeTitle!),
], ],
if (options.title != null) ...[ if (title != null) ...[
Align( Align(
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
child: wrapWithDefaultStyle( child: wrapWithDefaultStyle(
options.title, title,
theme.textTheme.headlineSmall, theme.textTheme.headlineSmall,
), ),
), ),
@ -113,11 +319,11 @@ class _EmailPasswordLoginFormState extends State<EmailPasswordLoginForm> {
if (options.spacers.spacerAfterTitle != null) ...[ if (options.spacers.spacerAfterTitle != null) ...[
Spacer(flex: options.spacers.spacerAfterTitle!), Spacer(flex: options.spacers.spacerAfterTitle!),
], ],
if (options.subtitle != null) ...[ if (subtitle != null) ...[
Align( Align(
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
child: wrapWithDefaultStyle( child: wrapWithDefaultStyle(
options.subtitle, subtitle,
theme.textTheme.titleSmall, theme.textTheme.titleSmall,
), ),
), ),
@ -135,127 +341,6 @@ class _EmailPasswordLoginFormState extends State<EmailPasswordLoginForm> {
Spacer(flex: options.spacers.spacerAfterImage!), Spacer(flex: options.spacers.spacerAfterImage!),
], ],
], ],
),
),
Expanded(
flex: options.spacers.formFlexValue,
child: ConstrainedBox(
constraints: BoxConstraints(
maxWidth: options.maxFormWidth ?? 300,
),
child: Form(
key: _formKey,
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
options.emailInputContainerBuilder(
TextFormField(
textAlign:
options.emailTextAlign ?? TextAlign.start,
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(
textAlign:
options.passwordTextAlign ?? TextAlign.start,
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(
padding: options.suffixIconPadding,
onPressed: () {
setState(() {
_obscurePassword =
!_obscurePassword;
});
},
icon: Icon(
_obscurePassword
? Icons.visibility
: Icons.visibility_off,
size: options.suffixIconSize,
),
)
: null,
),
),
),
if (widget.onForgotPassword != null) ...[
Align(
alignment: Alignment.topRight,
child: options.forgotPasswordButtonBuilder(
context,
() {
widget.onForgotPassword
?.call(_currentEmail, context);
},
false,
() {},
options,
),
),
] else ...[
const SizedBox(height: 16),
],
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,
context,
);
},
false,
() {},
options,
),
],
if (options.spacers.spacerAfterButton != null) ...[
Spacer(flex: options.spacers.spacerAfterButton!),
],
],
),
),
),
),
],
),
),
],
),
); );
} }
} }

View file

@ -1,55 +1,29 @@
import 'dart:async'; import "dart:async";
import 'package:flutter/material.dart'; import "package:flutter/material.dart";
import 'package:flutter_login/flutter_login.dart'; import "package:flutter_login/flutter_login.dart";
import "package:flutter_login/src/widgets/custom_semantics.dart";
// ignore: must_be_immutable
class ForgotPasswordForm extends StatefulWidget { class ForgotPasswordForm extends StatefulWidget {
/// Constructs a [ForgotPasswordForm] widget. /// Constructs a [ForgotPasswordForm] widget.
/// ///
/// [options]: The options for configuring the forgot password form. /// [options]: The options for configuring the forgot password form.
/// [description]: Widget to display description.
/// [onRequestForgotPassword]: Callback function for requesting /// [onRequestForgotPassword]: Callback function for requesting
/// password reset. /// password reset.
/// [title]: Widget to display title. /// [title]: Widget to display title.
ForgotPasswordForm({ /// [description]: Widget to display description.
const ForgotPasswordForm({
required this.options, required this.options,
required this.onRequestForgotPassword, required this.onRequestForgotPassword,
this.title,
this.description, this.description,
super.key, super.key,
this.title, });
}) {
title == null
? title = const Padding(
padding: EdgeInsets.only(bottom: 8.0),
child: Text(
'Forgot Password',
style: TextStyle(
color: Color(0xff71C6D1),
fontWeight: FontWeight.w800,
fontSize: 24,
),
),
)
: title = title;
description == null
? description = const Padding(
padding: EdgeInsets.only(bottom: 16),
child: Text(
'No worries. Enter your email address below so we can'
' send you a link to reset your password.',
textAlign: TextAlign.center,
style: TextStyle(fontWeight: FontWeight.w400, fontSize: 16),
),
)
: description = description;
}
final LoginOptions options; final LoginOptions options;
Widget? title; final Widget? title;
Widget? description; final Widget? description;
final FutureOr<void> Function(String email) onRequestForgotPassword; final FutureOr<void> Function(String email) onRequestForgotPassword;
@ -76,7 +50,7 @@ class _ForgotPasswordFormState extends State<ForgotPasswordForm> {
final ValueNotifier<bool> _formValid = ValueNotifier(false); final ValueNotifier<bool> _formValid = ValueNotifier(false);
String _currentEmail = ''; String _currentEmail = "";
void _updateCurrentEmail(String email) { void _updateCurrentEmail(String email) {
_currentEmail = email; _currentEmail = email;
@ -137,7 +111,9 @@ class _ForgotPasswordFormState extends State<ForgotPasswordForm> {
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
child: wrapWithDefaultStyle( child: wrapWithDefaultStyle(
widget.description, widget.description,
theme.textTheme.bodyMedium, theme.textTheme.bodyMedium?.copyWith(
height: 1.4,
),
), ),
), ),
if (options if (options
@ -156,10 +132,15 @@ class _ForgotPasswordFormState extends State<ForgotPasswordForm> {
), ),
child: Form( child: Form(
key: _formKey, key: _formKey,
child: AutofillGroup(
child: Align( child: Align(
alignment: Alignment.center, alignment: Alignment.center,
child: options.emailInputContainerBuilder( child: options.emailInputContainerBuilder(
TextFormField( CustomSemantics(
identifier: options.accessibilityIdentifiers
.emailTextFieldIdentifier,
child: TextFormField(
autofillHints: const [AutofillHints.email],
textAlign: textAlign:
options.emailTextAlign ?? TextAlign.start, options.emailTextAlign ?? TextAlign.start,
focusNode: _focusNode, focusNode: _focusNode,
@ -177,6 +158,8 @@ class _ForgotPasswordFormState extends State<ForgotPasswordForm> {
), ),
), ),
), ),
),
),
if (options.forgotPasswordSpacerOptions.spacerBeforeButton != if (options.forgotPasswordSpacerOptions.spacerBeforeButton !=
null) ...[ null) ...[
Spacer( Spacer(
@ -187,7 +170,11 @@ class _ForgotPasswordFormState extends State<ForgotPasswordForm> {
AnimatedBuilder( AnimatedBuilder(
animation: _formValid, animation: _formValid,
builder: (context, snapshot) => Align( builder: (context, snapshot) => Align(
child: widget.options.requestForgotPasswordButtonBuilder( child: CustomSemantics(
identifier: options.accessibilityIdentifiers
.requestForgotPasswordButtonIdentifier,
child:
widget.options.requestForgotPasswordButtonBuilder(
context, context,
() async { () async {
_formKey.currentState?.validate(); _formKey.currentState?.validate();
@ -203,6 +190,7 @@ class _ForgotPasswordFormState extends State<ForgotPasswordForm> {
), ),
), ),
), ),
),
if (options.forgotPasswordSpacerOptions.spacerAfterButton != if (options.forgotPasswordSpacerOptions.spacerAfterButton !=
null) ...[ null) ...[
Spacer( Spacer(

View file

@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import "package:flutter/material.dart";
import 'package:pinput/pinput.dart'; import "package:pinput/pinput.dart";
class MFAWidget extends StatefulWidget { class MFAWidget extends StatefulWidget {
/// Constructs an [MFAWidget]. /// Constructs an [MFAWidget].
@ -39,8 +39,8 @@ class MFAWidget extends StatefulWidget {
}) : assert( }) : assert(
(onSubmitted == null && submitButtonBuilder == null) || (onSubmitted == null && submitButtonBuilder == null) ||
(onSubmitted != null && submitButtonBuilder != null), (onSubmitted != null && submitButtonBuilder != null),
'onSubmitted and submitButtonBuilder must be both null or both' "onSubmitted and submitButtonBuilder must be both null or both"
' not null', " not null",
); );
/// Callback function triggered when the MFA code is completed. /// Callback function triggered when the MFA code is completed.
@ -106,7 +106,11 @@ class _MFAWidgetState extends State<MFAWidget> {
followingPinTheme: widget.followingPinTheme, followingPinTheme: widget.followingPinTheme,
disabledPinTheme: widget.disabledPinTheme, disabledPinTheme: widget.disabledPinTheme,
errorPinTheme: widget.errorPinTheme, errorPinTheme: widget.errorPinTheme,
separatorPositions: widget.seperatorPositions, separatorBuilder: (index) {
var seperatorSize =
widget.seperatorPositions?[index].toDouble() ?? 8.0;
return SizedBox(width: seperatorSize);
},
errorBuilder: widget.errorBuilder, errorBuilder: widget.errorBuilder,
errorText: widget.errorText, errorText: widget.errorText,
errorTextStyle: widget.errorTextStyle, errorTextStyle: widget.errorTextStyle,

View file

@ -1,22 +1,28 @@
name: flutter_login name: flutter_login
description: Flutter Login Component description: Flutter Login Component
version: 6.1.0 version: 7.3.0
publish_to: https://forgejo.internal.iconica.nl/api/packages/internal/pub
environment: environment:
sdk: ">=2.18.1 <3.0.0" sdk: ">=3.0.0 <4.0.0"
flutter: ">=1.17.0" flutter: ">=1.17.0"
dependencies: dependencies:
flutter: flutter:
sdk: flutter sdk: flutter
pinput: ^2.2.31 local_auth: ^2.3.0
pinput: ^5.0.1
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:
sdk: flutter sdk: flutter
flutter_iconica_analysis: flutter_iconica_analysis:
git: hosted: https://forgejo.internal.iconica.nl/api/packages/internal/pub
url: https://github.com/Iconica-Development/flutter_iconica_analysis version: ^7.0.0
ref: 6.0.0
flutter: flutter:
assets:
- assets/
- assets/2.0x/
- assets/3.0x/

View file

@ -0,0 +1,7 @@
import "package:flutter_test/flutter_test.dart";
void main() {
test("blank test", () {
expect(true, true);
});
}