update customizedButton

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Changelog
+## [9.0.1+1] - 2023-09-04
 
+- update customizedButton 
 ## [9.0.0+1] - 2023-02-15
 
 - Disable splash animation for hidden buttons.

example/.gitignore

@@ -29,6 +29,7 @@
 .pub-cache/
 .pub/
 /build/
+/windows/
 
 # Web related
 lib/generated_plugin_registrant.dart

example/.metadata

@@ -1,20 +1,23 @@
 # This file tracks properties of this Flutter project.
 # Used by Flutter tool to assess capabilities and perform upgrades etc.
 #
-# This file should be version controlled.
+# This file should be version controlled and should not be manually edited.
 
 version:
-  revision: eb6d86ee27deecba4a83536aa20f366a6044895c
-  channel: stable
+  revision: "ff5b5b5fa6f35b717667719ddfdb1521d8bdd05a"
+  channel: "stable"
 
 project_type: app
 
 # Tracks metadata for the flutter migrate command
 migration:
   platforms:
     - platform: root
-      create_revision: eb6d86ee27deecba4a83536aa20f366a6044895c
-      base_revision: eb6d86ee27deecba4a83536aa20f366a6044895c
+      create_revision: ff5b5b5fa6f35b717667719ddfdb1521d8bdd05a
+      base_revision: ff5b5b5fa6f35b717667719ddfdb1521d8bdd05a
+    - platform: windows
+      create_revision: ff5b5b5fa6f35b717667719ddfdb1521d8bdd05a
+      base_revision: ff5b5b5fa6f35b717667719ddfdb1521d8bdd05a
 
   # User provided section
 

example/lib/main.dart

@@ -95,6 +95,18 @@ class _MyHomePageState extends State<MyHomePage> {
                           },
                           child: const Text('Reset input'),
                         ),
+                        customizedButtonChild: (bool confirmed) => Icon(
+                          confirmed
+                              ? Icons.restart_alt_rounded
+                              : Icons.arrow_back,
+                        ),
+                        customizedButtonTap: (confirmed, controller) {
+                          if (confirmed) {
+                            controller.unsetConfirmed();
+                          } else {
+                            Navigator.of(context).pop();
+                          }
+                        },
                       );
                     },
                     child: const Text('Confirm mode'),
@@ -103,10 +115,11 @@ class _MyHomePageState extends State<MyHomePage> {
                     onPressed: () => screenLock(
                       context: context,
                       correctString: '1234',
-                      customizedButtonChild: const Icon(
+                      customizedButtonChild: (_) => const Icon(
                         Icons.fingerprint,
                       ),
-                      customizedButtonTap: () async => await localAuth(context),
+                      customizedButtonTap: (confirmed, controller) async =>
+                          await localAuth(context),
                       onOpened: () async => await localAuth(context),
                     ),
                     child: const Text(

example/pubspec.lock

@@ -5,23 +5,26 @@ packages:
     dependency: transitive
     description:
       name: characters
-      url: "https://pub.dartlang.org"
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.3.0"
   clock:
     dependency: transitive
     description:
       name: clock
-      url: "https://pub.dartlang.org"
+      sha256: "6021e0172ab6e6eaa1d391afed0a99353921f00c54385c574dc53e55d67c092c"
+      url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.dartlang.org"
+      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
+      url: "https://pub.dev"
     source: hosted
-    version: "1.16.0"
+    version: "1.17.2"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -31,14 +34,16 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      url: "https://pub.dartlang.org"
+      sha256: b543301ad291598523947dc534aaddc5aaad597b709d2426d3a0e0d44c5cb493
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.4"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      url: "https://pub.dartlang.org"
+      sha256: "0ba8a1854c2098ddbd043e47eb28451a13f4cab7db9b2696f13a39fd8853421d"
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
   flutter_screen_lock:
@@ -47,54 +52,61 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "9.0.0+1"
+    version: "9.0.1+1"
   intl:
     dependency: transitive
     description:
       name: intl
-      url: "https://pub.dartlang.org"
+      sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91"
+      url: "https://pub.dev"
     source: hosted
     version: "0.17.0"
   lints:
     dependency: transitive
     description:
       name: lints
-      url: "https://pub.dartlang.org"
+      sha256: a2c3d198cb5ea2e179926622d433331d8b58374ab8f29cdda6e863bd62fd369c
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.1"
   local_auth:
     dependency: "direct main"
     description:
       name: local_auth
-      url: "https://pub.dartlang.org"
+      sha256: e726cb95a302f3fd9186a97133ff00061aad993cce14fadc5d552a7eb66c7191
+      url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      url: "https://pub.dartlang.org"
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.1.5"
+    version: "0.5.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.0"
+    version: "1.9.1"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      sha256: "2ad4cddff7f5cc0e2d13069f2a3f7a73ca18f66abd6f5ecf215219cdb3638edb"
+      url: "https://pub.dev"
     source: hosted
     version: "1.8.0"
   platform:
     dependency: "direct main"
     description:
       name: platform
-      url: "https://pub.dartlang.org"
+      sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76"
+      url: "https://pub.dev"
     source: hosted
     version: "3.1.0"
   sky_engine:
@@ -106,9 +118,18 @@ packages:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.dartlang.org"
+      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.4"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "0.1.4-beta"
 sdks:
-  dart: ">=2.17.0 <3.0.0"
+  dart: ">=3.1.0-185.0.dev <4.0.0"
   flutter: ">=1.20.0"

example/pubspec.yaml

@@ -12,7 +12,7 @@ dependencies:
     sdk: flutter
   flutter_screen_lock:
     path: ../
-  local_auth: 1.1.0
+  local_auth: 
   platform: ^3.1.0
 
 dev_dependencies:

lib/src/configurations/screen_lock_config.dart

@@ -30,8 +30,8 @@ class ScreenLockConfig {
       scaffoldBackgroundColor: backgroundColor,
       outlinedButtonTheme: OutlinedButtonThemeData(style: buttonStyle),
       textTheme: TextTheme(
-        headline6: titleTextStyle,
-        bodyText2: textStyle,
+        titleLarge: titleTextStyle,
+        bodySmall: textStyle,
       ),
     );
   }

lib/src/functions.dart

@@ -44,8 +44,8 @@ Future<void> screenLock({
   SecretsConfig? secretsConfig,
   KeyPadConfig? keyPadConfig,
   DelayBuilderCallback? delayBuilder,
-  Widget? customizedButtonChild,
-  VoidCallback? customizedButtonTap,
+  Widget Function(bool confirmed)? customizedButtonChild,
+  Function(bool confirmed, InputController controller)? customizedButtonTap,
   Widget? footer,
   Widget? cancelButton,
   Widget? deleteButton,
@@ -151,8 +151,8 @@ Future<void> screenLockCreate({
   SecretsConfig? secretsConfig,
   KeyPadConfig? keyPadConfig,
   DelayBuilderCallback? delayBuilder,
-  Widget? customizedButtonChild,
-  VoidCallback? customizedButtonTap,
+  Widget Function(bool confirmed)? customizedButtonChild,
+  Function(bool confirmed, InputController controller)? customizedButtonTap,
   Widget? footer,
   Widget? cancelButton,
   Widget? deleteButton,

lib/src/screen_lock.dart

@@ -107,7 +107,8 @@ class ScreenLock extends StatefulWidget {
   final ValueChanged<int>? onMaxRetries;
 
   /// Tapped for left side lower button.
-  final VoidCallback? customizedButtonTap;
+  final Function(bool confirmed, InputController controller)?
+      customizedButtonTap;
 
   /// `0` is unlimited.
   /// For example, if it is set to 1, didMaxRetries will be called on the first failure.
@@ -140,7 +141,7 @@ class ScreenLock extends StatefulWidget {
   final DelayBuilderCallback? delayBuilder;
 
   /// Child for bottom left side button.
-  final Widget? customizedButtonChild;
+  final Widget Function(bool confirmed)? customizedButtonChild;
 
   /// Footer widget.
   final Widget? footer;
@@ -313,7 +314,7 @@ class _ScreenLockState extends State<ScreenLock> {
 
     return Builder(
       builder: (context) => DefaultTextStyle(
-        style: Theme.of(context).textTheme.headline6!,
+        style: Theme.of(context).textTheme.titleLarge!,
         textAlign: TextAlign.center,
         child: buildDelay(
           buildConfirmed(
@@ -324,6 +325,17 @@ class _ScreenLockState extends State<ScreenLock> {
     );
   }
 
+  Widget? customizedButtonChild() {
+    if (widget.customizedButtonChild != null) {
+      return StreamBuilder<bool>(
+        stream: inputController.confirmed,
+        builder: (context, snapshot) =>
+            widget.customizedButtonChild!(snapshot.data == true),
+      );
+    }
+    return null;
+  }
+
   @override
   Widget build(BuildContext context) {
     final orientations = <Orientation, Axis>{
@@ -352,18 +364,23 @@ class _ScreenLockState extends State<ScreenLock> {
     }
 
     Widget buildKeyPad() {
-      return Center(
-        child: KeyPad(
-          enabled: enabled && !inputDelayed,
-          config: widget.keyPadConfig,
-          inputState: inputController,
-          didCancelled: widget.onCancelled,
-          customizedButtonTap: widget.customizedButtonTap,
-          customizedButtonChild: widget.customizedButtonChild,
-          deleteButton: widget.deleteButton,
-          cancelButton: widget.cancelButton,
-        ),
-      );
+      return StreamBuilder<bool>(
+          stream: inputController.confirmed,
+          builder: (context, snapshot) {
+            return Center(
+              child: KeyPad(
+                enabled: enabled && !inputDelayed,
+                config: widget.keyPadConfig,
+                inputState: inputController,
+                didCancelled: widget.onCancelled,
+                customizedButtonTap: () => widget.customizedButtonTap
+                    ?.call(snapshot.data == true, inputController),
+                customizedButtonChild: customizedButtonChild(),
+                deleteButton: widget.deleteButton,
+                cancelButton: widget.cancelButton,
+              ),
+            );
+          });
     }
 
     Widget buildContent() {