bachelor/wonders
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup intro, remove button handler on final screen.

Browse Source
This commit is contained in:
Shawn 2023-01-03 10:35:26 -07:00
parent 7f54f4fab6
commit 15e1892589
1 changed files with 93 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

179
lib/ui/screens/intro/intro_screen.dart
View File

@ -24,7 +24,7 @@ class _IntroScreenState extends State<IntroScreen> {
late final PageController _pageController = PageController()..addListener(_handlePageChanged); late final PageController _pageController = PageController()..addListener(_handlePageChanged);
final ValueNotifier<int> _currentPage = ValueNotifier(0); final ValueNotifier<int> _currentPage = ValueNotifier(0);
bool get _isOnLastPage => _currentPage.value.round() == pageData.length - 1;
@override @override
void dispose() { void dispose() {
_pageController.dispose(); _pageController.dispose();
@ -50,6 +50,7 @@ class _IntroScreenState extends State<IntroScreen> {
void _handleNavTextDoubleTapped() { void _handleNavTextDoubleTapped() {
final int current = _pageController.page!.round(); final int current = _pageController.page!.round();
if (_isOnLastPage) return;
_pageController.animateToPage(current + 1, duration: 250.ms, curve: Curves.easeIn); _pageController.animateToPage(current + 1, duration: 250.ms, curve: Curves.easeIn);
} }
@ -66,96 +67,102 @@ class _IntroScreenState extends State<IntroScreen> {
// However, we only want the title / description to actually swipe, // However, we only want the title / description to actually swipe,
// so we stack a PageView with that content over top of all the other // so we stack a PageView with that content over top of all the other
// content, and line up their layouts. // content, and line up their layouts.
final List<Widget> pages = pageData.map((e) => _Page(data: e)).toList(); final List<Widget> pages = pageData.map((e) => _Page(data: e)).toList();
final Widget content = Stack(children: [ /// Return resulting widget tree
// page view with title & description:
MergeSemantics(
child: Semantics(
onIncrease: () => _handleSemanticSwipe(1),
onDecrease: () => _handleSemanticSwipe(-1),
child: PageView(
controller: _pageController,
children: pages,
onPageChanged: (_) => AppHaptics.lightImpact(),
),
),
),
IgnorePointer(
ignoringSemantics: false,
child: Column(children: [
Spacer(),
// logo:
Semantics(
header: true,
child: Container(
height: _logoHeight,
alignment: Alignment.center,
child: _WonderousLogo(),
),
),
// masked image:
SizedBox(
height: _imageSize,
width: _imageSize,
child: ValueListenableBuilder<int>(
valueListenable: _currentPage,
builder: (_, value, __) {
return AnimatedSwitcher(
duration: $styles.times.slow,
child: KeyedSubtree(
key: ValueKey(value), // so AnimatedSwitcher sees it as a different child.
child: _PageImage(data: pageData[value]),
),
);
},
),
),
// placeholder gap for text:
Gap(_IntroScreenState._textHeight),
// page indicator:
Container(
height: _pageIndicatorHeight,
alignment: Alignment(0.0, -0.75),
child:
AppPageIndicator(count: pageData.length, controller: _pageController, color: $styles.colors.offWhite),
),
Spacer(flex: 2),
]),
),
// Build a cpl overlays to hide the content when swiping on very wide screens
_buildHzGradientOverlay(left: true),
_buildHzGradientOverlay(),
// finish button:
Positioned(
right: $styles.insets.lg,
bottom: $styles.insets.lg,
child: _buildFinishBtn(context),
),
// nav help text:
BottomCenter(
child: Padding(
padding: EdgeInsets.only(bottom: $styles.insets.lg),
child: _buildNavText(context),
),
),
]);
return DefaultTextColor( return DefaultTextColor(
color: $styles.colors.offWhite, color: $styles.colors.offWhite,
child: Container( child: Container(
color: $styles.colors.black, color: $styles.colors.black,
child: SafeArea(child: content.animate().fadeIn(delay: 500.ms)), child: SafeArea(
child: Animate(
delay: 500.ms,
effects: const [FadeEffect()],
child: Stack(
children: [
// page view with title & description:
MergeSemantics(
child: Semantics(
onIncrease: () => _handleSemanticSwipe(1),
onDecrease: () => _handleSemanticSwipe(-1),
child: PageView(
controller: _pageController,
children: pages,
onPageChanged: (_) => AppHaptics.lightImpact(),
),
),
),
IgnorePointer(
ignoringSemantics: false,
child: Column(children: [
Spacer(),
// logo:
Semantics(
header: true,
child: Container(
height: _logoHeight,
alignment: Alignment.center,
child: _WonderousLogo(),
),
),
// masked image:
SizedBox(
height: _imageSize,
width: _imageSize,
child: ValueListenableBuilder<int>(
valueListenable: _currentPage,
builder: (_, value, __) {
return AnimatedSwitcher(
duration: $styles.times.slow,
child: KeyedSubtree(
key: ValueKey(value), // so AnimatedSwitcher sees it as a different child.
child: _PageImage(data: pageData[value]),
),
);
},
),
),
// placeholder gap for text:
Gap(_IntroScreenState._textHeight),
// page indicator:
Container(
height: _pageIndicatorHeight,
alignment: Alignment(0.0, -0.75),
child: AppPageIndicator(
count: pageData.length, controller: _pageController, color: $styles.colors.offWhite),
),
Spacer(flex: 2),
]),
),
// Build a cpl overlays to hide the content when swiping on very wide screens
_buildHzGradientOverlay(left: true),
_buildHzGradientOverlay(),
// finish button:
Positioned(
right: $styles.insets.lg,
bottom: $styles.insets.lg,
child: _buildFinishBtn(context),
),
// nav help text:
BottomCenter(
child: Padding(
padding: EdgeInsets.only(bottom: $styles.insets.lg),
child: _buildNavText(context),
),
),
],
),
),
),
), ),
); );
} }
@ -208,7 +215,7 @@ class _IntroScreenState extends State<IntroScreen> {
duration: $styles.times.fast, duration: $styles.times.fast,
child: Semantics( child: Semantics(
onTapHint: $strings.introSemanticNavigate, onTapHint: $strings.introSemanticNavigate,
onTap: _handleNavTextDoubleTapped, onTap: _isOnLastPage ? null : _handleNavTextDoubleTapped,
child: Text($strings.introSemanticSwipeLeft, style: $styles.text.bodySmall), child: Text($strings.introSemanticSwipeLeft, style: $styles.text.bodySmall),
), ),
); );