CHANGELOG.md

@@ -1,13 +1,3 @@
-## 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.

README.md

@@ -9,44 +9,6 @@ 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.
 
-
-### 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
 
 ```dart

example/.gitignore

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

example/README.md

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

example/analysis_options.yaml

@@ -1,12 +1,29 @@
-include: package:flutter_iconica_analysis/analysis_options.yaml
+# This file configures the analyzer, which statically analyzes Dart code to
+# 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`.
 
-# https://dart-lang.github.io/linter/lints/index.html
+# The following line activates a set of recommended lints for Flutter apps,
-
+# packages, and plugins designed to encourage good coding practices.
-# Possible to overwrite the rules from the package
+include: package:flutter_lints/flutter.yaml
-
-analyzer:
-  plugins:
-  exclude:
 
 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:
+    # 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

example/lib/main.dart

@@ -1,7 +1,7 @@
 // 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(
   emailDecoration: const InputDecoration(
@@ -15,24 +15,21 @@ final loginOptions = LoginOptions(
   image: const FlutterLogo(
     size: 200,
   ),
-  biometricsOptions: const LoginBiometricsOptions(
-    loginWithBiometrics: true,
-    triggerBiometricsAutomatically: false,
-  ),
   requestForgotPasswordButtonBuilder: (
     context,
     onPressed,
     isDisabled,
     onDisabledPress,
     translations,
-  ) =>
+  ) {
-      Opacity(
+    return 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() {
@@ -43,46 +40,54 @@ class LoginExample extends StatelessWidget {
   const LoginExample({super.key});
 
   @override
-  Widget build(BuildContext context) => MaterialApp(
+  Widget build(BuildContext context) {
-        theme: ThemeData.dark(),
+    return MaterialApp(
-        home: const LoginScreen(),
+      theme: ThemeData.dark(),
-      );
+      home: const LoginScreen(),
+    );
+  }
 }
 
 class LoginScreen extends StatelessWidget {
   const LoginScreen({super.key});
 
   @override
-  Widget build(BuildContext context) => Scaffold(
+  Widget build(BuildContext context) {
-        body: EmailPasswordLoginForm(
+    return Scaffold(
-          title: const Text("Login Demo"),
+      body: EmailPasswordLoginForm(
-          options: loginOptions,
+        title: const Text('Login Demo'),
-          onLogin: (email, password) => print("$email:$password"),
+        options: loginOptions,
-          onRegister: (email, password, ctx) => print("Register!"),
+        onLogin: (email, password) => print('$email:$password'),
-          onForgotPassword: (email, ctx) async {
+        onRegister: (email, password, ctx) => print('Register!'),
-            await Navigator.of(context).push(
+        onForgotPassword: (email, ctx) {
-              MaterialPageRoute(
+          Navigator.of(context).push(
-                builder: (context) => const ForgotPasswordScreen(),
+            MaterialPageRoute(
-              ),
+              builder: (context) {
-            );
+                return const ForgotPasswordScreen();
-          },
+              },
-        ),
+            ),
-      );
+          );
+        },
+      ),
+    );
+  }
 }
 
 class ForgotPasswordScreen extends StatelessWidget {
   const ForgotPasswordScreen({super.key});
 
   @override
-  Widget build(BuildContext context) => Scaffold(
+  Widget build(BuildContext context) {
-        appBar: AppBar(),
+    return Scaffold(
-        body: ForgotPasswordForm(
+      appBar: AppBar(),
-          options: loginOptions,
+      body: ForgotPasswordForm(
-          title: const Text("Forgot password"),
+        options: loginOptions,
-          description: const Text("Hello world"),
+        title: const Text('Forgot password'),
-          onRequestForgotPassword: (email) {
+        description: const Text('Hello world'),
-            print("Forgot password email sent to $email");
+        onRequestForgotPassword: (email) {
-          },
+          print('Forgot password email sent to $email');
-        ),
+        },
-      );
+      ),
+    );
+  }
 }

example/pubspec.lock

@@ -0,0 +1,241 @@
+# 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: "7.1.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: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.4"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.3"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.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: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.12.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: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.7.0"
+  universal_platform:
+    dependency: transitive
+    description:
+      name: universal_platform
+      sha256: "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
+  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: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
+      url: "https://pub.dev"
+    source: hosted
+    version: "14.2.1"
+sdks:
+  dart: ">=3.3.0 <4.0.0"
+  flutter: ">=3.18.0-18.0.pre.54"

example/pubspec.yaml

@@ -1,12 +1,14 @@
 name: example
 description: A new Flutter project.
 
-publish_to: "none"
+# The following line prevents the package from being accidentally published to
+# 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
 
 environment:
-  sdk: ">=2.18.1 <3.0.0"
+  sdk: '>=2.18.1 <3.0.0'
 
 dependencies:
   flutter:
@@ -14,12 +16,11 @@ dependencies:
   flutter_login:
     path: ../
 
+
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_iconica_analysis:
+  flutter_lints: ^2.0.0
-    hosted: https://forgejo.internal.iconica.nl/api/packages/internal/pub
-    version: ^7.0.0
 
 flutter:
   uses-material-design: true

example/test/widget_test.dart

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

lib/flutter_login.dart

@@ -1,11 +1,11 @@
 ///
 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';

lib/src/config/forgot_password_spacer_options.dart

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

lib/src/config/login_options.dart

@@ -1,10 +1,10 @@
-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
 class LoginOptions {
@@ -17,7 +17,7 @@ class LoginOptions {
     this.passwordTextAlign,
     this.emailDecoration = const InputDecoration(
       contentPadding: EdgeInsets.symmetric(horizontal: 8),
-      labelText: "Email address",
+      labelText: 'Email address',
       border: OutlineInputBorder(),
       focusedBorder: OutlineInputBorder(
         borderSide: BorderSide(
@@ -32,7 +32,7 @@ class LoginOptions {
     ),
     this.passwordDecoration = const InputDecoration(
       contentPadding: EdgeInsets.symmetric(horizontal: 8),
-      labelText: "Password",
+      labelText: 'Password',
       border: OutlineInputBorder(),
       focusedBorder: OutlineInputBorder(
         borderSide: BorderSide(
@@ -45,15 +45,14 @@ class LoginOptions {
         fontSize: 16,
       ),
     ),
-    this.initialEmail = "",
+    this.initialEmail = '',
-    this.initialPassword = "",
+    this.initialPassword = '',
     this.spacers = const LoginSpacerOptions(
       spacerBeforeTitle: 8,
       spacerAfterTitle: 2,
       formFlexValue: 2,
     ),
     this.translations = const LoginTranslations(),
-    this.accessibilityIdentifiers = const LoginAccessibilityIdentifiers.empty(),
     this.validationService,
     this.loginButtonBuilder = _createLoginButton,
     this.forgotPasswordButtonBuilder = _createForgotPasswordButton,
@@ -75,7 +74,6 @@ class LoginOptions {
     this.forgotPasswordCustomAppBar,
     this.suffixIconSize,
     this.suffixIconPadding,
-    this.biometricsOptions = const LoginBiometricsOptions(),
   });
 
   /// Builds the login button.
@@ -136,12 +134,6 @@ class LoginOptions {
   /// Translations for various texts on the login screen.
   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.
   final ValidationService? validationService;
 
@@ -165,55 +157,17 @@ class LoginOptions {
 
   /// forgot password custom AppBar
   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 {
-  /// Provide your own translations to override the default english translations
   const LoginTranslations({
-    this.emailEmpty = "Please enter your email address",
+    this.emailEmpty = 'Please enter your email address',
-    this.passwordEmpty = "Please enter your password",
+    this.passwordEmpty = 'Please enter your password',
-    this.emailInvalid = "Please enter a valid email address",
+    this.emailInvalid = 'Please enter a valid email address',
-    this.loginButton = "Log in",
+    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;
@@ -223,53 +177,6 @@ class LoginTranslations {
   final String forgotPasswordButton;
   final String requestForgotPasswordButton;
   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(

lib/src/config/spacer_options.dart

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

lib/src/service/local_auth_service.dart

@@ -1,35 +0,0 @@
-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();
-    }
-  }
-}

lib/src/service/login_validation.dart

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

lib/src/widgets/biometrics_button.dart

@@ -1,45 +0,0 @@
-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,
-    );
-  }
-}

lib/src/widgets/custom_semantics.dart

@@ -1,36 +0,0 @@
-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,
-      );
-}

lib/src/widgets/email_password_login.dart

@@ -1,10 +1,7 @@
-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 {
   /// Constructs an [EmailPasswordLoginForm] widget.
@@ -48,10 +45,8 @@ class _EmailPasswordLoginFormState extends State<EmailPasswordLoginForm> {
   final ValueNotifier<bool> _formValid = ValueNotifier(false);
   bool _obscurePassword = true;
 
-  String _currentEmail = "";
+  String _currentEmail = '';
-  String _currentPassword = "";
+  String _currentPassword = '';
-
-  final LocalAuthService _localAuthService = LocalAuthService();
 
   void _updateCurrentEmail(String email) {
     _currentEmail = email;
@@ -91,123 +86,96 @@ class _EmailPasswordLoginFormState extends State<EmailPasswordLoginForm> {
     _currentEmail = widget.options.initialEmail;
     _currentPassword = widget.options.initialPassword;
     _validate();
-
-    if (widget.options.biometricsOptions.loginWithBiometrics &&
-        widget.options.biometricsOptions.triggerBiometricsAutomatically) {
-      WidgetsBinding.instance.addPostFrameCallback((_) async {
-        await _localAuthService.authenticate(widget.options);
-      });
-    }
   }
 
   @override
   Widget build(BuildContext context) {
     var options = widget.options;
 
-    var emailTextFormField = CustomSemantics(
+    var emailTextFormField = TextFormField(
-      identifier: options.accessibilityIdentifiers.emailTextFieldIdentifier,
+      autofillHints: const [
-      child: TextFormField(
+        AutofillHints.email,
-        autofillHints: const [
+        AutofillHints.username,
-          AutofillHints.email,
+      ],
-          AutofillHints.username,
+      textAlign: options.emailTextAlign ?? TextAlign.start,
-        ],
+      onChanged: _updateCurrentEmail,
-        textAlign: options.emailTextAlign ?? TextAlign.start,
+      validator: widget.options.validations.validateEmail,
-        onChanged: _updateCurrentEmail,
+      initialValue: options.initialEmail,
-        validator: widget.options.validations.validateEmail,
+      keyboardType: TextInputType.emailAddress,
-        initialValue: options.initialEmail,
+      textInputAction: TextInputAction.next,
-        keyboardType: TextInputType.emailAddress,
+      style: options.emailTextStyle,
-        textInputAction: TextInputAction.next,
+      decoration: options.emailDecoration,
-        style: options.emailTextStyle,
-        decoration: options.emailDecoration,
-      ),
     );
 
-    var passwordTextFormField = CustomSemantics(
+    var passwordTextFormField = TextFormField(
-      identifier: options.accessibilityIdentifiers.passwordTextFieldIdentifier,
+      autofillHints: const [
-      child: TextFormField(
+        AutofillHints.password,
-        autofillHints: const [
+      ],
-          AutofillHints.password,
+      textAlign: options.passwordTextAlign ?? TextAlign.start,
-        ],
+      obscureText: _obscurePassword,
-        textAlign: options.passwordTextAlign ?? TextAlign.start,
+      onChanged: _updateCurrentPassword,
-        obscureText: _obscurePassword,
+      validator: widget.options.validations.validatePassword,
-        onChanged: _updateCurrentPassword,
+      initialValue: options.initialPassword,
-        validator: widget.options.validations.validatePassword,
+      keyboardType: TextInputType.visiblePassword,
-        initialValue: options.initialPassword,
+      textInputAction: TextInputAction.done,
-        keyboardType: TextInputType.visiblePassword,
+      style: options.passwordTextStyle,
-        textInputAction: TextInputAction.done,
+      onFieldSubmitted: (_) async => _handleLogin(),
-        style: options.passwordTextStyle,
+      decoration: options.passwordDecoration.copyWith(
-        onFieldSubmitted: (_) async => _handleLogin(),
+        suffixIcon: options.showObscurePassword
-        decoration: options.passwordDecoration.copyWith(
+            ? IconButton(
-          suffixIcon: options.showObscurePassword
+                padding: options.suffixIconPadding,
-              ? IconButton(
+                onPressed: () {
-                  padding: options.suffixIconPadding,
+                  setState(() {
-                  onPressed: () {
+                    _obscurePassword = !_obscurePassword;
-                    setState(() {
+                  });
-                      _obscurePassword = !_obscurePassword;
+                },
-                    });
+                icon: Icon(
-                  },
+                  _obscurePassword ? Icons.visibility : Icons.visibility_off,
-                  icon: Icon(
+                  size: options.suffixIconSize,
-                    _obscurePassword ? Icons.visibility : Icons.visibility_off,
+                ),
-                    size: options.suffixIconSize,
+              )
-                  ),
+            : null,
-                )
-              : null,
-        ),
       ),
     );
 
     var forgotPasswordButton = widget.onForgotPassword != null
         ? Align(
             alignment: Alignment.topRight,
-            child: CustomSemantics(
+            child: options.forgotPasswordButtonBuilder(
-              identifier: options
+              context,
-                  .accessibilityIdentifiers.forgotPasswordButtonIdentifier,
+              () => widget.onForgotPassword?.call(_currentEmail, context),
-              child: options.forgotPasswordButtonBuilder(
+              false,
-                context,
+              () {},
-                () => widget.onForgotPassword?.call(_currentEmail, context),
+              options,
-                false,
-                () {},
-                options,
-              ),
             ),
           )
         : const SizedBox(height: 16);
 
     var loginButton = AnimatedBuilder(
       animation: _formValid,
-      builder: (context, _) => CustomSemantics(
+      builder: (context, _) => options.loginButtonBuilder(
-        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 {
+        _handleLogin,
-          widget.onRegister?.call(
+        !_formValid.value,
-            _currentEmail,
+        () {
-            _currentPassword,
+          _formKey.currentState?.validate();
-            context,
-          );
         },
-        false,
-        () {},
         options,
       ),
     );
 
-    var biometricsButton = BiometricsButton(
+    var registerButton = options.registrationButtonBuilder(
-      onPressed: () async => LocalAuthService().authenticate(options),
+      context,
+      () async {
+        widget.onRegister?.call(
+          _currentEmail,
+          _currentPassword,
+          context,
+        );
+      },
+      false,
+      () {},
+      options,
     );
 
     return Scaffold(
@@ -250,24 +218,9 @@ class _EmailPasswordLoginFormState extends State<EmailPasswordLoginForm> {
                             if (options.spacers.spacerAfterForm != null) ...[
                               Spacer(flex: options.spacers.spacerAfterForm!),
                             ],
-                            if (options
+                            loginButton,
-                                .biometricsOptions.loginWithBiometrics) ...[
-                              Row(
-                                mainAxisAlignment:
-                                    MainAxisAlignment.spaceBetween,
-                                children: [
-                                  SizedBox(
-                                    width: BiometricsButton.buttonSize.width,
-                                  ),
-                                  loginButton,
-                                  biometricsButton,
-                                ],
-                              ),
-                            ] else ...[
-                              loginButton,
-                            ],
                             if (widget.onRegister != null) ...[
-                              registrationButton,
+                              registerButton,
                             ],
                             if (options.spacers.spacerAfterButton != null) ...[
                               Spacer(flex: options.spacers.spacerAfterButton!),

lib/src/widgets/forgot_password_form.dart

@@ -1,8 +1,7 @@
-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";
 
 class ForgotPasswordForm extends StatefulWidget {
   /// Constructs a [ForgotPasswordForm] widget.
@@ -50,7 +49,7 @@ class _ForgotPasswordFormState extends State<ForgotPasswordForm> {
 
   final ValueNotifier<bool> _formValid = ValueNotifier(false);
 
-  String _currentEmail = "";
+  String _currentEmail = '';
 
   void _updateCurrentEmail(String email) {
     _currentEmail = email;
@@ -136,23 +135,19 @@ class _ForgotPasswordFormState extends State<ForgotPasswordForm> {
                           child: Align(
                             alignment: Alignment.center,
                             child: options.emailInputContainerBuilder(
-                              CustomSemantics(
+                              TextFormField(
-                                identifier: options.accessibilityIdentifiers
+                                autofillHints: const [AutofillHints.email],
-                                    .emailTextFieldIdentifier,
+                                textAlign:
-                                child: TextFormField(
+                                    options.emailTextAlign ?? TextAlign.start,
-                                  autofillHints: const [AutofillHints.email],
+                                focusNode: _focusNode,
-                                  textAlign:
+                                onChanged: _updateCurrentEmail,
-                                      options.emailTextAlign ?? TextAlign.start,
+                                validator:
-                                  focusNode: _focusNode,
+                                    widget.options.validations.validateEmail,
-                                  onChanged: _updateCurrentEmail,
+                                initialValue: options.initialEmail,
-                                  validator:
+                                keyboardType: TextInputType.emailAddress,
-                                      widget.options.validations.validateEmail,
+                                textInputAction: TextInputAction.next,
-                                  initialValue: options.initialEmail,
+                                style: options.emailTextStyle,
-                                  keyboardType: TextInputType.emailAddress,
+                                decoration: options.emailDecoration,
-                                  textInputAction: TextInputAction.next,
-                                  style: options.emailTextStyle,
-                                  decoration: options.emailDecoration,
-                                ),
                               ),
                             ),
                           ),
@@ -170,24 +165,19 @@ class _ForgotPasswordFormState extends State<ForgotPasswordForm> {
                   AnimatedBuilder(
                     animation: _formValid,
                     builder: (context, snapshot) => Align(
-                      child: CustomSemantics(
+                      child: widget.options.requestForgotPasswordButtonBuilder(
-                        identifier: options.accessibilityIdentifiers
+                        context,
-                            .requestForgotPasswordButtonIdentifier,
+                        () async {
-                        child:
+                          _formKey.currentState?.validate();
-                            widget.options.requestForgotPasswordButtonBuilder(
+                          if (_formValid.value) {
-                          context,
+                            widget.onRequestForgotPassword(_currentEmail);
-                          () async {
+                          }
-                            _formKey.currentState?.validate();
+                        },
-                            if (_formValid.value) {
+                        !_formValid.value,
-                              widget.onRequestForgotPassword(_currentEmail);
+                        () {
-                            }
+                          _formKey.currentState?.validate();
-                          },
+                        },
-                          !_formValid.value,
+                        options,
-                          () {
-                            _formKey.currentState?.validate();
-                          },
-                          options,
-                        ),
                       ),
                     ),
                   ),

lib/src/widgets/mfa_widget.dart

@@ -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 {
   /// Constructs an [MFAWidget].
@@ -39,8 +39,8 @@ class MFAWidget extends StatefulWidget {
   }) : assert(
           (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.
@@ -106,11 +106,7 @@ class _MFAWidgetState extends State<MFAWidget> {
             followingPinTheme: widget.followingPinTheme,
             disabledPinTheme: widget.disabledPinTheme,
             errorPinTheme: widget.errorPinTheme,
-            separatorBuilder: (index) {
+            separatorPositions: widget.seperatorPositions,
-              var seperatorSize =
-                  widget.seperatorPositions?[index].toDouble() ?? 8.0;
-              return SizedBox(width: seperatorSize);
-            },
             errorBuilder: widget.errorBuilder,
             errorText: widget.errorText,
             errorTextStyle: widget.errorTextStyle,

pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_login
 description: Flutter Login Component
-version: 7.3.0
+version: 7.1.3
 
 publish_to: https://forgejo.internal.iconica.nl/api/packages/internal/pub
 
@@ -11,18 +11,14 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  local_auth: ^2.3.0
+  pinput: ^2.2.31
-  pinput: ^5.0.1
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
   flutter_iconica_analysis:
-    hosted: https://forgejo.internal.iconica.nl/api/packages/internal/pub
+    git:
-    version: ^7.0.0
+      url: https://github.com/Iconica-Development/flutter_iconica_analysis
+      ref: 6.0.0
 
 flutter:
-  assets:
-    - assets/
-    - assets/2.0x/
-    - assets/3.0x/

test/flutter_login_widget_test.dart

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