From cc94491f773b60c8d0e18a403ad168c2b6a0e118 Mon Sep 17 00:00:00 2001 From: jordyhers Date: Mon, 12 Jun 2023 19:48:34 +0200 Subject: [PATCH 1/2] fix(#) : fix splash screen error --- lib/app/splash/splash_content.dart | 86 +++++++++++++++--------------- 1 file changed, 42 insertions(+), 44 deletions(-) diff --git a/lib/app/splash/splash_content.dart b/lib/app/splash/splash_content.dart index a43caaa..1e520c0 100644 --- a/lib/app/splash/splash_content.dart +++ b/lib/app/splash/splash_content.dart @@ -50,29 +50,30 @@ class _SplashContentState extends State @override Widget build(BuildContext context) { - return SingleChildScrollView( - child: Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Padding( - padding: const EdgeInsets.symmetric( - horizontal: 10.0, - vertical: 40, - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Center( - child: Icon( - widget.icon, - size: 260, - ), + return Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Padding( + padding: const EdgeInsets.symmetric( + horizontal: 10.0, + vertical: 40, + ), + child: Stack( + children: [ + Center( + child: Icon( + widget.icon, + size: 260, ), - SizedBox(height: 20), - _SlideText( - slideAnimation: _slideAnimation, - delay: Duration(milliseconds: 200), + ), + SizedBox(height: 20), + _SlideText( + slideAnimation: _slideAnimation, + delay: Duration(milliseconds: 200), + child: Container( + padding: EdgeInsets.only(top: 250), + margin: EdgeInsets.symmetric(horizontal: 40), child: DisplayText( text: widget.title, fontSize: 25, @@ -82,28 +83,29 @@ class _SplashContentState extends State ), ), ), - SizedBox(height: 20), - _SlideText( - slideAnimation: _slideAnimation, - delay: Duration(milliseconds: 300), - child: Container( - margin: EdgeInsets.symmetric(horizontal: 40), - child: DisplayText( - text: widget.text, - fontSize: 17, - style: TextStyle( - color: Colors.black.withOpacity(0.5), - fontWeight: FontWeight.w400, - height: 1.2, - ), + ), + SizedBox(height: 20), + _SlideText( + slideAnimation: _slideAnimation, + delay: Duration(milliseconds: 300), + child: Container( + padding: EdgeInsets.only(top: 300), + margin: EdgeInsets.symmetric(horizontal: 40), + child: DisplayText( + text: widget.text, + fontSize: 17, + style: TextStyle( + color: Colors.black.withOpacity(0.5), + fontWeight: FontWeight.w400, + height: 1.2, ), ), ), - ], - ), + ), + ], ), - ], - ), + ), + ], ); } } @@ -125,10 +127,6 @@ class _SlideText extends StatelessWidget { return AnimatedPositioned( duration: const Duration(milliseconds: 300), curve: Curves.easeInOut, - left: 0, - right: 0, - top: 0, - bottom: 0, child: SlideTransition( position: slideAnimation!, child: _DelayedDisplay( From 460aa51b2a4ae4295cb3742052e9a35f86121a73 Mon Sep 17 00:00:00 2001 From: jordyhers Date: Mon, 12 Jun 2023 19:49:56 +0200 Subject: [PATCH 2/2] fix(#) : remove learn to --- lib/app/splash/splash_screen.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/app/splash/splash_screen.dart b/lib/app/splash/splash_screen.dart index cb3efc3..cd104a8 100644 --- a/lib/app/splash/splash_screen.dart +++ b/lib/app/splash/splash_screen.dart @@ -39,7 +39,7 @@ class _SplashScreenState extends State { { 'text': 'Send notifications to your child when time ' ' limit is reached or when he has to go to bed.', - 'title': 'Learn to Control and Monitor', + 'title': 'Control and Monitor', 'icon': Icons.lock_reset, }, {