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

5
lib/api/services/beneficiary_service.dart
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) {
@@ -127,4 +126,4 @@ class BeneficiaryService {
throw Exception('Unexpected error: ${e.toString()}'); throw Exception('Unexpected error: ${e.toString()}');
} }
} }
} }

39
lib/api/services/change_password_service.dart
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");
@@ -22,15 +19,12 @@ class ChangePasswordService {
return response.toString(); return response.toString();
} }
Future getOtpTpin({ Future getOtpTpin({
required String mobileNumber, required String mobileNumber,
}) 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,15 +33,14 @@ class ChangePasswordService {
return response.toString(); return response.toString();
} }
Future validateOtp({
Future validateOtp({
required String otp, required String otp,
required String mobileNumber, required String mobileNumber,
}) async { }) async {
final response = await _dio.post( final response = await _dio.post(
'/api/otp/verify?mobileNumber=$mobileNumber', '/api/otp/verify?mobileNumber=$mobileNumber',
data: { data: {
'otp' : otp, 'otp': otp,
}, },
); );
if (response.statusCode != 200) { if (response.statusCode != 200) {
@@ -56,22 +49,22 @@ class ChangePasswordService {
return response.toString(); return response.toString();
} }
Future validateChangePwd({ Future validateChangePwd({
required String OldLPsw, required String OldLPsw,
required String newLPsw, required String newLPsw,
required String confirmLPsw, required String confirmLPsw,
}) async { }) async {
final response = await _dio.post( final response = await _dio.post(
'/api/auth/change/login_password', '/api/auth/change/login_password',
data: { data: {
'OldLPsw': OldLPsw, 'OldLPsw': OldLPsw,
'newLPsw': newLPsw, 'newLPsw': newLPsw,
'confirmLPsw': confirmLPsw, 'confirmLPsw': confirmLPsw,
}, },
); );
if (response.statusCode != 200) { if (response.statusCode != 200) {
throw Exception("Wrong OTP"); throw Exception("Wrong OTP");
} }
return response.toString(); return response.toString();
} }
} }

59
lib/app.dart
View File

@@ -43,7 +43,7 @@ class _KMobileState extends State<KMobile> with WidgetsBindingObserver {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
WidgetsBinding.instance.addObserver(this); WidgetsBinding.instance.addObserver(this);
loadPreferences(); loadPreferences();
Future.delayed(const Duration(seconds: 3), () { Future.delayed(const Duration(seconds: 3), () {
setState(() { setState(() {
@@ -52,32 +52,32 @@ class _KMobileState extends State<KMobile> with WidgetsBindingObserver {
}); });
} }
@override @override
void dispose() { void dispose() {
WidgetsBinding.instance.removeObserver(this); WidgetsBinding.instance.removeObserver(this);
_backgroundTimer?.cancel(); _backgroundTimer?.cancel();
super.dispose(); super.dispose();
} }
@override @override
void didChangeAppLifecycleState(AppLifecycleState state) { void didChangeAppLifecycleState(AppLifecycleState state) {
super.didChangeAppLifecycleState(state); super.didChangeAppLifecycleState(state);
switch (state) { switch (state) {
case AppLifecycleState.resumed: case AppLifecycleState.resumed:
_backgroundTimer?.cancel(); _backgroundTimer?.cancel();
break; break;
case AppLifecycleState.paused: case AppLifecycleState.paused:
_backgroundTimer = Timer(const Duration(minutes: 2), () { _backgroundTimer = Timer(const Duration(minutes: 2), () {
if (Platform.isAndroid) { if (Platform.isAndroid) {
SystemNavigator.pop(); SystemNavigator.pop();
} }
exit(0); exit(0);
}); });
break; break;
default: default:
break; break;
}
} }
}
Future<void> loadPreferences() async { Future<void> loadPreferences() async {
final prefs = await SharedPreferences.getInstance(); final prefs = await SharedPreferences.getInstance();
@@ -217,7 +217,7 @@ class _AuthGateState extends State<AuthGate> {
return const SplashScreen(); return const SplashScreen();
} }
if (snapshot.data == true) { if (snapshot.data == true) {
return const NavigationScaffold(); return const NavigationScaffold();
} }
return MPinScreen( return MPinScreen(
mode: MPinMode.enter, mode: MPinMode.enter,
@@ -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;
@@ -460,4 +459,4 @@ class BiometricPromptScreen extends StatelessWidget {
onCompleted(); onCompleted();
} }
} }
} }

2
lib/data/models/imps_transaction.dart
View File

@@ -15,7 +15,7 @@ class ImpsTransaction {
required this.ifscCode, required this.ifscCode,
this.remitterName, this.remitterName,
required this.beneficiaryName, required this.beneficiaryName,
required this.tpin, required this.tpin,
this.remarks, this.remarks,
}); });

2
lib/data/models/neft_transaction.dart
View File

@@ -15,7 +15,7 @@ class NeftTransaction {
required this.ifscCode, required this.ifscCode,
required this.remitterName, required this.remitterName,
required this.beneficiaryName, required this.beneficiaryName,
required this.tpin, required this.tpin,
this.remarks, this.remarks,
}); });

2
lib/data/models/transfer.dart
View File

@@ -11,7 +11,7 @@ class Transfer {
required this.toAccount, required this.toAccount,
required this.toAccountType, required this.toAccountType,
required this.amount, required this.amount,
this.tpin, this.tpin,
this.remarks, this.remarks,
}); });

4
lib/data/repositories/auth_repository.dart
View File

@@ -49,12 +49,10 @@ class AuthRepository {
_tokenExpiryKey, token.expiresAt.toIso8601String()); _tokenExpiryKey, token.expiresAt.toIso8601String());
} }
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);

2
lib/data/repositories/transaction_repository.dart
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';

10
lib/di/injection.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: {

55
lib/features/accounts/screens/account_statement_screen.dart
View File

@@ -11,8 +11,8 @@ import 'transaction_details_screen.dart';
import 'package:pdf/widgets.dart' as pw; import 'package:pdf/widgets.dart' as pw;
import 'package:permission_handler/permission_handler.dart'; import 'package:permission_handler/permission_handler.dart';
import 'package:device_info_plus/device_info_plus.dart'; import 'package:device_info_plus/device_info_plus.dart';
import 'package:path_provider/path_provider.dart'; import 'package:path_provider/path_provider.dart';
import 'package:share_plus/share_plus.dart'; import 'package:share_plus/share_plus.dart';
class AccountStatementScreen extends StatefulWidget { class AccountStatementScreen extends StatefulWidget {
final String accountNo; final String accountNo;
@@ -295,20 +295,21 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
: '', : '',
style: const TextStyle(fontSize: 12), style: const TextStyle(fontSize: 12),
), ),
trailing: Column( trailing: Column(
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Text( Text(
"₹${tx.amount}", "₹${tx.amount}",
style: const TextStyle(fontSize: 17), style: const TextStyle(fontSize: 17),
), ),
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
], ),
), ],
),
onTap: () { onTap: () {
Navigator.push( Navigator.push(
context, context,
@@ -491,19 +492,17 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
} }
} }
// Add for IOS // Add for IOS
else if (Platform.isIOS) { else if (Platform.isIOS) {
// On iOS, we save to a temporary directory and then open the share sheet. // On iOS, we save to a temporary directory and then open the share sheet.
final tempDir = await getTemporaryDirectory(); final tempDir = await getTemporaryDirectory();
final file = await File('${tempDir.path}/$fileName').create(); final file = await File('${tempDir.path}/$fileName').create();
await file.writeAsBytes(pdfBytes); await file.writeAsBytes(pdfBytes);
// Use share_plus to open the iOS share dialog // Use share_plus to open the iOS share dialog
await Share.shareXFiles( await Share.shareXFiles(
[XFile(file.path)], [XFile(file.path)],
); );
} }
} catch (e) { } catch (e) {
if (mounted) { if (mounted) {
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(

4
lib/features/accounts/screens/transaction_details_screen.dart
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),
], ],
), ),
), ),

21
lib/features/auth/controllers/theme_state.dart
View File

@@ -16,26 +16,23 @@ 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});
ThemeData getLightThemeData() { ThemeData getLightThemeData() {
return AppThemes.getLightTheme(themeType); return AppThemes.getLightTheme(themeType);
}
ThemeData getDarkThemeData() {
return AppThemes.getDarkTheme(themeType);
}
@override
List<Object?> get props => [themeType];
} }
ThemeData getDarkThemeData() {
return AppThemes.getDarkTheme(themeType);
}
@override
List<Object?> get props => [themeType];
}

7
lib/features/auth/screens/set_password_screen.dart
View File

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

38
lib/features/auth/screens/splash_screen.dart
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,
),
), ),
), ),
], ],

110
lib/features/beneficiaries/screens/add_beneficiary_screen.dart
View File

@@ -24,8 +24,8 @@ class AddBeneficiaryScreen extends StatefulWidget {
class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> { class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
final _formKey = GlobalKey<FormState>(); final _formKey = GlobalKey<FormState>();
final _accountNumberFieldKey = GlobalKey<FormFieldState>(); final _accountNumberFieldKey = GlobalKey<FormFieldState>();
final _confirmAccountNumberFieldKey = GlobalKey<FormFieldState>(); final _confirmAccountNumberFieldKey = GlobalKey<FormFieldState>();
final _ifscFieldKey = GlobalKey<FormFieldState>(); final _ifscFieldKey = GlobalKey<FormFieldState>();
final TextEditingController accountNumberController = TextEditingController(); final TextEditingController accountNumberController = TextEditingController();
final TextEditingController confirmAccountNumberController = final TextEditingController confirmAccountNumberController =
TextEditingController(); TextEditingController();
@@ -47,10 +47,10 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
void initState() { void initState() {
super.initState(); super.initState();
_ifscFocusNode.addListener(() { _ifscFocusNode.addListener(() {
if (!_ifscFocusNode.hasFocus && ifscController.text.trim().length == 11) { if (!_ifscFocusNode.hasFocus && ifscController.text.trim().length == 11) {
_validateIFSC(); _validateIFSC();
} }
}); });
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {
setState(() { setState(() {
accountType = 'Savings'; accountType = 'Savings';
@@ -58,26 +58,26 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
}); });
} }
@override @override
void dispose() { void dispose() {
accountNumberController.dispose(); accountNumberController.dispose();
confirmAccountNumberController.dispose(); confirmAccountNumberController.dispose();
nameController.dispose(); nameController.dispose();
bankNameController.dispose(); bankNameController.dispose();
branchNameController.dispose(); branchNameController.dispose();
ifscController.dispose(); ifscController.dispose();
phoneController.dispose(); phoneController.dispose();
_ifscFocusNode.dispose(); _ifscFocusNode.dispose();
super.dispose(); super.dispose();
} }
void _validateIFSC() async { void _validateIFSC() async {
var beneficiaryService = getIt<BeneficiaryService>(); var beneficiaryService = getIt<BeneficiaryService>();
final ifsc = ifscController.text.trim().toUpperCase(); final ifsc = ifscController.text.trim().toUpperCase();
if (ifsc.isEmpty) return; if (ifsc.isEmpty) return;
try { try {
final result = await beneficiaryService.validateIFSC(ifsc); final result = await beneficiaryService.validateIFSC(ifsc);
if (mounted) { if (mounted) {
if (result.bankName.isEmpty) { if (result.bankName.isEmpty) {
@@ -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;
@@ -107,7 +108,7 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
branchNameController.clear(); branchNameController.clear();
} }
} }
} }
void _validateBeneficiary() async { void _validateBeneficiary() async {
FocusScope.of(context).unfocus(); FocusScope.of(context).unfocus();
@@ -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;
}, },
@@ -346,16 +349,16 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
), ),
textCapitalization: TextCapitalization.characters, textCapitalization: TextCapitalization.characters,
textInputAction: TextInputAction.next, textInputAction: TextInputAction.next,
onChanged: (value) { onChanged: (value) {
setState(() { setState(() {
final trimmed = value.trim().toUpperCase(); final trimmed = value.trim().toUpperCase();
if (trimmed.length < 11) { if (trimmed.length < 11) {
// clear bank/branch if backspace or changed // clear bank/branch if backspace or changed
bankNameController.clear(); bankNameController.clear();
branchNameController.clear(); branchNameController.clear();
} }
}); });
}, },
validator: (value) { validator: (value) {
final pattern = RegExp(r'^[A-Z]{4}0[A-Z0-9]{6}$'); final pattern = RegExp(r'^[A-Z]{4}0[A-Z0-9]{6}$');
if (value == null || value.trim().isEmpty) { if (value == null || value.trim().isEmpty) {
@@ -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 ||
? null ifscController.text.length != 11
: () { ? null
final isAccountValid = : () {
_accountNumberFieldKey.currentState!.validate(); final isAccountValid =
final isConfirmAccountValid = _accountNumberFieldKey.currentState!
_confirmAccountNumberFieldKey.currentState!.validate(); .validate();
final isIfscValid = _ifscFieldKey.currentState!.validate(); final isConfirmAccountValid =
_confirmAccountNumberFieldKey
if (isAccountValid && isConfirmAccountValid && isIfscValid) { .currentState!
_validateBeneficiary(); .validate();
} final isIfscValid = _ifscFieldKey
}, .currentState!
.validate();
if (isAccountValid &&
isConfirmAccountValid &&
isIfscValid) {
_validateBeneficiary();
}
},
child: _isValidating child: _isValidating
? const SizedBox( ? const SizedBox(
width: 20, width: 20,

5
lib/features/beneficiaries/screens/beneficiary_result_page.dart
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
), ),
), ),
), ),

108
lib/features/card/screens/card_management_screen.dart
View File

@@ -17,83 +17,83 @@ class CardManagementScreen extends StatefulWidget {
class _CardManagementScreen extends State<CardManagementScreen> { class _CardManagementScreen extends State<CardManagementScreen> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
automaticallyImplyLeading: false, automaticallyImplyLeading: false,
title: Text( title: Text(
AppLocalizations.of(context).cardManagement, AppLocalizations.of(context).cardManagement,
),
centerTitle: false,
),
body: ListView(
children: [
CardManagementTile(
icon: Symbols.add,
label: AppLocalizations.of(context).applyDebitCard,
onTap: () {},
disabled: true, // Add this
), ),
const Divider(height: 1), centerTitle: false,
CardManagementTile( ),
icon: Symbols.remove_moderator, body: ListView(
label: AppLocalizations.of(context).blockUnblockCard, children: [
onTap: () { CardManagementTile(
Navigator.push( icon: Symbols.add,
label: AppLocalizations.of(context).applyDebitCard,
onTap: () {},
disabled: true, // Add this
),
const Divider(height: 1),
CardManagementTile(
icon: Symbols.remove_moderator,
label: AppLocalizations.of(context).blockUnblockCard,
onTap: () {
Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => const BlockCardScreen(), builder: (context) => const BlockCardScreen(),
), ),
); );
}, },
disabled: true, disabled: true,
), ),
const Divider(height: 1), const Divider(height: 1),
CardManagementTile( CardManagementTile(
icon: Symbols.password_2, icon: Symbols.password_2,
label: AppLocalizations.of(context).changeCardPin, label: AppLocalizations.of(context).changeCardPin,
onTap: () { onTap: () {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => const CardPinChangeDetailsScreen(), builder: (context) => const CardPinChangeDetailsScreen(),
), ),
); );
}, },
disabled: true, disabled: true,
), ),
const Divider(height: 1), const Divider(height: 1),
CardManagementTile( CardManagementTile(
icon: Symbols.payment_card, icon: Symbols.payment_card,
label: AppLocalizations.of(context).viewCardDeatils, label: AppLocalizations.of(context).viewCardDeatils,
onTap: () { onTap: () {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => const CardDetailsScreen(), builder: (context) => const CardDetailsScreen(),
), ),
); );
}, },
disabled: true, disabled: true,
), ),
const Divider(height: 1), const Divider(height: 1),
], ],
), ),
); );
} }
} }
class CardManagementTile extends StatelessWidget { class CardManagementTile extends StatelessWidget {
final IconData icon; final IconData icon;
final String label; final String label;
final VoidCallback onTap; final VoidCallback onTap;
final bool disabled; final bool disabled;
const CardManagementTile({ const CardManagementTile({
super.key, super.key,
required this.icon, required this.icon,
required this.label, required this.label,
required this.onTap, required this.onTap,
this.disabled = false, this.disabled = false,
}); });
@override @override
@@ -102,20 +102,20 @@ class CardManagementTile extends StatelessWidget {
return ListTile( return ListTile(
leading: Icon( leading: Icon(
icon, icon,
color: disabled ? theme.disabledColor : null, color: disabled ? theme.disabledColor : null,
), ),
title: Text( title: Text(
label, label,
style: TextStyle( style: TextStyle(
color: disabled ? theme.disabledColor : null, color: disabled ? theme.disabledColor : null,
), ),
), ),
trailing: Icon( trailing: Icon(
Symbols.arrow_right, Symbols.arrow_right,
size: 20, size: 20,
color: disabled ? theme.disabledColor : null, color: disabled ? theme.disabledColor : null,
), ),
onTap: disabled ? null : onTap, onTap: disabled ? null : onTap,
); );
} }
} }

24
lib/features/customer_info/screens/customer_info_screen.dart
View File

@@ -13,14 +13,14 @@ class CustomerInfoScreen extends StatefulWidget {
class _CustomerInfoScreenState extends State<CustomerInfoScreen> { class _CustomerInfoScreenState extends State<CustomerInfoScreen> {
late final User user = widget.user; late final User user = widget.user;
String _maskPrimaryId(String? primaryId) { String _maskPrimaryId(String? primaryId) {
if (primaryId == null || primaryId.length <= 4) { if (primaryId == null || primaryId.length <= 4) {
return primaryId ?? 'N/A'; return primaryId ?? 'N/A';
} }
final lastFour = primaryId.substring(primaryId.length - 4); final lastFour = primaryId.substring(primaryId.length - 4);
return '*' * (primaryId.length - 4) + lastFour; return '*' * (primaryId.length - 4) + lastFour;
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@@ -92,10 +92,10 @@ class _CustomerInfoScreenState extends State<CustomerInfoScreen> {
label: AppLocalizations.of(context).branchAddress, label: AppLocalizations.of(context).branchAddress,
value: user.address ?? 'N/A', value: user.address ?? 'N/A',
), // Replace with Aadhar if available ), // Replace with Aadhar if available
InfoField( InfoField(
label: AppLocalizations.of(context).primaryId, label: AppLocalizations.of(context).primaryId,
value: _maskPrimaryId(user.primaryId), value: _maskPrimaryId(user.primaryId),
), // Replace with PAN if available ), // Replace with PAN if available
], ],
), ),
), ),

98
lib/features/dashboard/screens/dashboard_screen.dart
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;
@@ -139,7 +140,7 @@ class _DashboardScreenState extends State<DashboardScreen> with SingleTickerProv
case 'sa': case 'sa':
return AppLocalizations.of(context).savingsAccount; return AppLocalizations.of(context).savingsAccount;
case 'sb': case 'sb':
return AppLocalizations.of(context).savingsAccount; return AppLocalizations.of(context).savingsAccount;
case 'ln': case 'ln':
return AppLocalizations.of(context).loanAccount; return AppLocalizations.of(context).loanAccount;
case 'td': case 'td':
@@ -209,54 +210,54 @@ class _DashboardScreenState extends State<DashboardScreen> with SingleTickerProv
}, },
child: Scaffold( child: Scaffold(
backgroundColor: theme.scaffoldBackgroundColor, backgroundColor: theme.scaffoldBackgroundColor,
appBar: AppBar( appBar: AppBar(
backgroundColor: theme.scaffoldBackgroundColor, backgroundColor: theme.scaffoldBackgroundColor,
leading: Padding( leading: Padding(
padding: const EdgeInsets.only(left: 10.0), padding: const EdgeInsets.only(left: 10.0),
child: InkWell( child: InkWell(
borderRadius: BorderRadius.circular(20), borderRadius: BorderRadius.circular(20),
onTap: () { onTap: () {
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 && if (selectedAccountIndex >= 0 &&
selectedAccountIndex < authState.users.length) { selectedAccountIndex < authState.users.length) {
mobileNumberToPass = mobileNumberToPass =
authState.users[selectedAccountIndex].mobileNo ?? ''; authState.users[selectedAccountIndex].mobileNo ?? '';
} }
} }
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => builder: (context) =>
ProfileScreen(mobileNumber: mobileNumberToPass), ProfileScreen(mobileNumber: mobileNumberToPass),
),
);
},
child: CircleAvatar(
backgroundColor: Colors.grey[200],
radius: 20,
child: SvgPicture.asset(
'assets/images/avatar_male.svg',
width: 40,
height: 40,
fit: BoxFit.cover,
),
),
), ),
); ),
}, title: Text(
child: CircleAvatar( AppLocalizations.of(context).kccbMobile,
backgroundColor: Colors.grey[200], textAlign: TextAlign.left,
radius: 20, style: TextStyle(
child: SvgPicture.asset( color: theme.colorScheme.primary,
'assets/images/avatar_male.svg', fontWeight: FontWeight.w700,
width: 40, ),
height: 40, ),
fit: BoxFit.cover, centerTitle: true,
), ),
),
),
),
title: Text(
AppLocalizations.of(context).kccbMobile,
textAlign: TextAlign.left,
style: TextStyle(
color: theme.colorScheme.primary,
fontWeight: FontWeight.w700,
),
),
centerTitle: true,
),
body: BlocBuilder<AuthCubit, AuthState>( body: BlocBuilder<AuthCubit, AuthState>(
builder: (context, state) { builder: (context, state) {
if (state is AuthLoading || state is AuthInitial) { if (state is AuthLoading || state is AuthInitial) {
@@ -533,8 +534,9 @@ appBar: AppBar(
.accountNo!, .accountNo!,
balance: users[selectedAccountIndex] balance: users[selectedAccountIndex]
.availableBalance!, .availableBalance!,
accountType: users[selectedAccountIndex] accountType:
.accountType!, users[selectedAccountIndex]
.accountType!,
))); )));
}), }),
_buildQuickLink(Symbols.checkbook, _buildQuickLink(Symbols.checkbook,

1
lib/features/dashboard/widgets/account_card.dart
View File

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

60
lib/features/enquiry/screens/enquiry_screen.dart
View File

@@ -30,15 +30,15 @@ class _EnquiryScreen extends State<EnquiryScreen> {
} }
} }
Future<void> _launchUrl(String url) async { Future<void> _launchUrl(String url) async {
final Uri uri = Uri.parse(url); final Uri uri = Uri.parse(url);
if (await canLaunchUrl(uri)) { if (await canLaunchUrl(uri)) {
await launchUrl(uri); await launchUrl(uri);
} else { } else {
// Consider adding a 'urlLaunchError' key to your AppLocalizations // Consider adding a 'urlLaunchError' key to your AppLocalizations
debugPrint('Could not launch $url'); debugPrint('Could not launch $url');
} }
} }
Widget _buildContactItem(String role, String email, String phone) { Widget _buildContactItem(String role, String email, String phone) {
return Column( return Column(
@@ -75,29 +75,25 @@ class _EnquiryScreen extends State<EnquiryScreen> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
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, decorationColor: Theme.of(context).colorScheme.primary,
decorationColor: Theme.of(context).colorScheme.primary, ),
), ),
), const SizedBox(width: 4),
const SizedBox(width: 4), Icon(
Icon( Icons.open_in_new,
Icons.open_in_new, 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,

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), const SizedBox(height: 24),
], ],
//Remarks //Remarks
TextFormField( TextFormField(
controller: _remarksController, controller: _remarksController,
decoration: InputDecoration( decoration: InputDecoration(
labelText: AppLocalizations.of(context).remarks, labelText: AppLocalizations.of(context).remarks,
border: const OutlineInputBorder(), border: const OutlineInputBorder(),
),
), ),
const SizedBox(height: 24), ),
const SizedBox(height: 24),
// Amount // Amount
TextFormField( TextFormField(
controller: _amountController, controller: _amountController,

3
lib/features/fund_transfer/screens/payment_animation.dart
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(

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

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

51
lib/features/profile/change_password/change_password_otp_screen.dart
View File

@@ -14,12 +14,13 @@ class ChangePasswordOTPScreen extends StatefulWidget {
const ChangePasswordOTPScreen({ const ChangePasswordOTPScreen({
required this.currentPassword, required this.currentPassword,
required this.newPassword, required this.newPassword,
required this.confirmPassword, required this.confirmPassword,
required this.mobileNumber, required this.mobileNumber,
}); });
@override @override
State<ChangePasswordOTPScreen> createState() => _ChangePasswordOTPScreenState(); State<ChangePasswordOTPScreen> createState() =>
_ChangePasswordOTPScreenState();
} }
class _ChangePasswordOTPScreenState extends State<ChangePasswordOTPScreen> { class _ChangePasswordOTPScreenState extends State<ChangePasswordOTPScreen> {
@@ -36,33 +37,33 @@ class _ChangePasswordOTPScreenState extends State<ChangePasswordOTPScreen> {
}); });
}); });
} }
final changePasswordService = getIt<ChangePasswordService>(); final changePasswordService = getIt<ChangePasswordService>();
Future<void> _validateOTP() async { Future<void> _validateOTP() async {
try { try {
await changePasswordService.validateOtp( await changePasswordService.validateOtp(
otp: otpController.text, otp: otpController.text,
mobileNumber: widget.mobileNumber, mobileNumber: widget.mobileNumber,
); );
// If OTP is valid, then change the password // If OTP is valid, then change the password
await changePasswordService.validateChangePwd( await changePasswordService.validateChangePwd(
OldLPsw: widget.currentPassword, OldLPsw: widget.currentPassword,
newLPsw: widget.newPassword, newLPsw: widget.newPassword,
confirmLPsw: widget.confirmPassword, confirmLPsw: widget.confirmPassword,
); );
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text(AppLocalizations.of(context).pwdchangeSuccess)),
);
// Navigate back to profile or login ScaffoldMessenger.of(context).showSnackBar(
Navigator.of(context).popUntil((route) => route.isFirst); SnackBar(content: Text(AppLocalizations.of(context).pwdchangeSuccess)),
);
} catch (e) { // Navigate back to profile or login
ScaffoldMessenger.of(context).showSnackBar( Navigator.of(context).popUntil((route) => route.isFirst);
SnackBar(content: Text(AppLocalizations.of(context).invalidOtp)), } catch (e) {
); ScaffoldMessenger.of(context).showSnackBar(
} SnackBar(content: Text(AppLocalizations.of(context).invalidOtp)),
);
}
} }
@override @override
@@ -106,4 +107,4 @@ class _ChangePasswordOTPScreenState extends State<ChangePasswordOTPScreen> {
), ),
); );
} }
} }

58
lib/features/profile/change_password/change_password_screen.dart
View File

@@ -56,38 +56,40 @@ class _ChangePasswordScreenState extends State<ChangePasswordScreen> {
} }
return null; return null;
} }
final ChangePasswordService _changePasswordService = getIt<ChangePasswordService>();
void _proceed() async {
if (_formKey.currentState!.validate()) {
final ChangePasswordService _changePasswordService =
getIt<ChangePasswordService>();
void _proceed() async {
if (_formKey.currentState!.validate()) {
try {
await _changePasswordService.getOtp(mobileNumber: widget.mobileNumber);
try { Navigator.push(
await _changePasswordService.getOtp(mobileNumber: widget.mobileNumber); context,
MaterialPageRoute(
builder: (context) => ChangePasswordOTPScreen(
Navigator.push( currentPassword: currentPasswordController.text,
context, newPassword: newPasswordController.text,
MaterialPageRoute( confirmPassword: confirmPasswordController.text,
builder: (context) => ChangePasswordOTPScreen( mobileNumber: widget.mobileNumber,
currentPassword: currentPasswordController.text, ),
newPassword: newPasswordController.text,
confirmPassword: confirmPasswordController.text,
mobileNumber: widget.mobileNumber,
), ),
), );
); } catch (e) {
} catch (e) { ScaffoldMessenger.of(context).showSnackBar(
ScaffoldMessenger.of(context).showSnackBar( SnackBar(
SnackBar(content: Text('${AppLocalizations.of(context).failedtosentOTP}: $e')), content:
); Text('${AppLocalizations.of(context).failedtosentOTP}: $e')),
);
}
} }
} }
}
@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,
@@ -152,4 +154,4 @@ void _proceed() async {
), ),
); );
} }
} }

2
lib/features/profile/logout_dialog.dart
View File

@@ -22,4 +22,4 @@ class LogoutDialog extends StatelessWidget {
], ],
); );
} }
} }

6
lib/features/profile/preferences/theme_mode_dialog.dart
View File

@@ -17,13 +17,13 @@ String _getThemeModeText(ThemeMode mode, AppLocalizations l10n) {
Future<void> showThemeModeDialog(BuildContext context) async { Future<void> showThemeModeDialog(BuildContext context) async {
final cubit = context.read<ThemeModeCubit>(); final cubit = context.read<ThemeModeCubit>();
final currentMode = context.read<ThemeModeCubit>().state.mode; final currentMode = context.read<ThemeModeCubit>().state.mode;
final l10n = AppLocalizations.of(context); final l10n = AppLocalizations.of(context);
await showDialog( await showDialog(
context: context, context: context,
builder: (context) { builder: (context) {
return AlertDialog( return AlertDialog(
title: Text(l10n.selectThemeMode), title: Text(l10n.selectThemeMode),
content: Column( content: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: ThemeMode.values.map((mode) { children: ThemeMode.values.map((mode) {
@@ -43,4 +43,4 @@ Future<void> showThemeModeDialog(BuildContext context) async {
); );
}, },
); );
} }

308
lib/features/profile/profile_screen.dart
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';
@@ -20,22 +21,27 @@ class ProfileScreen extends StatefulWidget {
} }
class _ProfileScreenState extends State<ProfileScreen> { class _ProfileScreenState extends State<ProfileScreen> {
bool _isBiometricEnabled = false; bool _isBiometricEnabled = false;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
_loadBiometricStatus(); _loadBiometricStatus();
} }
Future<void> _loadBiometricStatus() async { Future<String> _getAppVersion() async {
final storage = getIt<SecureStorage>(); final PackageInfo info = await PackageInfo.fromPlatform();
final isEnabled = await storage.read('biometric_enabled'); return 'Version ${info.version} (${info.buildNumber})';
setState(() { }
_isBiometricEnabled = isEnabled == 'true';
});
}
Future<void> _handleLogout(BuildContext context) async { Future<void> _loadBiometricStatus() async {
final storage = getIt<SecureStorage>();
final isEnabled = await storage.read('biometric_enabled');
setState(() {
_isBiometricEnabled = isEnabled == 'true';
});
}
Future<void> _handleLogout(BuildContext context) async {
final auth = getIt<AuthRepository>(); final auth = getIt<AuthRepository>();
final prefs = await SharedPreferences.getInstance(); final prefs = await SharedPreferences.getInstance();
await prefs.clear(); // clear saved session/token await prefs.clear(); // clear saved session/token
@@ -44,89 +50,89 @@ 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>(); final canCheck = await localAuth.canCheckBiometrics;
final canCheck = await localAuth.canCheckBiometrics;
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;
}
if (enable) { if (enable) {
// Show "Enable" dialog // Show "Enable" dialog
final optIn = await showDialog<bool>( final optIn = await showDialog<bool>(
context: context, context: context,
barrierDismissible: false, barrierDismissible: false,
builder: (ctx) => AlertDialog( builder: (ctx) => AlertDialog(
title: Text(AppLocalizations.of(context).enableFingerprintLogin), title: Text(AppLocalizations.of(context).enableFingerprintLogin),
content: Text(AppLocalizations.of(context).enableFingerprintMessage), content: Text(AppLocalizations.of(context).enableFingerprintMessage),
actions: [ actions: [
TextButton( TextButton(
onPressed: () => Navigator.of(ctx).pop(false), onPressed: () => Navigator.of(ctx).pop(false),
child: Text(AppLocalizations.of(context).no), child: Text(AppLocalizations.of(context).no),
), ),
TextButton( TextButton(
onPressed: () => Navigator.of(ctx).pop(true), onPressed: () => Navigator.of(ctx).pop(true),
child: Text(AppLocalizations.of(context).yes), child: Text(AppLocalizations.of(context).yes),
), ),
], ],
), ),
); );
if (optIn == true) { if (optIn == true) {
try { try {
final didAuth = await localAuth.authenticate( final didAuth = await localAuth.authenticate(
localizedReason: AppLocalizations.of(context).authenticateToEnable, localizedReason: AppLocalizations.of(context).authenticateToEnable,
options: const AuthenticationOptions( options: const AuthenticationOptions(
stickyAuth: true, stickyAuth: true,
biometricOnly: true, biometricOnly: true,
), ),
); );
if (didAuth) { if (didAuth) {
await storage.write('biometric_enabled', 'true'); await storage.write('biometric_enabled', 'true');
setState(() { setState(() {
_isBiometricEnabled = true; _isBiometricEnabled = true;
}); });
} }
} catch (e) { } catch (e) {
// Handle authentication errors // Handle authentication errors
} }
} }
} else { } else {
// Show "Disable" dialog // Show "Disable" dialog
final optOut = await showDialog<bool>( final optOut = await showDialog<bool>(
context: context, context: context,
barrierDismissible: false, barrierDismissible: false,
builder: (ctx) => AlertDialog( builder: (ctx) => AlertDialog(
title: Text(AppLocalizations.of(context).disableFingerprintLogin), title: Text(AppLocalizations.of(context).disableFingerprintLogin),
content: Text(AppLocalizations.of(context).disableFingerprintMessage), content: Text(AppLocalizations.of(context).disableFingerprintMessage),
actions: [ actions: [
TextButton( TextButton(
onPressed: () => Navigator.of(ctx).pop(false), onPressed: () => Navigator.of(ctx).pop(false),
child: Text(AppLocalizations.of(context).no), child: Text(AppLocalizations.of(context).no),
), ),
TextButton( TextButton(
onPressed: () => Navigator.of(ctx).pop(true), onPressed: () => Navigator.of(ctx).pop(true),
child: Text(AppLocalizations.of(context).yes), child: Text(AppLocalizations.of(context).yes),
), ),
], ],
), ),
); );
if (optOut == true) { if (optOut == true) {
await storage.write('biometric_enabled', 'false'); await storage.write('biometric_enabled', 'false');
setState(() { setState(() {
_isBiometricEnabled = false; _isBiometricEnabled = false;
}); });
} }
} }
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@@ -140,7 +146,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
children: [ children: [
ListTile( ListTile(
leading: const Icon(Icons.settings), leading: const Icon(Icons.settings),
title: Text(loc.preferences), title: Text(loc.preferences),
onTap: () { onTap: () {
Navigator.push( Navigator.push(
context, context,
@@ -149,71 +155,93 @@ class _ProfileScreenState extends State<ProfileScreen> {
); );
}, },
), ),
SwitchListTile( SwitchListTile(
title: Text(AppLocalizations.of(context).enableFingerprintLogin), title: Text(AppLocalizations.of(context).enableFingerprintLogin),
value: _isBiometricEnabled, value: _isBiometricEnabled,
onChanged: (bool value) { onChanged: (bool value) {
_handleBiometricToggle(value); _handleBiometricToggle(value);
}, },
secondary: const Icon(Icons.fingerprint), secondary: const Icon(Icons.fingerprint),
), ),
ListTile( ListTile(
leading: const Icon(Icons.password), leading: const Icon(Icons.password),
title: Text(loc.changeLoginPassword), title: Text(loc.changeLoginPassword),
onTap: () { onTap: () {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute(builder: (context) => ChangePasswordScreen( MaterialPageRoute(
mobileNumber: widget.mobileNumber, builder: (context) => ChangePasswordScreen(
)), mobileNumber: widget.mobileNumber,
); )),
);
}, },
), ),
// ListTile( // ListTile(
// leading: const Icon(Icons.password), // leading: const Icon(Icons.password),
// title: const Text("Manage TPIN"), // title: const Text("Manage TPIN"),
// onTap: () async { // onTap: () async {
// }, // },
// ), // ),
// ListTile( // ListTile(
// leading: const Icon(Icons.password), // leading: const Icon(Icons.password),
// title: const Text("Change Login MPIN"), // title: const Text("Change Login MPIN"),
// onTap: () async { // onTap: () async {
// }, // },
// ), // ),
ListTile( ListTile(
leading: const Icon(Icons.exit_to_app), leading: const Icon(Icons.smartphone),
title: Text(AppLocalizations.of(context).logout), title: const Text("App Version"),
onTap: () async { trailing: FutureBuilder<String>(
final shouldExit = await showDialog<bool>( future: _getAppVersion(),
context: context, builder: (BuildContext context, AsyncSnapshot<String> snapshot) {
builder: (context) => AlertDialog( if (snapshot.connectionState == ConnectionState.waiting) {
title: Text(AppLocalizations.of(context).logout), // Show a loading indicator while waiting for the future to complete
content: Text(AppLocalizations.of(context).logoutCheck), return const CircularProgressIndicator();
actions: [ } else if (snapshot.hasError) {
TextButton( return const Text("Error");
onPressed: () => Navigator.of(context).pop(false), } else {
child: Text(AppLocalizations.of(context).no), // Display the version number once the future is complete
return Text(
snapshot.data ?? "N/A",
selectionColor: const Color(0xFFFFFFFF),
);
}
},
),
), ),
TextButton( ListTile(
onPressed: () => Navigator.of(context).pop(true), leading: const Icon(Icons.exit_to_app),
child: Text(AppLocalizations.of(context).yes), title: Text(AppLocalizations.of(context).logout),
), onTap: () async {
], final shouldExit = await showDialog<bool>(
), context: context,
); builder: (context) => AlertDialog(
title: Text(AppLocalizations.of(context).logout),
content: Text(AppLocalizations.of(context).logoutCheck),
actions: [
TextButton(
onPressed: () => Navigator.of(context).pop(false),
child: Text(AppLocalizations.of(context).no),
),
TextButton(
onPressed: () => Navigator.of(context).pop(true),
child: Text(AppLocalizations.of(context).yes),
),
],
),
);
if (shouldExit == true) { if (shouldExit == true) {
if (Platform.isAndroid) { if (Platform.isAndroid) {
SystemNavigator.pop(); SystemNavigator.pop();
} }
exit(0); exit(0);
} }
}, },
), ),
ListTile( ListTile(
leading: const Icon(Icons.logout), leading: const Icon(Icons.logout),
title: Text(AppLocalizations.of(context).deregister), title: Text(AppLocalizations.of(context).deregister),
onTap: () async { onTap: () async {
final shouldLogout = await showDialog<bool>( final shouldLogout = await showDialog<bool>(
context: context, context: context,

100
lib/features/quick_pay/screens/quick_pay_outside_bank_screen.dart
View File

@@ -51,10 +51,10 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
void initState() { void initState() {
super.initState(); super.initState();
_ifscFocusNode.addListener(() { _ifscFocusNode.addListener(() {
if (!_ifscFocusNode.hasFocus && ifscController.text.trim().length == 11) { if (!_ifscFocusNode.hasFocus && ifscController.text.trim().length == 11) {
_validateIFSC(); _validateIFSC();
} }
}); });
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {
setState(() { setState(() {
accountType = 'Savings'; accountType = 'Savings';
@@ -67,7 +67,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
if (ifsc.isEmpty) return; if (ifsc.isEmpty) return;
try { try {
final result = await service.validateIFSC(ifsc); final result = await service.validateIFSC(ifsc);
if (mounted) { if (mounted) {
if (result.bankName.isEmpty) { if (result.bankName.isEmpty) {
@@ -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;
@@ -97,7 +98,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
branchNameController.clear(); branchNameController.clear();
} }
} }
} }
void _validateBeneficiary() async { void _validateBeneficiary() async {
FocusScope.of(context).unfocus(); FocusScope.of(context).unfocus();
@@ -527,15 +528,15 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
controller: ifscController, controller: ifscController,
textInputAction: TextInputAction.next, textInputAction: TextInputAction.next,
onChanged: (value) { onChanged: (value) {
setState(() { setState(() {
final trimmed = value.trim().toUpperCase(); final trimmed = value.trim().toUpperCase();
if (trimmed.length < 11) { if (trimmed.length < 11) {
// clear bank/branch if backspace or changed // clear bank/branch if backspace or changed
bankNameController.clear(); bankNameController.clear();
branchNameController.clear(); branchNameController.clear();
} }
}); });
}, },
validator: (value) { validator: (value) {
final pattern = RegExp(r'^[A-Z]{4}0[A-Z0-9]{6}$'); final pattern = RegExp(r'^[A-Z]{4}0[A-Z0-9]{6}$');
if (value == null || value.trim().isEmpty) { if (value == null || value.trim().isEmpty) {
@@ -637,20 +638,21 @@ 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:
? null _isValidating || ifscController.text.length != 11
: () { ? null
if (confirmAccountNumberController.text == : () {
accountNumberController.text) { if (confirmAccountNumberController.text ==
_validateBeneficiary(); accountNumberController.text) {
} else { _validateBeneficiary();
setState(() { } else {
_validationError = setState(() {
AppLocalizations.of(context) _validationError =
.accountMismatch; AppLocalizations.of(context)
}); .accountMismatch;
} });
}, }
},
child: _isValidating child: _isValidating
? const SizedBox( ? const SizedBox(
width: 20, width: 20,
@@ -696,25 +698,25 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
return null; return null;
}, },
), ),
const SizedBox(height: 25), const SizedBox(height: 25),
TextFormField( TextFormField(
controller: remarksController, controller: remarksController,
decoration: InputDecoration( decoration: InputDecoration(
labelText: AppLocalizations.of(context).remarks, labelText: AppLocalizations.of(context).remarks,
border: const OutlineInputBorder(), border: const OutlineInputBorder(),
isDense: true, isDense: true,
filled: true, filled: true,
fillColor: Theme.of(context).scaffoldBackgroundColor, fillColor: Theme.of(context).scaffoldBackgroundColor,
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
color: Theme.of(context).colorScheme.outline), color: Theme.of(context).colorScheme.outline),
), ),
focusedBorder: OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
color: Theme.of(context).colorScheme.primary, width: 2), color: Theme.of(context).colorScheme.primary, width: 2),
), ),
), ),
), ),
const SizedBox(height: 25), const SizedBox(height: 25),
Row( Row(
children: [ children: [

38
lib/features/quick_pay/screens/quick_pay_within_bank_screen.dart
View File

@@ -58,7 +58,7 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
accountNumberController.dispose(); accountNumberController.dispose();
confirmAccountNumberController.dispose(); confirmAccountNumberController.dispose();
amountController.dispose(); amountController.dispose();
remarksController.dispose(); remarksController.dispose();
super.dispose(); super.dispose();
} }
@@ -278,24 +278,24 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
}, },
), ),
const SizedBox(height: 25), const SizedBox(height: 25),
TextFormField( TextFormField(
controller: remarksController, controller: remarksController,
decoration: InputDecoration( decoration: InputDecoration(
labelText: AppLocalizations.of(context).remarks, labelText: AppLocalizations.of(context).remarks,
border: const OutlineInputBorder(), border: const OutlineInputBorder(),
isDense: true, isDense: true,
filled: true, filled: true,
fillColor: Theme.of(context).scaffoldBackgroundColor, fillColor: Theme.of(context).scaffoldBackgroundColor,
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
color: Theme.of(context).colorScheme.outline), color: Theme.of(context).colorScheme.outline),
), ),
focusedBorder: OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
color: Theme.of(context).colorScheme.primary, width: 2), color: Theme.of(context).colorScheme.primary, width: 2),
), ),
), ),
), ),
const SizedBox(height: 25), const SizedBox(height: 25),
TextFormField( TextFormField(
decoration: InputDecoration( decoration: InputDecoration(

6
lib/features/security/security_error_screen.dart
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'),
), ),
], ],

250
lib/features/service/screens/branch_locator_screen.dart
View File

@@ -29,45 +29,45 @@ class BranchLocatorScreen extends StatefulWidget {
State<BranchLocatorScreen> createState() => _BranchLocatorScreenState(); State<BranchLocatorScreen> createState() => _BranchLocatorScreenState();
} }
class _BranchLocatorScreenState extends State<BranchLocatorScreen> { class _BranchLocatorScreenState extends State<BranchLocatorScreen> {
final TextEditingController _searchController = TextEditingController(); final TextEditingController _searchController = TextEditingController();
final List<Location> _allLocations = [ final List<Location> _allLocations = [
Location( Location(
name: "Dharamsala - Head Office", name: "Dharamsala - Head Office",
code: "002", code: "002",
ifsc: "KACE0000002", ifsc: "KACE0000002",
address: "Civil Lines Dharmashala, Kangra, HP - 176215", address: "Civil Lines Dharmashala, Kangra, HP - 176215",
type: LocationType.branch, type: LocationType.branch,
), ),
Location( Location(
name: "Kangra", name: "Kangra",
code: "033", code: "033",
ifsc: "KACE0000033", ifsc: "KACE0000033",
address: "Rajput Bhawankangrapo, Kangra, HP ", address: "Rajput Bhawankangrapo, Kangra, HP ",
type: LocationType.branch, type: LocationType.branch,
), ),
Location( Location(
name: "Dharamsala ATM", name: "Dharamsala ATM",
address: "Near Main Square, Dharamsala", address: "Near Main Square, Dharamsala",
type: LocationType.atm, type: LocationType.atm,
), ),
Location( Location(
name: "Kangra ATM", name: "Kangra ATM",
address: "Opposite Bus Stand, Kangra", address: "Opposite Bus Stand, Kangra",
type: LocationType.atm, type: LocationType.atm,
), ),
]; ];
List<Location> _filteredLocations = []; List<Location> _filteredLocations = [];
bool _isLoading = false; bool _isLoading = false;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
// _fetchAndSetLocations(); // _fetchAndSetLocations();
_filteredLocations = _allLocations; _filteredLocations = _allLocations;
} }
// Example of a future API fetching function // Example of a future API fetching function
/* /*
@@ -90,99 +90,99 @@ Future<void> _fetchAndSetLocations() async {
} }
} }
*/ */
void _filterLocations(String query) { void _filterLocations(String query) {
setState(() { setState(() {
if (query.isEmpty) { if (query.isEmpty) {
_filteredLocations = _allLocations; _filteredLocations = _allLocations;
} else { } else {
_filteredLocations = _allLocations.where((location) { _filteredLocations = _allLocations.where((location) {
final lowerQuery = query.toLowerCase(); final lowerQuery = query.toLowerCase();
return location.name.toLowerCase().contains(lowerQuery) || return location.name.toLowerCase().contains(lowerQuery) ||
(location.code?.toLowerCase().contains(lowerQuery) ?? false) || (location.code?.toLowerCase().contains(lowerQuery) ?? false) ||
(location.ifsc?.toLowerCase().contains(lowerQuery) ?? false) || (location.ifsc?.toLowerCase().contains(lowerQuery) ?? false) ||
location.address.toLowerCase().contains(lowerQuery); location.address.toLowerCase().contains(lowerQuery);
}).toList(); }).toList();
} }
}); });
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: Text(AppLocalizations.of(context).branchLocator), title: Text(AppLocalizations.of(context).branchLocator),
), ),
body: Column( body: Column(
children: [ children: [
Padding( Padding(
padding: const EdgeInsets.all(12.0), padding: const EdgeInsets.all(12.0),
child: TextField( child: TextField(
controller: _searchController, controller: _searchController,
onChanged: _filterLocations, onChanged: _filterLocations,
decoration: InputDecoration( decoration: InputDecoration(
hintText: AppLocalizations.of(context).searchbranchby, hintText: AppLocalizations.of(context).searchbranchby,
prefixIcon: const Icon(Icons.search), prefixIcon: const Icon(Icons.search),
border: OutlineInputBorder( border: OutlineInputBorder(
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
), ),
), ),
),
),
// Content area
Expanded(
child: _isLoading
? const Center(child: CircularProgressIndicator())
: _filteredLocations.isEmpty
? const Center(child: Text("No matching locations found"))
: ListView.builder(
itemCount: _filteredLocations.length,
itemBuilder: (context, index) {
final location = _filteredLocations[index];
return _buildLocationItem(location);
},
), ),
),
],
),
);
}
Widget _buildHeader(String title) {
return Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
child: Text(
title,
style: Theme.of(context).textTheme.titleLarge?.copyWith(
fontWeight: FontWeight.bold,
color: Theme.of(context).colorScheme.primary,
), ),
),
); // Content area
} Expanded(
child: _isLoading
? const Center(child: CircularProgressIndicator())
: _filteredLocations.isEmpty
? const Center(child: Text("No matching locations found"))
: ListView.builder(
itemCount: _filteredLocations.length,
itemBuilder: (context, index) {
final location = _filteredLocations[index];
return _buildLocationItem(location);
},
),
),
],
),
);
}
Widget _buildHeader(String title) {
return Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
child: Text(
title,
style: Theme.of(context).textTheme.titleLarge?.copyWith(
fontWeight: FontWeight.bold,
color: Theme.of(context).colorScheme.primary,
),
),
);
}
// Helper widget to build a single location item // Helper widget to build a single location item
Widget _buildLocationItem(Location location) { Widget _buildLocationItem(Location location) {
final isBranch = location.type == LocationType.branch; final isBranch = location.type == LocationType.branch;
return Card( return Card(
margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 6), margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
child: ListTile( child: ListTile(
leading: CircleAvatar( leading: CircleAvatar(
child: Icon(isBranch ? Icons.location_city : Icons.currency_rupee), child: Icon(isBranch ? Icons.location_city : Icons.currency_rupee),
),
title: Text(location.name,
style: const TextStyle(fontWeight: FontWeight.bold)),
subtitle: Text(
isBranch
? "Code: ${location.code} | IFSC: ${location.ifsc}\nAddress: ${location.address}"
: "Address: ${location.address}",
),
onTap: () {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text("Selected ${location.name}")),
);
},
), ),
title: Text(location.name, );
style: const TextStyle(fontWeight: FontWeight.bold)), }
subtitle: Text(
isBranch
? "Code: ${location.code} | IFSC: ${location.ifsc}\nAddress: ${location.address}"
: "Address: ${location.address}",
),
onTap: () {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text("Selected ${location.name}")),
);
},
),
);
} }
}

266
lib/features/service/screens/daily_transaction_limit.dart
View File

@@ -20,142 +20,142 @@ class _DailyLimitScreenState extends State<DailyLimitScreen> {
_currentLimit = null; _currentLimit = null;
} }
@override @override
void dispose() { void dispose() {
_limitController.dispose(); _limitController.dispose();
super.dispose(); super.dispose();
} }
Future<void> _showAddOrEditLimitDialog() async { Future<void> _showAddOrEditLimitDialog() async {
_limitController.text = _currentLimit?.toStringAsFixed(0) ?? ''; _limitController.text = _currentLimit?.toStringAsFixed(0) ?? '';
final newLimit = await showDialog<double>( final newLimit = await showDialog<double>(
context: context, context: context,
builder: (context) { builder: (context) {
final localizations = AppLocalizations.of(context); final localizations = AppLocalizations.of(context);
return AlertDialog( return AlertDialog(
title: Text( title: Text(
_currentLimit == null _currentLimit == null
? localizations.addLimit ? localizations.addLimit
: localizations.editLimit, : localizations.editLimit,
), ),
content: TextField( content: TextField(
controller: _limitController, controller: _limitController,
autofocus: true, autofocus: true,
keyboardType: TextInputType.number, keyboardType: TextInputType.number,
inputFormatters: [ inputFormatters: [
FilteringTextInputFormatter.allow(RegExp(r'^\d+')), FilteringTextInputFormatter.allow(RegExp(r'^\d+')),
],
decoration: InputDecoration(
labelText: localizations.limitAmount,
prefixText: '₹',
border: const OutlineInputBorder(),
),
),
actions: [
TextButton(
onPressed: () => Navigator.of(context).pop(),
child: Text(localizations.cancel),
),
ElevatedButton(
onPressed: () {
final value = double.tryParse(_limitController.text);
if (value != null && value > 0) {
Navigator.of(context).pop(value);
}
},
child: Text(localizations.save),
),
], ],
decoration: InputDecoration( );
labelText: localizations.limitAmount, },
prefixText: '₹', );
border: const OutlineInputBorder(), if (newLimit != null) {
), setState(() {
), _currentLimit = newLimit;
actions: [ });
TextButton( }
onPressed: () => Navigator.of(context).pop(), }
child: Text(localizations.cancel),
), void _removeLimit() {
ElevatedButton(
onPressed: () {
final value = double.tryParse(_limitController.text);
if (value != null && value > 0) {
Navigator.of(context).pop(value);
}
},
child: Text(localizations.save),
),
],
);
},
);
if (newLimit != null) {
setState(() { setState(() {
_currentLimit = newLimit; _currentLimit = null;
}); });
} }
@override
Widget build(BuildContext context) {
final localizations = AppLocalizations.of(context);
final theme = Theme.of(context);
final formatCurrency = NumberFormat.currency(locale: 'en_IN', symbol: '₹');
return Scaffold(
appBar: AppBar(
title: Text(localizations.dailylimit),
),
body: Center(
child: Padding(
padding: const EdgeInsets.all(16.0),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
localizations.currentDailyLimit,
style: theme.textTheme.headlineSmall?.copyWith(
color: theme.colorScheme.onSurface.withOpacity(0.7),
),
),
const SizedBox(height: 16),
Text(
_currentLimit == null
? localizations.noLimitSet
: formatCurrency.format(_currentLimit),
style: theme.textTheme.headlineMedium?.copyWith(
fontWeight: FontWeight.bold,
color: _currentLimit == null
? theme.colorScheme.secondary
: theme.colorScheme.primary,
),
),
const SizedBox(height: 48),
if (_currentLimit == null)
ElevatedButton.icon(
onPressed: _showAddOrEditLimitDialog,
icon: const Icon(Icons.add_circle_outline),
label: Text(localizations.addLimit),
style: ElevatedButton.styleFrom(
padding: const EdgeInsets.symmetric(
horizontal: 24, vertical: 12),
textStyle: theme.textTheme.titleMedium,
),
)
else
Column(
children: [
ElevatedButton.icon(
onPressed: _showAddOrEditLimitDialog,
icon: const Icon(Icons.edit_outlined),
label: Text(localizations.editLimit),
style: ElevatedButton.styleFrom(
padding: const EdgeInsets.symmetric(
horizontal: 24, vertical: 12),
textStyle: theme.textTheme.titleMedium,
),
),
const SizedBox(height: 16),
TextButton.icon(
onPressed: _removeLimit,
icon: const Icon(Icons.remove_circle_outline),
label: Text(localizations.removeLimit),
style: TextButton.styleFrom(
foregroundColor: theme.colorScheme.error,
),
),
],
),
],
),
),
),
);
}
} }
void _removeLimit() {
setState(() {
_currentLimit = null;
});
}
@override
Widget build(BuildContext context) {
final localizations = AppLocalizations.of(context);
final theme = Theme.of(context);
final formatCurrency = NumberFormat.currency(locale: 'en_IN', symbol: '₹');
return Scaffold(
appBar: AppBar(
title: Text(localizations.dailylimit),
),
body: Center(
child: Padding(
padding: const EdgeInsets.all(16.0),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
localizations.currentDailyLimit,
style: theme.textTheme.headlineSmall?.copyWith(
color: theme.colorScheme.onSurface.withOpacity(0.7),
),
),
const SizedBox(height: 16),
Text(
_currentLimit == null
? localizations.noLimitSet
: formatCurrency.format(_currentLimit),
style: theme.textTheme.headlineMedium?.copyWith(
fontWeight: FontWeight.bold,
color: _currentLimit == null
? theme.colorScheme.secondary
: theme.colorScheme.primary,
),
),
const SizedBox(height: 48),
if (_currentLimit == null)
ElevatedButton.icon(
onPressed: _showAddOrEditLimitDialog,
icon: const Icon(Icons.add_circle_outline),
label: Text(localizations.addLimit),
style: ElevatedButton.styleFrom(
padding: const EdgeInsets.symmetric(
horizontal: 24, vertical: 12),
textStyle: theme.textTheme.titleMedium,
),
)
else
Column(
children: [
ElevatedButton.icon(
onPressed: _showAddOrEditLimitDialog,
icon: const Icon(Icons.edit_outlined),
label: Text(localizations.editLimit),
style: ElevatedButton.styleFrom(
padding: const EdgeInsets.symmetric(
horizontal: 24, vertical: 12),
textStyle: theme.textTheme.titleMedium,
),
),
const SizedBox(height: 16),
TextButton.icon(
onPressed: _removeLimit,
icon: const Icon(Icons.remove_circle_outline),
label: Text(localizations.removeLimit),
style: TextButton.styleFrom(
foregroundColor: theme.colorScheme.error,
),
),
],
),
],
),
),
),
);
}
}

82
lib/features/service/screens/faqs_screen.dart
View File

@@ -1,47 +1,47 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:kmobile/l10n/app_localizations.dart'; import 'package:kmobile/l10n/app_localizations.dart';
class FaqsScreen extends StatefulWidget { class FaqsScreen extends StatefulWidget {
const FaqsScreen({super.key}); const FaqsScreen({super.key});
@override @override
State<FaqsScreen> createState() => _FaqsScreenState(); State<FaqsScreen> createState() => _FaqsScreenState();
} }
class _FaqsScreenState extends State<FaqsScreen> { class _FaqsScreenState extends State<FaqsScreen> {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
_getFaqs(); _getFaqs();
} }
// A placeholder for your future API call // A placeholder for your future API call
Future<void> _getFaqs() async { Future<void> _getFaqs() async {
// TODO: Implement API call to fetch FAQs data // TODO: Implement API call to fetch FAQs data
// For now, simulating a network call with a delay // For now, simulating a network call with a delay
await Future.delayed(const Duration(seconds: 1)); await Future.delayed(const Duration(seconds: 1));
// In a real implementation, you would process the API response here // In a real implementation, you would process the API response here
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: Row( title: Row(
children: [ children: [
Flexible( Flexible(
child: Text( child: Text(
AppLocalizations.of(context).faq, AppLocalizations.of(context).faq,
softWrap: true, softWrap: true,
style: const TextStyle( style: const TextStyle(
fontSize: 16.5, fontSize: 16.5,
), ),
textAlign: TextAlign.left, textAlign: TextAlign.left,
), ),
), ),
], ],
), ),
), ),
); );
} }
} }

2
lib/features/service/screens/quick_links_screen.dart
View File

@@ -31,4 +31,4 @@ class _QuickLinksScreenState extends State<QuickLinksScreen> {
), ),
); );
} }
} }

163
lib/features/service/screens/service_screen.dart
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});
@@ -13,95 +14,97 @@ class ServiceScreen extends StatefulWidget {
} }
class _ServiceScreen extends State<ServiceScreen> { class _ServiceScreen extends State<ServiceScreen> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
automaticallyImplyLeading: false, automaticallyImplyLeading: false,
title: Text( title: Text(
AppLocalizations.of(context).services, AppLocalizations.of(context).services,
),
centerTitle: false,
), ),
centerTitle: false, body: ListView(
), children: [
body: ListView( ServiceManagementTile(
children: [ icon: Symbols.add,
ServiceManagementTile( label: AppLocalizations.of(context).accountOpeningDeposit,
icon: Symbols.add, onTap: () {},
label: AppLocalizations.of(context).accountOpeningDeposit, disabled: true,
onTap: () {}, ),
disabled: true, const Divider(height: 1),
), ServiceManagementTile(
const Divider(height: 1), icon: Symbols.add,
ServiceManagementTile( label: AppLocalizations.of(context).accountOpeningLoan,
icon: Symbols.add, onTap: () {},
label: AppLocalizations.of(context).accountOpeningLoan, disabled: true,
onTap: () {}, ),
disabled: true, const Divider(height: 1),
), ServiceManagementTile(
const Divider(height: 1), icon: Symbols.currency_rupee,
ServiceManagementTile( label: AppLocalizations.of(context).dailylimit,
icon: Symbols.currency_rupee, onTap: () {
label: AppLocalizations.of(context).dailylimit, Navigator.of(context).push(
onTap: () {
Navigator.of(context).push(
MaterialPageRoute(builder: (context) => const DailyLimitScreen()),
);
},
disabled: true,
),
const Divider(height: 1),
ServiceManagementTile(
icon: Symbols.captive_portal,
label: AppLocalizations.of(context).quickLinks,
onTap: () {
Navigator.of(context).push(
MaterialPageRoute(builder: (context) => const QuickLinksScreen()),
);
},
disabled: true,
),
const Divider(height: 1),
ServiceManagementTile(
icon: Symbols.question_mark,
label: AppLocalizations.of(context).faq,
onTap: () {
Navigator.of(context).push(
MaterialPageRoute(builder: (context) => const FaqsScreen()),
);
},
disabled: true,
),
const Divider(height: 1),
ServiceManagementTile(
icon: Symbols.location_pin,
label: AppLocalizations.of(context).branchLocator,
onTap: () {
Navigator.push(
context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => const BranchLocatorScreen())); builder: (context) => const DailyLimitScreen()),
}, );
disabled: true, },
), disabled: true,
const Divider(height: 1), ),
], const Divider(height: 1),
), ServiceManagementTile(
); icon: Symbols.captive_portal,
} label: AppLocalizations.of(context).quickLinks,
onTap: () {
Navigator.of(context).push(
MaterialPageRoute(
builder: (context) => const QuickLinksScreen()),
);
},
disabled: true,
),
const Divider(height: 1),
ServiceManagementTile(
icon: Symbols.question_mark,
label: AppLocalizations.of(context).faq,
onTap: () {
Navigator.of(context).push(
MaterialPageRoute(builder: (context) => const FaqsScreen()),
);
},
disabled: true,
),
const Divider(height: 1),
ServiceManagementTile(
icon: Symbols.location_pin,
label: AppLocalizations.of(context).branchLocator,
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => const BranchLocatorScreen()));
},
disabled: true,
),
const Divider(height: 1),
],
),
);
}
} }
class ServiceManagementTile extends StatelessWidget { class ServiceManagementTile extends StatelessWidget {
final IconData icon; final IconData icon;
final String label; final String label;
final VoidCallback onTap; final VoidCallback onTap;
final bool disabled; final bool disabled;
const ServiceManagementTile({ const ServiceManagementTile({
super.key, super.key,
required this.icon, required this.icon,
required this.label, required this.label,
required this.onTap, required this.onTap,
this.disabled = false, this.disabled = false,
}); });
@override @override
@@ -110,20 +113,20 @@ class ServiceManagementTile extends StatelessWidget {
return ListTile( return ListTile(
leading: Icon( leading: Icon(
icon, icon,
color: disabled ? theme.disabledColor : null, color: disabled ? theme.disabledColor : null,
), ),
title: Text( title: Text(
label, label,
style: TextStyle( style: TextStyle(
color: disabled ? theme.disabledColor : null, color: disabled ? theme.disabledColor : null,
), ),
), ),
trailing: Icon( trailing: Icon(
Symbols.arrow_right, Symbols.arrow_right,
size: 20, size: 20,
color: disabled ? theme.disabledColor : null, color: disabled ? theme.disabledColor : null,
), ),
onTap: disabled ? null : onTap, onTap: disabled ? null : onTap,
); );
} }
} }

2
lib/main.dart
View File

@@ -24,4 +24,4 @@ void main() async {
// } // }
await setupDependencies(); await setupDependencies();
runApp(const KMobile()); runApp(const KMobile());
} }

8
lib/widgets/bank_logos.dart
View File

@@ -35,7 +35,7 @@ Widget getBankLogo(String? bankName, BuildContext context) {
width: 40, width: 40,
height: 40, height: 40,
); );
} }
if (bankName != null && if (bankName != null &&
bankName.toLowerCase().contains('punjab national bank')) { bankName.toLowerCase().contains('punjab national bank')) {
return Image.asset( return Image.asset(
@@ -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,

2
macos/Flutter/GeneratedPluginRegistrant.swift
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"))

80
pubspec.lock
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"

5
pubspec.yaml
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"