md.asif5/kmobile
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

App Version added and dart format

Browse Source
This commit is contained in:
Nilanjan Chakrabarti
2025-10-21 13:32:14 +05:30
parent 06ef2ab36b
commit 58e53d0aeb
45 changed files with 1334 additions and 1230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/features/fund_transfer/screens/fund_transfer_amount_screen.dart
View File

@@ -402,14 +402,14 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
const SizedBox(height: 24),
],
//Remarks
TextFormField(
TextFormField(
controller: _remarksController,
decoration: InputDecoration(
labelText: AppLocalizations.of(context).remarks,
border: const OutlineInputBorder(),
),
labelText: AppLocalizations.of(context).remarks,
border: const OutlineInputBorder(),
),
const SizedBox(height: 24),
),
const SizedBox(height: 24),
// Amount
TextFormField(
controller: _amountController,

3
lib/features/fund_transfer/screens/payment_animation.dart
View File

@@ -213,7 +213,8 @@ class _PaymentAnimationScreenState extends State<PaymentAnimationScreen> {
),
label: Text(
AppLocalizations.of(context).share,
style: TextStyle(color: Theme.of(context).colorScheme.primary),
style: TextStyle(
color: Theme.of(context).colorScheme.primary),
),
style: ElevatedButton.styleFrom(
padding: const EdgeInsets.symmetric(

309
lib/features/fund_transfer/screens/tpin_otp_screen.dart
View File

@@ -18,8 +18,9 @@ class _TpinOtpScreenState extends State<TpinOtpScreen> {
6,
(_) => TextEditingController(),
);
bool _isLoading = false;
final ChangePasswordService _changePasswordService = getIt<ChangePasswordService>();
bool _isLoading = false;
final ChangePasswordService _changePasswordService =
getIt<ChangePasswordService>();
@override
void dispose() {
@@ -33,7 +34,7 @@ class _TpinOtpScreenState extends State<TpinOtpScreen> {
}
void _onOtpChanged(int idx, String value) {
if (value.length == 1 && idx <5) {
if (value.length == 1 && idx < 5) {
_focusNodes[idx + 1].requestFocus();
}
if (value.isEmpty && idx > 0) {
@@ -44,160 +45,160 @@ class _TpinOtpScreenState extends State<TpinOtpScreen> {
String get _enteredOtp => _controllers.map((c) => c.text).join();
void _verifyOtp() async {
setState(() {
_isLoading = true;
});
void _verifyOtp() async {
setState(() {
_isLoading = true;
});
try {
await _changePasswordService.validateOtp(
otp: _enteredOtp,
mobileNumber: widget.mobileNumber,
);
try {
await _changePasswordService.validateOtp(
otp: _enteredOtp,
mobileNumber: widget.mobileNumber,
);
if (mounted) {
Navigator.pushReplacement(
context,
MaterialPageRoute(builder: (_) => const TpinSetScreen()),
);
}
} catch (e) {
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text(AppLocalizations.of(context).invalidOtp)),
);
}
} finally {
if (mounted) {
setState(() {
_isLoading = false;
});
if (mounted) {
Navigator.pushReplacement(
context,
MaterialPageRoute(builder: (_) => const TpinSetScreen()),
);
}
} catch (e) {
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text(AppLocalizations.of(context).invalidOtp)),
);
}
} finally {
if (mounted) {
setState(() {
_isLoading = false;
});
}
}
}
}
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
return Scaffold(
appBar: AppBar(
title: Text(AppLocalizations.of(context).enterOtp),
centerTitle: true,
elevation: 0,
),
body: Center(
child: SingleChildScrollView(
child: Column(
children: [
Icon(
Icons.lock_outline,
size: 48,
color: theme.colorScheme.primary,
),
const SizedBox(height: 16),
Text(
AppLocalizations.of(context).otpVerification,
style: theme.textTheme.titleLarge?.copyWith(
fontWeight: FontWeight.bold,
color: theme.colorScheme.primary,
),
),
const SizedBox(height: 8),
Text(
AppLocalizations.of(context).otpSentMessage,
textAlign: TextAlign.center,
style: theme.textTheme.bodyMedium?.copyWith(
color: Colors.grey[700],
),
),
const SizedBox(height: 32),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: List.generate(6, (i) {
return Container(
width: 32,
margin: const EdgeInsets.symmetric(horizontal: 8),
child: TextField(
controller: _controllers[i],
focusNode: _focusNodes[i],
keyboardType: TextInputType.number,
textAlign: TextAlign.center,
maxLength: 1,
obscureText: true,
obscuringCharacter: '*',
decoration: InputDecoration(
counterText: '',
filled: true,
fillColor: Theme.of(context).primaryColorLight,
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
borderSide: BorderSide(
color: theme.colorScheme.primary,
width: 2,
),
),
focusedBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
borderSide: BorderSide(
color: theme.colorScheme.primary,
width: 2.5,
),
),
),
onChanged: (val) => _onOtpChanged(i, val),
),
);
}),
),
const SizedBox(height: 32),
ElevatedButton.icon(
icon: _isLoading
? const SizedBox(
width: 20,
height: 20,
child: CircularProgressIndicator(
color: Colors.white,
strokeWidth: 2,
),
)
: const Icon(Icons.verified_user_rounded),
label: Text(
AppLocalizations.of(context).verifyOtp,
style: const TextStyle(
fontSize: 18, fontWeight: FontWeight.w600),
),
style: ElevatedButton.styleFrom(
backgroundColor: theme.colorScheme.onPrimary,
padding: const EdgeInsets.symmetric(
vertical: 14,
horizontal: 28,
),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(30),
),
),
// Update onPressed to handle loading state
onPressed: (_enteredOtp.length == 6 && !_isLoading)
? _verifyOtp
: null,
),
const SizedBox(height: 16),
TextButton(
onPressed: () {
// You can also add a getOtp call here for resending
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(AppLocalizations.of(context).otpResent),
),
);
},
child: Text(AppLocalizations.of(context).resendOtp),
),
const SizedBox(height: 60),
],
),
),
),
);
}
}
Widget build(BuildContext context) {
final theme = Theme.of(context);
return Scaffold(
appBar: AppBar(
title: Text(AppLocalizations.of(context).enterOtp),
centerTitle: true,
elevation: 0,
),
body: Center(
child: SingleChildScrollView(
child: Column(
children: [
Icon(
Icons.lock_outline,
size: 48,
color: theme.colorScheme.primary,
),
const SizedBox(height: 16),
Text(
AppLocalizations.of(context).otpVerification,
style: theme.textTheme.titleLarge?.copyWith(
fontWeight: FontWeight.bold,
color: theme.colorScheme.primary,
),
),
const SizedBox(height: 8),
Text(
AppLocalizations.of(context).otpSentMessage,
textAlign: TextAlign.center,
style: theme.textTheme.bodyMedium?.copyWith(
color: Colors.grey[700],
),
),
const SizedBox(height: 32),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: List.generate(6, (i) {
return Container(
width: 32,
margin: const EdgeInsets.symmetric(horizontal: 8),
child: TextField(
controller: _controllers[i],
focusNode: _focusNodes[i],
keyboardType: TextInputType.number,
textAlign: TextAlign.center,
maxLength: 1,
obscureText: true,
obscuringCharacter: '*',
decoration: InputDecoration(
counterText: '',
filled: true,
fillColor: Theme.of(context).primaryColorLight,
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
borderSide: BorderSide(
color: theme.colorScheme.primary,
width: 2,
),
),
focusedBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
borderSide: BorderSide(
color: theme.colorScheme.primary,
width: 2.5,
),
),
),
onChanged: (val) => _onOtpChanged(i, val),
),
);
}),
),
const SizedBox(height: 32),
ElevatedButton.icon(
icon: _isLoading
? const SizedBox(
width: 20,
height: 20,
child: CircularProgressIndicator(
color: Colors.white,
strokeWidth: 2,
),
)
: const Icon(Icons.verified_user_rounded),
label: Text(
AppLocalizations.of(context).verifyOtp,
style: const TextStyle(
fontSize: 18, fontWeight: FontWeight.w600),
),
style: ElevatedButton.styleFrom(
backgroundColor: theme.colorScheme.onPrimary,
padding: const EdgeInsets.symmetric(
vertical: 14,
horizontal: 28,
),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(30),
),
),
// Update onPressed to handle loading state
onPressed: (_enteredOtp.length == 6 && !_isLoading)
? _verifyOtp
: null,
),
const SizedBox(height: 16),
TextButton(
onPressed: () {
// You can also add a getOtp call here for resending
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(AppLocalizations.of(context).otpResent),
),
);
},
child: Text(AppLocalizations.of(context).resendOtp),
),
const SizedBox(height: 60),
],
),
),
),
);
}
}

134
lib/features/fund_transfer/screens/tpin_prompt_screen.dart
View File

@@ -15,44 +15,50 @@ class TpinSetupPromptScreen extends StatefulWidget {
State<TpinSetupPromptScreen> createState() => _TpinSetupPromptScreenState();
}
class _TpinSetupPromptScreenState extends State<TpinSetupPromptScreen> {
int selectedAccountIndex = 0;
bool _isLoading = false;
final ChangePasswordService _changePasswordService = getIt<ChangePasswordService>();
Future<void> _getOtp() async {
setState(() {
_isLoading = true;
});
class _TpinSetupPromptScreenState extends State<TpinSetupPromptScreen> {
int selectedAccountIndex = 0;
bool _isLoading = false;
final ChangePasswordService _changePasswordService =
getIt<ChangePasswordService>();
Future<void> _getOtp() async {
setState(() {
_isLoading = true;
});
try {
final authState = context.read<AuthCubit>().state;
String mobileNumberToPass = '';
if (authState is Authenticated) {
if (selectedAccountIndex >= 0 && selectedAccountIndex < authState.users.length) {
mobileNumberToPass = authState.users[selectedAccountIndex].mobileNo ?? '';
}
}
await _changePasswordService.getOtpTpin(mobileNumber: mobileNumberToPass);
if (mounted) {
Navigator.pushReplacement(
context,
MaterialPageRoute(builder: (_) => TpinOtpScreen(mobileNumber: mobileNumberToPass,)),
);
}
} catch (e) {
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text('Error: ${e.toString()}')),
);
}
} finally {
if (mounted) {
setState(() {
_isLoading = false;
});
try {
final authState = context.read<AuthCubit>().state;
String mobileNumberToPass = '';
if (authState is Authenticated) {
if (selectedAccountIndex >= 0 &&
selectedAccountIndex < authState.users.length) {
mobileNumberToPass =
authState.users[selectedAccountIndex].mobileNo ?? '';
}
}
await _changePasswordService.getOtpTpin(mobileNumber: mobileNumberToPass);
if (mounted) {
Navigator.pushReplacement(
context,
MaterialPageRoute(
builder: (_) => TpinOtpScreen(
mobileNumber: mobileNumberToPass,
)),
);
}
} catch (e) {
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text('Error: ${e.toString()}')),
);
}
} finally {
if (mounted) {
setState(() {
_isLoading = false;
});
}
}
}
}
@override
Widget build(BuildContext context) {
@@ -86,33 +92,35 @@ class TpinSetupPromptScreen extends StatefulWidget {
),
),
const SizedBox(height: 32),
ElevatedButton.icon(
icon: _isLoading
? const SizedBox(
width: 20,
height: 20,
child: CircularProgressIndicator(
color: Colors.white,
strokeWidth: 2,
),
)
: const Icon(Icons.arrow_forward_rounded),
label: Text(
AppLocalizations.of(context).setTpin,
style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w600),
),
style: ElevatedButton.styleFrom(
backgroundColor: theme.colorScheme.onPrimary,
padding: const EdgeInsets.symmetric(
vertical: 14,
horizontal: 32,
),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10),
),
),
onPressed: _isLoading ? null : _getOtp, // <-- Use the new function
),
ElevatedButton.icon(
icon: _isLoading
? const SizedBox(
width: 20,
height: 20,
child: CircularProgressIndicator(
color: Colors.white,
strokeWidth: 2,
),
)
: const Icon(Icons.arrow_forward_rounded),
label: Text(
AppLocalizations.of(context).setTpin,
style:
const TextStyle(fontSize: 18, fontWeight: FontWeight.w600),
),
style: ElevatedButton.styleFrom(
backgroundColor: theme.colorScheme.onPrimary,
padding: const EdgeInsets.symmetric(
vertical: 14,
horizontal: 32,
),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10),
),
),
onPressed:
_isLoading ? null : _getOtp, // <-- Use the new function
),
const SizedBox(height: 18),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 18.0),
@@ -129,4 +137,4 @@ ElevatedButton.icon(
),
);
}
}
}

1
lib/features/fund_transfer/screens/transaction_pin_screen.dart
View File

@@ -212,4 +212,3 @@ class _TransactionPinScreenState extends State<TransactionPinScreen>
);
}
}

22
lib/features/fund_transfer/screens/transaction_success_screen.dart
View File

@@ -67,13 +67,23 @@ class _TransactionSuccessScreen extends State<TransactionSuccessScreen> {
const SizedBox(height: 6),
Text(
"On $transactionDate",
style: TextStyle(fontSize: 14, color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6)),
style: TextStyle(
fontSize: 14,
color: Theme.of(context)
.colorScheme
.onSurface
.withOpacity(0.6)),
textAlign: TextAlign.center,
),
const SizedBox(height: 16),
Text(
"${AppLocalizations.of(context).toAccountNumber}: $creditAccount",
style: TextStyle(fontSize: 12, color: Theme.of(context).colorScheme.onSurface.withOpacity(0.8)),
style: TextStyle(
fontSize: 12,
color: Theme.of(context)
.colorScheme
.onSurface
.withOpacity(0.8)),
textAlign: TextAlign.center,
),
],
@@ -91,8 +101,12 @@ class _TransactionSuccessScreen extends State<TransactionSuccessScreen> {
child: OutlinedButton.icon(
onPressed: _shareScreenshot,
icon: const Icon(Icons.share, size: 18),
label: Text(AppLocalizations.of(context).share,
style: TextStyle(color: Theme.of(context).colorScheme.onPrimaryContainer),
label: Text(
AppLocalizations.of(context).share,
style: TextStyle(
color: Theme.of(context)
.colorScheme
.onPrimaryContainer),
),
style: ElevatedButton.styleFrom(
shape: const StadiumBorder(),