App Version added and dart format
This commit is contained in:
@@ -24,8 +24,8 @@ class AddBeneficiaryScreen extends StatefulWidget {
|
||||
class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
|
||||
final _formKey = GlobalKey<FormState>();
|
||||
final _accountNumberFieldKey = GlobalKey<FormFieldState>();
|
||||
final _confirmAccountNumberFieldKey = GlobalKey<FormFieldState>();
|
||||
final _ifscFieldKey = GlobalKey<FormFieldState>();
|
||||
final _confirmAccountNumberFieldKey = GlobalKey<FormFieldState>();
|
||||
final _ifscFieldKey = GlobalKey<FormFieldState>();
|
||||
final TextEditingController accountNumberController = TextEditingController();
|
||||
final TextEditingController confirmAccountNumberController =
|
||||
TextEditingController();
|
||||
@@ -47,10 +47,10 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
|
||||
void initState() {
|
||||
super.initState();
|
||||
_ifscFocusNode.addListener(() {
|
||||
if (!_ifscFocusNode.hasFocus && ifscController.text.trim().length == 11) {
|
||||
_validateIFSC();
|
||||
}
|
||||
});
|
||||
if (!_ifscFocusNode.hasFocus && ifscController.text.trim().length == 11) {
|
||||
_validateIFSC();
|
||||
}
|
||||
});
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
setState(() {
|
||||
accountType = 'Savings';
|
||||
@@ -58,26 +58,26 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
accountNumberController.dispose();
|
||||
confirmAccountNumberController.dispose();
|
||||
nameController.dispose();
|
||||
bankNameController.dispose();
|
||||
branchNameController.dispose();
|
||||
ifscController.dispose();
|
||||
phoneController.dispose();
|
||||
_ifscFocusNode.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
@override
|
||||
void dispose() {
|
||||
accountNumberController.dispose();
|
||||
confirmAccountNumberController.dispose();
|
||||
nameController.dispose();
|
||||
bankNameController.dispose();
|
||||
branchNameController.dispose();
|
||||
ifscController.dispose();
|
||||
phoneController.dispose();
|
||||
_ifscFocusNode.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
void _validateIFSC() async {
|
||||
var beneficiaryService = getIt<BeneficiaryService>();
|
||||
final ifsc = ifscController.text.trim().toUpperCase();
|
||||
if (ifsc.isEmpty) return;
|
||||
void _validateIFSC() async {
|
||||
var beneficiaryService = getIt<BeneficiaryService>();
|
||||
final ifsc = ifscController.text.trim().toUpperCase();
|
||||
if (ifsc.isEmpty) return;
|
||||
|
||||
try {
|
||||
final result = await beneficiaryService.validateIFSC(ifsc);
|
||||
try {
|
||||
final result = await beneficiaryService.validateIFSC(ifsc);
|
||||
|
||||
if (mounted) {
|
||||
if (result.bankName.isEmpty) {
|
||||
@@ -94,7 +94,8 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
|
||||
} catch (e) {
|
||||
if (mounted) {
|
||||
final errorMessage = e.toString().toUpperCase();
|
||||
String snackbarMessage = AppLocalizations.of(context).somethingWentWrong;
|
||||
String snackbarMessage =
|
||||
AppLocalizations.of(context).somethingWentWrong;
|
||||
|
||||
if (errorMessage.contains('INVALID') && errorMessage.contains('IFSC')) {
|
||||
snackbarMessage = AppLocalizations.of(context).invalidIfsc;
|
||||
@@ -107,7 +108,7 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
|
||||
branchNameController.clear();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void _validateBeneficiary() async {
|
||||
FocusScope.of(context).unfocus();
|
||||
@@ -325,7 +326,9 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
|
||||
).reenterAccountNumber;
|
||||
}
|
||||
if (value != accountNumberController.text) {
|
||||
return AppLocalizations.of(context,).accountMismatch;
|
||||
return AppLocalizations.of(
|
||||
context,
|
||||
).accountMismatch;
|
||||
}
|
||||
return null;
|
||||
},
|
||||
@@ -346,16 +349,16 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
|
||||
),
|
||||
textCapitalization: TextCapitalization.characters,
|
||||
textInputAction: TextInputAction.next,
|
||||
onChanged: (value) {
|
||||
setState(() {
|
||||
final trimmed = value.trim().toUpperCase();
|
||||
if (trimmed.length < 11) {
|
||||
// clear bank/branch if backspace or changed
|
||||
bankNameController.clear();
|
||||
branchNameController.clear();
|
||||
}
|
||||
});
|
||||
},
|
||||
onChanged: (value) {
|
||||
setState(() {
|
||||
final trimmed = value.trim().toUpperCase();
|
||||
if (trimmed.length < 11) {
|
||||
// clear bank/branch if backspace or changed
|
||||
bankNameController.clear();
|
||||
branchNameController.clear();
|
||||
}
|
||||
});
|
||||
},
|
||||
validator: (value) {
|
||||
final pattern = RegExp(r'^[A-Z]{4}0[A-Z0-9]{6}$');
|
||||
if (value == null || value.trim().isEmpty) {
|
||||
@@ -429,20 +432,27 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
|
||||
child: SizedBox(
|
||||
width: double.infinity,
|
||||
child: ElevatedButton(
|
||||
onPressed: _isValidating || ifscController.text.length != 11
|
||||
? null
|
||||
: () {
|
||||
final isAccountValid =
|
||||
_accountNumberFieldKey.currentState!.validate();
|
||||
final isConfirmAccountValid =
|
||||
_confirmAccountNumberFieldKey.currentState!.validate();
|
||||
final isIfscValid = _ifscFieldKey.currentState!.validate();
|
||||
|
||||
if (isAccountValid && isConfirmAccountValid && isIfscValid) {
|
||||
_validateBeneficiary();
|
||||
}
|
||||
},
|
||||
onPressed: _isValidating ||
|
||||
ifscController.text.length != 11
|
||||
? null
|
||||
: () {
|
||||
final isAccountValid =
|
||||
_accountNumberFieldKey.currentState!
|
||||
.validate();
|
||||
final isConfirmAccountValid =
|
||||
_confirmAccountNumberFieldKey
|
||||
.currentState!
|
||||
.validate();
|
||||
final isIfscValid = _ifscFieldKey
|
||||
.currentState!
|
||||
.validate();
|
||||
|
||||
if (isAccountValid &&
|
||||
isConfirmAccountValid &&
|
||||
isIfscValid) {
|
||||
_validateBeneficiary();
|
||||
}
|
||||
},
|
||||
child: _isValidating
|
||||
? const SizedBox(
|
||||
width: 20,
|
||||
|
||||
Reference in New Issue
Block a user