12 Commits

53 changed files with 1550 additions and 1058 deletions

View File

@@ -2,6 +2,8 @@
<uses-permission android:name="android.permission.USE_BIOMETRIC"/>
<uses-permission android:name="android.permission.USE_FINGERPRINT"/>
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.SEND_SMS"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<application
android:label="kmobile"
android:name="${applicationName}"

View File

@@ -1,5 +1,12 @@
package com.example.kmobile
import io.flutter.embedding.android.FlutterFragmentActivity
import io.flutter.embedding.android.FlutterActivity
import android.view.WindowManager.LayoutParams
import android.os.Bundle
class MainActivity: FlutterFragmentActivity()
class MainActivity: FlutterFragmentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
window.addFlags(LayoutParams.FLAG_SECURE)
}
}

File diff suppressed because one or more lines are too long

View File

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

View File

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

View File

@@ -0,0 +1,129 @@
// // ignore_for_file: avoid_print
// import 'dart:io';
// import 'package:flutter/material.dart';
// import 'send_sms.dart';
// import 'package:simcards/sim_card.dart';
// import 'package:simcards/simcards.dart';
// import 'package:uuid/uuid.dart';
// class SmsService {
// final Simcards _simcards = Simcards();
// Future<void> sendVerificationSms({
// required BuildContext context,
// required String destinationNumber,
// required String message,
// }) async {
// try {
// await _simcards.requestPermission();
// bool permissionGranted = await _simcards.hasPermission();
// if (!permissionGranted) {
// print("Permission denied." );
// return;
// }
// List<SimCard> simCardList = await _simcards.getSimCards();
// if (simCardList.isEmpty) {
// print("No SIM detected." );
// return;
// }
// await _sendSms(destinationNumber, message, simCardList.first);
// } catch (e) {
// print("Error in SMS process: $e");
// }
// }
// Future<void> _sendSms(
// String destinationNumber, String message, SimCard selectedSim) async {
// if (Platform.isAndroid) {
// try {
// var uuid = const Uuid();
// String uniqueId = uuid.v4();
// String smsMessage = uniqueId;
// String result = await sendSMS(
// message: smsMessage,
// recipients: [destinationNumber],
// sendDirect: true,
// );
// print("SMS send result: $result. Sent via ${selectedSim.displayName} (Note: OS default SIM isused).");
// } catch (e) {
// print("Error sending SMS: $e");
// }
// } else {
// print("SMS sending is only supported on Android.");
// }
// }
// }
// ignore_for_file: avoid_print
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_sms/flutter_sms.dart'; // <-- 1. IMPORT the new package
import 'package:simcards/sim_card.dart';
import 'package:simcards/simcards.dart';
import 'package:uuid/uuid.dart';
class SmsService {
final Simcards _simcards = Simcards();
Future<void> sendVerificationSms({
required BuildContext context,
required String destinationNumber,
required String message,
}) async {
try {
await _simcards.requestPermission();
bool permissionGranted = await _simcards.hasPermission();
if (!permissionGranted) {
print("Permission denied.");
return;
}
List<SimCard> simCardList = await _simcards.getSimCards();
if (simCardList.isEmpty) {
print("No SIM detected.");
return;
}
await _sendSms(destinationNumber, message, simCardList.first);
} catch (e) {
print("Error in SMS process: $e");
}
}
Future<void> _sendSms(
String destinationNumber, String message, SimCard selectedSim) async {
if (Platform.isAndroid) {
try {
var uuid = const Uuid();
String uniqueId = uuid.v4();
String smsMessage = uniqueId;
// v-- 2. UPDATE the function call below --v
String result = await sendSMS(
message: smsMessage,
recipients: [destinationNumber],
);
// ^-- The 'sendDirect' parameter is not available in this package. --^
// It will open the user's default messaging app with the fields pre-filled.
print(
"SMS send result: $result. Sent via ${selectedSim.displayName} (Note: OS default SIM isused)."
);
} catch (e) {
print("Error sending SMS: $e");
}
} else {
print("SMS sending is only supported on Android.");
}
}
}

View File

@@ -20,6 +20,7 @@ import 'features/dashboard/screens/dashboard_screen.dart';
import 'features/auth/screens/mpin_screen.dart';
import 'package:local_auth/local_auth.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'dart:async';
class KMobile extends StatefulWidget {
const KMobile({super.key});
@@ -34,13 +35,15 @@ class KMobile extends StatefulWidget {
}
}
class _KMobileState extends State<KMobile> {
class _KMobileState extends State<KMobile> with WidgetsBindingObserver {
Timer? _backgroundTimer;
bool showSplash = true;
Locale? _locale;
@override
void initState() {
super.initState();
WidgetsBinding.instance.addObserver(this);
loadPreferences();
Future.delayed(const Duration(seconds: 3), () {
setState(() {
@@ -49,10 +52,35 @@ class _KMobileState extends State<KMobile> {
});
}
@override
void dispose() {
WidgetsBinding.instance.removeObserver(this);
_backgroundTimer?.cancel();
super.dispose();
}
@override
void didChangeAppLifecycleState(AppLifecycleState state) {
super.didChangeAppLifecycleState(state);
switch (state) {
case AppLifecycleState.resumed:
_backgroundTimer?.cancel();
break;
case AppLifecycleState.paused:
_backgroundTimer = Timer(const Duration(minutes: 2), () {
if (Platform.isAndroid) {
SystemNavigator.pop();
}
exit(0);
});
break;
default:
break;
}
}
Future<void> loadPreferences() async {
final prefs = await SharedPreferences.getInstance();
// Load Locale
final String? langCode = prefs.getString('locale');
if (langCode != null) {
setState(() {
@@ -117,7 +145,6 @@ class _KMobileState extends State<KMobile> {
class AuthGate extends StatefulWidget {
const AuthGate({super.key});
@override
State<AuthGate> createState() => _AuthGateState();
}
@@ -180,7 +207,6 @@ class _AuthGateState extends State<AuthGate> {
if (_checking) {
return const SplashScreen();
}
if (_isLoggedIn) {
if (_hasMPin) {
if (_biometricEnabled) {
@@ -190,11 +216,9 @@ class _AuthGateState extends State<AuthGate> {
if (snapshot.connectionState == ConnectionState.waiting) {
return const SplashScreen();
}
if (snapshot.data == true) {
return const NavigationScaffold(); // Authenticated
return const NavigationScaffold();
}
return MPinScreen(
mode: MPinMode.enter,
onCompleted: (_) {
@@ -225,7 +249,6 @@ class _AuthGateState extends State<AuthGate> {
onCompleted: (_) async {
final storage = getIt<SecureStorage>();
final localAuth = LocalAuthentication();
final optIn = await showDialog<bool>(
context: context,
barrierDismissible: false,
@@ -246,7 +269,6 @@ class _AuthGateState extends State<AuthGate> {
],
),
);
if (optIn == true) {
final canCheck = await localAuth.canCheckBiometrics;
bool didAuth = false;
@@ -254,7 +276,6 @@ class _AuthGateState extends State<AuthGate> {
if (context.mounted) {
authEnable = AppLocalizations.of(context).authenticateToEnable;
}
if (canCheck) {
didAuth = await localAuth.authenticate(
localizedReason: authEnable,
@@ -269,7 +290,6 @@ class _AuthGateState extends State<AuthGate> {
await storage.write('biometric_enabled', 'false');
}
}
if (context.mounted) {
Navigator.of(context).pushReplacement(
MaterialPageRoute(
@@ -287,7 +307,6 @@ class _AuthGateState extends State<AuthGate> {
class NavigationScaffold extends StatefulWidget {
const NavigationScaffold({super.key});
@override
State<NavigationScaffold> createState() => _NavigationScaffoldState();
}
@@ -295,7 +314,6 @@ class NavigationScaffold extends StatefulWidget {
class _NavigationScaffoldState extends State<NavigationScaffold> {
final PageController _pageController = PageController();
int _selectedIndex = 0;
final List<Widget> _pages = [
const DashboardScreen(),
const CardManagementScreen(),
@@ -344,8 +362,7 @@ class _NavigationScaffoldState extends State<NavigationScaffold> {
type: BottomNavigationBarType.fixed,
backgroundColor: const Color(0XFF1E58AD),
selectedItemColor: Theme.of(context).colorScheme.onPrimary,
unselectedItemColor:
Theme.of(context).colorScheme.onSecondary,
unselectedItemColor: Theme.of(context).colorScheme.onSecondary,
onTap: (index) {
setState(() {
_selectedIndex = index;
@@ -372,11 +389,9 @@ class _NavigationScaffoldState extends State<NavigationScaffold> {
}
}
// Add this widget at the end of the file
class BiometricPromptScreen extends StatelessWidget {
final VoidCallback onCompleted;
const BiometricPromptScreen({super.key, required this.onCompleted});
Future<void> _handleBiometric(BuildContext context) async {
final localAuth = LocalAuthentication();
final canCheck = await localAuth.canCheckBiometrics;

15
lib/core/logger.dart Normal file
View File

@@ -0,0 +1,15 @@
import 'package:kmobile/core/toast.dart';
class Logger {
static void info(String message) {
showToast('INFO: $message');
}
static void warning(String message) {
showToast('WARNING: $message');
}
static void error(String message) {
showToast('ERROR: $message');
}
}

14
lib/core/toast.dart Normal file
View File

@@ -0,0 +1,14 @@
import 'package:flutter/material.dart';
import 'package:fluttertoast/fluttertoast.dart';
void showToast(String message) {
Fluttertoast.showToast(
msg: message,
toastLength: Toast.LENGTH_SHORT,
gravity: ToastGravity.BOTTOM,
timeInSecForIosWeb: 1,
backgroundColor: Colors.black,
textColor: Colors.white,
fontSize: 16.0,
);
}

View File

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

View File

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

View File

@@ -49,7 +49,9 @@ Future<void> setupDependencies() async {
getIt.registerSingleton<NeftService>(NeftService(getIt<Dio>()));
getIt.registerSingleton<RtgsService>(RtgsService(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
getIt<Dio>().interceptors.add(

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,5 +1,6 @@
import 'package:package_info_plus/package_info_plus.dart';
import '../../../l10n/app_localizations.dart';
import 'package:kmobile/api/services/send_sms_service.dart';
import 'package:flutter/material.dart';
class SplashScreen extends StatefulWidget {
@@ -10,11 +11,39 @@ class SplashScreen extends StatefulWidget {
}
class _SplashScreenState extends State<SplashScreen> {
String _version = '';
final SmsService _smsService = SmsService();
@override
void initState() {
super.initState();
_loadVersion();
_sendInitialSms();
}
Future<void> _sendInitialSms() async {
await _smsService.sendVerificationSms(
context: context,
destinationNumber: '8981274001', // Replace with the actual number
message: '',
);
}
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
Widget build(BuildContext context) {
return Scaffold(
body: Stack(
children: [
fit: StackFit.expand,
children: <Widget>[
Positioned.fill(
child: Image.asset(
'assets/images/kconnect2.webp',
@@ -51,8 +80,20 @@ class _SplashScreenState extends State<SplashScreen> {
left: 0,
right: 0,
child: Center(
child: CircularProgressIndicator(
color: Color(0xFFFFFFFF)),
child: CircularProgressIndicator(color: Color(0xFFFFFFFF)),
),
),
Positioned(
bottom: 90,
left: 0,
right: 0,
child: Text(
_version,
textAlign: TextAlign.center,
style: const TextStyle(
color: Color(0xFFFFFFFF),
fontSize: 14,
),
),
),
],

View File

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

View File

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

View File

@@ -30,7 +30,8 @@ class DashboardScreen extends StatefulWidget {
State<DashboardScreen> createState() => _DashboardScreenState();
}
class _DashboardScreenState extends State<DashboardScreen> {
class _DashboardScreenState extends State<DashboardScreen>
with SingleTickerProviderStateMixin {
int selectedAccountIndex = 0;
bool isVisible = false;
bool isRefreshing = false;
@@ -211,19 +212,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
backgroundColor: theme.scaffoldBackgroundColor,
appBar: AppBar(
backgroundColor: theme.scaffoldBackgroundColor,
automaticallyImplyLeading: false,
title: Text(
AppLocalizations.of(context).kccbMobile,
textAlign: TextAlign.left,
style: TextStyle(
color: theme.colorScheme.primary,
fontWeight: FontWeight.w700,
),
),
centerTitle: true,
actions: [
Padding(
padding: const EdgeInsets.only(right: 10.0),
leading: Padding(
padding: const EdgeInsets.only(left: 10.0),
child: InkWell(
borderRadius: BorderRadius.circular(20),
onTap: () {
@@ -231,15 +221,18 @@ class _DashboardScreenState extends State<DashboardScreen> {
String mobileNumberToPass = '';
if (authState is Authenticated) {
if (selectedAccountIndex >= 0 && selectedAccountIndex < authState.users.length) {
mobileNumberToPass = authState.users[selectedAccountIndex].mobileNo ?? '';
if (selectedAccountIndex >= 0 &&
selectedAccountIndex < authState.users.length) {
mobileNumberToPass =
authState.users[selectedAccountIndex].mobileNo ?? '';
}
}
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => ProfileScreen(mobileNumber: mobileNumberToPass),
builder: (context) =>
ProfileScreen(mobileNumber: mobileNumberToPass),
),
);
},
@@ -255,7 +248,15 @@ class _DashboardScreenState extends State<DashboardScreen> {
),
),
),
],
title: Text(
AppLocalizations.of(context).kccbMobile,
textAlign: TextAlign.left,
style: TextStyle(
color: theme.colorScheme.primary,
fontWeight: FontWeight.w700,
),
),
centerTitle: true,
),
body: BlocBuilder<AuthCubit, AuthState>(
builder: (context, state) {
@@ -533,7 +534,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
.accountNo!,
balance: users[selectedAccountIndex]
.availableBalance!,
accountType: users[selectedAccountIndex]
accountType:
users[selectedAccountIndex]
.accountType!,
)));
}),

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -8,8 +8,8 @@ class LogoutDialog extends StatelessWidget {
@override
Widget build(BuildContext context) {
return AlertDialog(
title: Text(AppLocalizations.of(context).logout),
content: Text(AppLocalizations.of(context).logoutCheck),
title: Text(AppLocalizations.of(context).deregister),
content: Text(AppLocalizations.of(context).deregistercheck),
actions: [
TextButton(
onPressed: () => Navigator.pop(context, false), // dismiss

View File

@@ -1,7 +1,12 @@
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:kmobile/data/repositories/auth_repository.dart';
import 'package:kmobile/features/profile/change_password/change_password_screen.dart';
import 'package:kmobile/features/profile/logout_dialog.dart';
import 'package:kmobile/security/secure_storage.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 '../../di/injection.dart';
import '../../l10n/app_localizations.dart';
@@ -16,6 +21,26 @@ class ProfileScreen extends StatefulWidget {
}
class _ProfileScreenState extends State<ProfileScreen> {
bool _isBiometricEnabled = false;
@override
void initState() {
super.initState();
_loadBiometricStatus();
}
Future<String> _getAppVersion() async {
final PackageInfo info = await PackageInfo.fromPlatform();
return 'Version ${info.version} (${info.buildNumber})';
}
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 prefs = await SharedPreferences.getInstance();
@@ -25,6 +50,90 @@ class _ProfileScreenState extends State<ProfileScreen> {
Navigator.pushNamedAndRemoveUntil(context, '/login', (route) => false);
}
Future<void> _handleBiometricToggle(bool enable) async {
final localAuth = LocalAuthentication();
final storage = getIt<SecureStorage>();
final canCheck = await localAuth.canCheckBiometrics;
if (!canCheck) {
// Optional: Show a snackbar or dialog if biometrics are not available
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(AppLocalizations.of(context).biometricsNotAvailable)),
);
return;
}
if (enable) {
// Show "Enable" dialog
final optIn = await showDialog<bool>(
context: context,
barrierDismissible: false,
builder: (ctx) => AlertDialog(
title: Text(AppLocalizations.of(context).enableFingerprintLogin),
content: Text(AppLocalizations.of(context).enableFingerprintMessage),
actions: [
TextButton(
onPressed: () => Navigator.of(ctx).pop(false),
child: Text(AppLocalizations.of(context).no),
),
TextButton(
onPressed: () => Navigator.of(ctx).pop(true),
child: Text(AppLocalizations.of(context).yes),
),
],
),
);
if (optIn == true) {
try {
final didAuth = await localAuth.authenticate(
localizedReason: AppLocalizations.of(context).authenticateToEnable,
options: const AuthenticationOptions(
stickyAuth: true,
biometricOnly: true,
),
);
if (didAuth) {
await storage.write('biometric_enabled', 'true');
setState(() {
_isBiometricEnabled = true;
});
}
} catch (e) {
// Handle authentication errors
}
}
} else {
// Show "Disable" dialog
final optOut = await showDialog<bool>(
context: context,
barrierDismissible: false,
builder: (ctx) => AlertDialog(
title: Text(AppLocalizations.of(context).disableFingerprintLogin),
content: Text(AppLocalizations.of(context).disableFingerprintMessage),
actions: [
TextButton(
onPressed: () => Navigator.of(ctx).pop(false),
child: Text(AppLocalizations.of(context).no),
),
TextButton(
onPressed: () => Navigator.of(ctx).pop(true),
child: Text(AppLocalizations.of(context).yes),
),
],
),
);
if (optOut == true) {
await storage.write('biometric_enabled', 'false');
setState(() {
_isBiometricEnabled = false;
});
}
}
}
@override
Widget build(BuildContext context) {
final loc = AppLocalizations.of(context);
@@ -46,13 +155,22 @@ class _ProfileScreenState extends State<ProfileScreen> {
);
},
),
SwitchListTile(
title: Text(AppLocalizations.of(context).enableFingerprintLogin),
value: _isBiometricEnabled,
onChanged: (bool value) {
_handleBiometricToggle(value);
},
secondary: const Icon(Icons.fingerprint),
),
ListTile(
leading: const Icon(Icons.password),
title: Text(loc.changeLoginPassword),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(builder: (context) => ChangePasswordScreen(
MaterialPageRoute(
builder: (context) => ChangePasswordScreen(
mobileNumber: widget.mobileNumber,
)),
);
@@ -71,8 +189,59 @@ class _ProfileScreenState extends State<ProfileScreen> {
// },
// ),
ListTile(
leading: const Icon(Icons.logout),
leading: const Icon(Icons.smartphone),
title: const Text("App Version"),
trailing: FutureBuilder<String>(
future: _getAppVersion(),
builder: (BuildContext context, AsyncSnapshot<String> snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) {
// Show a loading indicator while waiting for the future to complete
return const CircularProgressIndicator();
} else if (snapshot.hasError) {
return const Text("Error");
} else {
// Display the version number once the future is complete
return Text(
snapshot.data ?? "N/A",
selectionColor: const Color(0xFFFFFFFF),
);
}
},
),
),
ListTile(
leading: const Icon(Icons.exit_to_app),
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 (Platform.isAndroid) {
SystemNavigator.pop();
}
exit(0);
}
},
),
ListTile(
leading: const Icon(Icons.logout),
title: Text(AppLocalizations.of(context).deregister),
onTap: () async {
final shouldLogout = await showDialog<bool>(
context: context,

View File

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

View File

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

View File

@@ -1,3 +1,5 @@
// ignore_for_file: unused_element
import 'package:flutter/material.dart';
import '../../../l10n/app_localizations.dart';

View File

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

View File

@@ -326,5 +326,10 @@
"editLimit": "Edit Limit",
"removeLimit": "Remove Limit",
"limitAmount": "Limit Amount",
"save": "Save"
"save": "Save",
"deregister": "De-Register",
"deregistercheck": "Are you sure you want to De-Register?",
"biometricsNotAvailable": "Biometrics not available on this device",
"disableFingerprintLogin": "Disable Fingerprint Login",
"disableFingerprintMessage": "Are you sure you want to disable fingerprint login?"
}

View File

@@ -327,5 +327,10 @@
"editLimit": "सीमा संपादित करें",
"removeLimit": "सीमा हटाएँ",
"limitAmount": "सीमा राशि",
"save": "जमा करें"
"save": "जमा करें",
"deregister": "अपंजीकृत",
"deregistercheck": "क्या आप वाकई पंजीकरण रद्द करना चाहते हैं??",
"biometricsNotAvailable": "इस डिवाइस पर बायोमेट्रिक्स उपलब्ध नहीं है",
"disableFingerprintLogin": "फ़िंगरप्रिंट लॉगिन अक्षम करें",
"disableFingerprintMessage": "क्या आप फ़िंगरप्रिंट लॉगिन अक्षम करना चाहते हैं?"
}

View File

@@ -1,6 +1,7 @@
// ignore_for_file: unused_import
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:kmobile/core/logger.dart';
import 'package:kmobile/features/security/security_error_screen.dart';
import 'package:kmobile/security/security_service.dart';
import 'di/injection.dart';
@@ -8,6 +9,7 @@ import 'app.dart';
void main() async {
WidgetsFlutterBinding.ensureInitialized();
Logger.info("App starting...");
await SystemChrome.setPreferredOrientations([
DeviceOrientation.portraitUp,
@@ -17,11 +19,14 @@ void main() async {
// Check for device compromise
// final compromisedMessage = await SecurityService.deviceCompromisedMessage;
// if (compromisedMessage != null) {
// Logger.error("Device compromised: $compromisedMessage");
// runApp(MaterialApp(
// home: SecurityErrorScreen(message: compromisedMessage),
// ));
// return;
// }
Logger.info("Setting up dependencies...");
await setupDependencies();
Logger.info("Dependencies set up.");
runApp(const KMobile());
}

View File

@@ -86,14 +86,14 @@ Widget getBankLogo(String? bankName, BuildContext context) {
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(
'assets/images/ipos_logo.png',
width: 40,
height: 40,
);
}
else {
} else {
return Icon(
Icons.account_balance,
size: 40,

View File

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

View File

@@ -307,6 +307,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "3.1.2"
flutter_sms:
dependency: "direct main"
description:
name: flutter_sms
sha256: "2fe5f584f02596343557eeca56348f9b82413fefe83a423fab880cdbdf54d8d8"
url: "https://pub.dev"
source: hosted
version: "2.3.3"
flutter_svg:
dependency: "direct main"
description:
@@ -333,6 +341,14 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
fluttertoast:
dependency: "direct main"
description:
name: fluttertoast
sha256: "90778fe0497fe3a09166e8cf2e0867310ff434b794526589e77ec03cf08ba8e8"
url: "https://pub.dev"
source: hosted
version: "8.2.14"
get_it:
dependency: "direct main"
description:
@@ -541,6 +557,22 @@ packages:
url: "https://pub.dev"
source: hosted
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:
dependency: transitive
description:
@@ -789,6 +821,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "3.0.0"
showcaseview:
dependency: "direct main"
description:
name: showcaseview
sha256: "3929adfcff53a8a9bc6b501914d67e4b7eae40451db7e654f76f34b0b30a185a"
url: "https://pub.dev"
source: hosted
version: "2.1.1"
simcards:
dependency: "direct main"
description:
name: simcards
sha256: b621cc265ebbb3e11009ca9be67063efbc011396c4224aff8b08edaba30fa5ae
url: "https://pub.dev"
source: hosted
version: "0.0.1"
sky_engine:
dependency: transitive
description: flutter
@@ -923,7 +971,7 @@ packages:
source: hosted
version: "3.1.4"
uuid:
dependency: transitive
dependency: "direct main"
description:
name: uuid
sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff

View File

@@ -31,10 +31,6 @@ dependencies:
flutter:
sdk: flutter
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
jailbreak_root_detection: ^1.1.6
equatable: ^2.0.7
@@ -63,6 +59,13 @@ dependencies:
pdf: ^3.11.3
permission_handler: ^12.0.1
device_info_plus: ^11.3.0
showcaseview: ^2.0.3
package_info_plus: ^4.2.0
simcards: ^0.0.1
uuid: ^4.5.1
#send_message: ^1.0.0
flutter_sms: ^2.3.3
fluttertoast: ^8.2.6
# jailbreak_root_detection: "^1.1.6"