From ff515e2621e4862e5e056d3fcfb140ec8c3176d5 Mon Sep 17 00:00:00 2001 From: Dian Bayu Nugroho Date: Mon, 26 Feb 2024 15:11:28 +0700 Subject: [PATCH] fix: styling step registration --- .../risk_profile/risk_profile_view.dart | 10 ++-- .../submission_data/submission_parent.dart | 55 +++++++++---------- .../submit_signature/initial_signature.dart | 44 ++++++++------- 3 files changed, 54 insertions(+), 55 deletions(-) diff --git a/lib/features/auth/registration/view/submission_data/risk_profile/risk_profile_view.dart b/lib/features/auth/registration/view/submission_data/risk_profile/risk_profile_view.dart index 03a2520..d5b08ab 100644 --- a/lib/features/auth/registration/view/submission_data/risk_profile/risk_profile_view.dart +++ b/lib/features/auth/registration/view/submission_data/risk_profile/risk_profile_view.dart @@ -14,12 +14,12 @@ class RiskProfileView extends StatelessWidget { Widget build(BuildContext context) { return Container( width: SizeConfig.width, - height: SizeConfig.height, - padding: EdgeInsets.all(24), + height: SizeConfig.height * .8, + padding: const EdgeInsets.all(24), child: Column( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Column( + const Column( children: [ ImageView(image: PathAssets.imgDataReport), SizedBox( @@ -48,7 +48,7 @@ class RiskProfileView extends StatelessWidget { ), Column( children: [ - Row( + const Row( mainAxisAlignment: MainAxisAlignment.center, children: [ ImageView( @@ -68,7 +68,7 @@ class RiskProfileView extends StatelessWidget { ) ], ), - SizedBox( + const SizedBox( height: 24, ), ButtonView( diff --git a/lib/features/auth/registration/view/submission_data/submission_parent.dart b/lib/features/auth/registration/view/submission_data/submission_parent.dart index a881054..9f4689d 100644 --- a/lib/features/auth/registration/view/submission_data/submission_parent.dart +++ b/lib/features/auth/registration/view/submission_data/submission_parent.dart @@ -1,3 +1,4 @@ +import 'package:cims_apps/application/component/button/back_button_view.dart'; import 'package:cims_apps/application/component/custom_app_bar/custom_app_bar.dart'; import 'package:cims_apps/application/theme/color_palette.dart'; import 'package:cims_apps/core/route/route.dart'; @@ -82,8 +83,8 @@ class _SubmissionParentState extends State { appBar: CustomAppBar( height: SizeConfig.height * .1, title: 'Registration', - leading: BackButton( - onPressed: () { + leading: BackButtonView( + onPress: () { routePush( context, page: const BottomNavigationView(), @@ -92,35 +93,29 @@ class _SubmissionParentState extends State { }, ), ), - body: Stack( + body: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Padding( - padding: const EdgeInsets.symmetric( - horizontal: 16.0, vertical: 16.0), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: - List.generate(provider.stepAmount, (index) { - return _stepItem( - isCurrentStep: - provider.getCurrentStep == index + 1 || - provider.getCurrentStep - 1 > index, - ); - }), - ), - ), - Expanded( - child: Container( - padding: - const EdgeInsets.symmetric(horizontal: 16.0), - child: _content(provider.getCurrentStep), - ), - ), - ], + Padding( + padding: const EdgeInsets.symmetric( + horizontal: 16.0, vertical: 16.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: List.generate(provider.stepAmount, (index) { + return _stepItem( + isCurrentStep: + provider.getCurrentStep == index + 1 || + provider.getCurrentStep - 1 > index, + ); + }), + ), + ), + Expanded( + child: SingleChildScrollView( + padding: const EdgeInsets.symmetric(horizontal: 16.0), + child: _content(provider.getCurrentStep), + ), ), ], ), diff --git a/lib/features/auth/registration/view/submission_data/submit_signature/initial_signature.dart b/lib/features/auth/registration/view/submission_data/submit_signature/initial_signature.dart index 1811e35..d1bdbd3 100644 --- a/lib/features/auth/registration/view/submission_data/submit_signature/initial_signature.dart +++ b/lib/features/auth/registration/view/submission_data/submit_signature/initial_signature.dart @@ -24,26 +24,30 @@ class InitialSignature extends StatelessWidget { builder: (context, child) { return Consumer( builder: (context, provider, child) { - return Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - const TextCaption(title: 'Draw your digital sign'), - const ImageView(image: PathAssets.frameSignature), - const ListTileView( - title: - 'Make sure the sign you draw is match with your ID Card'), - SizedBox(height: SizeConfig.height * .07), - ButtonView( - name: 'Next', - onPressed: () { - provider.next(context).then((value) { - if (value) { - routePush(context, page: const SubmitSignature()); - } - }); - }, - ) - ], + return SizedBox( + height: SizeConfig.height * .8, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + const TextCaption(title: 'Draw your digital sign'), + const ImageView(image: PathAssets.frameSignature), + const ListTileView( + title: + 'Make sure the sign you draw is match with your ID Card'), + SizedBox(height: SizeConfig.height * .1), + ButtonView( + name: 'Next', + onPressed: () { + provider.next(context).then((value) { + if (value) { + routePush(context, page: const SubmitSignature()); + } + }); + }, + ) + ], + ), ); }); });