From ad6195061d5743eb68c4f1c7f2cf456c3e9a92df Mon Sep 17 00:00:00 2001 From: Dian Bayu Nugroho Date: Tue, 20 Feb 2024 10:24:32 +0700 Subject: [PATCH] fix: widget overflow --- .../component/text_form/text_form_view.dart | 4 +- .../view/registration_password_view.dart | 2 +- .../data_bank/submit_bank_account.dart | 91 ++++++++++--------- .../submission_data/submit_data_id_card.dart | 8 +- 4 files changed, 57 insertions(+), 48 deletions(-) diff --git a/lib/application/component/text_form/text_form_view.dart b/lib/application/component/text_form/text_form_view.dart index 2c0eb1e..d52d093 100644 --- a/lib/application/component/text_form/text_form_view.dart +++ b/lib/application/component/text_form/text_form_view.dart @@ -139,7 +139,7 @@ class TextFormView extends StatelessWidget { style: TextStyle( fontWeight: FontWeight.w500, fontSize: 14, - color: fontColorDisabled ?? ColorPalette.slate500, + color: fontColorDisabled ?? ColorPalette.slate800, ), readOnly: readOnly, validator: validator, @@ -161,7 +161,7 @@ class TextFormView extends StatelessWidget { hintStyle: hintTextStyle ?? const TextStyle( fontSize: 14, - color: ColorPalette.greyFont, + color: ColorPalette.slate400, fontWeight: FontWeight.normal, ), isDense: true, diff --git a/lib/features/auth/registration/view/registration_password_view.dart b/lib/features/auth/registration/view/registration_password_view.dart index d614e6c..47c1a3f 100644 --- a/lib/features/auth/registration/view/registration_password_view.dart +++ b/lib/features/auth/registration/view/registration_password_view.dart @@ -45,7 +45,7 @@ class RegistrationPasswordView extends StatelessWidget { validator: (value) { if (value!.isEmpty) { return 'Password must filled'; - } else if (value.length <= 8) { + } else if (value.length < 8) { return 'Minimum password 8 Character'; } else { return null; diff --git a/lib/features/auth/registration/view/submission_data/data_bank/submit_bank_account.dart b/lib/features/auth/registration/view/submission_data/data_bank/submit_bank_account.dart index d625392..fb7197a 100644 --- a/lib/features/auth/registration/view/submission_data/data_bank/submit_bank_account.dart +++ b/lib/features/auth/registration/view/submission_data/data_bank/submit_bank_account.dart @@ -29,52 +29,57 @@ class SubmitBankAccount extends StatelessWidget { return SizedBox( child: Consumer( builder: (context, provider, child) { - return Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - const TextCaption(title: 'Input your bank account data'), - SelectFormView( - name: 'Bank Name', - hintText: 'Select Bank', - listItem: provider.listBank, - ctrl: provider.ctrlBankName, - onSelect: (value) {}, - ), - TextFormView( - name: 'Account Number', - hintText: 'Input Account Number', - trailingTitleWidget: SizedBox( - width: 24, - child: GestureDetector( - onTap: () { - routePush(context, page: const GuideScreen()); - }, - child: const ImageView(image: PathAssets.iconQuestion), + return SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const TextCaption(title: 'Input your bank account data'), + SelectFormView( + name: 'Bank Name', + hintText: 'Select Bank', + listItem: provider.listBank, + ctrl: provider.ctrlBankName, + onSelect: (value) {}, + ), + TextFormView( + name: 'Account Number', + hintText: 'Input Account Number', + keyboardType: TextInputType.number, + trailingTitleWidget: SizedBox( + width: 24, + child: GestureDetector( + onTap: () { + routePush(context, page: const GuideScreen()); + }, + child: + const ImageView(image: PathAssets.iconQuestion), + ), ), ), - ), - TextFormView( - name: 'Account Owner Name', - hintText: 'Input Account Name', - ), - const Text( - "Make sure the account you use is in your name, not someone else's", - style: TextStyle( - color: ColorPalette.slate400, + TextFormView( + name: 'Account Owner Name', + hintText: 'Input Account Name', ), - ), - SizedBox(height: SizeConfig.height * .08), - ButtonView( - name: 'Next', - onPressed: () { - provider.next(context).then((value) { - if (value) { - routePush(context, page: const ConfirmBankAccount()); - } - }); - }, - ) - ], + const Text( + "Make sure the account you use is in your name, not someone else's", + style: TextStyle( + color: ColorPalette.slate400, + ), + ), + SizedBox(height: SizeConfig.height * .08), + ButtonView( + name: 'Next', + onPressed: () { + provider.next(context).then((value) { + if (value) { + routePush(context, + page: const ConfirmBankAccount()); + } + }); + }, + ) + ], + ), ); }), ); diff --git a/lib/features/auth/registration/view/submission_data/submit_data_id_card.dart b/lib/features/auth/registration/view/submission_data/submit_data_id_card.dart index 24c096b..a7445cb 100644 --- a/lib/features/auth/registration/view/submission_data/submit_data_id_card.dart +++ b/lib/features/auth/registration/view/submission_data/submit_data_id_card.dart @@ -30,7 +30,7 @@ class SubmitDataIdCard extends StatelessWidget { color: Colors.white, borderRadius: BorderRadius.vertical(top: Radius.circular(18))), - height: SizeConfig.height * .32, + height: SizeConfig.height * .35, padding: const EdgeInsets.all(16.0), child: Column( mainAxisAlignment: MainAxisAlignment.spaceBetween, @@ -173,11 +173,15 @@ class SubmitDataIdCard extends StatelessWidget { children: [ const TextCaption( title: 'Check your ID card data for accuracy'), - TextFormView(name: 'NIK'), + TextFormView( + name: 'NIK', + keyboardType: TextInputType.number, + ), TextFormView(name: 'Full Name'), DatePickerView( name: 'Birth Date', ctrl: provider.ctrlBirthDate, + maxDate: DateTime.now(), isMultipleSelection: false, enabled: true), photoDocument(provider),