diff --git a/lib/api/services/limit_service.dart b/lib/api/services/limit_service.dart new file mode 100644 index 0000000..5ad3b6f --- /dev/null +++ b/lib/api/services/limit_service.dart @@ -0,0 +1,57 @@ +// ignore_for_file: collection_methods_unrelated_type +import 'dart:developer'; +import 'package:dio/dio.dart'; + +class Limit { + final double dailyLimit; + final double usedLimit; + + Limit({ + required this.dailyLimit, + required this.usedLimit, + }); + + factory Limit.fromJson(Map json) { + return Limit( + dailyLimit: json['dailyLimit']!, + usedLimit: json['usedLimit']!, + ); + } +} + +class LimitService { + final Dio _dio; + LimitService(this._dio); + + Future getLimit() async { + try { + final response = await _dio.get('/api/customer/daily-limit'); + if (response.statusCode == 200) { + log('Response: ${response.data}'); + return Limit.fromJson(response.data); + } else { + throw Exception('Failed to load'); + } + } on DioException catch (e) { + throw Exception('Network error: ${e.message}'); + } catch (e) { + throw Exception('Unexpected error: ${e.toString()}'); + } + } + + void editLimit( double newLimit) async { + try { + final response = await _dio.post('/api/customer/daily-limit', + data: '{"amount": $newLimit}'); + if (response.statusCode == 200) { + log('Response: ${response.data}'); + } else { + throw Exception('Failed to load'); + } + } on DioException catch (e) { + throw Exception('Network error: ${e.message}'); + } catch (e) { + throw Exception('Unexpected error: ${e.toString()}'); + } + } +} diff --git a/lib/di/injection.dart b/lib/di/injection.dart index 8f86abc..bef663c 100644 --- a/lib/di/injection.dart +++ b/lib/di/injection.dart @@ -1,3 +1,4 @@ +import 'package:kmobile/api/services/limit_service.dart'; import 'package:kmobile/api/services/rtgs_service.dart'; import 'package:kmobile/api/services/neft_service.dart'; import 'package:kmobile/api/services/imps_service.dart'; @@ -46,6 +47,7 @@ Future setupDependencies() async { getIt.registerSingleton(PaymentService(getIt())); getIt.registerSingleton(BeneficiaryService(getIt())); + getIt.registerSingleton(LimitService(getIt())); getIt.registerSingleton(NeftService(getIt())); getIt.registerSingleton(RtgsService(getIt())); getIt.registerSingleton(ImpsService(getIt())); @@ -69,7 +71,7 @@ Dio _createDioClient() { baseUrl: '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 - //'https://kccbmbnk.net', + //'https://kccbmbnk.net', //prod small connectTimeout: const Duration(seconds: 60), receiveTimeout: const Duration(seconds: 60), headers: { diff --git a/lib/features/auth/screens/sms_verification_screen.dart b/lib/features/auth/screens/sms_verification_screen.dart index e330118..95c6b88 100644 --- a/lib/features/auth/screens/sms_verification_screen.dart +++ b/lib/features/auth/screens/sms_verification_screen.dart @@ -23,6 +23,46 @@ _loadVersion(); _initiateSmsSequence(); } + + Future _showRestrictedSmsDialog() async { + await showDialog( + context: context, + builder: (context) => AlertDialog( + title: const Text("SMS Permission Restricted"), + content: const SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text("It seems your device is restricting this app from sending SMS messages, which is required for verification. Please follow these steps to enable it:\n"), + Text("1. Open your device Settings.", style: TextStyle(fontWeight: FontWeight.bold)), + Text("2. Go to 'Apps' or 'Apps & notifications'."), + Text("3. Find and tap on this app ('KMobile')."), + Text("4. Tap on the three dots (⋮) in the top right corner."), + Text("5. Select 'Allow restricted settings' and confirm. This is crucial to allow SMS permission."), + Text("6. Now you have two options to allow SMS permission:"), + Text(" a. Tap on 'Permissions', then find 'SMS' and ensure it's set to 'Allow'."), + Text(" b. Alternatively, you can return to the KMobile app, and the SMS permission pop-up should appear again, allowing you to grant it directly."), + Text("\nSome devices have an additional setting for 'Premium SMS'. If the above doesn't work, look for a 'Premium SMS access' setting (you can search for it in your Settings app) and set it to 'Always Allow' for this app.\n"), + Text("After you've enabled the permission, please come back to the app."), + ], + ), + ), + actions: [ + TextButton( + child: const Text("I've Enabled It"), + onPressed: () => Navigator.of(context).pop(), + ), + TextButton( + child: const Text("Open Settings"), + onPressed: () { + openAppSettings(); + Navigator.of(context).pop(); + }, + ), + ], + ), + ); + } void _showSnackBar(String message) { if (!mounted) return; @@ -76,32 +116,13 @@ // Wait for user to return from settings await Future.delayed(const Duration(seconds: 5)); break; - case PermissionStatusResult.restricted: - if (mounted) { - await showDialog( - context: context, - builder: (context) => AlertDialog( - title: const Text("Permission Restricted"), - content: const Text( - "SMS and Phone permissions are restricted on this device. Please check your device settings or parental controls and enable them for this app."), - actions: [ - TextButton( - child: const Text("Cancel"), - onPressed: () => Navigator.of(context).pop(), - ), - TextButton( - child: const Text("Open Settings"), - onPressed: () { - openAppSettings(); - Navigator.of(context).pop(); - }, - ), - ], - ), - ); - } - await Future.delayed(const Duration(seconds: 5)); - break; + case PermissionStatusResult.restricted: + if (mounted) { + await _showRestrictedSmsDialog(); + } + // Wait for user to return from settings + await Future.delayed(const Duration(seconds: 10)); + break; } } diff --git a/lib/features/fund_transfer/screens/fund_transfer_amount_screen.dart b/lib/features/fund_transfer/screens/fund_transfer_amount_screen.dart index 98898f9..189266d 100644 --- a/lib/features/fund_transfer/screens/fund_transfer_amount_screen.dart +++ b/lib/features/fund_transfer/screens/fund_transfer_amount_screen.dart @@ -2,6 +2,8 @@ import 'dart:async'; import 'dart:convert'; import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; +import 'package:intl/intl.dart'; +import 'package:kmobile/api/services/limit_service.dart'; import 'package:kmobile/api/services/neft_service.dart'; import 'package:kmobile/api/services/rtgs_service.dart'; import 'package:kmobile/api/services/imps_service.dart'; @@ -40,13 +42,67 @@ class FundTransferAmountScreen extends StatefulWidget { } class _FundTransferAmountScreenState extends State { + final _limitService = getIt(); +Limit? _limit; +bool _isLoadingLimit = true; +bool _isAmountOverLimit = false; +final _formatCurrency = NumberFormat.currency(locale: 'en_IN', symbol: '₹'); final _amountController = TextEditingController(); final _remarksController = TextEditingController(); final _formKey = GlobalKey(); TransactionMode _selectedMode = TransactionMode.neft; +@override +void initState() { + super.initState(); + _loadLimit(); // Call the new method + _amountController.addListener(_checkAmountLimit); +} + Future _loadLimit() async { + setState(() { + _isLoadingLimit = true; + }); + try { + final limitData = await _limitService.getLimit(); + setState(() { + _limit = limitData; + _isLoadingLimit = false; + }); + } catch (e) { + // Handle error if needed + setState(() { + _isLoadingLimit = false; + }); + } + } + + // Add this method to check the amount against the limit +void _checkAmountLimit() { + if (_limit == null) return; + + final amount = double.tryParse(_amountController.text) ?? 0; + final remainingLimit = _limit!.dailyLimit - _limit!.usedLimit; + final bool isOverLimit = amount > remainingLimit; + + if (isOverLimit) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text('Amount exceeds remaining daily limit of ${_formatCurrency.format(remainingLimit)}'), + backgroundColor: Colors.red, + ), + ); + } + + if (_isAmountOverLimit != isOverLimit) { + setState(() { + _isAmountOverLimit = isOverLimit; + }); + } +} + @override void dispose() { + _amountController.removeListener(_checkAmountLimit); _amountController.dispose(); _remarksController.dispose(); super.dispose(); @@ -430,19 +486,27 @@ class _FundTransferAmountScreenState extends State { return null; }, ), + const SizedBox(height: 8), + if (_isLoadingLimit) + const Text('Fetching daily limit...'), + if (!_isLoadingLimit && _limit != null) + Text( + 'Remaining Daily Limit: ${_formatCurrency.format(_limit!.dailyLimit - _limit!.usedLimit)}', + style: Theme.of(context).textTheme.bodySmall, + ), const Spacer(), // Proceed Button SizedBox( - width: double.infinity, - child: ElevatedButton( - onPressed: _onProceed, - style: ElevatedButton.styleFrom( - padding: const EdgeInsets.symmetric(vertical: 16), - ), - child: Text(AppLocalizations.of(context).proceed), - ), - ), + width: double.infinity, + child: ElevatedButton( + onPressed: _isAmountOverLimit ? null : _onProceed, + style: ElevatedButton.styleFrom( + padding: const EdgeInsets.symmetric(vertical: 16), + ), + child: Text(AppLocalizations.of(context).proceed), + ), +), const SizedBox(height: 10), ], ), diff --git a/lib/features/profile/daily_transaction_limit.dart b/lib/features/profile/daily_transaction_limit.dart new file mode 100644 index 0000000..9e56d6d --- /dev/null +++ b/lib/features/profile/daily_transaction_limit.dart @@ -0,0 +1,228 @@ +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:kmobile/api/services/limit_service.dart'; +import 'package:kmobile/di/injection.dart'; +import 'package:kmobile/l10n/app_localizations.dart'; +import 'package:intl/intl.dart'; + +class DailyLimitScreen extends StatefulWidget { + const DailyLimitScreen({super.key}); + @override + State createState() => _DailyLimitScreenState(); +} + +class _DailyLimitScreenState extends State { + double? _currentLimit; + double? _spentAmount = 0.0; + final _limitController = TextEditingController(); + var service = getIt(); + Limit? limit; + bool _isLoading = true; + + @override + void initState() { + super.initState(); + _loadlimits(); + } + + Future _loadlimits() async { + setState(() { + _isLoading = true; + }); + final limit_data = await service.getLimit(); + setState(() { + limit = limit_data; + _isLoading = false; + }); + } + + @override + void dispose() { + _limitController.dispose(); + super.dispose(); + } + +Future _showAddOrEditLimitDialog() async { + _limitController.text = _currentLimit?.toStringAsFixed(0) ?? ''; + final newLimit = await showDialog( + context: context, + builder: (dialogContext) { + final localizations = AppLocalizations.of(dialogContext); + final theme = Theme.of(dialogContext); + return AlertDialog( + title: Text( + _currentLimit == null + ? localizations.addLimit + : localizations.editLimit, + ), + content: TextField( + controller: _limitController, + autofocus: true, + keyboardType: TextInputType.number, + inputFormatters: [ + FilteringTextInputFormatter.allow(RegExp(r'^\d+')), + ], + decoration: InputDecoration( + labelText: localizations.limitAmount, + prefixText: '₹', + border: const OutlineInputBorder(), + ), + ), + actions: [ + TextButton( + onPressed: () => Navigator.of(dialogContext).pop(), + child: Text(localizations.cancel), + ), + ElevatedButton( + onPressed: () { + final value = double.tryParse(_limitController.text); + if (value == null || value <= 0) return; + + if (value > 200000) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: const Text("Limit To be Set must be less than 200000"), + behavior: SnackBarBehavior.floating, + backgroundColor: theme.colorScheme.error, + ), + ); + } else { + service.editLimit(value); + Navigator.of(dialogContext).pop(value); + } + }, + child: Text(localizations.save), + ), + ], + ); + }, + ); + + if (newLimit != null) { + _loadlimits(); + if (!mounted) return; + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar( + content: Text("Limit Updated"), + behavior: SnackBarBehavior.floating, + ), + ); + } +} + + + void _removeLimit() { + setState(() { + _currentLimit = null; + }); + } + + @override + Widget build(BuildContext context) { + if (_isLoading) { + final localizations = AppLocalizations.of(context); + return Scaffold( + appBar: AppBar( + title: Text(localizations.dailylimit), + ), + body: const Center( + child: CircularProgressIndicator(), + ), + ); +} + _currentLimit = limit?.dailyLimit; + _spentAmount = limit?.usedLimit; + final localizations = AppLocalizations.of(context); + final theme = Theme.of(context); + final formatCurrency = NumberFormat.currency(locale: 'en_IN', symbol: '₹'); + final remainingLimit = _currentLimit != null ? _currentLimit! - _spentAmount! : 0.0; + + 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, + ), + ), + if (_currentLimit != null) ...[ + const SizedBox(height: 24), + Text( + "Remaining Limit Today", // This should be localized + style: theme.textTheme.titleMedium, + ), + const SizedBox(height: 4), + Text( + formatCurrency.format(remainingLimit), + style: theme.textTheme.headlineSmall?.copyWith( + fontWeight: FontWeight.bold, + color: remainingLimit > 0 + ? Colors.green + : theme.colorScheme.error, + ), + ), + ], + 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, + // ), + // ), + ], + ), + ], + ), + ), + ), + ); + } +} diff --git a/lib/features/profile/profile_screen.dart b/lib/features/profile/profile_screen.dart index 3a8e6bb..362b783 100644 --- a/lib/features/profile/profile_screen.dart +++ b/lib/features/profile/profile_screen.dart @@ -3,6 +3,7 @@ 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/daily_transaction_limit.dart'; import 'package:kmobile/features/profile/logout_dialog.dart'; import 'package:kmobile/security/secure_storage.dart'; import 'package:local_auth/local_auth.dart'; @@ -155,6 +156,17 @@ class _ProfileScreenState extends State { ); }, ), + ListTile( + leading: const Icon(Icons.currency_rupee), + title: Text(AppLocalizations.of(context).dailylimit), + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => const DailyLimitScreen()), + ); + }, + ), SwitchListTile( title: Text(AppLocalizations.of(context).enableFingerprintLogin), value: _isBiometricEnabled, diff --git a/lib/features/quick_pay/screens/quick_pay_outside_bank_screen.dart b/lib/features/quick_pay/screens/quick_pay_outside_bank_screen.dart index ea1b36a..81bdc94 100644 --- a/lib/features/quick_pay/screens/quick_pay_outside_bank_screen.dart +++ b/lib/features/quick_pay/screens/quick_pay_outside_bank_screen.dart @@ -2,7 +2,9 @@ import 'dart:async'; import 'dart:developer'; import 'package:dio/dio.dart'; import 'package:flutter/services.dart'; +import 'package:intl/intl.dart'; import 'package:kmobile/api/services/imps_service.dart'; +import 'package:kmobile/api/services/limit_service.dart'; import 'package:kmobile/api/services/neft_service.dart'; import 'package:kmobile/api/services/rtgs_service.dart'; import 'package:kmobile/data/models/imps_transaction.dart'; @@ -28,7 +30,10 @@ class QuickPayOutsideBankScreen extends StatefulWidget { class _QuickPayOutsideBankScreen extends State { final _formKey = GlobalKey(); - + final _limitService = getIt(); +Limit? _limit; +bool _isLoadingLimit = true; +final _formatCurrency = NumberFormat.currency(locale: 'en_IN', symbol: '₹'); // Controllers final accountNumberController = TextEditingController(); final confirmAccountNumberController = TextEditingController(); @@ -41,6 +46,7 @@ class _QuickPayOutsideBankScreen extends State { final remarksController = TextEditingController(); final _ifscFocusNode = FocusNode(); final service = getIt(); + bool _isAmountOverLimit = false; late String accountType; bool _isValidating = false; @@ -50,6 +56,7 @@ class _QuickPayOutsideBankScreen extends State { @override void initState() { super.initState(); + _loadLimit(); _ifscFocusNode.addListener(() { if (!_ifscFocusNode.hasFocus && ifscController.text.trim().length == 11) { _validateIFSC(); @@ -60,8 +67,51 @@ class _QuickPayOutsideBankScreen extends State { accountType = 'Savings'; }); }); + amountController.addListener(_checkAmountLimit); } +Future _loadLimit() async { + setState(() { + _isLoadingLimit = true; + }); + try { + final limitData = await _limitService.getLimit(); + setState(() { + _limit = limitData; + _isLoadingLimit = false; + }); + } catch (e) { + // Handle error if needed + setState(() { + _isLoadingLimit = false; + }); + } +} + +// Add this method to check the amount against the limit + void _checkAmountLimit() { + if (_limit == null) return; + + final amount = double.tryParse(amountController.text) ?? 0; + final remainingLimit = _limit!.dailyLimit - _limit!.usedLimit; + final bool isOverLimit = amount > remainingLimit; + + if (isOverLimit) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text('Amount exceeds remaining daily limit of ${_formatCurrency.format(remainingLimit)}'), + backgroundColor: Colors.red, + ), + ); + } + + if (_isAmountOverLimit != isOverLimit) { + setState(() { + _isAmountOverLimit = isOverLimit; + }); + } + } + void _validateIFSC() async { final ifsc = ifscController.text.trim().toUpperCase(); if (ifsc.isEmpty) return; @@ -718,6 +768,9 @@ class _QuickPayOutsideBankScreen extends State { ), ), const SizedBox(height: 25), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ Row( children: [ Expanded( @@ -783,6 +836,22 @@ class _QuickPayOutsideBankScreen extends State { ), ], ), + ], + ), + const SizedBox(height: 8), +if (_isLoadingLimit) + const Padding( + padding: EdgeInsets.only(left: 8.0), + child: Text('Fetching daily limit...'), + ), +if (!_isLoadingLimit && _limit != null) + Padding( + padding: const EdgeInsets.only(left: 8.0), + child: Text( + 'Remaining Daily Limit: ${_formatCurrency.format(_limit!.dailyLimit - _limit!.usedLimit)}', + style: Theme.of(context).textTheme.bodySmall, + ), + ), const SizedBox(height: 30), Row( children: [ @@ -795,24 +864,31 @@ class _QuickPayOutsideBankScreen extends State { ], ), const SizedBox(height: 45), - Align( - alignment: Alignment.center, - child: SwipeButton.expand( - thumb: Icon(Icons.arrow_forward, - color: Theme.of(context).dialogBackgroundColor), - activeThumbColor: Theme.of(context).colorScheme.primary, - activeTrackColor: - Theme.of(context).colorScheme.secondary.withAlpha(100), - borderRadius: BorderRadius.circular(30), - height: 56, - onSwipe: _onProceedToPay, - child: Text( - AppLocalizations.of(context).swipeToPay, - style: const TextStyle( - fontSize: 16, fontWeight: FontWeight.bold), - ), - ), - ), + Align( + alignment: Alignment.center, + child: SwipeButton.expand( + thumb: Icon(Icons.arrow_forward, + color: _isAmountOverLimit ? Colors.grey : Theme.of(context).dialogBackgroundColor), + activeThumbColor: _isAmountOverLimit ? Colors.grey.shade700 : + Theme.of(context).colorScheme.primary, + activeTrackColor: _isAmountOverLimit + ? Colors.grey.shade300 + : Theme.of(context).colorScheme.secondary.withAlpha(100), + borderRadius: BorderRadius.circular(30), + height: 56, + onSwipe: () { + if (_isAmountOverLimit) { + return; // Do nothing if amount is over the limit + } + _onProceedToPay(); + }, + child: Text( + AppLocalizations.of(context).swipeToPay, + style: const TextStyle( + fontSize: 16, fontWeight: FontWeight.bold), + ), + ), + ), ], ), ), diff --git a/lib/features/quick_pay/screens/quick_pay_within_bank_screen.dart b/lib/features/quick_pay/screens/quick_pay_within_bank_screen.dart index 1f1c3d9..11982c9 100644 --- a/lib/features/quick_pay/screens/quick_pay_within_bank_screen.dart +++ b/lib/features/quick_pay/screens/quick_pay_within_bank_screen.dart @@ -1,7 +1,9 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter_swipe_button/flutter_swipe_button.dart'; +import 'package:intl/intl.dart'; import 'package:kmobile/api/services/beneficiary_service.dart'; +import 'package:kmobile/api/services/limit_service.dart'; import 'package:kmobile/api/services/payment_service.dart'; import 'package:kmobile/data/models/transfer.dart'; import 'package:kmobile/di/injection.dart'; @@ -19,14 +21,17 @@ class QuickPayWithinBankScreen extends StatefulWidget { class _QuickPayWithinBankScreen extends State { final _formKey = GlobalKey(); - + final _limitService = getIt(); +Limit? _limit; +bool _isLoadingLimit = true; +final _formatCurrency = NumberFormat.currency(locale: 'en_IN', symbol: '₹'); final TextEditingController accountNumberController = TextEditingController(); final TextEditingController confirmAccountNumberController = TextEditingController(); final TextEditingController amountController = TextEditingController(); final TextEditingController remarksController = TextEditingController(); String? _selectedAccountType; - + bool _isAmountOverLimit = false; String? _beneficiaryName; bool _isValidating = false; bool _isBeneficiaryValidated = false; @@ -35,10 +40,54 @@ class _QuickPayWithinBankScreen extends State { @override void initState() { super.initState(); + _loadLimit(); accountNumberController.addListener(_resetBeneficiaryValidation); confirmAccountNumberController.addListener(_resetBeneficiaryValidation); + amountController.addListener(_checkAmountLimit); } +Future _loadLimit() async { + setState(() { + _isLoadingLimit = true; + }); + try { + final limitData = await _limitService.getLimit(); + setState(() { + _limit = limitData; + _isLoadingLimit = false; + }); + } catch (e) { + // Handle error if needed + setState(() { + _isLoadingLimit = false; + }); + } +} + +void _checkAmountLimit() { + if (_limit == null) return; + + final amount = double.tryParse(amountController.text) ?? 0; + final remainingLimit = _limit!.dailyLimit - _limit!.usedLimit; + final bool isOverLimit = amount > remainingLimit; + + if (isOverLimit) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text('Amount exceeds remaining daily limit of ${_formatCurrency.format(remainingLimit)}'), + backgroundColor: Colors.red, + ), + ); + } + + // Update state only if it changes to avoid unnecessary rebuilds + if (_isAmountOverLimit != isOverLimit) { + setState(() { + _isAmountOverLimit = isOverLimit; + }); + } +} + void _resetBeneficiaryValidation() { if (_isBeneficiaryValidated || _beneficiaryName != null || @@ -53,6 +102,7 @@ class _QuickPayWithinBankScreen extends State { @override void dispose() { + amountController.removeListener(_checkAmountLimit); accountNumberController.removeListener(_resetBeneficiaryValidation); confirmAccountNumberController.removeListener(_resetBeneficiaryValidation); accountNumberController.dispose(); @@ -102,7 +152,8 @@ class _QuickPayWithinBankScreen extends State { padding: const EdgeInsets.all(16.0), child: Form( key: _formKey, - child: Column( + child: SingleChildScrollView( + child: Column( children: [ const SizedBox(height: 10), TextFormField( @@ -297,6 +348,7 @@ class _QuickPayWithinBankScreen extends State { ), ), const SizedBox(height: 25), + TextFormField( decoration: InputDecoration( labelText: AppLocalizations.of(context).amount, @@ -327,66 +379,81 @@ class _QuickPayWithinBankScreen extends State { return null; }, ), + const SizedBox(height: 8), +if (_isLoadingLimit) + const Text('Fetching daily limit...'), +if (!_isLoadingLimit && _limit != null) + Text( + 'Remaining Daily Limit: ${_formatCurrency.format(_limit!.dailyLimit - _limit!.usedLimit)}', + style: Theme.of(context).textTheme.bodySmall, + ), const SizedBox(height: 45), - Align( - alignment: Alignment.center, - child: SwipeButton.expand( - thumb: Icon(Icons.arrow_forward, - color: Theme.of(context).dialogBackgroundColor), - activeThumbColor: Theme.of(context).colorScheme.primary, - activeTrackColor: Theme.of( - context, - ).colorScheme.secondary.withAlpha(100), - borderRadius: BorderRadius.circular(30), - height: 56, - child: Text( - AppLocalizations.of(context).swipeToPay, - style: const TextStyle(fontSize: 16), - ), - onSwipe: () { - if (_formKey.currentState!.validate()) { - if (!_isBeneficiaryValidated) { - setState(() { - _validationError = AppLocalizations.of(context) - .validateBeneficiaryproceeding; - }); - return; - } - // Perform payment logic - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => TransactionPinScreen( - onPinCompleted: (pinScreenContext, tpin) async { - final transfer = Transfer( - fromAccount: widget.debitAccount, - toAccount: accountNumberController.text, - toAccountType: _selectedAccountType!, - amount: amountController.text, - tpin: tpin, - remarks: remarksController.text, - ); + Align( + alignment: Alignment.center, + child: SwipeButton.expand( + thumb: Icon(Icons.arrow_forward, + color: _isAmountOverLimit ? Colors.grey : Theme.of(context).dialogBackgroundColor), + activeThumbColor: _isAmountOverLimit ? Colors.grey.shade700 : + Theme.of(context).colorScheme.primary, + activeTrackColor: _isAmountOverLimit + ? Colors.grey.shade300 + : Theme.of( + context, + ).colorScheme.secondary.withAlpha(100), + borderRadius: BorderRadius.circular(30), + height: 56, + child: Text( + AppLocalizations.of(context).swipeToPay, + style: const TextStyle(fontSize: 16), + ), + onSwipe: () { + if (_isAmountOverLimit) { + return; // Do nothing if amount is over limit + } + if (_formKey.currentState!.validate()) { + if (!_isBeneficiaryValidated) { + setState(() { + _validationError = AppLocalizations.of(context) + .validateBeneficiaryproceeding; + }); + return; + } + // Perform payment logic + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => TransactionPinScreen( + onPinCompleted: (pinScreenContext, tpin) async { + final transfer = Transfer( + fromAccount: widget.debitAccount, + toAccount: accountNumberController.text, + toAccountType: _selectedAccountType!, + amount: amountController.text, + tpin: tpin, + remarks: remarksController.text, + ); - final paymentService = getIt(); - final paymentResponseFuture = paymentService - .processQuickPayWithinBank(transfer); + final paymentService = getIt(); + final paymentResponseFuture = paymentService + .processQuickPayWithinBank(transfer); - Navigator.of(pinScreenContext).pushReplacement( - MaterialPageRoute( - builder: (_) => PaymentAnimationScreen( - paymentResponse: paymentResponseFuture), - ), - ); - }, - ), - ), - ); - } - }, - ), - ), + Navigator.of(pinScreenContext).pushReplacement( + MaterialPageRoute( + builder: (_) => PaymentAnimationScreen( + paymentResponse: paymentResponseFuture), + ), + ); + }, + ), + ), + ); + } + }, + ), + ), ], ), + ), ), ), ); diff --git a/lib/features/service/screens/daily_transaction_limit.dart b/lib/features/service/screens/daily_transaction_limit.dart deleted file mode 100644 index fd242b4..0000000 --- a/lib/features/service/screens/daily_transaction_limit.dart +++ /dev/null @@ -1,161 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:kmobile/l10n/app_localizations.dart'; -import 'package:intl/intl.dart'; - -class DailyLimitScreen extends StatefulWidget { - const DailyLimitScreen({super.key}); - @override - State createState() => _DailyLimitScreenState(); -} - -class _DailyLimitScreenState extends State { - double? _currentLimit; - final _limitController = TextEditingController(); - - @override - void initState() { - super.initState(); - // Now just taking null, but for real time limit will be fetched using API call - _currentLimit = null; - } - - @override - void dispose() { - _limitController.dispose(); - super.dispose(); - } - - Future _showAddOrEditLimitDialog() async { - _limitController.text = _currentLimit?.toStringAsFixed(0) ?? ''; - final newLimit = await showDialog( - context: context, - builder: (context) { - final localizations = AppLocalizations.of(context); - return AlertDialog( - title: Text( - _currentLimit == null - ? localizations.addLimit - : localizations.editLimit, - ), - content: TextField( - controller: _limitController, - autofocus: true, - keyboardType: TextInputType.number, - inputFormatters: [ - 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), - ), - ], - ); - }, - ); - if (newLimit != null) { - setState(() { - _currentLimit = newLimit; - }); - } - } - - 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, - ), - ), - ], - ), - ], - ), - ), - ), - ); - } -} diff --git a/lib/features/service/screens/service_screen.dart b/lib/features/service/screens/service_screen.dart index 218d4a5..3f67a75 100644 --- a/lib/features/service/screens/service_screen.dart +++ b/lib/features/service/screens/service_screen.dart @@ -1,5 +1,5 @@ import 'package:kmobile/features/service/screens/branch_locator_screen.dart'; -import 'package:kmobile/features/service/screens/daily_transaction_limit.dart'; +import 'package:kmobile/features/profile/daily_transaction_limit.dart'; import '../../../l10n/app_localizations.dart'; import 'package:flutter/material.dart'; import 'package:material_symbols_icons/material_symbols_icons.dart'; @@ -40,18 +40,6 @@ class _ServiceScreen extends State { disabled: true, ), const Divider(height: 1), - ServiceManagementTile( - icon: Symbols.currency_rupee, - label: AppLocalizations.of(context).dailylimit, - 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, diff --git a/lib/widgets/bank_logos.dart b/lib/widgets/bank_logos.dart index a641b3a..2604e86 100644 --- a/lib/widgets/bank_logos.dart +++ b/lib/widgets/bank_logos.dart @@ -22,7 +22,7 @@ Widget getBankLogo(String? bankName, BuildContext context) { height: 40, ); } - if (bankName != null && bankName.toLowerCase().contains('icici bank ltd')) { + if (bankName != null && bankName.toLowerCase().contains('icici')) { return Image.asset( 'assets/images/icici_logo.png', width: 40, diff --git a/pubspec.lock b/pubspec.lock index f80d371..b81d9fd 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -69,10 +69,10 @@ packages: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" checked_yaml: dependency: transitive description: @@ -93,18 +93,18 @@ packages: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" collection: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.1" confetti: dependency: "direct main" description: @@ -181,10 +181,10 @@ packages: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.3" ffi: dependency: transitive description: @@ -393,10 +393,10 @@ packages: dependency: "direct main" description: name: intl - sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf + sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5" url: "https://pub.dev" source: hosted - version: "0.19.0" + version: "0.20.2" jailbreak_root_detection: dependency: "direct main" description: @@ -425,26 +425,26 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de" url: "https://pub.dev" source: hosted - version: "10.0.5" + version: "11.0.2" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.10" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" lints: dependency: transitive description: @@ -505,10 +505,10 @@ packages: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.17" material_color_utilities: dependency: transitive description: @@ -529,10 +529,10 @@ packages: dependency: transitive description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.16.0" mime: dependency: transitive description: @@ -569,10 +569,10 @@ packages: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" path_parsing: dependency: transitive description: @@ -841,7 +841,7 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_span: dependency: transitive description: @@ -862,18 +862,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" string_scanner: dependency: transitive description: @@ -894,10 +894,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00" url: "https://pub.dev" source: hosted - version: "0.7.2" + version: "0.7.6" typed_data: dependency: transitive description: @@ -1006,10 +1006,10 @@ packages: dependency: transitive description: name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.2.0" vm_service: dependency: transitive description: @@ -1067,5 +1067,5 @@ packages: source: hosted version: "3.1.3" sdks: - dart: ">=3.5.0 <4.0.0" + dart: ">=3.8.0-0 <4.0.0" flutter: ">=3.24.0"