App Version added and dart format

This commit is contained in:
2025-10-21 13:32:14 +05:30
parent 06ef2ab36b
commit 58e53d0aeb
45 changed files with 1334 additions and 1230 deletions

View File

@@ -40,8 +40,7 @@ class BeneficiaryService {
} on DioException catch (e) { } on DioException catch (e) {
if (e.response?.statusCode == 404) { if (e.response?.statusCode == 404) {
throw Exception('INVALID IFSC CODE'); throw Exception('INVALID IFSC CODE');
} } else if (e.response?.statusCode == 401) {
else if (e.response?.statusCode == 401) {
throw Exception('INVALID IFSC CODE'); throw Exception('INVALID IFSC CODE');
} }
} catch (e) { } catch (e) {

View File

@@ -10,10 +10,7 @@ class ChangePasswordService {
}) async { }) async {
final response = await _dio.post( final response = await _dio.post(
'/api/otp/send', '/api/otp/send',
data: { data: {'mobileNumber': mobileNumber, 'type': "CHANGE_LPWORD"},
'mobileNumber': mobileNumber,
'type': "CHANGE_LPWORD"
},
); );
if (response.statusCode != 200) { if (response.statusCode != 200) {
throw Exception("Invalid Mobile Number/Type"); throw Exception("Invalid Mobile Number/Type");
@@ -27,10 +24,7 @@ class ChangePasswordService {
}) async { }) async {
final response = await _dio.post( final response = await _dio.post(
'/api/otp/send', '/api/otp/send',
data: { data: {'mobileNumber': mobileNumber, 'type': "CHANGE_TPIN"},
'mobileNumber': mobileNumber,
'type': "CHANGE_TPIN"
},
); );
if (response.statusCode != 200) { if (response.statusCode != 200) {
throw Exception("Invalid Mobile Number/Type"); throw Exception("Invalid Mobile Number/Type");
@@ -39,7 +33,6 @@ class ChangePasswordService {
return response.toString(); return response.toString();
} }
Future validateOtp({ Future validateOtp({
required String otp, required String otp,
required String mobileNumber, required String mobileNumber,

View File

@@ -362,8 +362,7 @@ class _NavigationScaffoldState extends State<NavigationScaffold> {
type: BottomNavigationBarType.fixed, type: BottomNavigationBarType.fixed,
backgroundColor: const Color(0XFF1E58AD), backgroundColor: const Color(0XFF1E58AD),
selectedItemColor: Theme.of(context).colorScheme.onPrimary, selectedItemColor: Theme.of(context).colorScheme.onPrimary,
unselectedItemColor: unselectedItemColor: Theme.of(context).colorScheme.onSecondary,
Theme.of(context).colorScheme.onSecondary,
onTap: (index) { onTap: (index) {
setState(() { setState(() {
_selectedIndex = index; _selectedIndex = index;

View File

@@ -51,10 +51,8 @@ class AuthRepository {
Future<void> clearAuthTokens() async { Future<void> clearAuthTokens() async {
await _secureStorage.deleteAll(); await _secureStorage.deleteAll();
} }
Future<AuthToken?> _getAuthToken() async { Future<AuthToken?> _getAuthToken() async {
final accessToken = await _secureStorage.read(_accessTokenKey); final accessToken = await _secureStorage.read(_accessTokenKey);
final expiryString = await _secureStorage.read(_tokenExpiryKey); final expiryString = await _secureStorage.read(_tokenExpiryKey);

View File

@@ -1,5 +1,3 @@
import 'package:dio/dio.dart'; import 'package:dio/dio.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:kmobile/data/models/transaction.dart'; import 'package:kmobile/data/models/transaction.dart';

View File

@@ -49,7 +49,9 @@ Future<void> setupDependencies() async {
getIt.registerSingleton<NeftService>(NeftService(getIt<Dio>())); getIt.registerSingleton<NeftService>(NeftService(getIt<Dio>()));
getIt.registerSingleton<RtgsService>(RtgsService(getIt<Dio>())); getIt.registerSingleton<RtgsService>(RtgsService(getIt<Dio>()));
getIt.registerSingleton<ImpsService>(ImpsService(getIt<Dio>())); getIt.registerSingleton<ImpsService>(ImpsService(getIt<Dio>()));
getIt.registerLazySingleton<ChangePasswordService>(() => ChangePasswordService(getIt<Dio>()),); getIt.registerLazySingleton<ChangePasswordService>(
() => ChangePasswordService(getIt<Dio>()),
);
// Add auth interceptor after repository is available // Add auth interceptor after repository is available
getIt<Dio>().interceptors.add( getIt<Dio>().interceptors.add(
@@ -65,9 +67,9 @@ Dio _createDioClient() {
final dio = Dio( final dio = Dio(
BaseOptions( BaseOptions(
baseUrl: baseUrl:
//'http://lb-test-mobile-banking-app-192209417.ap-south-1.elb.amazonaws.com:8080', //test 'http://lb-test-mobile-banking-app-192209417.ap-south-1.elb.amazonaws.com:8080', //test
//'http://lb-kccb-mobile-banking-app-848675342.ap-south-1.elb.amazonaws.com', //prod //'http://lb-kccb-mobile-banking-app-848675342.ap-south-1.elb.amazonaws.com', //prod
'https://kccbmbnk.net', //'https://kccbmbnk.net',
connectTimeout: const Duration(seconds: 60), connectTimeout: const Duration(seconds: 60),
receiveTimeout: const Duration(seconds: 60), receiveTimeout: const Duration(seconds: 60),
headers: { headers: {

View File

@@ -305,7 +305,8 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
), ),
Text( Text(
"Bal: ₹${tx.balance}", "Bal: ₹${tx.balance}",
style: const TextStyle(fontSize: 12), // Style matches tx.name style: const TextStyle(
fontSize: 12), // Style matches tx.name
), ),
], ],
), ),
@@ -502,8 +503,6 @@ else if (Platform.isIOS) {
[XFile(file.path)], [XFile(file.path)],
); );
} }
} catch (e) { } catch (e) {
if (mounted) { if (mounted) {
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(

View File

@@ -73,8 +73,8 @@ class TransactionDetailsScreen extends StatelessWidget {
// AppLocalizations.of(context).beneficiaryAccountNo, // AppLocalizations.of(context).beneficiaryAccountNo,
// transaction.name.split("A/C ").last ?? "") // transaction.name.split("A/C ").last ?? "")
// ] // ]
_buildDetailRow(AppLocalizations.of(context).details, _buildDetailRow(
transaction.name), AppLocalizations.of(context).details, transaction.name),
], ],
), ),
), ),

View File

@@ -16,11 +16,11 @@ class ThemeState extends Equatable {
List<Object?> get props => [themeType]; List<Object?> get props => [themeType];
}*/ }*/
import 'package:equatable/equatable.dart'; import 'package:equatable/equatable.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:kmobile/config/theme_type.dart'; import 'package:kmobile/config/theme_type.dart';
import 'package:kmobile/config/themes.dart'; import 'package:kmobile/config/themes.dart';
class ThemeState extends Equatable { class ThemeState extends Equatable {
final ThemeType themeType; final ThemeType themeType;
const ThemeState({required this.themeType}); const ThemeState({required this.themeType});
@@ -36,6 +36,3 @@ class ThemeState extends Equatable {
@override @override
List<Object?> get props => [themeType]; List<Object?> get props => [themeType];
} }

View File

@@ -140,7 +140,8 @@ class _SetPasswordScreenState extends State<SetPasswordScreen> {
if (_error != null) ...[ if (_error != null) ...[
Text( Text(
_error!, _error!,
style: const TextStyle(color: Colors.red, style: const TextStyle(
color: Colors.red,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 20), fontSize: 20),
textAlign: TextAlign.center, textAlign: TextAlign.center,

View File

@@ -1,3 +1,5 @@
import 'package:package_info_plus/package_info_plus.dart';
import '../../../l10n/app_localizations.dart'; import '../../../l10n/app_localizations.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@@ -10,11 +12,29 @@ class SplashScreen extends StatefulWidget {
} }
class _SplashScreenState extends State<SplashScreen> { class _SplashScreenState extends State<SplashScreen> {
String _version = '';
@override
void initState() {
super.initState();
_loadVersion();
}
Future<void> _loadVersion() async {
final PackageInfo info = await PackageInfo.fromPlatform();
if (mounted) {
// Check if the widget is still in the tree
setState(() {
_version = 'Version ${info.version} (${info.buildNumber})';
});
}
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
body: Stack( body: Stack(
children: [ fit: StackFit.expand,
children: <Widget>[
Positioned.fill( Positioned.fill(
child: Image.asset( child: Image.asset(
'assets/images/kconnect2.webp', 'assets/images/kconnect2.webp',
@@ -51,8 +71,20 @@ class _SplashScreenState extends State<SplashScreen> {
left: 0, left: 0,
right: 0, right: 0,
child: Center( child: Center(
child: CircularProgressIndicator( child: CircularProgressIndicator(color: Color(0xFFFFFFFF)),
color: Color(0xFFFFFFFF)), ),
),
Positioned(
bottom: 90,
left: 0,
right: 0,
child: Text(
_version,
textAlign: TextAlign.center,
style: const TextStyle(
color: Color(0xFFFFFFFF),
fontSize: 14,
),
), ),
), ),
], ],

View File

@@ -94,7 +94,8 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
} catch (e) { } catch (e) {
if (mounted) { if (mounted) {
final errorMessage = e.toString().toUpperCase(); final errorMessage = e.toString().toUpperCase();
String snackbarMessage = AppLocalizations.of(context).somethingWentWrong; String snackbarMessage =
AppLocalizations.of(context).somethingWentWrong;
if (errorMessage.contains('INVALID') && errorMessage.contains('IFSC')) { if (errorMessage.contains('INVALID') && errorMessage.contains('IFSC')) {
snackbarMessage = AppLocalizations.of(context).invalidIfsc; snackbarMessage = AppLocalizations.of(context).invalidIfsc;
@@ -325,7 +326,9 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
).reenterAccountNumber; ).reenterAccountNumber;
} }
if (value != accountNumberController.text) { if (value != accountNumberController.text) {
return AppLocalizations.of(context,).accountMismatch; return AppLocalizations.of(
context,
).accountMismatch;
} }
return null; return null;
}, },
@@ -429,20 +432,27 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
child: SizedBox( child: SizedBox(
width: double.infinity, width: double.infinity,
child: ElevatedButton( child: ElevatedButton(
onPressed: _isValidating || ifscController.text.length != 11 onPressed: _isValidating ||
ifscController.text.length != 11
? null ? null
: () { : () {
final isAccountValid = final isAccountValid =
_accountNumberFieldKey.currentState!.validate(); _accountNumberFieldKey.currentState!
.validate();
final isConfirmAccountValid = final isConfirmAccountValid =
_confirmAccountNumberFieldKey.currentState!.validate(); _confirmAccountNumberFieldKey
final isIfscValid = _ifscFieldKey.currentState!.validate(); .currentState!
.validate();
final isIfscValid = _ifscFieldKey
.currentState!
.validate();
if (isAccountValid && isConfirmAccountValid && isIfscValid) { if (isAccountValid &&
isConfirmAccountValid &&
isIfscValid) {
_validateBeneficiary(); _validateBeneficiary();
} }
}, },
child: _isValidating child: _isValidating
? const SizedBox( ? const SizedBox(
width: 20, width: 20,

View File

@@ -90,7 +90,10 @@ class _BeneficiaryResultPageState extends State<BeneficiaryResultPage> {
), ),
child: Text( child: Text(
AppLocalizations.of(context).done, AppLocalizations.of(context).done,
style: TextStyle(color: Theme.of(context).colorScheme.onPrimaryContainer), // slightly bigger text style: TextStyle(
color: Theme.of(context)
.colorScheme
.onPrimaryContainer), // slightly bigger text
), ),
), ),
), ),

View File

@@ -30,7 +30,8 @@ class DashboardScreen extends StatefulWidget {
State<DashboardScreen> createState() => _DashboardScreenState(); State<DashboardScreen> createState() => _DashboardScreenState();
} }
class _DashboardScreenState extends State<DashboardScreen> with SingleTickerProviderStateMixin { class _DashboardScreenState extends State<DashboardScreen>
with SingleTickerProviderStateMixin {
int selectedAccountIndex = 0; int selectedAccountIndex = 0;
bool isVisible = false; bool isVisible = false;
bool isRefreshing = false; bool isRefreshing = false;
@@ -533,7 +534,8 @@ appBar: AppBar(
.accountNo!, .accountNo!,
balance: users[selectedAccountIndex] balance: users[selectedAccountIndex]
.availableBalance!, .availableBalance!,
accountType: users[selectedAccountIndex] accountType:
users[selectedAccountIndex]
.accountType!, .accountType!,
))); )));
}), }),

View File

@@ -72,4 +72,3 @@ class AccountCard extends StatelessWidget {
); );
} }
} }

View File

@@ -78,10 +78,9 @@ class _EnquiryScreen extends State<EnquiryScreen> {
const SizedBox(height: 20), const SizedBox(height: 20),
GestureDetector( GestureDetector(
onTap: () => _launchUrl("https://kccb.in/complaint-form"), onTap: () => _launchUrl("https://kccb.in/complaint-form"),
child: Row( child: Row(mainAxisSize: MainAxisSize.min, children: [
mainAxisSize: MainAxisSize.min, Text(
children: [ "Complaint Form",
Text("Complaint Form",
style: TextStyle( style: TextStyle(
fontSize: 17, fontSize: 17,
color: Theme.of(context).colorScheme.primary, color: Theme.of(context).colorScheme.primary,
@@ -94,10 +93,7 @@ class _EnquiryScreen extends State<EnquiryScreen> {
color: Theme.of(context).colorScheme.primary, color: Theme.of(context).colorScheme.primary,
size: 16.0, size: 16.0,
), ),
] ])),
)
),
const SizedBox(height: 40), const SizedBox(height: 40),
Text( Text(
AppLocalizations.of(context).keyContacts, AppLocalizations.of(context).keyContacts,

View File

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

View File

@@ -19,7 +19,8 @@ class _TpinOtpScreenState extends State<TpinOtpScreen> {
(_) => TextEditingController(), (_) => TextEditingController(),
); );
bool _isLoading = false; bool _isLoading = false;
final ChangePasswordService _changePasswordService = getIt<ChangePasswordService>(); final ChangePasswordService _changePasswordService =
getIt<ChangePasswordService>();
@override @override
void dispose() { void dispose() {

View File

@@ -18,7 +18,8 @@ class TpinSetupPromptScreen extends StatefulWidget {
class _TpinSetupPromptScreenState extends State<TpinSetupPromptScreen> { class _TpinSetupPromptScreenState extends State<TpinSetupPromptScreen> {
int selectedAccountIndex = 0; int selectedAccountIndex = 0;
bool _isLoading = false; bool _isLoading = false;
final ChangePasswordService _changePasswordService = getIt<ChangePasswordService>(); final ChangePasswordService _changePasswordService =
getIt<ChangePasswordService>();
Future<void> _getOtp() async { Future<void> _getOtp() async {
setState(() { setState(() {
_isLoading = true; _isLoading = true;
@@ -28,15 +29,20 @@ class TpinSetupPromptScreen extends StatefulWidget {
final authState = context.read<AuthCubit>().state; final authState = context.read<AuthCubit>().state;
String mobileNumberToPass = ''; String mobileNumberToPass = '';
if (authState is Authenticated) { if (authState is Authenticated) {
if (selectedAccountIndex >= 0 && selectedAccountIndex < authState.users.length) { if (selectedAccountIndex >= 0 &&
mobileNumberToPass = authState.users[selectedAccountIndex].mobileNo ?? ''; selectedAccountIndex < authState.users.length) {
mobileNumberToPass =
authState.users[selectedAccountIndex].mobileNo ?? '';
} }
} }
await _changePasswordService.getOtpTpin(mobileNumber: mobileNumberToPass); await _changePasswordService.getOtpTpin(mobileNumber: mobileNumberToPass);
if (mounted) { if (mounted) {
Navigator.pushReplacement( Navigator.pushReplacement(
context, context,
MaterialPageRoute(builder: (_) => TpinOtpScreen(mobileNumber: mobileNumberToPass,)), MaterialPageRoute(
builder: (_) => TpinOtpScreen(
mobileNumber: mobileNumberToPass,
)),
); );
} }
} catch (e) { } catch (e) {
@@ -99,7 +105,8 @@ ElevatedButton.icon(
: const Icon(Icons.arrow_forward_rounded), : const Icon(Icons.arrow_forward_rounded),
label: Text( label: Text(
AppLocalizations.of(context).setTpin, AppLocalizations.of(context).setTpin,
style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w600), style:
const TextStyle(fontSize: 18, fontWeight: FontWeight.w600),
), ),
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
backgroundColor: theme.colorScheme.onPrimary, backgroundColor: theme.colorScheme.onPrimary,
@@ -111,7 +118,8 @@ ElevatedButton.icon(
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
), ),
), ),
onPressed: _isLoading ? null : _getOtp, // <-- Use the new function onPressed:
_isLoading ? null : _getOtp, // <-- Use the new function
), ),
const SizedBox(height: 18), const SizedBox(height: 18),
Padding( Padding(

View File

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

View File

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

View File

@@ -19,7 +19,8 @@ class ChangePasswordOTPScreen extends StatefulWidget {
}); });
@override @override
State<ChangePasswordOTPScreen> createState() => _ChangePasswordOTPScreenState(); State<ChangePasswordOTPScreen> createState() =>
_ChangePasswordOTPScreenState();
} }
class _ChangePasswordOTPScreenState extends State<ChangePasswordOTPScreen> { class _ChangePasswordOTPScreenState extends State<ChangePasswordOTPScreen> {
@@ -36,6 +37,7 @@ class _ChangePasswordOTPScreenState extends State<ChangePasswordOTPScreen> {
}); });
}); });
} }
final changePasswordService = getIt<ChangePasswordService>(); final changePasswordService = getIt<ChangePasswordService>();
Future<void> _validateOTP() async { Future<void> _validateOTP() async {
try { try {
@@ -57,7 +59,6 @@ class _ChangePasswordOTPScreenState extends State<ChangePasswordOTPScreen> {
// Navigate back to profile or login // Navigate back to profile or login
Navigator.of(context).popUntil((route) => route.isFirst); Navigator.of(context).popUntil((route) => route.isFirst);
} catch (e) { } catch (e) {
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text(AppLocalizations.of(context).invalidOtp)), SnackBar(content: Text(AppLocalizations.of(context).invalidOtp)),

View File

@@ -56,15 +56,14 @@ class _ChangePasswordScreenState extends State<ChangePasswordScreen> {
} }
return null; return null;
} }
final ChangePasswordService _changePasswordService = getIt<ChangePasswordService>();
final ChangePasswordService _changePasswordService =
getIt<ChangePasswordService>();
void _proceed() async { void _proceed() async {
if (_formKey.currentState!.validate()) { if (_formKey.currentState!.validate()) {
try { try {
await _changePasswordService.getOtp(mobileNumber: widget.mobileNumber); await _changePasswordService.getOtp(mobileNumber: widget.mobileNumber);
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
@@ -78,7 +77,9 @@ void _proceed() async {
); );
} catch (e) { } catch (e) {
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text('${AppLocalizations.of(context).failedtosentOTP}: $e')), SnackBar(
content:
Text('${AppLocalizations.of(context).failedtosentOTP}: $e')),
); );
} }
} }
@@ -87,7 +88,8 @@ void _proceed() async {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar(title: Text(AppLocalizations.of(context).changeLoginPassword)), appBar:
AppBar(title: Text(AppLocalizations.of(context).changeLoginPassword)),
body: Padding( body: Padding(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
child: Form( child: Form(
@@ -103,8 +105,8 @@ void _proceed() async {
icon: Icon(_showCurrentPassword icon: Icon(_showCurrentPassword
? Icons.visibility ? Icons.visibility
: Icons.visibility_off), : Icons.visibility_off),
onPressed: () => onPressed: () => setState(
setState(() => _showCurrentPassword = !_showCurrentPassword), () => _showCurrentPassword = !_showCurrentPassword),
), ),
), ),
validator: validateCurrentPassword, validator: validateCurrentPassword,
@@ -135,8 +137,8 @@ void _proceed() async {
icon: Icon(_showConfirmPassword icon: Icon(_showConfirmPassword
? Icons.visibility ? Icons.visibility
: Icons.visibility_off), : Icons.visibility_off),
onPressed: () => onPressed: () => setState(
setState(() => _showConfirmPassword = !_showConfirmPassword), () => _showConfirmPassword = !_showConfirmPassword),
), ),
), ),
validator: validateConfirmPassword, validator: validateConfirmPassword,

View File

@@ -6,6 +6,7 @@ import 'package:kmobile/features/profile/change_password/change_password_screen.
import 'package:kmobile/features/profile/logout_dialog.dart'; import 'package:kmobile/features/profile/logout_dialog.dart';
import 'package:kmobile/security/secure_storage.dart'; import 'package:kmobile/security/secure_storage.dart';
import 'package:local_auth/local_auth.dart'; import 'package:local_auth/local_auth.dart';
import 'package:package_info_plus/package_info_plus.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
import '../../di/injection.dart'; import '../../di/injection.dart';
import '../../l10n/app_localizations.dart'; import '../../l10n/app_localizations.dart';
@@ -27,6 +28,11 @@ class _ProfileScreenState extends State<ProfileScreen> {
_loadBiometricStatus(); _loadBiometricStatus();
} }
Future<String> _getAppVersion() async {
final PackageInfo info = await PackageInfo.fromPlatform();
return 'Version ${info.version} (${info.buildNumber})';
}
Future<void> _loadBiometricStatus() async { Future<void> _loadBiometricStatus() async {
final storage = getIt<SecureStorage>(); final storage = getIt<SecureStorage>();
final isEnabled = await storage.read('biometric_enabled'); final isEnabled = await storage.read('biometric_enabled');
@@ -44,7 +50,6 @@ class _ProfileScreenState extends State<ProfileScreen> {
Navigator.pushNamedAndRemoveUntil(context, '/login', (route) => false); Navigator.pushNamedAndRemoveUntil(context, '/login', (route) => false);
} }
Future<void> _handleBiometricToggle(bool enable) async { Future<void> _handleBiometricToggle(bool enable) async {
final localAuth = LocalAuthentication(); final localAuth = LocalAuthentication();
final storage = getIt<SecureStorage>(); final storage = getIt<SecureStorage>();
@@ -53,7 +58,8 @@ class _ProfileScreenState extends State<ProfileScreen> {
if (!canCheck) { if (!canCheck) {
// Optional: Show a snackbar or dialog if biometrics are not available // Optional: Show a snackbar or dialog if biometrics are not available
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text(AppLocalizations.of(context).biometricsNotAvailable)), SnackBar(
content: Text(AppLocalizations.of(context).biometricsNotAvailable)),
); );
return; return;
} }
@@ -163,7 +169,8 @@ class _ProfileScreenState extends State<ProfileScreen> {
onTap: () { onTap: () {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute(builder: (context) => ChangePasswordScreen( MaterialPageRoute(
builder: (context) => ChangePasswordScreen(
mobileNumber: widget.mobileNumber, mobileNumber: widget.mobileNumber,
)), )),
); );
@@ -181,6 +188,27 @@ class _ProfileScreenState extends State<ProfileScreen> {
// onTap: () async { // onTap: () async {
// }, // },
// ), // ),
ListTile(
leading: const Icon(Icons.smartphone),
title: const Text("App Version"),
trailing: FutureBuilder<String>(
future: _getAppVersion(),
builder: (BuildContext context, AsyncSnapshot<String> snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) {
// Show a loading indicator while waiting for the future to complete
return const CircularProgressIndicator();
} else if (snapshot.hasError) {
return const Text("Error");
} else {
// Display the version number once the future is complete
return Text(
snapshot.data ?? "N/A",
selectionColor: const Color(0xFFFFFFFF),
);
}
},
),
),
ListTile( ListTile(
leading: const Icon(Icons.exit_to_app), leading: const Icon(Icons.exit_to_app),
title: Text(AppLocalizations.of(context).logout), title: Text(AppLocalizations.of(context).logout),

View File

@@ -84,7 +84,8 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
} catch (e) { } catch (e) {
if (mounted) { if (mounted) {
final errorMessage = e.toString().toUpperCase(); final errorMessage = e.toString().toUpperCase();
String snackbarMessage = AppLocalizations.of(context).somethingWentWrong; String snackbarMessage =
AppLocalizations.of(context).somethingWentWrong;
if (errorMessage.contains('INVALID') && errorMessage.contains('IFSC')) { if (errorMessage.contains('INVALID') && errorMessage.contains('IFSC')) {
snackbarMessage = AppLocalizations.of(context).invalidIfsc; snackbarMessage = AppLocalizations.of(context).invalidIfsc;
@@ -637,7 +638,8 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
child: SizedBox( child: SizedBox(
width: double.infinity, width: double.infinity,
child: ElevatedButton( child: ElevatedButton(
onPressed: _isValidating || ifscController.text.length != 11 onPressed:
_isValidating || ifscController.text.length != 11
? null ? null
: () { : () {
if (confirmAccountNumberController.text == if (confirmAccountNumberController.text ==

View File

@@ -5,7 +5,8 @@ import 'package:lottie/lottie.dart';
class SecurityErrorScreen extends StatelessWidget { class SecurityErrorScreen extends StatelessWidget {
final String message; final String message;
const SecurityErrorScreen({Key? key, required this.message}) : super(key: key); const SecurityErrorScreen({Key? key, required this.message})
: super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@@ -24,7 +25,8 @@ class SecurityErrorScreen extends StatelessWidget {
), ),
const SizedBox(height: 40), const SizedBox(height: 40),
ElevatedButton( ElevatedButton(
onPressed: () => SystemChannels.platform.invokeMethod('SystemNavigator.pop'), onPressed: () =>
SystemChannels.platform.invokeMethod('SystemNavigator.pop'),
child: const Text('Okay'), child: const Text('Okay'),
), ),
], ],

View File

@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
import 'package:material_symbols_icons/material_symbols_icons.dart'; import 'package:material_symbols_icons/material_symbols_icons.dart';
import 'package:kmobile/features/service/screens/quick_links_screen.dart'; import 'package:kmobile/features/service/screens/quick_links_screen.dart';
import 'package:kmobile/features/service/screens/faqs_screen.dart'; import 'package:kmobile/features/service/screens/faqs_screen.dart';
class ServiceScreen extends StatefulWidget { class ServiceScreen extends StatefulWidget {
const ServiceScreen({super.key}); const ServiceScreen({super.key});
@@ -44,7 +45,8 @@ Widget build(BuildContext context) {
label: AppLocalizations.of(context).dailylimit, label: AppLocalizations.of(context).dailylimit,
onTap: () { onTap: () {
Navigator.of(context).push( Navigator.of(context).push(
MaterialPageRoute(builder: (context) => const DailyLimitScreen()), MaterialPageRoute(
builder: (context) => const DailyLimitScreen()),
); );
}, },
disabled: true, disabled: true,
@@ -55,7 +57,8 @@ Widget build(BuildContext context) {
label: AppLocalizations.of(context).quickLinks, label: AppLocalizations.of(context).quickLinks,
onTap: () { onTap: () {
Navigator.of(context).push( Navigator.of(context).push(
MaterialPageRoute(builder: (context) => const QuickLinksScreen()), MaterialPageRoute(
builder: (context) => const QuickLinksScreen()),
); );
}, },
disabled: true, disabled: true,

View File

@@ -86,14 +86,14 @@ Widget getBankLogo(String? bankName, BuildContext context) {
height: 40, height: 40,
); );
} }
if (bankName != null && bankName.toLowerCase().contains('ipsbank') || bankName != null && bankName.toLowerCase().contains('india post') ) { if (bankName != null && bankName.toLowerCase().contains('ipsbank') ||
bankName != null && bankName.toLowerCase().contains('india post')) {
return Image.asset( return Image.asset(
'assets/images/ipos_logo.png', 'assets/images/ipos_logo.png',
width: 40, width: 40,
height: 40, height: 40,
); );
} } else {
else {
return Icon( return Icon(
Icons.account_balance, Icons.account_balance,
size: 40, size: 40,

View File

@@ -8,6 +8,7 @@ import Foundation
import device_info_plus import device_info_plus
import flutter_secure_storage_macos import flutter_secure_storage_macos
import local_auth_darwin import local_auth_darwin
import package_info_plus
import path_provider_foundation import path_provider_foundation
import share_plus import share_plus
import shared_preferences_foundation import shared_preferences_foundation
@@ -17,6 +18,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin")) FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin"))
FLALocalAuthPlugin.register(with: registry.registrar(forPlugin: "FLALocalAuthPlugin")) FLALocalAuthPlugin.register(with: registry.registrar(forPlugin: "FLALocalAuthPlugin"))
FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin")) SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))

View File

@@ -69,10 +69,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: characters name: characters
sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.4.0" version: "1.3.0"
checked_yaml: checked_yaml:
dependency: transitive dependency: transitive
description: description:
@@ -93,18 +93,18 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: clock name: clock
sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.1.2" version: "1.1.1"
collection: collection:
dependency: transitive dependency: transitive
description: description:
name: collection name: collection
sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.19.1" version: "1.18.0"
confetti: confetti:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -181,10 +181,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: fake_async name: fake_async
sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.3.3" version: "1.3.1"
ffi: ffi:
dependency: transitive dependency: transitive
description: description:
@@ -385,10 +385,10 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: intl name: intl
sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5" sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.20.2" version: "0.19.0"
jailbreak_root_detection: jailbreak_root_detection:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -417,26 +417,26 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker name: leak_tracker
sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de" sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "11.0.2" version: "10.0.5"
leak_tracker_flutter_testing: leak_tracker_flutter_testing:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker_flutter_testing name: leak_tracker_flutter_testing
sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.0.10" version: "3.0.5"
leak_tracker_testing: leak_tracker_testing:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker_testing name: leak_tracker_testing
sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.0.2" version: "3.0.1"
lints: lints:
dependency: transitive dependency: transitive
description: description:
@@ -497,10 +497,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: matcher name: matcher
sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.12.17" version: "0.12.16+1"
material_color_utilities: material_color_utilities:
dependency: transitive dependency: transitive
description: description:
@@ -521,10 +521,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: meta name: meta
sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.16.0" version: "1.15.0"
mime: mime:
dependency: transitive dependency: transitive
description: description:
@@ -541,14 +541,30 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.0.0" version: "1.0.0"
package_info_plus:
dependency: "direct main"
description:
name: package_info_plus
sha256: "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017"
url: "https://pub.dev"
source: hosted
version: "4.2.0"
package_info_plus_platform_interface:
dependency: transitive
description:
name: package_info_plus_platform_interface
sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6"
url: "https://pub.dev"
source: hosted
version: "2.0.1"
path: path:
dependency: transitive dependency: transitive
description: description:
name: path name: path
sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.9.1" version: "1.9.0"
path_parsing: path_parsing:
dependency: transitive dependency: transitive
description: description:
@@ -801,7 +817,7 @@ packages:
dependency: transitive dependency: transitive
description: flutter description: flutter
source: sdk source: sdk
version: "0.0.0" version: "0.0.99"
source_span: source_span:
dependency: transitive dependency: transitive
description: description:
@@ -822,18 +838,18 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: stack_trace name: stack_trace
sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.12.1" version: "1.11.1"
stream_channel: stream_channel:
dependency: transitive dependency: transitive
description: description:
name: stream_channel name: stream_channel
sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.1.4" version: "2.1.2"
string_scanner: string_scanner:
dependency: transitive dependency: transitive
description: description:
@@ -854,10 +870,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: test_api name: test_api
sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00" sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.7.6" version: "0.7.2"
typed_data: typed_data:
dependency: transitive dependency: transitive
description: description:
@@ -966,10 +982,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: vector_math name: vector_math
sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.2.0" version: "2.1.4"
vm_service: vm_service:
dependency: transitive dependency: transitive
description: description:
@@ -1027,5 +1043,5 @@ packages:
source: hosted source: hosted
version: "3.1.3" version: "3.1.3"
sdks: sdks:
dart: ">=3.8.0-0 <4.0.0" dart: ">=3.5.0 <4.0.0"
flutter: ">=3.24.0" flutter: ">=3.24.0"

View File

@@ -31,10 +31,6 @@ dependencies:
flutter: flutter:
sdk: flutter sdk: flutter
flutter_neumorphic : 3.2.0 flutter_neumorphic : 3.2.0
# The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons.
cupertino_icons: ^1.0.6 cupertino_icons: ^1.0.6
jailbreak_root_detection: ^1.1.6 jailbreak_root_detection: ^1.1.6
equatable: ^2.0.7 equatable: ^2.0.7
@@ -64,6 +60,7 @@ dependencies:
permission_handler: ^12.0.1 permission_handler: ^12.0.1
device_info_plus: ^11.3.0 device_info_plus: ^11.3.0
showcaseview: ^2.0.3 showcaseview: ^2.0.3
package_info_plus: ^4.2.0
# jailbreak_root_detection: "^1.1.6" # jailbreak_root_detection: "^1.1.6"