Merge branch 'master' into master

Author: Pyozer

README.md

@@ -349,7 +349,7 @@ This is the full list:
   - This param is required, EXCEPT if you set `showNextButton: false`
 - Define pre-made Skip button child (Widget), by adding `skip: Text('Skip')`
   - This param is required if you set `showSkipButton: true`
-  Define pre-made Back button child (Widget), by adding `back: Text('Back')`
+- Define pre-made Back button child (Widget), by adding `back: Text('Back')`
   - This param is required if you set `showBackButton: true`
 
 #### Use custom buttons

lib/src/introduction_screen.dart

@@ -3,10 +3,9 @@ library introduction_screen;
 import 'dart:async';
 import 'dart:math';
 
-import 'package:flutter/material.dart';
-
 import 'package:collection/collection.dart';
 import 'package:dots_indicator/dots_indicator.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_keyboard_visibility_temp_fork/flutter_keyboard_visibility_temp_fork.dart';
 
 import '/src/helper.dart';
@@ -42,28 +41,32 @@ class IntroductionScreen extends StatefulWidget {
 
   /// Override pre-made done button.
   /// You can what you want (button, text, image, ...)
-  final Widget? overrideDone;
+  final Widget Function(BuildContext context, Function()? onPressed)?
+      overrideDone;
 
   /// Skip button child for the pre-made TextButton
   final Widget? skip;
 
   /// Override pre-made skip button.
   /// You can what you want (button, text, image, ...)
-  final Widget? overrideSkip;
+  final Widget Function(BuildContext context, Function() onPressed)?
+      overrideSkip;
 
   /// Next button child for the pre-made TextButton
   final Widget? next;
 
   /// Override pre-made next button.
   /// You can what you want (button, text, image, ...)
-  final Widget? overrideNext;
+  final Widget Function(BuildContext context, Function()? onPressed)?
+      overrideNext;
 
   /// Back button child for the pre-made TextButton
   final Widget? back;
 
   /// Override pre-made back button.
   /// You can what you want (button, text, image, ...)
-  final Widget? overrideBack;
+  final Widget Function(BuildContext context, Function()? onPressed)?
+      overrideBack;
 
   /// Is the Skip button should be display
   ///
@@ -96,6 +99,11 @@ class IntroductionScreen extends StatefulWidget {
   /// @Default `false`
   final bool showBackButton;
 
+  /// If the Back button should be display for the first page
+  ///
+  /// @Default `false`
+  final bool showFirstBackButton;
+
   /// If a custom Widget should be used instead of the default progress indicator
   ///
   /// @Default `null`
@@ -199,6 +207,9 @@ class IntroductionScreen extends StatefulWidget {
   /// Back button semantic label
   final String? backSemantic;
 
+  /// Progress indicator semantic label
+  final String Function(int, int)? progressSemantic;
+
   /// Enable or disable content resizing for bottom inset (e.g. keyboard)
   ///
   /// @Default `true`
@@ -299,6 +310,7 @@ class IntroductionScreen extends StatefulWidget {
       this.showDoneButton = true,
       this.showBottomPart = true,
       this.showBackButton = false,
+      this.showFirstBackButton = false,
       this.customProgress,
       this.isProgress = true,
       this.hideBottomOnKeyboard = false,
@@ -324,6 +336,7 @@ class IntroductionScreen extends StatefulWidget {
       this.nextSemantic,
       this.doneSemantic,
       this.backSemantic,
+      this.progressSemantic,
       this.resizeToAvoidBottomInset = true,
       this.controlsPosition = const Position(left: 0, right: 0, bottom: 0),
       this.controlsMargin = EdgeInsets.zero,
@@ -558,49 +571,54 @@ class IntroductionScreenState extends State<IntroductionScreen> {
         maintainAnimation: true,
         // Needs to be true to maintain size
         maintainSize: true,
-        child: widget.overrideSkip ??
-            IntroButton(
-              child: widget.skip!,
-              style: widget.baseBtnStyle?.merge(widget.skipStyle) ??
-                  widget.skipStyle,
-              semanticLabel: widget.skipSemantic,
-              onPressed: _onSkip,
-            ),
+        child: widget.overrideSkip != null
+            ? widget.overrideSkip!(context, _onSkip)
+            : IntroButton(
+                child: widget.skip!,
+                style: widget.baseBtnStyle?.merge(widget.skipStyle) ??
+                    widget.skipStyle,
+                semanticLabel: widget.skipSemantic,
+                onPressed: _onSkip,
+              ),
       );
-    } else if (widget.showBackButton &&
-        getCurrentPage() > 0 &&
-        widget.canProgress(getCurrentPage())) {
-      leftBtn = widget.overrideBack ??
-          IntroButton(
-            child: widget.back!,
-            style: widget.baseBtnStyle?.merge(widget.backStyle) ??
-                widget.backStyle,
-            semanticLabel: widget.backSemantic,
-            onPressed: !_isScrolling ? previous : null,
-          );
+    } else if ((widget.showFirstBackButton && getCurrentPage() == 0) ||
+        (widget.showBackButton &&
+            getCurrentPage() > 0 &&
+            widget.canProgress(getCurrentPage()))) {
+      leftBtn = widget.overrideBack != null
+          ? widget.overrideBack!(context, !_isScrolling ? previous : null)
+          : IntroButton(
+              child: widget.back!,
+              style: widget.baseBtnStyle?.merge(widget.backStyle) ??
+                  widget.backStyle,
+              semanticLabel: widget.backSemantic,
+              onPressed: !_isScrolling ? previous : null,
+            );
     }
 
     Widget? rightBtn;
     if (isLastPage && widget.showDoneButton) {
-      rightBtn = widget.overrideDone ??
-          IntroButton(
-            child: widget.done!,
-            style: widget.baseBtnStyle?.merge(widget.doneStyle) ??
-                widget.doneStyle,
-            semanticLabel: widget.doneSemantic,
-            onPressed: !_isScrolling ? widget.onDone : null,
-          );
+      rightBtn = widget.overrideDone != null
+          ? widget.overrideDone!(context, !_isScrolling ? widget.onDone : null)
+          : IntroButton(
+              child: widget.done!,
+              style: widget.baseBtnStyle?.merge(widget.doneStyle) ??
+                  widget.doneStyle,
+              semanticLabel: widget.doneSemantic,
+              onPressed: !_isScrolling ? widget.onDone : null,
+            );
     } else if (!isLastPage &&
         widget.showNextButton &&
         widget.canProgress(getCurrentPage())) {
-      rightBtn = widget.overrideNext ??
-          IntroButton(
-            child: widget.next!,
-            style: widget.baseBtnStyle?.merge(widget.nextStyle) ??
-                widget.nextStyle,
-            semanticLabel: widget.nextSemantic,
-            onPressed: !_isScrolling ? next : null,
-          );
+      rightBtn = widget.overrideNext != null
+          ? widget.overrideNext!(context, !_isScrolling ? next : null)
+          : IntroButton(
+              child: widget.next!,
+              style: widget.baseBtnStyle?.merge(widget.nextStyle) ??
+                  widget.nextStyle,
+              semanticLabel: widget.nextSemantic,
+              onPressed: !_isScrolling ? next : null,
+            );
     }
 
     final pages = widget.pages
@@ -680,7 +698,9 @@ class IntroductionScreenState extends State<IntroductionScreen> {
                               child: widget.isProgress
                                   ? widget.customProgress ??
                                       Semantics(
-                                        label:
+                                        label: widget.progressSemantic?.call(
+                                                getCurrentPage() + 1,
+                                                getPagesLength()) ??
                                             "Page ${getCurrentPage() + 1} of ${getPagesLength()}",
                                         excludeSemantics: true,
                                         child: DotsIndicator(