Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/impure/introduction_screen …
Browse files Browse the repository at this point in the history
…into impure-master
  • Loading branch information
Pyozer committed Jan 15, 2022
2 parents 349655f + 24ee9aa commit 6f79aef
Showing 1 changed file with 20 additions and 13 deletions.
33 changes: 20 additions & 13 deletions lib/src/introduction_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -307,11 +307,14 @@ class IntroductionScreenState extends State<IntroductionScreen> {
onPressed: isSkipBtn ? _onSkip : null,
);

final nextBtn = IntroButton(
child: widget.next,
color: widget.nextColor ?? widget.color,
style: widget.nextStyle,
onPressed: widget.showNextButton && !_isScrolling ? next : null,
final nextBtn = Semantics(
child: IntroButton(
child: widget.next,
color: widget.nextColor ?? widget.color,
style: widget.nextStyle,
onPressed: widget.showNextButton && !_isScrolling ? next : null,
),
label: "Next Button",
);

final doneBtn = IntroButton(
Expand Down Expand Up @@ -376,14 +379,18 @@ class IntroductionScreenState extends State<IntroductionScreen> {
flex: widget.dotsFlex,
child: Center(
child: widget.isProgress
? DotsIndicator(
reversed: widget.rtl,
dotsCount: getPagesLength(),
position: _currentPage,
decorator: widget.dotsDecorator,
onTap: widget.isProgressTap && !widget.freeze
? (pos) => animateScroll(pos.toInt())
: null,
? Semantics(
label: "Page ${_currentPage.round() + 1} of ${getPagesLength()}",
excludeSemantics: true,
child: DotsIndicator(
reversed: widget.rtl,
dotsCount: getPagesLength(),
position: _currentPage,
decorator: widget.dotsDecorator,
onTap: widget.isProgressTap && !widget.freeze
? (pos) => animateScroll(pos.toInt())
: null,
),
)
: const SizedBox(),
),
Expand Down

0 comments on commit 6f79aef

Please sign in to comment.