diff --git a/cmp-android/dependencies/prodReleaseRuntimeClasspath.tree.txt b/cmp-android/dependencies/prodReleaseRuntimeClasspath.tree.txt index f666a3614..d46291228 100644 --- a/cmp-android/dependencies/prodReleaseRuntimeClasspath.tree.txt +++ b/cmp-android/dependencies/prodReleaseRuntimeClasspath.tree.txt @@ -3012,6 +3012,38 @@ | | +--- org.jetbrains.compose.material3:material3:1.8.2 (*) | | +--- org.jetbrains.compose.components:components-resources:1.8.2 (*) | | \--- org.jetbrains.compose.components:components-ui-tooling-preview:1.8.2 (*) +| +--- project :feature:autopay +| | +--- androidx.lifecycle:lifecycle-runtime-compose:2.9.2 (*) +| | +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.9.2 (*) +| | +--- androidx.tracing:tracing-ktx:1.3.0 (*) +| | +--- io.insert-koin:koin-bom:4.1.0 (*) +| | +--- io.insert-koin:koin-android:4.1.0 (*) +| | +--- io.insert-koin:koin-androidx-compose:4.1.0 (*) +| | +--- io.insert-koin:koin-androidx-navigation:4.1.0 (*) +| | +--- io.insert-koin:koin-core-viewmodel:4.1.0 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:2.1.20 -> 2.1.21 (*) +| | +--- io.insert-koin:koin-core:4.1.0 (*) +| | +--- io.insert-koin:koin-annotations:2.1.0 (*) +| | +--- project :core:ui (*) +| | +--- project :core:designsystem (*) +| | +--- project :core:data (*) +| | +--- io.insert-koin:koin-compose:4.1.0 (*) +| | +--- io.insert-koin:koin-compose-viewmodel:4.1.0 (*) +| | +--- org.jetbrains.compose.runtime:runtime:1.8.2 (*) +| | +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1 (*) +| | +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1 (*) +| | +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1 (*) +| | +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1 (*) +| | +--- org.jetbrains.androidx.savedstate:savedstate:1.3.1 (*) +| | +--- org.jetbrains.androidx.core:core-bundle:1.0.1 (*) +| | +--- org.jetbrains.androidx.navigation:navigation-compose:2.9.0-beta03 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3 -> 1.8.0 (*) +| | +--- org.jetbrains.compose.ui:ui:1.8.2 (*) +| | +--- org.jetbrains.compose.foundation:foundation:1.8.2 (*) +| | +--- org.jetbrains.compose.material3:material3:1.8.2 (*) +| | +--- org.jetbrains.compose.components:components-resources:1.8.2 (*) +| | \--- org.jetbrains.compose.components:components-ui-tooling-preview:1.8.2 (*) | \--- org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.20 (*) +--- project :core:data (*) +--- project :core:ui (*) diff --git a/cmp-android/dependencies/prodReleaseRuntimeClasspath.txt b/cmp-android/dependencies/prodReleaseRuntimeClasspath.txt index 89aaf0d21..7d2e8a654 100644 --- a/cmp-android/dependencies/prodReleaseRuntimeClasspath.txt +++ b/cmp-android/dependencies/prodReleaseRuntimeClasspath.txt @@ -12,6 +12,7 @@ :core:ui :feature:accounts :feature:auth +:feature:autopay :feature:editpassword :feature:faq :feature:finance diff --git a/cmp-android/prodRelease-badging.txt b/cmp-android/prodRelease-badging.txt index 91ced69b5..522e01de8 100644 --- a/cmp-android/prodRelease-badging.txt +++ b/cmp-android/prodRelease-badging.txt @@ -1,4 +1,4 @@ -package: name='org.mifospay' versionCode='1' versionName='2025.8.2-beta.0.3' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15' +package: name='org.mifospay' versionCode='1' versionName='2025.8.4-beta.0.9' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15' minSdkVersion:'26' targetSdkVersion:'34' uses-permission: name='android.permission.INTERNET' diff --git a/cmp-shared/build.gradle.kts b/cmp-shared/build.gradle.kts index 0b8ef8a66..0c2ef4174 100644 --- a/cmp-shared/build.gradle.kts +++ b/cmp-shared/build.gradle.kts @@ -55,6 +55,7 @@ kotlin { implementation(projects.feature.qr) implementation(projects.feature.merchants) implementation(projects.feature.upiSetup) + implementation(projects.feature.autopay) } desktopMain.dependencies { diff --git a/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/di/KoinModules.kt b/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/di/KoinModules.kt index b87dc3783..9d8cb8366 100644 --- a/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/di/KoinModules.kt +++ b/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/di/KoinModules.kt @@ -24,6 +24,7 @@ import org.mifospay.core.network.di.LocalModule import org.mifospay.core.network.di.NetworkModule import org.mifospay.feature.accounts.di.AccountsModule import org.mifospay.feature.auth.di.AuthModule +import org.mifospay.feature.autopay.di.AutoPayModule import org.mifospay.feature.editpassword.di.EditPasswordModule import org.mifospay.feature.faq.di.FaqModule import org.mifospay.feature.history.di.HistoryModule @@ -88,6 +89,7 @@ object KoinModules { QrModule, MerchantsModule, UpiSetupModule, + AutoPayModule, ) } private val LibraryModule = module { diff --git a/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/navigation/MifosNavHost.kt b/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/navigation/MifosNavHost.kt index d6a94277b..904743e4a 100644 --- a/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/navigation/MifosNavHost.kt +++ b/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/navigation/MifosNavHost.kt @@ -22,6 +22,18 @@ import org.mifospay.feature.accounts.savingsaccount.addEditSavingAccountScreen import org.mifospay.feature.accounts.savingsaccount.details.navigateToSavingAccountDetails import org.mifospay.feature.accounts.savingsaccount.details.savingAccountDetailRoute import org.mifospay.feature.accounts.savingsaccount.navigateToSavingAccountAddEdit +import org.mifospay.feature.autopay.AutoPayScreen +import org.mifospay.feature.autopay.autoPayGraph +import org.mifospay.feature.autopay.navigateToAddBill +import org.mifospay.feature.autopay.navigateToAddBiller +import org.mifospay.feature.autopay.navigateToAutoPay +import org.mifospay.feature.autopay.navigateToAutoPayHistory +import org.mifospay.feature.autopay.navigateToAutoPayPreferences +import org.mifospay.feature.autopay.navigateToAutoPayRules +import org.mifospay.feature.autopay.navigateToAutoPayScheduleDetails +import org.mifospay.feature.autopay.navigateToAutoPaySetup +import org.mifospay.feature.autopay.navigateToBillList +import org.mifospay.feature.autopay.navigateToBillerList import org.mifospay.feature.editpassword.navigation.editPasswordScreen import org.mifospay.feature.editpassword.navigation.navigateToEditPassword import org.mifospay.feature.faq.navigation.faqScreen @@ -72,7 +84,12 @@ import org.mifospay.feature.savedcards.details.cardDetailRoute import org.mifospay.feature.savedcards.details.navigateToCardDetails import org.mifospay.feature.send.money.SendMoneyScreen import org.mifospay.feature.send.money.navigation.SEND_MONEY_BASE_ROUTE +import org.mifospay.feature.send.money.navigation.SEND_MONEY_OPTIONS_ROUTE +import org.mifospay.feature.send.money.navigation.navigateToPayeeDetailsScreen +import org.mifospay.feature.send.money.navigation.navigateToSendMoneyOptionsScreen import org.mifospay.feature.send.money.navigation.navigateToSendMoneyScreen +import org.mifospay.feature.send.money.navigation.payeeDetailsScreen +import org.mifospay.feature.send.money.navigation.sendMoneyOptionsScreen import org.mifospay.feature.send.money.navigation.sendMoneyScreen import org.mifospay.feature.settings.navigation.settingsScreen import org.mifospay.feature.standing.instruction.StandingInstructionsScreen @@ -97,6 +114,7 @@ internal fun MifosNavHost( onBackClick = navController::navigateUp, navigateToTransferScreen = navController::navigateToTransferScreen, navigateToScanQrScreen = navController::navigateToScanQr, + navigateToPayeeDetails = navController::navigateToPayeeDetailsScreen, showTopBar = false, ) }, @@ -121,6 +139,38 @@ internal fun MifosNavHost( navigateToInvoiceDetailScreen = navController::navigateToInvoiceDetail, ) }, + TabContent(PaymentsScreenContents.AUTOPAY.name) { + AutoPayScreen( + onNavigateToSetup = { + navController.navigateToAutoPaySetup() + }, + onNavigateToRules = { + navController.navigateToAutoPayRules() + }, + onNavigateToPreferences = { + navController.navigateToAutoPayPreferences() + }, + onNavigateToHistory = { + navController.navigateToAutoPayHistory() + }, + onNavigateToScheduleDetails = { scheduleId -> + navController.navigateToAutoPayScheduleDetails(scheduleId) + }, + onNavigateToAddBiller = { + navController.navigateToAddBiller() + }, + onNavigateToBillerList = { + navController.navigateToBillerList() + }, + onNavigateToAddBill = { + navController.navigateToAddBill() + }, + onNavigateToBillList = { + navController.navigateToBillList() + }, + showTopBar = false, + ) + }, ) val tabContents = listOf( @@ -160,7 +210,10 @@ internal fun MifosNavHost( onRequest = { navController.navigateToShowQrScreen() }, - onPay = navController::navigateToSendMoneyScreen, + onPay = navController::navigateToSendMoneyOptionsScreen, + onAutoPay = { + navController.navigateToAutoPay() + }, navigateToTransactionDetail = navController::navigateToSpecificTransaction, navigateToAccountDetail = navController::navigateToSavingAccountDetails, ) @@ -279,12 +332,55 @@ internal fun MifosNavHost( navigateBack = navController::navigateUp, ) + sendMoneyOptionsScreen( + onBackClick = navController::popBackStack, + onScanQrClick = { + // This is now handled by the ViewModel using ML Kit scanner + }, + onPayAnyoneClick = { + // TODO: Navigate to Pay Anyone screen + }, + onBankTransferClick = { + // TODO: Navigate to Bank Transfer screen + }, + onFineractPaymentsClick = { + navController.navigateToSendMoneyScreen() + }, + onAutoPayClick = { + navController.navigateToAutoPay() + }, + onQrCodeScanned = { qrData -> + navController.navigateToSendMoneyScreen( + requestData = qrData, + navOptions = navOptions { + popUpTo(SEND_MONEY_OPTIONS_ROUTE) { + inclusive = true + } + }, + ) + }, + onNavigateToPayeeDetails = { qrCodeData -> + navController.navigateToPayeeDetailsScreen(qrCodeData) + }, + ) + sendMoneyScreen( onBackClick = navController::popBackStack, navigateToTransferScreen = navController::navigateToTransferScreen, + navigateToPayeeDetailsScreen = navController::navigateToPayeeDetailsScreen, navigateToScanQrScreen = navController::navigateToScanQr, ) + payeeDetailsScreen( + onBackClick = navController::popBackStack, + onNavigateToUpiPayment = { state -> + // TODO: Handle UPI payment navigation + }, + onNavigateToFineractPayment = { state -> + // TODO: Handle Fineract payment navigation + }, + ) + transferScreen( navigateBack = navController::popBackStack, onTransferSuccess = { @@ -322,6 +418,16 @@ internal fun MifosNavHost( }, ) }, + navigateToPayeeDetailsScreen = { + navController.navigateToPayeeDetailsScreen( + qrCodeData = it, + navOptions = navOptions { + popUpTo(SCAN_QR_ROUTE) { + inclusive = true + } + }, + ) + }, ) merchantTransferScreen( @@ -332,5 +438,10 @@ internal fun MifosNavHost( setupUpiPinScreen( navigateBack = navController::navigateUp, ) + + autoPayGraph( + navController = navController, + onNavigateBack = navController::navigateUp, + ) } } diff --git a/core/data/src/commonMain/kotlin/org/mifospay/core/data/di/RepositoryModule.kt b/core/data/src/commonMain/kotlin/org/mifospay/core/data/di/RepositoryModule.kt index 053c48b7b..c9e778401 100644 --- a/core/data/src/commonMain/kotlin/org/mifospay/core/data/di/RepositoryModule.kt +++ b/core/data/src/commonMain/kotlin/org/mifospay/core/data/di/RepositoryModule.kt @@ -16,7 +16,9 @@ import org.mifospay.core.common.MifosDispatchers import org.mifospay.core.data.repository.AccountRepository import org.mifospay.core.data.repository.AssetRepository import org.mifospay.core.data.repository.AuthenticationRepository +import org.mifospay.core.data.repository.AutoPayRepository import org.mifospay.core.data.repository.BeneficiaryRepository +import org.mifospay.core.data.repository.BillerRepository import org.mifospay.core.data.repository.ClientRepository import org.mifospay.core.data.repository.DocumentRepository import org.mifospay.core.data.repository.InvoiceRepository @@ -36,7 +38,9 @@ import org.mifospay.core.data.repository.UserRepository import org.mifospay.core.data.repositoryImpl.AccountRepositoryImpl import org.mifospay.core.data.repositoryImpl.AssetRepositoryImpl import org.mifospay.core.data.repositoryImpl.AuthenticationRepositoryImpl +import org.mifospay.core.data.repositoryImpl.AutoPayRepositoryImpl import org.mifospay.core.data.repositoryImpl.BeneficiaryRepositoryImpl +import org.mifospay.core.data.repositoryImpl.BillerRepositoryImpl import org.mifospay.core.data.repositoryImpl.ClientRepositoryImpl import org.mifospay.core.data.repositoryImpl.DocumentRepositoryImpl import org.mifospay.core.data.repositoryImpl.InvoiceRepositoryImpl @@ -93,6 +97,14 @@ val RepositoryModule = module { } single { TwoFactorAuthRepositoryImpl(get(), get(ioDispatcher)) } single { UserRepositoryImpl(get(), get(ioDispatcher)) } + single { AutoPayRepositoryImpl(get(), get(ioDispatcher)) } + + // TODO: Switch to network-based implementation when APIs are finalized + // or use hybrid approach syncing local and remote data + // single { BillerRepositoryImpl(get(), get(ioDispatcher)) } + + // Current local storage implementation + single { BillerRepositoryImpl(get(), get(ioDispatcher)) } includes(platformModule) single { getPlatformDataModule } diff --git a/core/data/src/commonMain/kotlin/org/mifospay/core/data/repository/AutoPayRepository.kt b/core/data/src/commonMain/kotlin/org/mifospay/core/data/repository/AutoPayRepository.kt new file mode 100644 index 000000000..91806a986 --- /dev/null +++ b/core/data/src/commonMain/kotlin/org/mifospay/core/data/repository/AutoPayRepository.kt @@ -0,0 +1,109 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.core.data.repository + +import kotlinx.coroutines.flow.Flow +import org.mifospay.core.common.DataState +import org.mifospay.core.model.autopay.AutoPay +import org.mifospay.core.model.autopay.AutoPayHistory +import org.mifospay.core.model.autopay.AutoPayPayload +import org.mifospay.core.model.autopay.AutoPayTemplate +import org.mifospay.core.model.autopay.AutoPayUpdatePayload +import org.mifospay.core.model.autopay.UpcomingPayment +import org.mifospay.core.network.model.entity.Page + +interface AutoPayRepository { + /** + * Get AutoPay template for creating new AutoPay schedules + */ + fun getAutoPayTemplate( + clientId: Long, + sourceAccountId: Long, + ): Flow> + + /** + * Get all AutoPay schedules for a client + */ + fun getAllAutoPaySchedules( + clientId: Long, + ): Flow>> + + /** + * Get AutoPay schedule by ID + */ + fun getAutoPaySchedule(autoPayId: Long): Flow> + + /** + * Create a new AutoPay schedule + */ + suspend fun createAutoPaySchedule( + payload: AutoPayPayload, + ): DataState + + /** + * Update an existing AutoPay schedule + */ + suspend fun updateAutoPaySchedule( + autoPayId: Long, + payload: AutoPayUpdatePayload, + ): DataState + + /** + * Delete an AutoPay schedule + */ + suspend fun deleteAutoPaySchedule(autoPayId: Long): DataState + + /** + * Pause an AutoPay schedule + */ + suspend fun pauseAutoPaySchedule(autoPayId: Long): DataState + + /** + * Resume a paused AutoPay schedule + */ + suspend fun resumeAutoPaySchedule(autoPayId: Long): DataState + + /** + * Get AutoPay payment history + */ + fun getAutoPayHistory( + autoPayId: Long, + limit: Int = 20, + ): Flow>> + + /** + * Get upcoming payments for all AutoPay schedules + */ + fun getUpcomingPayments( + clientId: Long, + limit: Int = 10, + ): Flow>> + + /** + * Get AutoPay statistics for dashboard + */ + fun getAutoPayStatistics( + clientId: Long, + ): Flow> + + /** + * Validate AutoPay payload before submission + */ + suspend fun validateAutoPayPayload(payload: AutoPayPayload): DataState +} + +data class AutoPayStatistics( + val totalActiveSchedules: Int = 0, + val totalPausedSchedules: Int = 0, + val totalCompletedSchedules: Int = 0, + val totalUpcomingPayments: Int = 0, + val totalAmountThisMonth: Double = 0.0, + val currency: String = "USD", +) diff --git a/core/data/src/commonMain/kotlin/org/mifospay/core/data/repository/BillerRepository.kt b/core/data/src/commonMain/kotlin/org/mifospay/core/data/repository/BillerRepository.kt new file mode 100644 index 000000000..8ab1c916d --- /dev/null +++ b/core/data/src/commonMain/kotlin/org/mifospay/core/data/repository/BillerRepository.kt @@ -0,0 +1,62 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.core.data.repository + +import kotlinx.coroutines.flow.Flow +import org.mifospay.core.common.DataState +import org.mifospay.core.model.autopay.Biller +import org.mifospay.core.model.autopay.BillerCategory + +interface BillerRepository { + /** + * Get all saved billers + */ + fun getAllBillers(): Flow> + + /** + * Get biller by ID + */ + suspend fun getBillerById(id: String): Biller? + + /** + * Save a new biller + */ + suspend fun saveBiller(biller: Biller): DataState + + /** + * Update an existing biller + */ + suspend fun updateBiller(biller: Biller): DataState + + /** + * Delete a biller + */ + suspend fun deleteBiller(id: String): DataState + + /** + * Get billers by category + */ + suspend fun getBillersByCategory(category: BillerCategory): List + + /** + * Search billers by name + */ + suspend fun searchBillersByName(query: String): List + + /** + * Check if biller exists by name and account number + */ + suspend fun isBillerExists(name: String, accountNumber: String): Boolean + + /** + * Clear all billers + */ + suspend fun clearAllBillers(): DataState +} diff --git a/core/data/src/commonMain/kotlin/org/mifospay/core/data/repositoryImpl/AutoPayRepositoryImpl.kt b/core/data/src/commonMain/kotlin/org/mifospay/core/data/repositoryImpl/AutoPayRepositoryImpl.kt new file mode 100644 index 000000000..2196bbe57 --- /dev/null +++ b/core/data/src/commonMain/kotlin/org/mifospay/core/data/repositoryImpl/AutoPayRepositoryImpl.kt @@ -0,0 +1,188 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.core.data.repositoryImpl + +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.catch +import kotlinx.coroutines.flow.flowOn +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.withContext +import org.mifospay.core.common.DataState +import org.mifospay.core.common.asDataStateFlow +import org.mifospay.core.data.repository.AutoPayRepository +import org.mifospay.core.data.repository.AutoPayStatistics +import org.mifospay.core.data.util.AutoPayValidator +import org.mifospay.core.model.autopay.AutoPay +import org.mifospay.core.model.autopay.AutoPayHistory +import org.mifospay.core.model.autopay.AutoPayPayload +import org.mifospay.core.model.autopay.AutoPayTemplate +import org.mifospay.core.model.autopay.AutoPayUpdatePayload +import org.mifospay.core.model.autopay.UpcomingPayment +import org.mifospay.core.network.FineractApiManager + +class AutoPayRepositoryImpl( + private val apiManager: FineractApiManager, + private val ioDispatcher: CoroutineDispatcher, +) : AutoPayRepository { + + override fun getAutoPayTemplate( + clientId: Long, + sourceAccountId: Long, + ): Flow> { + return apiManager.autoPayApi + .getAutoPayTemplate(clientId, sourceAccountId) + .catch { DataState.Error(it, null) } + .asDataStateFlow().flowOn(ioDispatcher) + } + + override fun getAllAutoPaySchedules( + clientId: Long, + ): Flow>> { + return apiManager.autoPayApi + .getAllAutoPaySchedules(clientId) + .catch { DataState.Error(it, null) } + .asDataStateFlow().flowOn(ioDispatcher) + } + + override fun getAutoPaySchedule( + autoPayId: Long, + ): Flow> { + return apiManager.autoPayApi + .getAutoPaySchedule(autoPayId) + .catch { DataState.Error(it, null) } + .asDataStateFlow().flowOn(ioDispatcher) + } + + override suspend fun createAutoPaySchedule( + payload: AutoPayPayload, + ): DataState { + return try { + withContext(ioDispatcher) { + apiManager.autoPayApi.createAutoPaySchedule(payload) + } + DataState.Success("AutoPay schedule created successfully") + } catch (e: Exception) { + DataState.Error(e, null) + } + } + + override suspend fun updateAutoPaySchedule( + autoPayId: Long, + payload: AutoPayUpdatePayload, + ): DataState { + return try { + withContext(ioDispatcher) { + apiManager.autoPayApi.updateAutoPaySchedule( + autoPayId = autoPayId, + payload = payload, + ) + } + DataState.Success("AutoPay schedule updated successfully") + } catch (e: Exception) { + DataState.Error(e, null) + } + } + + override suspend fun deleteAutoPaySchedule( + autoPayId: Long, + ): DataState { + return try { + withContext(ioDispatcher) { + apiManager.autoPayApi.deleteAutoPaySchedule(autoPayId) + } + DataState.Success("AutoPay schedule deleted successfully") + } catch (e: Exception) { + DataState.Error(e, null) + } + } + + override suspend fun pauseAutoPaySchedule( + autoPayId: Long, + ): DataState { + return try { + withContext(ioDispatcher) { + apiManager.autoPayApi.pauseAutoPaySchedule(autoPayId) + } + DataState.Success("AutoPay schedule paused successfully") + } catch (e: Exception) { + DataState.Error(e, null) + } + } + + override suspend fun resumeAutoPaySchedule( + autoPayId: Long, + ): DataState { + return try { + withContext(ioDispatcher) { + apiManager.autoPayApi.resumeAutoPaySchedule(autoPayId) + } + DataState.Success("AutoPay schedule resumed successfully") + } catch (e: Exception) { + DataState.Error(e, null) + } + } + + override fun getAutoPayHistory( + autoPayId: Long, + limit: Int, + ): Flow>> { + return apiManager.autoPayApi + .getAutoPayHistory(autoPayId, limit) + .catch { DataState.Error(it, null) } + .asDataStateFlow().flowOn(ioDispatcher) + } + + override fun getUpcomingPayments( + clientId: Long, + limit: Int, + ): Flow>> { + return apiManager.autoPayApi + .getUpcomingPayments(clientId, limit) + .catch { DataState.Error(it, null) } + .asDataStateFlow().flowOn(ioDispatcher) + } + + override fun getAutoPayStatistics( + clientId: Long, + ): Flow> { + return apiManager.autoPayApi + .getAutoPayStatistics(clientId) + .catch { DataState.Error(it, null) } + .map { response -> + AutoPayStatistics( + totalActiveSchedules = response.totalActiveSchedules, + totalPausedSchedules = response.totalPausedSchedules, + totalCompletedSchedules = response.totalCompletedSchedules, + totalUpcomingPayments = response.totalUpcomingPayments, + totalAmountThisMonth = response.totalAmountThisMonth, + currency = response.currency, + ) + } + .asDataStateFlow().flowOn(ioDispatcher) + } + + override suspend fun validateAutoPayPayload( + payload: AutoPayPayload, + ): DataState { + return try { + withContext(ioDispatcher) { + when (val validationResult = AutoPayValidator.validateAutoPayPayload(payload)) { + is AutoPayValidator.ValidationResult.Valid -> DataState.Success(true) + is AutoPayValidator.ValidationResult.Invalid -> { + DataState.Error(Exception(validationResult.errorMessage), null) + } + } + } + } catch (e: Exception) { + DataState.Error(e, null) + } + } +} diff --git a/core/data/src/commonMain/kotlin/org/mifospay/core/data/repositoryImpl/BillerRepositoryImpl.kt b/core/data/src/commonMain/kotlin/org/mifospay/core/data/repositoryImpl/BillerRepositoryImpl.kt new file mode 100644 index 000000000..a6e8a8c07 --- /dev/null +++ b/core/data/src/commonMain/kotlin/org/mifospay/core/data/repositoryImpl/BillerRepositoryImpl.kt @@ -0,0 +1,130 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.core.data.repositoryImpl + +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.catch +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.flowOn +import kotlinx.coroutines.withContext +import org.mifospay.core.common.DataState +import org.mifospay.core.data.repository.BillerRepository +import org.mifospay.core.model.autopay.Biller +import org.mifospay.core.model.autopay.BillerCategory +import org.mifospay.core.network.FineractApiManager + +/** + * Network-based implementation of BillerRepository. + * + * TODO: This implementation uses placeholder API endpoints. When the backend APIs + * for biller management are finalized, update the endpoints and request/response + * models according to the actual API contract. + */ +class BillerRepositoryImpl( + private val apiManager: FineractApiManager, + private val ioDispatcher: CoroutineDispatcher, +) : BillerRepository { + + override fun getAllBillers(): Flow> { + return apiManager.billerApi + .getAllBillers() + .catch { + // Return empty list on error for now + emit(emptyList()) + } + .flowOn(ioDispatcher) + } + + override suspend fun getBillerById(id: String): Biller? { + return try { + withContext(ioDispatcher) { + apiManager.billerApi.getBillerById(id).first() + } + } catch (e: Exception) { + null + } + } + + override suspend fun saveBiller(biller: Biller): DataState { + return try { + val result = withContext(ioDispatcher) { + apiManager.billerApi.createBiller(biller).first() + } + DataState.Success(result) + } catch (e: Exception) { + DataState.Error(e) + } + } + + override suspend fun updateBiller(biller: Biller): DataState { + return try { + val billerId = biller.id ?: return DataState.Error(Exception("Biller ID is required for update")) + val result = withContext(ioDispatcher) { + apiManager.billerApi.updateBiller(billerId, biller).first() + } + DataState.Success(result) + } catch (e: Exception) { + DataState.Error(e) + } + } + + override suspend fun deleteBiller(id: String): DataState { + return try { + withContext(ioDispatcher) { + apiManager.billerApi.deleteBiller(id).first() + } + DataState.Success(Unit) + } catch (e: Exception) { + DataState.Error(e) + } + } + + override suspend fun getBillersByCategory(category: BillerCategory): List { + return try { + withContext(ioDispatcher) { + apiManager.billerApi.getBillersByCategory(category).first() + } + } catch (e: Exception) { + emptyList() + } + } + + override suspend fun searchBillersByName(query: String): List { + return try { + withContext(ioDispatcher) { + apiManager.billerApi.searchBillersByName(query).first() + } + } catch (e: Exception) { + emptyList() + } + } + + override suspend fun isBillerExists(name: String, accountNumber: String): Boolean { + return try { + withContext(ioDispatcher) { + apiManager.billerApi.isBillerExists(name, accountNumber).first() + } + } catch (e: Exception) { + false + } + } + + override suspend fun clearAllBillers(): DataState { + return try { + withContext(ioDispatcher) { + apiManager.billerApi.clearAllBillers().first() + } + DataState.Success(Unit) + } catch (e: Exception) { + DataState.Error(e) + } + } +} diff --git a/core/data/src/commonMain/kotlin/org/mifospay/core/data/util/AutoPayErrorHandler.kt b/core/data/src/commonMain/kotlin/org/mifospay/core/data/util/AutoPayErrorHandler.kt new file mode 100644 index 000000000..cc2ada913 --- /dev/null +++ b/core/data/src/commonMain/kotlin/org/mifospay/core/data/util/AutoPayErrorHandler.kt @@ -0,0 +1,171 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.core.data.util + +import io.ktor.client.plugins.ClientRequestException +import io.ktor.client.plugins.ServerResponseException +import io.ktor.http.HttpStatusCode +import org.mifospay.core.common.DataState + +object AutoPayErrorHandler { + + sealed class AutoPayError( + open val message: String, + open val code: String? = null, + ) { + data class NetworkError( + override val message: String, + override val code: String? = null, + ) : AutoPayError(message, code) + + data class ValidationError( + override val message: String, + override val code: String? = null, + ) : AutoPayError(message, code) + + data class ServerError( + override val message: String, + override val code: String? = null, + ) : AutoPayError(message, code) + + data class AuthenticationError( + override val message: String, + override val code: String? = null, + ) : AutoPayError(message, code) + + data class AuthorizationError( + override val message: String, + override val code: String? = null, + ) : AutoPayError(message, code) + + data class NotFoundError( + override val message: String, + override val code: String? = null, + ) : AutoPayError(message, code) + + data class ConflictError( + override val message: String, + override val code: String? = null, + ) : AutoPayError(message, code) + + data class RateLimitError( + override val message: String, + override val code: String? = null, + ) : AutoPayError(message, code) + + data class UnknownError( + override val message: String, + override val code: String? = null, + ) : AutoPayError(message, code) + } + + fun handleException(exception: Exception): AutoPayError { + return when (exception) { + is ClientRequestException -> handleClientRequestException(exception) + is ServerResponseException -> handleServerResponseException(exception) + is IllegalArgumentException -> AutoPayError.ValidationError( + message = exception.message ?: "Invalid input provided", + code = "VALIDATION_ERROR", + ) + is IllegalStateException -> AutoPayError.ValidationError( + message = exception.message ?: "Invalid state", + code = "STATE_ERROR", + ) + else -> AutoPayError.UnknownError( + message = exception.message ?: "An unexpected error occurred", + code = "UNKNOWN_ERROR", + ) + } + } + + private fun handleClientRequestException(exception: ClientRequestException): AutoPayError { + return when (exception.response.status) { + HttpStatusCode.Unauthorized -> AutoPayError.AuthenticationError( + message = "Authentication required. Please log in again.", + code = "UNAUTHORIZED", + ) + HttpStatusCode.Forbidden -> AutoPayError.AuthorizationError( + message = "You don't have permission to perform this action.", + code = "FORBIDDEN", + ) + HttpStatusCode.NotFound -> AutoPayError.NotFoundError( + message = "The requested AutoPay schedule was not found.", + code = "NOT_FOUND", + ) + HttpStatusCode.Conflict -> AutoPayError.ConflictError( + message = "The AutoPay schedule already exists or conflicts with existing data.", + code = "CONFLICT", + ) + HttpStatusCode.TooManyRequests -> AutoPayError.RateLimitError( + message = "Too many requests. Please try again later.", + code = "RATE_LIMIT", + ) + HttpStatusCode.BadRequest -> AutoPayError.ValidationError( + message = "Invalid request data. Please check your input.", + code = "BAD_REQUEST", + ) + else -> AutoPayError.NetworkError( + message = "Network error occurred. Please check your connection.", + code = "NETWORK_ERROR", + ) + } + } + + private fun handleServerResponseException(exception: ServerResponseException): AutoPayError { + return when (exception.response.status) { + HttpStatusCode.InternalServerError -> AutoPayError.ServerError( + message = "Server error occurred. Please try again later.", + code = "INTERNAL_SERVER_ERROR", + ) + HttpStatusCode.ServiceUnavailable -> AutoPayError.ServerError( + message = "Service temporarily unavailable. Please try again later.", + code = "SERVICE_UNAVAILABLE", + ) + HttpStatusCode.GatewayTimeout -> AutoPayError.NetworkError( + message = "Request timeout. Please try again.", + code = "TIMEOUT", + ) + else -> AutoPayError.ServerError( + message = "Server error occurred. Please try again later.", + code = "SERVER_ERROR", + ) + } + } + + fun createErrorDataState(error: AutoPayError): DataState { + return DataState.Error( + exception = Exception(error.message), + data = null, + ) + } + + fun getErrorMessage(error: AutoPayError): String { + return when (error) { + is AutoPayError.NetworkError -> "Network Error: ${error.message}" + is AutoPayError.ValidationError -> "Validation Error: ${error.message}" + is AutoPayError.ServerError -> "Server Error: ${error.message}" + is AutoPayError.AuthenticationError -> "Authentication Error: ${error.message}" + is AutoPayError.AuthorizationError -> "Authorization Error: ${error.message}" + is AutoPayError.NotFoundError -> "Not Found: ${error.message}" + is AutoPayError.ConflictError -> "Conflict: ${error.message}" + is AutoPayError.RateLimitError -> "Rate Limit: ${error.message}" + is AutoPayError.UnknownError -> "Error: ${error.message}" + } + } + + fun isRetryableError(error: AutoPayError): Boolean { + return when (error) { + is AutoPayError.NetworkError -> true + is AutoPayError.ServerError -> true + is AutoPayError.RateLimitError -> true + else -> false + } + } +} diff --git a/core/data/src/commonMain/kotlin/org/mifospay/core/data/util/AutoPayValidator.kt b/core/data/src/commonMain/kotlin/org/mifospay/core/data/util/AutoPayValidator.kt new file mode 100644 index 000000000..b9d01e8e0 --- /dev/null +++ b/core/data/src/commonMain/kotlin/org/mifospay/core/data/util/AutoPayValidator.kt @@ -0,0 +1,151 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.core.data.util + +import kotlinx.datetime.LocalDate +import kotlinx.datetime.LocalDateTime +import kotlinx.datetime.format.FormatStringsInDatetimeFormats +import kotlinx.datetime.format.byUnicodePattern +import org.mifospay.core.model.autopay.AutoPayPayload +import org.mifospay.core.model.autopay.AutoPayUpdatePayload + +@OptIn(FormatStringsInDatetimeFormats::class) +object AutoPayValidator { + + private val dateFormat = LocalDateTime.Format { + byUnicodePattern("dd MMMM yyyy") + } + + sealed class ValidationResult { + data object Valid : ValidationResult() + data class Invalid(val errorMessage: String) : ValidationResult() + } + + fun validateAutoPayPayload(payload: AutoPayPayload): ValidationResult { + return when { + payload.name.isBlank() -> ValidationResult.Invalid("Schedule name is required") + payload.name.length < 3 -> ValidationResult.Invalid("Schedule name must be at least 3 characters") + payload.name.length > 100 -> ValidationResult.Invalid("Schedule name must be less than 100 characters") + + payload.amount.isBlank() -> ValidationResult.Invalid("Amount is required") + !isValidAmount(payload.amount) -> ValidationResult.Invalid("Invalid amount format") + payload.amount.toDoubleOrNull()?.let { it <= 0 } == true -> ValidationResult.Invalid("Amount must be greater than 0") + + payload.currency.isBlank() -> ValidationResult.Invalid("Currency is required") + !isValidCurrency(payload.currency) -> ValidationResult.Invalid("Invalid currency code") + + payload.frequency.isBlank() -> ValidationResult.Invalid("Frequency is required") + !isValidFrequency(payload.frequency) -> ValidationResult.Invalid("Invalid frequency") + + payload.recipientName.isBlank() -> ValidationResult.Invalid("Recipient name is required") + payload.recipientName.length < 2 -> ValidationResult.Invalid("Recipient name must be at least 2 characters") + payload.recipientName.length > 100 -> ValidationResult.Invalid("Recipient name must be less than 100 characters") + + payload.recipientAccountNumber.isBlank() -> ValidationResult.Invalid("Recipient account number is required") + !isValidAccountNumber(payload.recipientAccountNumber) -> ValidationResult.Invalid("Invalid account number format") + + payload.sourceAccountId <= 0 -> ValidationResult.Invalid("Invalid source account") + payload.clientId <= 0 -> ValidationResult.Invalid("Invalid client ID") + + payload.validFrom.isNotBlank() && !isValidDate(payload.validFrom) -> ValidationResult.Invalid("Invalid start date format") + payload.validTill.isNotBlank() && !isValidDate(payload.validTill) -> ValidationResult.Invalid("Invalid end date format") + + payload.validFrom.isNotBlank() && payload.validTill.isNotBlank() -> { + val startDate = parseDate(payload.validFrom) + val endDate = parseDate(payload.validTill) + if (startDate != null && endDate != null && startDate >= endDate) { + ValidationResult.Invalid("End date must be after start date") + } else { + ValidationResult.Valid + } + } + + else -> ValidationResult.Valid + } + } + + fun validateAutoPayUpdatePayload(payload: AutoPayUpdatePayload): ValidationResult { + return when { + payload.name?.let { it.isBlank() } == true -> ValidationResult.Invalid("Schedule name cannot be empty") + payload.name?.let { it.length < 3 } == true -> ValidationResult.Invalid("Schedule name must be at least 3 characters") + payload.name?.let { it.length > 100 } == true -> ValidationResult.Invalid("Schedule name must be less than 100 characters") + + payload.amount?.let { it.isBlank() } == true -> ValidationResult.Invalid("Amount cannot be empty") + payload.amount?.let { !isValidAmount(it) } == true -> ValidationResult.Invalid("Invalid amount format") + payload.amount?.toDoubleOrNull()?.let { it <= 0 } == true -> ValidationResult.Invalid("Amount must be greater than 0") + + payload.currency?.let { it.isBlank() } == true -> ValidationResult.Invalid("Currency cannot be empty") + payload.currency?.let { !isValidCurrency(it) } == true -> ValidationResult.Invalid("Invalid currency code") + + payload.frequency?.let { it.isBlank() } == true -> ValidationResult.Invalid("Frequency cannot be empty") + payload.frequency?.let { !isValidFrequency(it) } == true -> ValidationResult.Invalid("Invalid frequency") + + payload.recipientName?.let { it.isBlank() } == true -> ValidationResult.Invalid("Recipient name cannot be empty") + payload.recipientName?.let { it.length < 2 } == true -> ValidationResult.Invalid("Recipient name must be at least 2 characters") + payload.recipientName?.let { it.length > 100 } == true -> ValidationResult.Invalid("Recipient name must be less than 100 characters") + + payload.recipientAccountNumber?.let { it.isBlank() } == true -> ValidationResult.Invalid("Recipient account number cannot be empty") + payload.recipientAccountNumber?.let { !isValidAccountNumber(it) } == true -> ValidationResult.Invalid("Invalid account number format") + + payload.validFrom?.let { it.isNotBlank() && !isValidDate(it) } == true -> ValidationResult.Invalid("Invalid start date format") + payload.validTill?.let { it.isNotBlank() && !isValidDate(it) } == true -> ValidationResult.Invalid("Invalid end date format") + + payload.validFrom?.let { it.isNotBlank() } == true && payload.validTill?.let { it.isNotBlank() } == true -> { + val startDate = parseDate(payload.validFrom!!) + val endDate = parseDate(payload.validTill!!) + if (startDate != null && endDate != null && startDate >= endDate) { + ValidationResult.Invalid("End date must be after start date") + } else { + ValidationResult.Valid + } + } + + else -> ValidationResult.Valid + } + } + + private fun isValidAmount(amount: String): Boolean { + return try { + amount.toDoubleOrNull() != null && amount.toDouble() > 0 + } catch (e: NumberFormatException) { + false + } + } + + private fun isValidCurrency(currency: String): Boolean { + return currency.length == 3 && currency.all { it.isLetter() } + } + + private fun isValidFrequency(frequency: String): Boolean { + val validFrequencies = listOf("DAILY", "WEEKLY", "MONTHLY", "QUARTERLY", "YEARLY") + return validFrequencies.contains(frequency.uppercase()) + } + + private fun isValidAccountNumber(accountNumber: String): Boolean { + return accountNumber.length >= 8 && accountNumber.length <= 20 && accountNumber.all { it.isLetterOrDigit() } + } + + private fun isValidDate(date: String): Boolean { + return try { + dateFormat.parse(date) + true + } catch (e: Exception) { + false + } + } + + private fun parseDate(date: String): LocalDate? { + return try { + dateFormat.parse(date).date + } catch (e: Exception) { + null + } + } +} diff --git a/core/data/src/commonMain/kotlin/org/mifospay/core/data/util/BillValidator.kt b/core/data/src/commonMain/kotlin/org/mifospay/core/data/util/BillValidator.kt new file mode 100644 index 000000000..9cadf0410 --- /dev/null +++ b/core/data/src/commonMain/kotlin/org/mifospay/core/data/util/BillValidator.kt @@ -0,0 +1,83 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.core.data.util + +import kotlinx.datetime.Clock +import org.mifospay.core.model.autopay.BillFormData +import org.mifospay.core.model.autopay.BillValidationResult +import org.mifospay.core.model.autopay.RecurrencePattern + +object BillValidator { + + fun validateNameField(name: String): String? { + return when { + name.isBlank() -> "Bill name is required" + name.length < 3 -> "Bill name must be at least 3 characters" + name.length > 100 -> "Bill name must be less than 100 characters" + else -> null + } + } + + fun validateAmountField(amount: String): String? { + return when { + amount.isBlank() -> "Amount is required" + !amount.matches(Regex("^\\d+(\\.\\d{1,2})?$")) -> "Please enter a valid amount" + amount.toDoubleOrNull() == null -> "Please enter a valid number" + amount.toDoubleOrNull()!! <= 0 -> "Amount must be greater than 0" + amount.toDoubleOrNull()!! > 999999.99 -> "Amount cannot exceed 999,999.99" + else -> null + } + } + + fun validateDueDateField(dueDate: Long): String? { + return when { + dueDate == 0L -> "Due date is required" + dueDate < Clock.System.now().toEpochMilliseconds() -> "Due date cannot be in the past" + else -> null + } + } + + fun validateRecurrencePatternField(recurrencePattern: RecurrencePattern): String? { + return when { + recurrencePattern == RecurrencePattern.NONE -> null + else -> null + } + } + + fun validateBillerField(billerId: String?, billerName: String?): String? { + return when { + billerId.isNullOrBlank() || billerName.isNullOrBlank() -> "Please select a biller" + else -> null + } + } + + fun validateBillForm(formData: BillFormData): BillValidationResult { + val nameError = validateNameField(formData.name) + val amountError = validateAmountField(formData.amount) + val dueDateError = validateDueDateField(formData.dueDate) + val recurrencePatternError = validateRecurrencePatternField(formData.recurrencePattern) + val billerError = validateBillerField(formData.billerId, formData.billerName) + + val isValid = nameError == null && + amountError == null && + dueDateError == null && + recurrencePatternError == null && + billerError == null + + return BillValidationResult( + isValid = isValid, + nameError = nameError, + amountError = amountError, + dueDateError = dueDateError, + recurrencePatternError = recurrencePatternError, + billerError = billerError, + ) + } +} diff --git a/core/data/src/commonMain/kotlin/org/mifospay/core/data/util/BillerValidator.kt b/core/data/src/commonMain/kotlin/org/mifospay/core/data/util/BillerValidator.kt new file mode 100644 index 000000000..1a2d3327b --- /dev/null +++ b/core/data/src/commonMain/kotlin/org/mifospay/core/data/util/BillerValidator.kt @@ -0,0 +1,209 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.core.data.util + +import co.touchlab.kermit.Logger +import org.mifospay.core.model.autopay.BillerFormData +import org.mifospay.core.model.autopay.BillerValidationResult + +/** + * Validator for biller form data with comprehensive validation rules. + * + * Provides validation for all biller fields including: + * - Name validation (required, length, format) + * - Account number validation (required, format, length) + * - Contact number validation (required, format, length) + * - Email validation (optional, format) + * - Category validation (required) + * - Address validation (optional, length) + */ +object BillerValidator { + + private val logger = Logger.withTag("BILLER_VALIDATOR") + + // Validation constants + private const val MIN_NAME_LENGTH = 2 + private const val MAX_NAME_LENGTH = 100 + private const val MIN_ACCOUNT_NUMBER_LENGTH = 8 + private const val MAX_ACCOUNT_NUMBER_LENGTH = 20 + private const val MIN_CONTACT_NUMBER_LENGTH = 10 + private const val MAX_CONTACT_NUMBER_LENGTH = 15 + private const val MAX_EMAIL_LENGTH = 254 + private const val MAX_ADDRESS_LENGTH = 500 + + // Regex patterns + private val NAME_PATTERN = Regex("^[a-zA-Z0-9\\s\\-_.]+$") + private val ACCOUNT_NUMBER_PATTERN = Regex("^[0-9]+$") + private val CONTACT_NUMBER_PATTERN = Regex("^[+]?[0-9\\s\\-()]+$") + private val EMAIL_PATTERN = Regex("^[A-Za-z0-9+_.-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}$") + + /** + * Validates the complete biller form data and returns validation result. + * + * @param formData The biller form data to validate + * @return BillerValidationResult containing validation status and error messages + */ + fun validateBillerForm(formData: BillerFormData): BillerValidationResult { + logger.d("BILLER_VALIDATOR Starting validation for biller: ${formData.name}") + + val nameError = validateName(formData.name) + val accountNumberError = validateAccountNumber(formData.accountNumber) + val contactNumberError = validateContactNumber(formData.contactNumber) + val emailError = validateEmail(formData.email) + val categoryError = validateCategory(formData.category) + val addressError = validateAddress(formData.address) + + val isValid = nameError == null && + accountNumberError == null && + contactNumberError == null && + emailError == null && + categoryError == null && + addressError == null + + val validationResult = BillerValidationResult( + isValid = isValid, + nameError = nameError, + accountNumberError = accountNumberError, + contactNumberError = contactNumberError, + emailError = emailError, + categoryError = categoryError, + ) + + logger.d("BILLER_VALIDATOR Validation completed. Valid: $isValid") + return validationResult + } + + /** + * Validates biller name with length and format requirements. + * + * @param name The biller name to validate + * @return Error message if invalid, null if valid + */ + private fun validateName(name: String): String? { + return when { + name.isBlank() -> "Biller name is required" + name.length < MIN_NAME_LENGTH -> "Biller name must be at least $MIN_NAME_LENGTH characters" + name.length > MAX_NAME_LENGTH -> "Biller name must be less than $MAX_NAME_LENGTH characters" + !NAME_PATTERN.matches(name.trim()) -> "Biller name contains invalid characters" + name.trim().isEmpty() -> "Biller name cannot be only whitespace" + else -> null + } + } + + /** + * Validates account number with format and length requirements. + * + * @param accountNumber The account number to validate + * @return Error message if invalid, null if valid + */ + private fun validateAccountNumber(accountNumber: String): String? { + return when { + accountNumber.isBlank() -> "Account number is required" + accountNumber.length < MIN_ACCOUNT_NUMBER_LENGTH -> "Account number must be at least $MIN_ACCOUNT_NUMBER_LENGTH digits" + accountNumber.length > MAX_ACCOUNT_NUMBER_LENGTH -> "Account number must be less than $MAX_ACCOUNT_NUMBER_LENGTH digits" + !ACCOUNT_NUMBER_PATTERN.matches(accountNumber.trim()) -> "Account number must contain only digits" + accountNumber.trim().isEmpty() -> "Account number cannot be only whitespace" + else -> null + } + } + + /** + * Validates contact number with format and length requirements. + * + * @param contactNumber The contact number to validate + * @return Error message if invalid, null if valid + */ + private fun validateContactNumber(contactNumber: String): String? { + return when { + contactNumber.isBlank() -> "Contact number is required" + contactNumber.length < MIN_CONTACT_NUMBER_LENGTH -> "Contact number must be at least $MIN_CONTACT_NUMBER_LENGTH digits" + contactNumber.length > MAX_CONTACT_NUMBER_LENGTH -> "Contact number must be less than $MAX_CONTACT_NUMBER_LENGTH digits" + !CONTACT_NUMBER_PATTERN.matches(contactNumber.trim()) -> "Contact number contains invalid characters" + contactNumber.trim().isEmpty() -> "Contact number cannot be only whitespace" + else -> null + } + } + + /** + * Validates email address format (optional field). + * + * @param email The email address to validate + * @return Error message if invalid, null if valid + */ + private fun validateEmail(email: String): String? { + return when { + email.isBlank() -> null // Email is optional + email.length > MAX_EMAIL_LENGTH -> "Email address is too long (max $MAX_EMAIL_LENGTH characters)" + !EMAIL_PATTERN.matches(email.trim()) -> "Please enter a valid email address" + email.trim().isEmpty() -> "Email cannot be only whitespace" + else -> null + } + } + + /** + * Validates that a category has been selected. + * + * @param category The selected category to validate + * @return Error message if invalid, null if valid + */ + private fun validateCategory(category: org.mifospay.core.model.autopay.BillerCategory?): String? { + return when { + category == null -> "Please select a biller category" + else -> null + } + } + + /** + * Validates address length (optional field). + * + * @param address The address to validate + * @return Error message if invalid, null if valid + */ + private fun validateAddress(address: String): String? { + return when { + address.isBlank() -> null // Address is optional + address.length > MAX_ADDRESS_LENGTH -> "Address is too long (max $MAX_ADDRESS_LENGTH characters)" + address.trim().isEmpty() -> "Address cannot be only whitespace" + else -> null + } + } + + /** + * Validates individual name field for real-time validation. + * + * @param name The name to validate + * @return Error message if invalid, null if valid + */ + fun validateNameField(name: String): String? = validateName(name) + + /** + * Validates individual account number field for real-time validation. + * + * @param accountNumber The account number to validate + * @return Error message if invalid, null if valid + */ + fun validateAccountNumberField(accountNumber: String): String? = validateAccountNumber(accountNumber) + + /** + * Validates individual contact number field for real-time validation. + * + * @param contactNumber The contact number to validate + * @return Error message if invalid, null if valid + */ + fun validateContactNumberField(contactNumber: String): String? = validateContactNumber(contactNumber) + + /** + * Validates individual email field for real-time validation. + * + * @param email The email to validate + * @return Error message if invalid, null if valid + */ + fun validateEmailField(email: String): String? = validateEmail(email) +} diff --git a/core/data/src/commonMain/kotlin/org/mifospay/core/data/util/StandardUpiQrCodeProcessor.kt b/core/data/src/commonMain/kotlin/org/mifospay/core/data/util/StandardUpiQrCodeProcessor.kt new file mode 100644 index 000000000..545f7b574 --- /dev/null +++ b/core/data/src/commonMain/kotlin/org/mifospay/core/data/util/StandardUpiQrCodeProcessor.kt @@ -0,0 +1,102 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.core.data.util + +import org.mifospay.core.model.utils.PaymentQrData +import org.mifospay.core.model.utils.StandardUpiQrData + +/** + * Standard UPI QR Code Processor + * Handles parsing of standard UPI QR codes according to UPI specification + */ +object StandardUpiQrCodeProcessor { + + /** + * Checks if the given string is a valid UPI QR code + * @param qrData The QR code data string + * @return true if it's a valid UPI QR code, false otherwise + */ + fun isValidUpiQrCode(qrData: String): Boolean { + return qrData.startsWith("upi://") || qrData.startsWith("UPI://") + } + + /** + * Parses a standard UPI QR code string + * @param qrData The QR code data string + * @return StandardUpiQrData object with parsed information + * @throws IllegalArgumentException if the QR code is invalid + */ + fun parseUpiQrCode(qrData: String): StandardUpiQrData { + if (!isValidUpiQrCode(qrData)) { + throw IllegalArgumentException("Invalid UPI QR code format") + } + + val paramsString = qrData.substringAfter("upi://").substringAfter("UPI://") + val parts = paramsString.split("?", limit = 2) + val params = if (parts.size > 1) parseParams(parts[1]) else emptyMap() + + val payeeVpa = params["pa"] ?: run { + throw IllegalArgumentException("Missing payee VPA (pa) in UPI QR code") + } + val payeeName = params["pn"] ?: "Unknown" + + val vpaParts = payeeVpa.split("@", limit = 2) + val actualVpa = if (vpaParts.size == 2) payeeVpa else payeeVpa + + return StandardUpiQrData( + payeeName = payeeName, + payeeVpa = actualVpa, + amount = params["am"] ?: "", + currency = params["cu"] ?: StandardUpiQrData.DEFAULT_CURRENCY, + transactionNote = params["tn"] ?: "", + merchantCode = params["mc"] ?: "", + transactionReference = params["tr"] ?: "", + url = params["url"] ?: "", + mode = params["mode"] ?: "02", + ) + } + + /** + * Parses URL parameters into a map + * @param paramsString The parameters string + * @return Map of parameter keys and values + */ + private fun parseParams(paramsString: String): Map { + return paramsString + .split("&") + .associate { param -> + val keyValue = param.split("=", limit = 2) + if (keyValue.size == 2) { + keyValue[0] to keyValue[1] + } else { + param to "" + } + } + } + + /** + * Converts StandardUpiQrData to PaymentQrData for compatibility with existing code + * @param standardData Standard UPI QR data + * @return PaymentQrData object + * Note: clientId and accountId not available in standard UPI + */ + fun toPaymentQrData(standardData: StandardUpiQrData): PaymentQrData { + return PaymentQrData( + clientId = 0, + clientName = standardData.payeeName, + accountNo = standardData.payeeVpa, + amount = standardData.amount, + accountId = 0, + currency = standardData.currency, + officeId = 1, + accountTypeId = 2, + ) + } +} diff --git a/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/AutoPayPreferencesDataSource.kt b/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/AutoPayPreferencesDataSource.kt new file mode 100644 index 000000000..d550535ca --- /dev/null +++ b/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/AutoPayPreferencesDataSource.kt @@ -0,0 +1,171 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +@file:OptIn(ExperimentalSerializationApi::class, ExperimentalSettingsApi::class) + +package org.mifospay.core.datastore + +import com.russhwolf.settings.ExperimentalSettingsApi +import com.russhwolf.settings.Settings +import com.russhwolf.settings.serialization.decodeValue +import com.russhwolf.settings.serialization.encodeValue +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.withContext +import kotlinx.datetime.Clock +import kotlinx.serialization.ExperimentalSerializationApi +import kotlinx.serialization.builtins.ListSerializer +import org.mifospay.core.model.autopay.AutoPay +import org.mifospay.core.model.autopay.AutoPayHistory +import org.mifospay.core.model.autopay.UpcomingPayment + +private const val IS_AUTO_PAY_ENABLED_KEY = "is_autopay_enabled" +private const val CACHED_AUTO_PAY_SCHEDULES_KEY = "cached_autopay_schedules" +private const val CACHED_UPCOMING_PAYMENTS_KEY = "cached_upcoming_payments" +private const val CACHED_AUTO_PAY_HISTORY_KEY = "cached_autopay_history" +private const val LAST_SYNC_TIMESTAMP_KEY = "last_sync_timestamp" + +@OptIn(ExperimentalSerializationApi::class) +class AutoPayPreferencesDataSource( + private val settings: Settings, + private val dispatcher: CoroutineDispatcher, +) { + + private val _isAutoPayEnabled = MutableStateFlow( + settings.getBoolean(IS_AUTO_PAY_ENABLED_KEY, false), + ) + + private val _cachedAutoPaySchedules = MutableStateFlow( + settings.decodeValue( + key = CACHED_AUTO_PAY_SCHEDULES_KEY, + serializer = ListSerializer(AutoPay.serializer()), + defaultValue = emptyList(), + ), + ) + + private val _cachedUpcomingPayments = MutableStateFlow( + settings.decodeValue( + key = CACHED_UPCOMING_PAYMENTS_KEY, + serializer = ListSerializer(UpcomingPayment.serializer()), + defaultValue = emptyList(), + ), + ) + + private val _cachedAutoPayHistory = MutableStateFlow( + settings.decodeValue( + key = CACHED_AUTO_PAY_HISTORY_KEY, + serializer = ListSerializer(AutoPayHistory.serializer()), + defaultValue = emptyList(), + ), + ) + + private val _lastSyncTimestamp = MutableStateFlow( + settings.getLong(LAST_SYNC_TIMESTAMP_KEY, 0L), + ) + + val isAutoPayEnabled: StateFlow = _isAutoPayEnabled + val cachedAutoPaySchedules: Flow> = _cachedAutoPaySchedules + val cachedUpcomingPayments: Flow> = _cachedUpcomingPayments + val cachedAutoPayHistory: Flow> = _cachedAutoPayHistory + val lastSyncTimestamp: StateFlow = _lastSyncTimestamp + + suspend fun updateAutoPayEnabled(enabled: Boolean) { + withContext(dispatcher) { + settings.putBoolean(IS_AUTO_PAY_ENABLED_KEY, enabled) + _isAutoPayEnabled.value = enabled + } + } + + suspend fun cacheAutoPaySchedules(schedules: List) { + withContext(dispatcher) { + settings.putAutoPaySchedules(schedules) + _cachedAutoPaySchedules.value = schedules + } + } + + suspend fun cacheUpcomingPayments(payments: List) { + withContext(dispatcher) { + settings.putUpcomingPayments(payments) + _cachedUpcomingPayments.value = payments + } + } + + suspend fun cacheAutoPayHistory(history: List) { + withContext(dispatcher) { + settings.putAutoPayHistory(history) + _cachedAutoPayHistory.value = history + } + } + + suspend fun updateLastSyncTimestamp(timestamp: Long) { + withContext(dispatcher) { + settings.putLong(LAST_SYNC_TIMESTAMP_KEY, timestamp) + _lastSyncTimestamp.value = timestamp + } + } + + suspend fun updateLastSyncTimestamp() { + withContext(dispatcher) { + val timestamp = Clock.System.now().toEpochMilliseconds() + settings.putLong(LAST_SYNC_TIMESTAMP_KEY, timestamp) + _lastSyncTimestamp.value = timestamp + } + } + + suspend fun clearCache() { + withContext(dispatcher) { + settings.remove(CACHED_AUTO_PAY_SCHEDULES_KEY) + settings.remove(CACHED_UPCOMING_PAYMENTS_KEY) + settings.remove(CACHED_AUTO_PAY_HISTORY_KEY) + settings.remove(LAST_SYNC_TIMESTAMP_KEY) + + _cachedAutoPaySchedules.value = emptyList() + _cachedUpcomingPayments.value = emptyList() + _cachedAutoPayHistory.value = emptyList() + _lastSyncTimestamp.value = 0L + } + } + + suspend fun getCachedAutoPaySchedule(autoPayId: Long): AutoPay? { + return _cachedAutoPaySchedules.value.find { autoPay -> autoPay.id == autoPayId } + } + + suspend fun isCacheStale(maxAgeMinutes: Long): Boolean { + val lastSync = _lastSyncTimestamp.value + val currentTime = Clock.System.now().toEpochMilliseconds() + val maxAgeMillis = maxAgeMinutes * 60 * 1000 + return (currentTime - lastSync) > maxAgeMillis + } +} + +private fun Settings.putAutoPaySchedules(schedules: List) { + encodeValue( + key = CACHED_AUTO_PAY_SCHEDULES_KEY, + serializer = ListSerializer(AutoPay.serializer()), + value = schedules, + ) +} + +private fun Settings.putUpcomingPayments(payments: List) { + encodeValue( + key = CACHED_UPCOMING_PAYMENTS_KEY, + serializer = ListSerializer(UpcomingPayment.serializer()), + value = payments, + ) +} + +private fun Settings.putAutoPayHistory(history: List) { + encodeValue( + key = CACHED_AUTO_PAY_HISTORY_KEY, + serializer = ListSerializer(AutoPayHistory.serializer()), + value = history, + ) +} diff --git a/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/AutoPayPreferencesRepository.kt b/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/AutoPayPreferencesRepository.kt new file mode 100644 index 000000000..40d3f6c73 --- /dev/null +++ b/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/AutoPayPreferencesRepository.kt @@ -0,0 +1,84 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.core.datastore + +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.StateFlow +import org.mifospay.core.common.DataState +import org.mifospay.core.model.autopay.AutoPay +import org.mifospay.core.model.autopay.AutoPayHistory +import org.mifospay.core.model.autopay.UpcomingPayment + +interface AutoPayPreferencesRepository { + /** + * AutoPay enabled state + */ + val isAutoPayEnabled: StateFlow + + /** + * Cached AutoPay schedules + */ + val cachedAutoPaySchedules: Flow> + + /** + * Cached upcoming payments + */ + val cachedUpcomingPayments: Flow> + + /** + * Cached AutoPay history + */ + val cachedAutoPayHistory: Flow> + + /** + * Last sync timestamp + */ + val lastSyncTimestamp: StateFlow + + /** + * Update AutoPay enabled state + */ + suspend fun updateAutoPayEnabled(enabled: Boolean): DataState + + /** + * Cache AutoPay schedules + */ + suspend fun cacheAutoPaySchedules(schedules: List): DataState + + /** + * Cache upcoming payments + */ + suspend fun cacheUpcomingPayments(payments: List): DataState + + /** + * Cache AutoPay history + */ + suspend fun cacheAutoPayHistory(history: List): DataState + + /** + * Update last sync timestamp + */ + suspend fun updateLastSyncTimestamp(timestamp: Long): DataState + + /** + * Clear all cached data + */ + suspend fun clearCache(): DataState + + /** + * Get cached AutoPay schedule by ID + */ + suspend fun getCachedAutoPaySchedule(autoPayId: Long): AutoPay? + + /** + * Check if cache is stale (older than specified time) + */ + suspend fun isCacheStale(maxAgeMinutes: Long = 30): Boolean +} diff --git a/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/AutoPayPreferencesRepositoryImpl.kt b/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/AutoPayPreferencesRepositoryImpl.kt new file mode 100644 index 000000000..63562dac3 --- /dev/null +++ b/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/AutoPayPreferencesRepositoryImpl.kt @@ -0,0 +1,109 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.core.datastore + +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.flowOn +import org.mifospay.core.common.DataState +import org.mifospay.core.model.autopay.AutoPay +import org.mifospay.core.model.autopay.AutoPayHistory +import org.mifospay.core.model.autopay.UpcomingPayment + +class AutoPayPreferencesRepositoryImpl( + private val autoPayPreferencesDataSource: AutoPayPreferencesDataSource, + private val ioDispatcher: CoroutineDispatcher, + unconfinedDispatcher: CoroutineDispatcher, +) : AutoPayPreferencesRepository { + private val unconfinedScope = CoroutineScope(unconfinedDispatcher) + + override val isAutoPayEnabled: StateFlow = autoPayPreferencesDataSource.isAutoPayEnabled + + override val cachedAutoPaySchedules: Flow> = autoPayPreferencesDataSource.cachedAutoPaySchedules.flowOn(ioDispatcher) + + override val cachedUpcomingPayments: Flow> = autoPayPreferencesDataSource.cachedUpcomingPayments.flowOn(ioDispatcher) + + override val cachedAutoPayHistory: Flow> = autoPayPreferencesDataSource.cachedAutoPayHistory.flowOn(ioDispatcher) + + override val lastSyncTimestamp: StateFlow = autoPayPreferencesDataSource.lastSyncTimestamp + + override suspend fun updateAutoPayEnabled(enabled: Boolean): DataState { + return try { + autoPayPreferencesDataSource.updateAutoPayEnabled(enabled) + DataState.Success(Unit) + } catch (e: Exception) { + DataState.Error(e, null) + } + } + + override suspend fun cacheAutoPaySchedules(schedules: List): DataState { + return try { + autoPayPreferencesDataSource.cacheAutoPaySchedules(schedules) + DataState.Success(Unit) + } catch (e: Exception) { + DataState.Error(e, null) + } + } + + override suspend fun cacheUpcomingPayments(payments: List): DataState { + return try { + autoPayPreferencesDataSource.cacheUpcomingPayments(payments) + DataState.Success(Unit) + } catch (e: Exception) { + DataState.Error(e, null) + } + } + + override suspend fun cacheAutoPayHistory(history: List): DataState { + return try { + autoPayPreferencesDataSource.cacheAutoPayHistory(history) + DataState.Success(Unit) + } catch (e: Exception) { + DataState.Error(e, null) + } + } + + override suspend fun updateLastSyncTimestamp(timestamp: Long): DataState { + return try { + autoPayPreferencesDataSource.updateLastSyncTimestamp(timestamp) + DataState.Success(Unit) + } catch (e: Exception) { + DataState.Error(e, null) + } + } + + suspend fun updateLastSyncTimestamp(): DataState { + return try { + autoPayPreferencesDataSource.updateLastSyncTimestamp() + DataState.Success(Unit) + } catch (e: Exception) { + DataState.Error(e, null) + } + } + + override suspend fun clearCache(): DataState { + return try { + autoPayPreferencesDataSource.clearCache() + DataState.Success(Unit) + } catch (e: Exception) { + DataState.Error(e, null) + } + } + + override suspend fun getCachedAutoPaySchedule(autoPayId: Long): AutoPay? { + return autoPayPreferencesDataSource.getCachedAutoPaySchedule(autoPayId) + } + + override suspend fun isCacheStale(maxAgeMinutes: Long): Boolean { + return autoPayPreferencesDataSource.isCacheStale(maxAgeMinutes) + } +} diff --git a/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/BillDataSource.kt b/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/BillDataSource.kt new file mode 100644 index 000000000..fb48bf5ab --- /dev/null +++ b/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/BillDataSource.kt @@ -0,0 +1,83 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +@file:OptIn(ExperimentalSerializationApi::class, ExperimentalSettingsApi::class) + +package org.mifospay.core.datastore + +import com.russhwolf.settings.ExperimentalSettingsApi +import com.russhwolf.settings.Settings +import com.russhwolf.settings.serialization.decodeValue +import com.russhwolf.settings.serialization.encodeValue +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.withContext +import kotlinx.serialization.ExperimentalSerializationApi +import kotlinx.serialization.builtins.ListSerializer +import org.mifospay.core.model.autopay.Bill + +private const val BILLS_KEY = "bills" + +class BillDataSource( + private val settings: Settings, + private val dispatcher: CoroutineDispatcher, +) { + private val _bills = MutableStateFlow( + settings.decodeValue( + key = BILLS_KEY, + serializer = ListSerializer(Bill.serializer()), + defaultValue = emptyList(), + ), + ) + + val bills: Flow> = _bills + + suspend fun updateBills(bills: List) { + withContext(dispatcher) { + settings.putBills(bills) + _bills.value = bills + } + } + + suspend fun addBill(bill: Bill) { + withContext(dispatcher) { + val currentBills = _bills.value.toMutableList() + if (!currentBills.any { it.id == bill.id }) { + currentBills.add(bill) + settings.putBills(currentBills) + _bills.value = currentBills + } + } + } + + suspend fun removeBill(billId: String) { + withContext(dispatcher) { + val currentBills = _bills.value.toMutableList() + currentBills.removeAll { it.id == billId } + settings.putBills(currentBills) + _bills.value = currentBills + } + } + + suspend fun clearBills() { + withContext(dispatcher) { + settings.remove(BILLS_KEY) + _bills.value = emptyList() + } + } +} + +private fun Settings.putBills(bills: List) { + encodeValue( + key = BILLS_KEY, + serializer = ListSerializer(Bill.serializer()), + value = bills, + ) +} diff --git a/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/BillRepository.kt b/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/BillRepository.kt new file mode 100644 index 000000000..94a3a31c9 --- /dev/null +++ b/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/BillRepository.kt @@ -0,0 +1,51 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.core.datastore + +import kotlinx.coroutines.flow.Flow +import org.mifospay.core.common.DataState +import org.mifospay.core.model.autopay.Bill + +interface BillRepository { + /** + * Get all saved bills + */ + fun getAllBills(): Flow> + + /** + * Get bill by ID + */ + suspend fun getBillById(id: String): Bill? + + /** + * Save a new bill + */ + suspend fun saveBill(bill: Bill): DataState + + /** + * Update an existing bill + */ + suspend fun updateBill(bill: Bill): DataState + + /** + * Delete a bill + */ + suspend fun deleteBill(id: String): DataState + + /** + * Search bills by name + */ + suspend fun searchBillsByName(query: String): List + + /** + * Clear all bills + */ + suspend fun clearAllBills(): DataState +} diff --git a/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/BillRepositoryImpl.kt b/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/BillRepositoryImpl.kt new file mode 100644 index 000000000..d45d3b111 --- /dev/null +++ b/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/BillRepositoryImpl.kt @@ -0,0 +1,103 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.core.datastore + +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.first +import org.mifospay.core.common.DataState +import org.mifospay.core.model.autopay.Bill + +/** + * TODO: This implementation currently uses local storage (Multiplatform Settings) for bill data. + * When the backend APIs for bill management are clarified and implemented, this should be + * refactored to use network-based repository pattern similar to other repositories in the codebase + * (e.g., UserRepositoryImpl, BeneficiaryRepositoryImpl) with proper API integration. + */ +class BillRepositoryImpl( + private val billDataSource: BillDataSource, +) : BillRepository { + + override fun getAllBills(): Flow> { + return billDataSource.bills + } + + override suspend fun getBillById(id: String): Bill? { + return try { + val bills = billDataSource.bills.first() + bills.find { it.id == id } + } catch (e: Exception) { + null + } + } + + override suspend fun saveBill(bill: Bill): DataState { + return try { + val existingBills = billDataSource.bills.first() + + // Check if bill already exists + val existingBill = existingBills.find { + it.name == bill.name && it.billerId == bill.billerId + } + + if (existingBill != null) { + DataState.Error(Exception("Bill with this name and biller already exists")) + } else { + billDataSource.addBill(bill) + DataState.Success(bill) + } + } catch (e: Exception) { + DataState.Error(Exception("Failed to save bill: ${e.message}")) + } + } + + override suspend fun updateBill(bill: Bill): DataState { + return try { + val existingBills = billDataSource.bills.first().toMutableList() + val index = existingBills.indexOfFirst { it.id == bill.id } + + if (index != -1) { + existingBills[index] = bill + billDataSource.updateBills(existingBills) + DataState.Success(bill) + } else { + DataState.Error(Exception("Bill not found")) + } + } catch (e: Exception) { + DataState.Error(Exception("Failed to update bill: ${e.message}")) + } + } + + override suspend fun deleteBill(id: String): DataState { + return try { + billDataSource.removeBill(id) + DataState.Success(Unit) + } catch (e: Exception) { + DataState.Error(Exception("Failed to delete bill: ${e.message}")) + } + } + + override suspend fun searchBillsByName(query: String): List { + return try { + val bills = billDataSource.bills.first() + bills.filter { it.name.contains(query, ignoreCase = true) } + } catch (e: Exception) { + emptyList() + } + } + + override suspend fun clearAllBills(): DataState { + return try { + billDataSource.clearBills() + DataState.Success(Unit) + } catch (e: Exception) { + DataState.Error(Exception("Failed to clear bills: ${e.message}")) + } + } +} diff --git a/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/BillerDataSource.kt b/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/BillerDataSource.kt new file mode 100644 index 000000000..043f49ebf --- /dev/null +++ b/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/BillerDataSource.kt @@ -0,0 +1,83 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +@file:OptIn(ExperimentalSerializationApi::class, ExperimentalSettingsApi::class) + +package org.mifospay.core.datastore + +import com.russhwolf.settings.ExperimentalSettingsApi +import com.russhwolf.settings.Settings +import com.russhwolf.settings.serialization.decodeValue +import com.russhwolf.settings.serialization.encodeValue +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.withContext +import kotlinx.serialization.ExperimentalSerializationApi +import kotlinx.serialization.builtins.ListSerializer +import org.mifospay.core.model.autopay.Biller + +private const val BILLERS_KEY = "billers" + +class BillerDataSource( + private val settings: Settings, + private val dispatcher: CoroutineDispatcher, +) { + private val _billers = MutableStateFlow( + settings.decodeValue( + key = BILLERS_KEY, + serializer = ListSerializer(Biller.serializer()), + defaultValue = emptyList(), + ), + ) + + val billers: Flow> = _billers + + suspend fun updateBillers(billers: List) { + withContext(dispatcher) { + settings.putBillers(billers) + _billers.value = billers + } + } + + suspend fun addBiller(biller: Biller) { + withContext(dispatcher) { + val currentBillers = _billers.value.toMutableList() + if (!currentBillers.any { it.id == biller.id }) { + currentBillers.add(biller) + settings.putBillers(currentBillers) + _billers.value = currentBillers + } + } + } + + suspend fun removeBiller(billerId: String) { + withContext(dispatcher) { + val currentBillers = _billers.value.toMutableList() + currentBillers.removeAll { it.id == billerId } + settings.putBillers(currentBillers) + _billers.value = currentBillers + } + } + + suspend fun clearBillers() { + withContext(dispatcher) { + settings.remove(BILLERS_KEY) + _billers.value = emptyList() + } + } +} + +private fun Settings.putBillers(billers: List) { + encodeValue( + key = BILLERS_KEY, + serializer = ListSerializer(Biller.serializer()), + value = billers, + ) +} diff --git a/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/BillerRepository.kt b/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/BillerRepository.kt new file mode 100644 index 000000000..31ee24aad --- /dev/null +++ b/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/BillerRepository.kt @@ -0,0 +1,62 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.core.datastore + +import kotlinx.coroutines.flow.Flow +import org.mifospay.core.common.DataState +import org.mifospay.core.model.autopay.Biller +import org.mifospay.core.model.autopay.BillerCategory + +interface BillerRepository { + /** + * Get all saved billers + */ + fun getAllBillers(): Flow> + + /** + * Get biller by ID + */ + suspend fun getBillerById(id: String): Biller? + + /** + * Save a new biller + */ + suspend fun saveBiller(biller: Biller): DataState + + /** + * Update an existing biller + */ + suspend fun updateBiller(biller: Biller): DataState + + /** + * Delete a biller + */ + suspend fun deleteBiller(id: String): DataState + + /** + * Get billers by category + */ + suspend fun getBillersByCategory(category: BillerCategory): List + + /** + * Search billers by name + */ + suspend fun searchBillersByName(query: String): List + + /** + * Check if biller exists by name and account number + */ + suspend fun isBillerExists(name: String, accountNumber: String): Boolean + + /** + * Clear all billers + */ + suspend fun clearAllBillers(): DataState +} diff --git a/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/BillerRepositoryImpl.kt b/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/BillerRepositoryImpl.kt new file mode 100644 index 000000000..82292a482 --- /dev/null +++ b/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/BillerRepositoryImpl.kt @@ -0,0 +1,122 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.core.datastore + +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.first +import org.mifospay.core.common.DataState +import org.mifospay.core.model.autopay.Biller +import org.mifospay.core.model.autopay.BillerCategory + +/** + * TODO: This implementation currently uses local storage (Multiplatform Settings) for biller data. + * When the backend APIs for biller management are clarified and implemented, this should be + * refactored to use network-based repository pattern similar to other repositories in the codebase + * (e.g., UserRepositoryImpl, BeneficiaryRepositoryImpl) with proper API integration. + */ +class BillerRepositoryImpl( + private val billerDataSource: BillerDataSource, +) : BillerRepository { + + override fun getAllBillers(): Flow> { + return billerDataSource.billers + } + + override suspend fun getBillerById(id: String): Biller? { + return try { + val billers = billerDataSource.billers.first() + billers.find { it.id == id } + } catch (e: Exception) { + null + } + } + + override suspend fun saveBiller(biller: Biller): DataState { + return try { + val existingBillers = billerDataSource.billers.first() + + // Check if biller already exists + val existingBiller = existingBillers.find { + it.name == biller.name && it.accountNumber == biller.accountNumber + } + + if (existingBiller != null) { + DataState.Error(Exception("Biller with this name and account number already exists")) + } else { + billerDataSource.addBiller(biller) + DataState.Success(biller) + } + } catch (e: Exception) { + DataState.Error(Exception("Failed to save biller: ${e.message}")) + } + } + + override suspend fun updateBiller(biller: Biller): DataState { + return try { + val existingBillers = billerDataSource.billers.first().toMutableList() + val index = existingBillers.indexOfFirst { it.id == biller.id } + + if (index != -1) { + existingBillers[index] = biller + billerDataSource.updateBillers(existingBillers) + DataState.Success(biller) + } else { + DataState.Error(Exception("Biller not found")) + } + } catch (e: Exception) { + DataState.Error(Exception("Failed to update biller: ${e.message}")) + } + } + + override suspend fun deleteBiller(id: String): DataState { + return try { + billerDataSource.removeBiller(id) + DataState.Success(Unit) + } catch (e: Exception) { + DataState.Error(Exception("Failed to delete biller: ${e.message}")) + } + } + + override suspend fun getBillersByCategory(category: BillerCategory): List { + return try { + val billers = billerDataSource.billers.first() + billers.filter { it.category == category } + } catch (e: Exception) { + emptyList() + } + } + + override suspend fun searchBillersByName(query: String): List { + return try { + val billers = billerDataSource.billers.first() + billers.filter { it.name.contains(query, ignoreCase = true) } + } catch (e: Exception) { + emptyList() + } + } + + override suspend fun isBillerExists(name: String, accountNumber: String): Boolean { + return try { + val billers = billerDataSource.billers.first() + billers.any { it.name == name && it.accountNumber == accountNumber } + } catch (e: Exception) { + false + } + } + + override suspend fun clearAllBillers(): DataState { + return try { + billerDataSource.clearBillers() + DataState.Success(Unit) + } catch (e: Exception) { + DataState.Error(Exception("Failed to clear billers: ${e.message}")) + } + } +} diff --git a/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/di/PreferenceModule.kt b/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/di/PreferenceModule.kt index e74bee4cf..220bde71e 100644 --- a/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/di/PreferenceModule.kt +++ b/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/di/PreferenceModule.kt @@ -13,6 +13,15 @@ import com.russhwolf.settings.Settings import org.koin.core.qualifier.named import org.koin.dsl.module import org.mifospay.core.common.MifosDispatchers +import org.mifospay.core.datastore.AutoPayPreferencesDataSource +import org.mifospay.core.datastore.AutoPayPreferencesRepository +import org.mifospay.core.datastore.AutoPayPreferencesRepositoryImpl +import org.mifospay.core.datastore.BillDataSource +import org.mifospay.core.datastore.BillRepository +import org.mifospay.core.datastore.BillRepositoryImpl +import org.mifospay.core.datastore.BillerDataSource +import org.mifospay.core.datastore.BillerRepository +import org.mifospay.core.datastore.BillerRepositoryImpl import org.mifospay.core.datastore.UserPreferencesDataSource import org.mifospay.core.datastore.UserPreferencesRepository import org.mifospay.core.datastore.UserPreferencesRepositoryImpl @@ -21,6 +30,9 @@ val PreferencesModule = module { factory { Settings() } // Use the IO dispatcher name - MifosDispatchers.IO.name factory { UserPreferencesDataSource(get(), get(named(MifosDispatchers.IO.name))) } + factory { AutoPayPreferencesDataSource(get(), get(named(MifosDispatchers.IO.name))) } + factory { BillerDataSource(get(), get(named(MifosDispatchers.IO.name))) } + factory { BillDataSource(get(), get(named(MifosDispatchers.IO.name))) } single { UserPreferencesRepositoryImpl( @@ -29,4 +41,24 @@ val PreferencesModule = module { unconfinedDispatcher = get(named(MifosDispatchers.Unconfined.name)), ) } + + single { + AutoPayPreferencesRepositoryImpl( + autoPayPreferencesDataSource = get(), + ioDispatcher = get(named(MifosDispatchers.IO.name)), + unconfinedDispatcher = get(named(MifosDispatchers.Unconfined.name)), + ) + } + + single { + BillerRepositoryImpl( + billerDataSource = get(), + ) + } + + single { + BillRepositoryImpl( + billDataSource = get(), + ) + } } diff --git a/core/designsystem/src/commonMain/kotlin/org/mifospay/core/designsystem/icon/MifosIcons.kt b/core/designsystem/src/commonMain/kotlin/org/mifospay/core/designsystem/icon/MifosIcons.kt index 5bca46905..041768751 100644 --- a/core/designsystem/src/commonMain/kotlin/org/mifospay/core/designsystem/icon/MifosIcons.kt +++ b/core/designsystem/src/commonMain/kotlin/org/mifospay/core/designsystem/icon/MifosIcons.kt @@ -11,6 +11,9 @@ package org.mifospay.core.designsystem.icon import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.automirrored.filled.ArrowForward +import androidx.compose.material.icons.automirrored.filled.List +import androidx.compose.material.icons.automirrored.filled.Rule import androidx.compose.material.icons.automirrored.outlined.ArrowBack import androidx.compose.material.icons.filled.ArrowOutward import androidx.compose.material.icons.filled.AttachMoney @@ -18,27 +21,39 @@ import androidx.compose.material.icons.filled.Badge import androidx.compose.material.icons.filled.CalendarMonth import androidx.compose.material.icons.filled.Camera import androidx.compose.material.icons.filled.Check +import androidx.compose.material.icons.filled.CheckCircle import androidx.compose.material.icons.filled.ChevronLeft import androidx.compose.material.icons.filled.ChevronRight import androidx.compose.material.icons.filled.Close import androidx.compose.material.icons.filled.ContentCopy +import androidx.compose.material.icons.filled.CreditCard +import androidx.compose.material.icons.filled.CurrencyRupee import androidx.compose.material.icons.filled.Delete import androidx.compose.material.icons.filled.Description import androidx.compose.material.icons.filled.Edit +import androidx.compose.material.icons.filled.Error import androidx.compose.material.icons.filled.FlashOff import androidx.compose.material.icons.filled.FlashOn +import androidx.compose.material.icons.filled.History import androidx.compose.material.icons.filled.Info import androidx.compose.material.icons.filled.KeyboardArrowDown +import androidx.compose.material.icons.filled.List import androidx.compose.material.icons.filled.Person +import androidx.compose.material.icons.filled.PersonAdd import androidx.compose.material.icons.filled.Photo import androidx.compose.material.icons.filled.PhotoLibrary +import androidx.compose.material.icons.filled.Power import androidx.compose.material.icons.filled.QrCode import androidx.compose.material.icons.filled.QrCode2 import androidx.compose.material.icons.filled.RadioButtonChecked import androidx.compose.material.icons.filled.RadioButtonUnchecked +import androidx.compose.material.icons.filled.Receipt +import androidx.compose.material.icons.filled.Schedule +import androidx.compose.material.icons.filled.Security import androidx.compose.material.icons.filled.Share import androidx.compose.material.icons.filled.Visibility import androidx.compose.material.icons.filled.VisibilityOff +import androidx.compose.material.icons.filled.Warning import androidx.compose.material.icons.outlined.AccountCircle import androidx.compose.material.icons.outlined.Cancel import androidx.compose.material.icons.outlined.DeleteOutline @@ -124,9 +139,27 @@ object MifosIcons { val CalenderMonth = Icons.Filled.CalendarMonth val OutlinedDoneAll = Icons.Outlined.DoneAll val Person = Icons.Filled.Person + val PersonAdd = Icons.Filled.PersonAdd val Badge = Icons.Filled.Badge val DataInfo = Icons.Filled.Description val Scan = Icons.Outlined.QrCodeScanner val RadioButtonUnchecked = Icons.Default.RadioButtonUnchecked val RadioButtonChecked = Icons.Filled.RadioButtonChecked + + val ArrowForward = Icons.AutoMirrored.Filled.ArrowForward + + val CurrencyRupee = Icons.Filled.CurrencyRupee + val History = Icons.Filled.History + val CheckCircle = Icons.Filled.CheckCircle + val Error = Icons.Filled.Error + + // AutoPay specific icons + val Warning = Icons.Filled.Warning + val Schedule = Icons.Filled.Schedule + val Security = Icons.Filled.Security + val Power = Icons.Filled.Power + val CreditCard = Icons.Filled.CreditCard + val Rule = Icons.AutoMirrored.Filled.Rule + val Receipt = Icons.Filled.Receipt + val List = Icons.AutoMirrored.Filled.List } diff --git a/core/model/src/commonMain/kotlin/org/mifospay/core/model/autopay/AutoPay.kt b/core/model/src/commonMain/kotlin/org/mifospay/core/model/autopay/AutoPay.kt new file mode 100644 index 000000000..a08c19367 --- /dev/null +++ b/core/model/src/commonMain/kotlin/org/mifospay/core/model/autopay/AutoPay.kt @@ -0,0 +1,113 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.core.model.autopay + +import kotlinx.serialization.Serializable +import org.mifospay.core.common.Parcelable +import org.mifospay.core.common.Parcelize + +// TODO: Align data models with final API response schema once confirmed by backend + +@Serializable +@Parcelize +data class AutoPay( + val id: Long? = null, + val name: String? = null, + val description: String? = null, + val amount: Double? = null, + val currency: String? = null, + val frequency: String? = null, + val frequencyInterval: Int? = null, + val nextPaymentDate: String? = null, + val status: AutoPayStatus? = null, + val recipientName: String? = null, + val recipientAccountNumber: String? = null, + val recipientBankCode: String? = null, + val sourceAccountId: Long? = null, + val sourceAccountNumber: String? = null, + val sourceAccountType: String? = null, + val clientId: Long? = null, + val createdDate: String? = null, + val lastModifiedDate: String? = null, + val validFrom: String? = null, + val validTill: String? = null, + val maxAmount: Double? = null, + val minAmount: Double? = null, + val paymentMethod: String? = null, + val isActive: Boolean? = null, +) : Parcelable + +@Serializable +@Parcelize +data class AutoPayTemplate( + val id: Long? = null, + val name: String? = null, + val description: String? = null, + val frequencyOptions: List? = emptyList(), + val paymentMethods: List? = emptyList(), + val currencyOptions: List? = emptyList(), + val accountTypes: List? = emptyList(), + val maxAmount: Double? = null, + val minAmount: Double? = null, +) : Parcelable + +@Serializable +@Parcelize +data class FrequencyOption( + val id: Long, + val code: String, + val value: String, + val description: String? = null, +) : Parcelable + +@Serializable +@Parcelize +data class PaymentMethod( + val id: Long, + val code: String, + val value: String, + val description: String? = null, +) : Parcelable + +@Serializable +@Parcelize +data class CurrencyOption( + val code: String, + val name: String, + val symbol: String? = null, +) : Parcelable + +@Serializable +@Parcelize +data class AccountType( + val id: Long, + val code: String, + val value: String, + val description: String? = null, +) : Parcelable + +@Serializable +enum class AutoPayStatus { + ACTIVE, + PAUSED, + CANCELLED, + COMPLETED, + FAILED, + PENDING, +} + +@Serializable +enum class PaymentStatus { + UPCOMING, + PROCESSING, + COMPLETED, + FAILED, + CANCELLED, +} diff --git a/core/model/src/commonMain/kotlin/org/mifospay/core/model/autopay/AutoPayPayload.kt b/core/model/src/commonMain/kotlin/org/mifospay/core/model/autopay/AutoPayPayload.kt new file mode 100644 index 000000000..402283f2e --- /dev/null +++ b/core/model/src/commonMain/kotlin/org/mifospay/core/model/autopay/AutoPayPayload.kt @@ -0,0 +1,94 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.core.model.autopay + +import kotlinx.serialization.Serializable +import org.mifospay.core.common.Parcelable +import org.mifospay.core.common.Parcelize + +// TODO: Align data models with final API response schema once confirmed by backend +@Serializable +@Parcelize +data class AutoPayPayload( + val name: String = "", + val description: String = "", + val amount: String = "", + val currency: String = "", + val frequency: String = "", + val frequencyInterval: String = "", + val recipientName: String = "", + val recipientAccountNumber: String = "", + val recipientBankCode: String = "", + val sourceAccountId: Long = 0, + val sourceAccountNumber: String = "", + val sourceAccountType: String = "", + val clientId: Long = 0, + val validFrom: String = "", + val validTill: String = "", + val maxAmount: String = "", + val minAmount: String = "", + val paymentMethod: String = "", + val locale: String = "en", + val dateFormat: String = "dd MMMM yyyy", +) : Parcelable + +@Serializable +@Parcelize +data class AutoPayUpdatePayload( + val name: String? = null, + val description: String? = null, + val amount: String? = null, + val currency: String? = null, + val frequency: String? = null, + val frequencyInterval: String? = null, + val recipientName: String? = null, + val recipientAccountNumber: String? = null, + val recipientBankCode: String? = null, + val validFrom: String? = null, + val validTill: String? = null, + val maxAmount: String? = null, + val minAmount: String? = null, + val paymentMethod: String? = null, + val status: String? = null, + val locale: String = "en", + val dateFormat: String = "dd MMMM yyyy", +) : Parcelable + +@Serializable +@Parcelize +data class AutoPayHistory( + val id: Long? = null, + val autoPayId: Long? = null, + val amount: Double? = null, + val currency: String? = null, + val status: PaymentStatus? = null, + val transactionDate: String? = null, + val recipientName: String? = null, + val recipientAccountNumber: String? = null, + val sourceAccountNumber: String? = null, + val referenceNumber: String? = null, + val failureReason: String? = null, + val createdDate: String? = null, +) : Parcelable + +@Serializable +@Parcelize +data class UpcomingPayment( + val id: String? = null, + val autoPayId: Long? = null, + val scheduleName: String? = null, + val amount: Double? = null, + val currency: String? = null, + val dueDate: String? = null, + val status: PaymentStatus? = null, + val recipientName: String? = null, + val recipientAccountNumber: String? = null, + val sourceAccountNumber: String? = null, +) : Parcelable diff --git a/core/model/src/commonMain/kotlin/org/mifospay/core/model/autopay/Bill.kt b/core/model/src/commonMain/kotlin/org/mifospay/core/model/autopay/Bill.kt new file mode 100644 index 000000000..46c16960d --- /dev/null +++ b/core/model/src/commonMain/kotlin/org/mifospay/core/model/autopay/Bill.kt @@ -0,0 +1,88 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.core.model.autopay + +import kotlinx.datetime.Clock +import kotlinx.serialization.Serializable +import org.mifospay.core.common.Parcelable +import org.mifospay.core.common.Parcelize + +@Serializable +@Parcelize +data class Bill( + val id: String? = null, + val name: String, + val amount: Double, + val currency: String = "USD", + val dueDate: Long, + val recurrencePattern: RecurrencePattern, + val billerId: String? = null, + val billerName: String? = null, + val description: String? = null, + val isActive: Boolean = true, + val status: BillStatus = BillStatus.ACTIVE, + val createdAt: Long = Clock.System.now().toEpochMilliseconds(), + val updatedAt: Long = Clock.System.now().toEpochMilliseconds(), +) : Parcelable + +@Serializable +enum class RecurrencePattern(val displayName: String, val interval: Int) { + NONE("No Recurrence", 0), + WEEKLY("Weekly", 7), + BIWEEKLY("Bi-weekly", 14), + MONTHLY("Monthly", 30), + QUARTERLY("Quarterly", 90), + SEMI_ANNUALLY("Semi-annually", 180), + ANNUALLY("Annually", 365), + ; + + companion object { + fun fromDisplayName(displayName: String): RecurrencePattern? { + return entries.find { it.displayName == displayName } + } + } +} + +@Serializable +enum class BillStatus { + ACTIVE, + PAUSED, + CANCELLED, + COMPLETED, +} + +@Serializable +data class BillFormData( + val name: String = "", + val amount: String = "", + val currency: String = "USD", + val dueDate: Long = 0L, + val recurrencePattern: RecurrencePattern = RecurrencePattern.NONE, + val billerId: String? = null, + val billerName: String? = null, + val description: String = "", +) + +@Serializable +data class BillValidationResult( + val isValid: Boolean, + val nameError: String? = null, + val amountError: String? = null, + val dueDateError: String? = null, + val recurrencePatternError: String? = null, + val billerError: String? = null, +) + +@Serializable +data class NextPaymentDate( + val date: Long, + val formattedDate: String, + val isOverdue: Boolean = false, +) diff --git a/core/model/src/commonMain/kotlin/org/mifospay/core/model/autopay/Biller.kt b/core/model/src/commonMain/kotlin/org/mifospay/core/model/autopay/Biller.kt new file mode 100644 index 000000000..f0de1ce05 --- /dev/null +++ b/core/model/src/commonMain/kotlin/org/mifospay/core/model/autopay/Biller.kt @@ -0,0 +1,70 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.core.model.autopay + +import kotlinx.datetime.Clock +import kotlinx.serialization.Serializable +import org.mifospay.core.common.Parcelable +import org.mifospay.core.common.Parcelize + +@Serializable +@Parcelize +data class Biller( + val id: String? = null, + val name: String, + val accountNumber: String, + val contactNumber: String, + val email: String? = null, + val category: BillerCategory, + val address: String? = null, + val isActive: Boolean = true, + val createdAt: Long = Clock.System.now().toEpochMilliseconds(), + val updatedAt: Long = Clock.System.now().toEpochMilliseconds(), +) : Parcelable + +@Serializable +enum class BillerCategory(val displayName: String) { + UTILITIES("Utilities"), + INSURANCE("Insurance"), + TELECOM("Telecommunications"), + INTERNET("Internet & Cable"), + LOAN("Loan Payments"), + CREDIT_CARD("Credit Card"), + RENT("Rent"), + SUBSCRIPTION("Subscriptions"), + OTHER("Other"), + ; + + companion object { + fun fromDisplayName(displayName: String): BillerCategory? { + return entries.find { it.displayName == displayName } + } + } +} + +@Serializable +data class BillerFormData( + val name: String = "", + val accountNumber: String = "", + val contactNumber: String = "", + val email: String = "", + val category: BillerCategory? = null, + val address: String = "", +) + +@Serializable +data class BillerValidationResult( + val isValid: Boolean, + val nameError: String? = null, + val accountNumberError: String? = null, + val contactNumberError: String? = null, + val emailError: String? = null, + val categoryError: String? = null, +) diff --git a/core/model/src/commonMain/kotlin/org/mifospay/core/model/utils/StandardUpiQrData.kt b/core/model/src/commonMain/kotlin/org/mifospay/core/model/utils/StandardUpiQrData.kt new file mode 100644 index 000000000..861d4c6bb --- /dev/null +++ b/core/model/src/commonMain/kotlin/org/mifospay/core/model/utils/StandardUpiQrData.kt @@ -0,0 +1,34 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.core.model.utils + +import kotlinx.serialization.Serializable + +/** + * Data class representing standard UPI QR code data + * Based on UPI QR code specification + */ +@Serializable +data class StandardUpiQrData( + val payeeName: String, + val payeeVpa: String, + val amount: String = "", + val currency: String = "INR", + val transactionNote: String = "", + val merchantCode: String = "", + val transactionReference: String = "", + val url: String = "", + // 02 for QR code + val mode: String = "02", +) { + companion object { + const val DEFAULT_CURRENCY = "INR" + } +} diff --git a/core/network/src/commonMain/kotlin/org/mifospay/core/network/FineractApiManager.kt b/core/network/src/commonMain/kotlin/org/mifospay/core/network/FineractApiManager.kt index 388b1df68..149bb1aaa 100644 --- a/core/network/src/commonMain/kotlin/org/mifospay/core/network/FineractApiManager.kt +++ b/core/network/src/commonMain/kotlin/org/mifospay/core/network/FineractApiManager.kt @@ -44,4 +44,8 @@ class FineractApiManager( val savingsAccountsApi by lazy { ktorfitClient.savingsAccountsApi } val standingInstructionApi by lazy { ktorfitClient.standingInstructionApi } + + val autoPayApi by lazy { ktorfitClient.autoPayApi } + + val billerApi by lazy { ktorfitClient.billerApi } } diff --git a/core/network/src/commonMain/kotlin/org/mifospay/core/network/KtorfitClient.kt b/core/network/src/commonMain/kotlin/org/mifospay/core/network/KtorfitClient.kt index 66f05fc41..c67769532 100644 --- a/core/network/src/commonMain/kotlin/org/mifospay/core/network/KtorfitClient.kt +++ b/core/network/src/commonMain/kotlin/org/mifospay/core/network/KtorfitClient.kt @@ -12,7 +12,9 @@ package org.mifospay.core.network import de.jensklingenberg.ktorfit.Ktorfit import org.mifospay.core.network.services.createAccountTransfersService import org.mifospay.core.network.services.createAuthenticationService +import org.mifospay.core.network.services.createAutoPayService import org.mifospay.core.network.services.createBeneficiaryService +import org.mifospay.core.network.services.createBillerService import org.mifospay.core.network.services.createClientService import org.mifospay.core.network.services.createDocumentService import org.mifospay.core.network.services.createInvoiceService @@ -63,5 +65,9 @@ class KtorfitClient( internal val standingInstructionApi by lazy { ktorfit.createStandingInstructionService() } + internal val autoPayApi by lazy { ktorfit.createAutoPayService() } + internal val beneficiaryApi by lazy { ktorfit.createBeneficiaryService() } + + internal val billerApi by lazy { ktorfit.createBillerService() } } diff --git a/core/network/src/commonMain/kotlin/org/mifospay/core/network/services/AutoPayService.kt b/core/network/src/commonMain/kotlin/org/mifospay/core/network/services/AutoPayService.kt new file mode 100644 index 000000000..bee42d886 --- /dev/null +++ b/core/network/src/commonMain/kotlin/org/mifospay/core/network/services/AutoPayService.kt @@ -0,0 +1,136 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.core.network.services + +import de.jensklingenberg.ktorfit.http.Body +import de.jensklingenberg.ktorfit.http.GET +import de.jensklingenberg.ktorfit.http.POST +import de.jensklingenberg.ktorfit.http.PUT +import de.jensklingenberg.ktorfit.http.Path +import de.jensklingenberg.ktorfit.http.Query +import kotlinx.coroutines.flow.Flow +import org.mifospay.core.model.autopay.AutoPay +import org.mifospay.core.model.autopay.AutoPayHistory +import org.mifospay.core.model.autopay.AutoPayPayload +import org.mifospay.core.model.autopay.AutoPayTemplate +import org.mifospay.core.model.autopay.AutoPayUpdatePayload +import org.mifospay.core.model.autopay.UpcomingPayment +import org.mifospay.core.network.model.entity.Page +import org.mifospay.core.network.utils.ApiEndPoints + +// TODO: Sync with backend team and update service layer according to finalized API contract + +interface AutoPayService { + + /** + * Get AutoPay template for creating new AutoPay schedules + */ + @GET("${ApiEndPoints.AUTO_PAY}/template") + fun getAutoPayTemplate( + @Query("clientId") clientId: Long, + @Query("sourceAccountId") sourceAccountId: Long, + ): Flow + + /** + * Get all AutoPay schedules for a client + */ + @GET(ApiEndPoints.AUTO_PAY) + fun getAllAutoPaySchedules( + @Query("clientId") clientId: Long, + ): Flow> + + /** + * Get AutoPay schedule by ID + */ + @GET("${ApiEndPoints.AUTO_PAY}/{autoPayId}") + fun getAutoPaySchedule( + @Path("autoPayId") autoPayId: Long, + ): Flow + + /** + * Create a new AutoPay schedule + */ + @POST(ApiEndPoints.AUTO_PAY) + suspend fun createAutoPaySchedule( + @Body payload: AutoPayPayload, + ) + + /** + * Update an existing AutoPay schedule + */ + @PUT("${ApiEndPoints.AUTO_PAY}/{autoPayId}") + suspend fun updateAutoPaySchedule( + @Path("autoPayId") autoPayId: Long, + @Body payload: AutoPayUpdatePayload, + @Query("command") command: String = "update", + ) + + /** + * Delete an AutoPay schedule + */ + @PUT("${ApiEndPoints.AUTO_PAY}/{autoPayId}") + suspend fun deleteAutoPaySchedule( + @Path("autoPayId") autoPayId: Long, + @Query("command") command: String = "delete", + ) + + /** + * Pause an AutoPay schedule + */ + @PUT("${ApiEndPoints.AUTO_PAY}/{autoPayId}") + suspend fun pauseAutoPaySchedule( + @Path("autoPayId") autoPayId: Long, + @Query("command") command: String = "pause", + ) + + /** + * Resume a paused AutoPay schedule + */ + @PUT("${ApiEndPoints.AUTO_PAY}/{autoPayId}") + suspend fun resumeAutoPaySchedule( + @Path("autoPayId") autoPayId: Long, + @Query("command") command: String = "resume", + ) + + /** + * Get AutoPay payment history + */ + @GET("${ApiEndPoints.AUTO_PAY}/{autoPayId}/history") + fun getAutoPayHistory( + @Path("autoPayId") autoPayId: Long, + @Query("limit") limit: Int = 20, + ): Flow> + + /** + * Get upcoming payments for all AutoPay schedules + */ + @GET("${ApiEndPoints.AUTO_PAY}/upcoming-payments") + fun getUpcomingPayments( + @Query("clientId") clientId: Long, + @Query("limit") limit: Int = 10, + ): Flow> + + /** + * Get AutoPay statistics for dashboard + */ + @GET("${ApiEndPoints.AUTO_PAY}/statistics") + fun getAutoPayStatistics( + @Query("clientId") clientId: Long, + ): Flow +} + +data class AutoPayStatisticsResponse( + val totalActiveSchedules: Int = 0, + val totalPausedSchedules: Int = 0, + val totalCompletedSchedules: Int = 0, + val totalUpcomingPayments: Int = 0, + val totalAmountThisMonth: Double = 0.0, + val currency: String = "USD", +) diff --git a/core/network/src/commonMain/kotlin/org/mifospay/core/network/services/BillerService.kt b/core/network/src/commonMain/kotlin/org/mifospay/core/network/services/BillerService.kt new file mode 100644 index 000000000..dd81eba49 --- /dev/null +++ b/core/network/src/commonMain/kotlin/org/mifospay/core/network/services/BillerService.kt @@ -0,0 +1,63 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.core.network.services + +import de.jensklingenberg.ktorfit.http.Body +import de.jensklingenberg.ktorfit.http.DELETE +import de.jensklingenberg.ktorfit.http.GET +import de.jensklingenberg.ktorfit.http.POST +import de.jensklingenberg.ktorfit.http.PUT +import de.jensklingenberg.ktorfit.http.Path +import de.jensklingenberg.ktorfit.http.Query +import kotlinx.coroutines.flow.Flow +import org.mifospay.core.model.autopay.Biller +import org.mifospay.core.model.autopay.BillerCategory + +/** + * TODO: Update endpoint paths when backend APIs are finalized + */ +interface BillerService { + @GET("billers") + fun getAllBillers(): Flow> + + @GET("billers/{billerId}") + suspend fun getBillerById(@Path("billerId") billerId: String): Flow + + @POST("billers") + suspend fun createBiller(@Body biller: Biller): Flow + + @PUT("billers/{billerId}") + suspend fun updateBiller( + @Path("billerId") billerId: String, + @Body biller: Biller, + ): Flow + + @DELETE("billers/{billerId}") + suspend fun deleteBiller(@Path("billerId") billerId: String): Flow + + @GET("billers/category/{category}") + suspend fun getBillersByCategory( + @Path("category") category: BillerCategory, + ): Flow> + + @GET("billers/search") + suspend fun searchBillersByName( + @Query("query") query: String, + ): Flow> + + @GET("billers/exists") + suspend fun isBillerExists( + @Query("name") name: String, + @Query("accountNumber") accountNumber: String, + ): Flow + + @DELETE("billers") + suspend fun clearAllBillers(): Flow +} diff --git a/core/network/src/commonMain/kotlin/org/mifospay/core/network/utils/ApiEndPoints.kt b/core/network/src/commonMain/kotlin/org/mifospay/core/network/utils/ApiEndPoints.kt index 19d8424b2..346175ba2 100644 --- a/core/network/src/commonMain/kotlin/org/mifospay/core/network/utils/ApiEndPoints.kt +++ b/core/network/src/commonMain/kotlin/org/mifospay/core/network/utils/ApiEndPoints.kt @@ -27,4 +27,10 @@ object ApiEndPoints { const val RUN_REPORT = "runreports" const val USER = "users" const val STANDING_INSTRUCTION = "standinginstructions" + + // TODO: Verify with backend team and update according to finalized API contract + const val AUTO_PAY = "autopay" + + // TODO: Update endpoint path when backend APIs are finalized + const val BILLERS = "billers" } diff --git a/feature/autopay/README.md b/feature/autopay/README.md new file mode 100644 index 000000000..6fb08aaca --- /dev/null +++ b/feature/autopay/README.md @@ -0,0 +1,16 @@ +# AutoPay Feature + +## Overview +The AutoPay feature module provides functionality for setting up and managing automatic payment schedules. This module allows users to configure recurring payments, set up payment rules, and manage their automatic payment preferences. + +## Screenshots +### Android +*Screenshots will be added as the feature is developed* + +### Desktop +*Screenshots will be added as the feature is developed* + +### Web +*Screenshots will be added as the feature is developed* + + diff --git a/feature/autopay/build.gradle.kts b/feature/autopay/build.gradle.kts new file mode 100644 index 000000000..6b0eaec56 --- /dev/null +++ b/feature/autopay/build.gradle.kts @@ -0,0 +1,28 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +plugins { + alias(libs.plugins.cmp.feature.convention) +} + +android { + namespace = "org.mifospay.feature.autopay" +} + +kotlin { + sourceSets { + commonMain.dependencies { + implementation(compose.ui) + implementation(compose.foundation) + implementation(compose.material3) + implementation(compose.components.resources) + implementation(compose.components.uiToolingPreview) + } + } +} diff --git a/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AddBillScreen.kt b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AddBillScreen.kt new file mode 100644 index 000000000..cf5eb21e0 --- /dev/null +++ b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AddBillScreen.kt @@ -0,0 +1,344 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.feature.autopay + +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.DatePicker +import androidx.compose.material3.DatePickerDialog +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.IconButtonDefaults +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.material3.rememberDatePickerState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.derivedStateOf +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.unit.dp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import kotlinx.datetime.Clock +import org.koin.compose.viewmodel.koinViewModel +import org.mifospay.core.common.DateHelper +import org.mifospay.core.designsystem.component.BasicDialogState +import org.mifospay.core.designsystem.component.LoadingDialogState +import org.mifospay.core.designsystem.component.MifosBasicDialog +import org.mifospay.core.designsystem.component.MifosButton +import org.mifospay.core.designsystem.component.MifosLoadingDialog +import org.mifospay.core.designsystem.component.MifosOutlinedButton +import org.mifospay.core.designsystem.component.MifosOutlinedTextField +import org.mifospay.core.designsystem.component.MifosScaffold +import org.mifospay.core.designsystem.component.MifosTextField +import org.mifospay.core.designsystem.component.MifosTopBar +import org.mifospay.core.designsystem.icon.MifosIcons +import org.mifospay.core.designsystem.utils.onClick +import org.mifospay.core.model.autopay.RecurrencePattern +import org.mifospay.core.ui.DropdownBox +import org.mifospay.core.ui.DropdownBoxItem +import org.mifospay.core.ui.utils.EventsEffect +import template.core.base.designsystem.theme.KptTheme + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun AddBillScreen( + onNavigateBack: () -> Unit, + onNavigateToBillList: () -> Unit, + onNavigateToAddBiller: () -> Unit, + viewModel: AddBillViewModel = koinViewModel(), +) { + val state by viewModel.stateFlow.collectAsStateWithLifecycle() + var showRecurrenceDropdown by remember { mutableStateOf(false) } + var showBillerDropdown by remember { mutableStateOf(false) } + var showDatePicker by remember { mutableStateOf(false) } + + EventsEffect(viewModel) { event -> + when (event) { + is AddBillEvent.BillSaved -> { + onNavigateToBillList() + } + } + } + + LaunchedEffect(Unit) { + viewModel.trySendAction(AddBillAction.RefreshBillers) + } + + MifosScaffold( + topBar = { + MifosTopBar( + topBarTitle = "Add New Bill", + backPress = onNavigateBack, + ) + }, + ) { paddingValues -> + Column( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + .padding(16.dp), + ) { + Column( + modifier = Modifier + .weight(1f) + .verticalScroll(rememberScrollState()), + verticalArrangement = Arrangement.spacedBy(16.dp), + ) { + Text( + text = "Enter bill details to set up automatic payments", + modifier = Modifier.padding(bottom = 8.dp), + ) + + MifosOutlinedTextField( + label = "Bill Name *", + value = state.formData.name, + onValueChange = { viewModel.trySendAction(AddBillAction.UpdateBillName(it)) }, + isError = state.validationResult.nameError != null, + errorMessage = state.validationResult.nameError, + singleLine = true, + keyboardOptions = KeyboardOptions( + imeAction = ImeAction.Next, + ), + ) + + DropdownBox( + expanded = showBillerDropdown, + label = "Select Biller *", + value = state.formData.billerName ?: "Select a biller", + readOnly = true, + isError = state.validationResult.billerError != null, + errorText = state.validationResult.billerError, + onExpandChange = { showBillerDropdown = it }, + ) { + state.availableBillers.forEach { biller -> + DropdownBoxItem( + text = biller.name, + onClick = { + viewModel.trySendAction(AddBillAction.SelectBiller(biller)) + showBillerDropdown = false + }, + ) + } + DropdownBoxItem( + text = "+ Add New Biller", + onClick = { + showBillerDropdown = false + onNavigateToAddBiller() + }, + ) + } + + MifosOutlinedTextField( + label = "Amount *", + value = state.formData.amount, + onValueChange = { viewModel.trySendAction(AddBillAction.UpdateAmount(it)) }, + isError = state.validationResult.amountError != null, + errorMessage = state.validationResult.amountError, + singleLine = true, + keyboardOptions = KeyboardOptions( + keyboardType = KeyboardType.Decimal, + imeAction = ImeAction.Next, + ), + ) + + Box( + modifier = Modifier.onClick { showDatePicker = true }, + ) { + MifosTextField( + label = "Due Date *", + value = if (state.formData.dueDate > 0L) { + formatDateForDisplay(state.formData.dueDate) + } else { + "" + }, + onValueChange = { }, + isError = state.validationResult.dueDateError != null, + errorText = state.validationResult.dueDateError, + singleLine = true, + readOnly = true, + showClearIcon = false, + trailingIcon = { + IconButton( + onClick = { showDatePicker = true }, + colors = IconButtonDefaults.iconButtonColors( + containerColor = KptTheme.colorScheme.tertiary, + contentColor = KptTheme.colorScheme.tertiaryContainer, + ), + ) { + Icon( + imageVector = MifosIcons.CalenderMonth, + contentDescription = "Choose Date", + ) + } + }, + ) + } + + DropdownBox( + expanded = showRecurrenceDropdown, + label = "Recurrence Pattern *", + value = state.formData.recurrencePattern.displayName, + readOnly = true, + isError = state.validationResult.recurrencePatternError != null, + errorText = state.validationResult.recurrencePatternError, + onExpandChange = { showRecurrenceDropdown = it }, + ) { + RecurrencePattern.entries.forEach { pattern -> + DropdownBoxItem( + text = pattern.displayName, + onClick = { + viewModel.trySendAction(AddBillAction.UpdateRecurrencePattern(pattern)) + showRecurrenceDropdown = false + }, + ) + } + } + + MifosOutlinedTextField( + label = "Description (Optional)", + value = state.formData.description, + onValueChange = { viewModel.trySendAction(AddBillAction.UpdateDescription(it)) }, + singleLine = false, + keyboardOptions = KeyboardOptions( + imeAction = ImeAction.Done, + ), + ) + + if (state.nextPaymentDates.isNotEmpty()) { + Spacer(modifier = Modifier.height(16.dp)) + + Text( + text = "Next Payment Dates:", + style = KptTheme.typography.titleMedium, + ) + + state.nextPaymentDates.forEach { nextDate -> + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically, + ) { + Text( + text = nextDate.formattedDate, + style = KptTheme.typography.bodyMedium, + ) + if (nextDate.isOverdue) { + Text( + text = "Overdue", + style = KptTheme.typography.bodySmall, + color = KptTheme.colorScheme.error, + ) + } + } + } + } + } + + Spacer(modifier = Modifier.height(24.dp)) + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(16.dp), + ) { + MifosOutlinedButton( + text = { Text("Cancel") }, + onClick = onNavigateBack, + modifier = Modifier.weight(1f), + ) + MifosButton( + text = { Text("Save Bill") }, + onClick = { viewModel.trySendAction(AddBillAction.SaveBill) }, + modifier = Modifier.weight(1f), + enabled = !state.isLoading, + ) + } + } + } + + AnimatedVisibility(showDatePicker) { + val dateState = rememberDatePickerState( + initialSelectedDateMillis = if (state.formData.dueDate > 0L) { + state.formData.dueDate + } else { + Clock.System.now().toEpochMilliseconds() + }, + ) + + val confirmEnabled = remember { + derivedStateOf { dateState.selectedDateMillis != null } + } + + DatePickerDialog( + onDismissRequest = { showDatePicker = false }, + confirmButton = { + TextButton( + onClick = { + dateState.selectedDateMillis?.let { timestamp -> + viewModel.trySendAction(AddBillAction.UpdateDueDate(timestamp)) + } + showDatePicker = false + }, + enabled = confirmEnabled.value, + ) { + Text("OK") + } + }, + dismissButton = { + TextButton( + onClick = { showDatePicker = false }, + ) { + Text("Cancel") + } + }, + content = { + DatePicker(state = dateState) + }, + ) + } + + if (state.isLoading) { + MifosLoadingDialog( + visibilityState = LoadingDialogState.Shown, + ) + } + + state.error?.let { error -> + MifosBasicDialog( + visibilityState = BasicDialogState.Shown( + title = "Error", + message = error, + ), + onDismissRequest = { viewModel.trySendAction(AddBillAction.ClearError) }, + ) + } +} + +private fun formatDateForDisplay(timestamp: Long): String { + return DateHelper.getDateAsStringFromLong(timestamp) +} diff --git a/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AddBillViewModel.kt b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AddBillViewModel.kt new file mode 100644 index 000000000..f3fa41c37 --- /dev/null +++ b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AddBillViewModel.kt @@ -0,0 +1,318 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.feature.autopay + +import androidx.lifecycle.SavedStateHandle +import androidx.lifecycle.viewModelScope +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import kotlinx.datetime.Clock +import kotlinx.serialization.Serializable +import org.mifospay.core.common.DateHelper +import org.mifospay.core.common.getSerialized +import org.mifospay.core.common.setSerialized +import org.mifospay.core.data.util.BillValidator +import org.mifospay.core.model.autopay.Bill +import org.mifospay.core.model.autopay.BillFormData +import org.mifospay.core.model.autopay.BillValidationResult +import org.mifospay.core.model.autopay.Biller +import org.mifospay.core.model.autopay.NextPaymentDate +import org.mifospay.core.model.autopay.RecurrencePattern +import org.mifospay.core.ui.utils.BaseViewModel +import kotlin.random.Random + +class AddBillViewModel( + savedStateHandle: SavedStateHandle, + private val billRepository: org.mifospay.core.datastore.BillRepository, + private val billerRepository: org.mifospay.core.datastore.BillerRepository, +) : BaseViewModel( + initialState = savedStateHandle.getSerialized(KEY_STATE) ?: AddBillState(), +) { + + companion object { + private const val KEY_STATE = "add_bill_state" + } + + init { + stateFlow + .onEach { savedStateHandle.setSerialized(key = KEY_STATE, value = it) } + .launchIn(viewModelScope) + + // Load available billers + loadAvailableBillers() + } + + override fun handleAction(action: AddBillAction) { + when (action) { + is AddBillAction.UpdateBillName -> { + updateBillName(action.name) + } + is AddBillAction.UpdateAmount -> { + updateAmount(action.amount) + } + is AddBillAction.UpdateDueDate -> { + updateDueDate(action.dueDate) + } + is AddBillAction.UpdateRecurrencePattern -> { + updateRecurrencePattern(action.recurrencePattern) + } + is AddBillAction.UpdateDescription -> { + updateDescription(action.description) + } + is AddBillAction.SaveBill -> { + saveBill() + } + is AddBillAction.ValidateForm -> { + validateForm() + } + is AddBillAction.ClearError -> { + clearError() + } + is AddBillAction.ClearValidationErrors -> { + clearValidationErrors() + } + is AddBillAction.CalculateNextPaymentDates -> { + calculateNextPaymentDates() + } + is AddBillAction.SelectBiller -> { + selectBiller(action.biller) + } + is AddBillAction.RefreshBillers -> { + loadAvailableBillers() + } + } + } + + private fun updateBillName(name: String) { + val nameError = BillValidator.validateNameField(name) + mutableStateFlow.update { + it.copy( + formData = it.formData.copy(name = name), + validationResult = it.validationResult.copy(nameError = nameError), + ) + } + } + + private fun updateAmount(amount: String) { + val amountError = BillValidator.validateAmountField(amount) + mutableStateFlow.update { + it.copy( + formData = it.formData.copy(amount = amount), + validationResult = it.validationResult.copy(amountError = amountError), + ) + } + } + + private fun updateDueDate(dueDate: Long) { + val dueDateError = BillValidator.validateDueDateField(dueDate) + mutableStateFlow.update { + it.copy( + formData = it.formData.copy(dueDate = dueDate), + validationResult = it.validationResult.copy(dueDateError = dueDateError), + ) + } + calculateNextPaymentDates() + } + + private fun updateRecurrencePattern(recurrencePattern: RecurrencePattern) { + val recurrencePatternError = BillValidator.validateRecurrencePatternField(recurrencePattern) + mutableStateFlow.update { + it.copy( + formData = it.formData.copy(recurrencePattern = recurrencePattern), + validationResult = it.validationResult.copy(recurrencePatternError = recurrencePatternError), + ) + } + calculateNextPaymentDates() + } + + private fun updateDescription(description: String) { + mutableStateFlow.update { + it.copy(formData = it.formData.copy(description = description)) + } + } + + private fun validateForm(): BillValidationResult { + val currentState = stateFlow.value + val formData = currentState.formData + + val validationResult = BillValidator.validateBillForm(formData) + + mutableStateFlow.update { it.copy(validationResult = validationResult) } + return validationResult + } + + private fun generateUniqueId(): String { + val timestamp = Clock.System.now().toEpochMilliseconds() + val random = Random.nextInt(100000, 999999) + return "$timestamp-$random" + } + + private fun calculateNextPaymentDates() { + val currentState = stateFlow.value + val formData = currentState.formData + + if (formData.dueDate == 0L || formData.recurrencePattern == RecurrencePattern.NONE) { + mutableStateFlow.update { it.copy(nextPaymentDates = emptyList()) } + return + } + + val nextDates = mutableListOf() + val currentTime = Clock.System.now().toEpochMilliseconds() + var nextDate = formData.dueDate + + // Generate next 5 payment dates + repeat(5) { + if (nextDate >= currentTime) { + val isOverdue = nextDate < currentTime + val formattedDate = formatDate(nextDate) + nextDates.add(NextPaymentDate(nextDate, formattedDate, isOverdue)) + } + + // Calculate next date based on recurrence pattern + nextDate += (formData.recurrencePattern.interval * 24 * 60 * 60 * 1000L) + } + + mutableStateFlow.update { it.copy(nextPaymentDates = nextDates) } + } + + private fun formatDate(timestamp: Long): String { + return DateHelper.getDateAsStringFromLong(timestamp) + } + + private fun saveBill() { + val validationResult = validateForm() + + if (!validationResult.isValid) { + return + } + + mutableStateFlow.update { it.copy(isLoading = true) } + + viewModelScope.launch { + try { + val currentState = stateFlow.value + val formData = currentState.formData + + val bill = Bill( + id = generateUniqueId(), + name = formData.name.trim(), + amount = formData.amount.toDoubleOrNull() ?: 0.0, + currency = formData.currency, + dueDate = formData.dueDate, + recurrencePattern = formData.recurrencePattern, + billerId = formData.billerId, + billerName = formData.billerName, + description = formData.description.takeIf { it.isNotBlank() }, + ) + + val result = billRepository.saveBill(bill) + + when (result) { + is org.mifospay.core.common.DataState.Loading -> { + // Loading state is already handled by setting isLoading = true above + } + is org.mifospay.core.common.DataState.Success -> { + mutableStateFlow.update { + it.copy( + isLoading = false, + isSuccess = true, + ) + } + sendEvent(AddBillEvent.BillSaved(result.data)) + } + is org.mifospay.core.common.DataState.Error -> { + mutableStateFlow.update { + it.copy( + isLoading = false, + error = "Failed to save bill: ${result.exception.message}", + ) + } + } + } + } catch (exception: Exception) { + mutableStateFlow.update { + it.copy( + isLoading = false, + error = "Failed to save bill: ${exception.message}", + ) + } + } + } + } + + private fun loadAvailableBillers() { + viewModelScope.launch { + try { + billerRepository.getAllBillers().collect { billers -> + mutableStateFlow.update { it.copy(availableBillers = billers) } + } + } catch (exception: Exception) { + // Handle error silently for now + } + } + } + + private fun selectBiller(biller: Biller) { + val billerError = BillValidator.validateBillerField(biller.id, biller.name) + mutableStateFlow.update { + it.copy( + formData = it.formData.copy( + billerId = biller.id, + billerName = biller.name, + ), + validationResult = it.validationResult.copy(billerError = billerError), + ) + } + } + + private fun clearError() { + mutableStateFlow.update { it.copy(error = null) } + } + + private fun clearValidationErrors() { + mutableStateFlow.update { + it.copy( + validationResult = BillValidationResult(isValid = false), + ) + } + } +} + +@Serializable +data class AddBillState( + val formData: BillFormData = BillFormData(), + val validationResult: BillValidationResult = BillValidationResult(isValid = false), + val isLoading: Boolean = false, + val isSuccess: Boolean = false, + val error: String? = null, + val nextPaymentDates: List = emptyList(), + val availableBillers: List = emptyList(), +) + +sealed interface AddBillEvent { + data class BillSaved(val bill: Bill) : AddBillEvent +} + +sealed interface AddBillAction { + data class UpdateBillName(val name: String) : AddBillAction + data class UpdateAmount(val amount: String) : AddBillAction + data class UpdateDueDate(val dueDate: Long) : AddBillAction + data class UpdateRecurrencePattern(val recurrencePattern: RecurrencePattern) : AddBillAction + data class UpdateDescription(val description: String) : AddBillAction + data object SaveBill : AddBillAction + data object ValidateForm : AddBillAction + data object ClearError : AddBillAction + data object ClearValidationErrors : AddBillAction + data object CalculateNextPaymentDates : AddBillAction + data class SelectBiller(val biller: Biller) : AddBillAction + data object RefreshBillers : AddBillAction +} diff --git a/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AddBillerScreen.kt b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AddBillerScreen.kt new file mode 100644 index 000000000..21ee44e40 --- /dev/null +++ b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AddBillerScreen.kt @@ -0,0 +1,217 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.feature.autopay + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.unit.dp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import org.koin.compose.viewmodel.koinViewModel +import org.mifospay.core.designsystem.component.BasicDialogState +import org.mifospay.core.designsystem.component.LoadingDialogState +import org.mifospay.core.designsystem.component.MifosBasicDialog +import org.mifospay.core.designsystem.component.MifosButton +import org.mifospay.core.designsystem.component.MifosLoadingDialog +import org.mifospay.core.designsystem.component.MifosOutlinedButton +import org.mifospay.core.designsystem.component.MifosOutlinedTextField +import org.mifospay.core.designsystem.component.MifosScaffold +import org.mifospay.core.designsystem.component.MifosTopBar +import org.mifospay.core.model.autopay.BillerCategory +import org.mifospay.core.ui.DropdownBox +import org.mifospay.core.ui.DropdownBoxItem +import org.mifospay.core.ui.utils.EventsEffect + +// TODO currec +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun AddBillerScreen( + onNavigateBack: () -> Unit, + onNavigateToBillerList: () -> Unit, + viewModel: AddBillerViewModel = koinViewModel(), +) { + val state by viewModel.stateFlow.collectAsStateWithLifecycle() + var showCategoryDropdown by remember { mutableStateOf(false) } + + EventsEffect(viewModel) { event -> + when (event) { + is AddBillerEvent.BillerSaved -> { + // Check if we should go back or to biller list based on source + val source = viewModel.getSource() + if (source == "bill_creation") { + onNavigateBack() + } else { + onNavigateToBillerList() + } + } + } + } + + MifosScaffold( + topBar = { + MifosTopBar( + topBarTitle = "Add New Biller", + backPress = onNavigateBack, + ) + }, + ) { paddingValues -> + Column( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + .padding(16.dp), + ) { + Column( + modifier = Modifier + .weight(1f) + .verticalScroll(rememberScrollState()), + verticalArrangement = Arrangement.spacedBy(16.dp), + ) { + Text( + text = "Enter biller details to set up automatic payments", + modifier = Modifier.padding(bottom = 8.dp), + ) + + MifosOutlinedTextField( + label = "Biller Name *", + value = state.formData.name, + onValueChange = { viewModel.trySendAction(AddBillerAction.UpdateBillerName(it)) }, + isError = state.validationResult.nameError != null, + errorMessage = state.validationResult.nameError, + singleLine = true, + keyboardOptions = KeyboardOptions( + imeAction = ImeAction.Next, + ), + ) + + MifosOutlinedTextField( + label = "Account Number *", + value = state.formData.accountNumber, + onValueChange = { viewModel.trySendAction(AddBillerAction.UpdateAccountNumber(it)) }, + isError = state.validationResult.accountNumberError != null, + errorMessage = state.validationResult.accountNumberError, + singleLine = true, + keyboardOptions = KeyboardOptions( + keyboardType = KeyboardType.Number, + imeAction = ImeAction.Next, + ), + ) + + MifosOutlinedTextField( + label = "Contact Number *", + value = state.formData.contactNumber, + onValueChange = { viewModel.trySendAction(AddBillerAction.UpdateContactNumber(it)) }, + isError = state.validationResult.contactNumberError != null, + errorMessage = state.validationResult.contactNumberError, + singleLine = true, + keyboardOptions = KeyboardOptions( + keyboardType = KeyboardType.Phone, + imeAction = ImeAction.Next, + ), + ) + + MifosOutlinedTextField( + label = "Email (Optional)", + value = state.formData.email, + onValueChange = { viewModel.trySendAction(AddBillerAction.UpdateEmail(it)) }, + isError = state.validationResult.emailError != null, + errorMessage = state.validationResult.emailError, + singleLine = true, + keyboardOptions = KeyboardOptions( + keyboardType = KeyboardType.Email, + imeAction = ImeAction.Next, + ), + ) + + DropdownBox( + expanded = showCategoryDropdown, + label = "Biller Category *", + value = state.formData.category?.displayName ?: "", + isError = state.validationResult.categoryError != null, + errorText = state.validationResult.categoryError, + onExpandChange = { showCategoryDropdown = it }, + ) { + BillerCategory.entries.forEach { category -> + DropdownBoxItem( + text = category.displayName, + onClick = { + viewModel.trySendAction(AddBillerAction.UpdateCategory(category)) + showCategoryDropdown = false + }, + ) + } + } + + MifosOutlinedTextField( + label = "Address (Optional)", + value = state.formData.address, + onValueChange = { viewModel.trySendAction(AddBillerAction.UpdateAddress(it)) }, + singleLine = false, + keyboardOptions = KeyboardOptions( + imeAction = ImeAction.Done, + ), + ) + } + + Spacer(modifier = Modifier.height(24.dp)) + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(16.dp), + ) { + MifosOutlinedButton( + text = { Text("Cancel") }, + onClick = onNavigateBack, + modifier = Modifier.weight(1f), + ) + MifosButton( + text = { Text("Save Biller") }, + onClick = { viewModel.trySendAction(AddBillerAction.SaveBiller) }, + modifier = Modifier.weight(1f), + enabled = !state.isLoading, + ) + } + } + } + + if (state.isLoading) { + MifosLoadingDialog( + visibilityState = LoadingDialogState.Shown, + ) + } + + state.error?.let { error -> + MifosBasicDialog( + visibilityState = BasicDialogState.Shown( + title = "Error", + message = error, + ), + onDismissRequest = { viewModel.trySendAction(AddBillerAction.ClearError) }, + ) + } +} diff --git a/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AddBillerViewModel.kt b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AddBillerViewModel.kt new file mode 100644 index 000000000..37efa0fa4 --- /dev/null +++ b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AddBillerViewModel.kt @@ -0,0 +1,256 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.feature.autopay + +import androidx.lifecycle.SavedStateHandle +import androidx.lifecycle.viewModelScope +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import kotlinx.datetime.Clock +import kotlinx.serialization.Serializable +import org.mifospay.core.common.DataState +import org.mifospay.core.common.getSerialized +import org.mifospay.core.common.setSerialized +import org.mifospay.core.data.util.BillerValidator +import org.mifospay.core.datastore.BillerRepository +import org.mifospay.core.model.autopay.Biller +import org.mifospay.core.model.autopay.BillerCategory +import org.mifospay.core.model.autopay.BillerFormData +import org.mifospay.core.model.autopay.BillerValidationResult +import org.mifospay.core.ui.utils.BaseViewModel +import kotlin.random.Random + +class AddBillerViewModel( + savedStateHandle: SavedStateHandle, + private val billerRepository: BillerRepository, +) : BaseViewModel( + initialState = savedStateHandle.getSerialized(KEY_STATE) ?: AddBillerState(), +) { + + companion object { + private const val KEY_STATE = "add_biller_state" + private const val SOURCE_ARG = "source" + } + + private val source: String = savedStateHandle.get(SOURCE_ARG) ?: "direct" + + fun getSource(): String = source + + init { + stateFlow + .onEach { savedStateHandle.setSerialized(key = KEY_STATE, value = it) } + .launchIn(viewModelScope) + } + + override fun handleAction(action: AddBillerAction) { + when (action) { + is AddBillerAction.UpdateBillerName -> { + updateBillerName(action.name) + } + is AddBillerAction.UpdateAccountNumber -> { + updateAccountNumber(action.accountNumber) + } + is AddBillerAction.UpdateContactNumber -> { + updateContactNumber(action.contactNumber) + } + is AddBillerAction.UpdateEmail -> { + updateEmail(action.email) + } + is AddBillerAction.UpdateCategory -> { + updateCategory(action.category) + } + is AddBillerAction.UpdateAddress -> { + updateAddress(action.address) + } + is AddBillerAction.SaveBiller -> { + saveBiller() + } + is AddBillerAction.ValidateForm -> { + validateForm() + } + is AddBillerAction.ClearError -> { + clearError() + } + is AddBillerAction.ClearValidationErrors -> { + clearValidationErrors() + } + } + } + + private fun updateBillerName(name: String) { + val nameError = BillerValidator.validateNameField(name) + mutableStateFlow.update { + it.copy( + formData = it.formData.copy(name = name), + validationResult = it.validationResult.copy(nameError = nameError), + ) + } + } + + private fun updateAccountNumber(accountNumber: String) { + val accountNumberError = BillerValidator.validateAccountNumberField(accountNumber) + mutableStateFlow.update { + it.copy( + formData = it.formData.copy(accountNumber = accountNumber), + validationResult = it.validationResult.copy(accountNumberError = accountNumberError), + ) + } + } + + private fun updateContactNumber(contactNumber: String) { + val contactNumberError = BillerValidator.validateContactNumberField(contactNumber) + mutableStateFlow.update { + it.copy( + formData = it.formData.copy(contactNumber = contactNumber), + validationResult = it.validationResult.copy(contactNumberError = contactNumberError), + ) + } + } + + private fun updateEmail(email: String) { + val emailError = BillerValidator.validateEmailField(email) + mutableStateFlow.update { + it.copy( + formData = it.formData.copy(email = email), + validationResult = it.validationResult.copy(emailError = emailError), + ) + } + } + + private fun updateCategory(category: BillerCategory) { + mutableStateFlow.update { + it.copy( + formData = it.formData.copy(category = category), + validationResult = it.validationResult.copy(categoryError = null), + ) + } + } + + private fun updateAddress(address: String) { + mutableStateFlow.update { + it.copy(formData = it.formData.copy(address = address)) + } + } + + private fun validateForm(): BillerValidationResult { + val currentState = stateFlow.value + val formData = currentState.formData + + val validationResult = BillerValidator.validateBillerForm(formData) + + mutableStateFlow.update { it.copy(validationResult = validationResult) } + return validationResult + } + + private fun generateUniqueId(): String { + val timestamp = Clock.System.now().toEpochMilliseconds() + val random = Random.nextInt(100000, 999999) + return "$timestamp-$random" + } + + private fun saveBiller() { + val validationResult = validateForm() + + if (!validationResult.isValid) { + return + } + + mutableStateFlow.update { it.copy(isLoading = true) } + + viewModelScope.launch { + try { + val currentState = stateFlow.value + val formData = currentState.formData + + val biller = Biller( + id = generateUniqueId(), + name = formData.name.trim(), + accountNumber = formData.accountNumber.trim(), + contactNumber = formData.contactNumber.trim(), + email = formData.email.takeIf { it.isNotBlank() }, + category = formData.category!!, + address = formData.address.takeIf { it.isNotBlank() }, + ) + + val result = billerRepository.saveBiller(biller) + + when (result) { + is DataState.Loading -> { + // Loading state is already handled by setting isLoading = true above + } + is DataState.Success -> { + mutableStateFlow.update { + it.copy( + isLoading = false, + isSuccess = true, + ) + } + sendEvent(AddBillerEvent.BillerSaved(result.data)) + } + is DataState.Error -> { + mutableStateFlow.update { + it.copy( + isLoading = false, + error = result.message, + ) + } + } + } + } catch (exception: Exception) { + mutableStateFlow.update { + it.copy( + isLoading = false, + error = "Failed to save biller: ${exception.message}", + ) + } + } + } + } + + private fun clearError() { + mutableStateFlow.update { it.copy(error = null) } + } + + private fun clearValidationErrors() { + mutableStateFlow.update { + it.copy( + validationResult = BillerValidationResult(isValid = false), + ) + } + } +} + +@Serializable +data class AddBillerState( + val formData: BillerFormData = BillerFormData(), + val validationResult: BillerValidationResult = BillerValidationResult(isValid = false), + val isLoading: Boolean = false, + val isSuccess: Boolean = false, + val error: String? = null, +) + +sealed interface AddBillerEvent { + data class BillerSaved(val biller: Biller) : AddBillerEvent +} + +sealed interface AddBillerAction { + data class UpdateBillerName(val name: String) : AddBillerAction + data class UpdateAccountNumber(val accountNumber: String) : AddBillerAction + data class UpdateContactNumber(val contactNumber: String) : AddBillerAction + data class UpdateEmail(val email: String) : AddBillerAction + data class UpdateCategory(val category: BillerCategory) : AddBillerAction + data class UpdateAddress(val address: String) : AddBillerAction + data object SaveBiller : AddBillerAction + data object ValidateForm : AddBillerAction + data object ClearError : AddBillerAction + data object ClearValidationErrors : AddBillerAction +} diff --git a/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AutoPayHistoryScreen.kt b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AutoPayHistoryScreen.kt new file mode 100644 index 000000000..f075c092c --- /dev/null +++ b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AutoPayHistoryScreen.kt @@ -0,0 +1,247 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.feature.autopay + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.Divider +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import org.mifospay.core.designsystem.component.MifosScaffold +import org.mifospay.core.designsystem.icon.MifosIcons + +@Composable +fun AutoPayHistoryScreen( + onNavigateBack: () -> Unit, + modifier: Modifier = Modifier, +) { + MifosScaffold( + modifier = modifier, + topBarTitle = "AutoPay History", + backPress = onNavigateBack, + ) { paddingValues -> + Column( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + .padding(16.dp), + ) { + Column( + horizontalAlignment = Alignment.CenterHorizontally, + modifier = Modifier.padding(bottom = 16.dp), + ) { + Icon( + imageVector = MifosIcons.History, + contentDescription = null, + modifier = Modifier.size(64.dp), + tint = MaterialTheme.colorScheme.primary, + ) + + Spacer(modifier = Modifier.height(16.dp)) + + Text( + text = "AutoPay History", + style = MaterialTheme.typography.headlineMedium, + fontWeight = FontWeight.Medium, + ) + + Text( + text = "View your AutoPay transaction history and activities.", + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + + LazyColumn( + verticalArrangement = Arrangement.spacedBy(12.dp), + ) { + items(getDummyHistoryItems()) { historyItem -> + HistoryItemCard(historyItem = historyItem) + } + } + } + } +} + +@Composable +private fun HistoryItemCard( + historyItem: AutoPayHistoryItem, + modifier: Modifier = Modifier, +) { + Card( + modifier = modifier.fillMaxWidth(), + colors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surface, + ), + elevation = CardDefaults.cardElevation(defaultElevation = 2.dp), + ) { + Column( + modifier = Modifier.padding(16.dp), + ) { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + ) { + Icon( + imageVector = historyItem.icon, + contentDescription = null, + modifier = Modifier.size(24.dp), + tint = historyItem.statusColor, + ) + + Spacer(modifier = Modifier.size(12.dp)) + + Column( + modifier = Modifier.weight(1f), + ) { + Text( + text = historyItem.title, + style = MaterialTheme.typography.bodyMedium, + fontWeight = FontWeight.Medium, + ) + + Text( + text = historyItem.description, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + + Column( + horizontalAlignment = Alignment.End, + ) { + Text( + text = historyItem.amount, + style = MaterialTheme.typography.bodyMedium, + fontWeight = FontWeight.Medium, + ) + + Text( + text = historyItem.date, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + } + + if (historyItem.status != null) { + Spacer(modifier = Modifier.height(8.dp)) + + Divider() + + Spacer(modifier = Modifier.height(8.dp)) + + Text( + text = "Status: ${historyItem.status}", + style = MaterialTheme.typography.bodySmall, + color = historyItem.statusColor, + fontWeight = FontWeight.Medium, + ) + } + } + } +} + +private data class AutoPayHistoryItem( + val title: String, + val description: String, + val amount: String, + val date: String, + val status: String?, + val icon: ImageVector, + val statusColor: Color, +) + +private fun getDummyHistoryItems(): List { + return listOf( + AutoPayHistoryItem( + title = "Monthly Rent Payment", + description = "AutoPay to Landlord Corp", + amount = "$1,200.00", + date = "Jan 15, 2024", + status = "Completed", + icon = MifosIcons.CheckCircle, + statusColor = Color.Green, + ), + AutoPayHistoryItem( + title = "Internet Bill", + description = "AutoPay to Comcast", + amount = "$89.99", + date = "Jan 10, 2024", + status = "Completed", + icon = MifosIcons.CheckCircle, + statusColor = Color.Green, + ), + AutoPayHistoryItem( + title = "Electricity Bill", + description = "AutoPay to Power Company", + amount = "$156.75", + date = "Jan 5, 2024", + status = "Failed", + icon = MifosIcons.Error, + statusColor = Color.Red, + ), + AutoPayHistoryItem( + title = "Phone Bill", + description = "AutoPay to Verizon", + amount = "$85.50", + date = "Dec 28, 2023", + status = "Completed", + icon = MifosIcons.CheckCircle, + statusColor = Color.Green, + ), + AutoPayHistoryItem( + title = "Gym Membership", + description = "AutoPay to Fitness Center", + amount = "$45.00", + date = "Dec 20, 2023", + status = "Completed", + icon = MifosIcons.CheckCircle, + statusColor = Color.Green, + ), + AutoPayHistoryItem( + title = "Schedule Created", + description = "New AutoPay schedule for Netflix", + amount = "$15.99/month", + date = "Dec 15, 2023", + status = null, + icon = MifosIcons.Add, + statusColor = Color.Blue, + ), + AutoPayHistoryItem( + title = "Schedule Cancelled", + description = "AutoPay schedule for Spotify cancelled", + amount = "$9.99/month", + date = "Dec 10, 2023", + status = null, + icon = MifosIcons.Cancel, + statusColor = Color.Yellow, + ), + ) +} diff --git a/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AutoPayNavigation.kt b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AutoPayNavigation.kt new file mode 100644 index 000000000..95dc191ed --- /dev/null +++ b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AutoPayNavigation.kt @@ -0,0 +1,298 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.feature.autopay + +import androidx.compose.animation.AnimatedContentScope +import androidx.compose.animation.core.tween +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.runtime.Composable +import androidx.navigation.NavBackStackEntry +import androidx.navigation.NavController +import androidx.navigation.NavGraphBuilder +import androidx.navigation.NavOptions +import androidx.navigation.NavType +import androidx.navigation.compose.composable +import androidx.navigation.navArgument +import androidx.navigation.navOptions + +object AutoPayNavigation { + const val AUTO_PAY_ROUTE = "autopay_route" + const val AUTO_PAY_SETUP_ROUTE = "autopay_setup_route" + const val AUTO_PAY_RULES_ROUTE = "autopay_rules_route" + const val AUTO_PAY_PREFERENCES_ROUTE = "autopay_preferences_route" + const val AUTO_PAY_HISTORY_ROUTE = "autopay_history_route" + const val AUTO_PAY_SCHEDULE_DETAILS_ROUTE = "autopay_schedule_details_route" + const val AUTO_PAY_ADD_BILLER_ROUTE = "autopay_add_biller_route" + const val AUTO_PAY_BILLER_LIST_ROUTE = "autopay_biller_list_route" + const val AUTO_PAY_EDIT_BILLER_ROUTE = "autopay_edit_biller_route" + const val AUTO_PAY_ADD_BILL_ROUTE = "autopay_add_bill_route" + const val AUTO_PAY_BILL_LIST_ROUTE = "autopay_bill_list_route" + const val AUTO_PAY_EDIT_BILL_ROUTE = "autopay_edit_bill_route" + const val SCHEDULE_ID_ARG = "scheduleId" + const val BILLER_ID_ARG = "billerId" + const val BILL_ID_ARG = "billId" + const val SOURCE_ARG = "source" +} + +/** + * Custom composable function that uses fade transitions to prevent the state issue + * where both screens are visible momentarily during navigation. + */ +fun NavGraphBuilder.composableWithFadeTransitions( + route: String, + arguments: List = emptyList(), + deepLinks: List = emptyList(), + content: @Composable AnimatedContentScope.(NavBackStackEntry) -> Unit, +) { + this.composable( + route = route, + arguments = arguments, + deepLinks = deepLinks, + enterTransition = { + fadeIn(animationSpec = tween(300)) + }, + exitTransition = { + fadeOut(animationSpec = tween(300)) + }, + popEnterTransition = { + fadeIn(animationSpec = tween(300)) + }, + popExitTransition = { + fadeOut(animationSpec = tween(300)) + }, + content = content, + ) +} + +fun NavController.navigateToAutoPay(navOptions: NavOptions? = null) { + navigate(AutoPayNavigation.AUTO_PAY_ROUTE, navOptions) +} + +fun NavController.navigateToAutoPaySetup(navOptions: NavOptions? = null) { + navigate(AutoPayNavigation.AUTO_PAY_SETUP_ROUTE, navOptions) +} + +fun NavController.navigateToAutoPayRules(navOptions: NavOptions? = null) { + navigate(AutoPayNavigation.AUTO_PAY_RULES_ROUTE, navOptions) +} + +fun NavController.navigateToAutoPayPreferences(navOptions: NavOptions? = null) { + navigate(AutoPayNavigation.AUTO_PAY_PREFERENCES_ROUTE, navOptions) +} + +fun NavController.navigateToAutoPayHistory(navOptions: NavOptions? = null) { + navigate(AutoPayNavigation.AUTO_PAY_HISTORY_ROUTE, navOptions) +} + +fun NavController.navigateToAutoPayScheduleDetails(scheduleId: String, navOptions: NavOptions? = null) { + val route = "${AutoPayNavigation.AUTO_PAY_SCHEDULE_DETAILS_ROUTE}?${AutoPayNavigation.SCHEDULE_ID_ARG}=$scheduleId" + navigate(route, navOptions) +} + +fun NavController.navigateToAddBiller(source: String = "direct", navOptions: NavOptions? = null) { + val route = "${AutoPayNavigation.AUTO_PAY_ADD_BILLER_ROUTE}?${AutoPayNavigation.SOURCE_ARG}=$source" + navigate(route, navOptions) +} + +fun NavController.navigateToBillerList(navOptions: NavOptions? = null) { + navigate(AutoPayNavigation.AUTO_PAY_BILLER_LIST_ROUTE, navOptions) +} + +fun NavController.navigateToEditBiller(billerId: String, navOptions: NavOptions? = null) { + val route = "${AutoPayNavigation.AUTO_PAY_EDIT_BILLER_ROUTE}?${AutoPayNavigation.BILLER_ID_ARG}=$billerId" + navigate(route, navOptions) +} + +fun NavController.navigateToAddBill(navOptions: NavOptions? = null) { + navigate(AutoPayNavigation.AUTO_PAY_ADD_BILL_ROUTE, navOptions) +} + +fun NavController.navigateToBillList(navOptions: NavOptions? = null) { + navigate(AutoPayNavigation.AUTO_PAY_BILL_LIST_ROUTE, navOptions) +} + +fun NavController.navigateToEditBill(billId: String, navOptions: NavOptions? = null) { + val route = "${AutoPayNavigation.AUTO_PAY_EDIT_BILL_ROUTE}?${AutoPayNavigation.BILL_ID_ARG}=$billId" + navigate(route, navOptions) +} + +fun NavGraphBuilder.autoPayGraph( + navController: NavController, + onNavigateBack: () -> Unit = { navController.navigateUp() }, +) { + composableWithFadeTransitions(AutoPayNavigation.AUTO_PAY_ROUTE) { + AutoPayScreen( + onNavigateToSetup = { + navController.navigateToAutoPaySetup() + }, + onNavigateToRules = { + navController.navigateToAutoPayRules() + }, + onNavigateToPreferences = { + navController.navigateToAutoPayPreferences() + }, + onNavigateToHistory = { + navController.navigateToAutoPayHistory() + }, + onNavigateToScheduleDetails = { scheduleId -> + navController.navigateToAutoPayScheduleDetails(scheduleId) + }, + onNavigateToAddBiller = { + navController.navigateToAddBiller() + }, + onNavigateToBillerList = { + navController.navigateToBillerList() + }, + onNavigateToAddBill = { + navController.navigateToAddBill() + }, + onNavigateToBillList = { + navController.navigateToBillList() + }, + onNavigateBack = onNavigateBack, + showTopBar = true, + ) + } + + composableWithFadeTransitions(AutoPayNavigation.AUTO_PAY_SETUP_ROUTE) { + AutoPaySetupScreen( + onNavigateBack = onNavigateBack, + ) + } + + composableWithFadeTransitions(AutoPayNavigation.AUTO_PAY_RULES_ROUTE) { + AutoPayRulesScreen( + onNavigateBack = onNavigateBack, + ) + } + + composableWithFadeTransitions(AutoPayNavigation.AUTO_PAY_PREFERENCES_ROUTE) { + AutoPayPreferencesScreen( + onNavigateBack = onNavigateBack, + ) + } + + composableWithFadeTransitions(AutoPayNavigation.AUTO_PAY_HISTORY_ROUTE) { + AutoPayHistoryScreen( + onNavigateBack = onNavigateBack, + ) + } + + composableWithFadeTransitions( + route = "${AutoPayNavigation.AUTO_PAY_SCHEDULE_DETAILS_ROUTE}?${AutoPayNavigation.SCHEDULE_ID_ARG}={${AutoPayNavigation.SCHEDULE_ID_ARG}}", + arguments = listOf( + navArgument(AutoPayNavigation.SCHEDULE_ID_ARG) { + type = NavType.StringType + nullable = false + }, + ), + ) { + AutoPayScheduleDetailsScreen( + onNavigateBack = onNavigateBack, + ) + } + + composableWithFadeTransitions( + route = "${AutoPayNavigation.AUTO_PAY_ADD_BILLER_ROUTE}?${AutoPayNavigation.SOURCE_ARG}={${AutoPayNavigation.SOURCE_ARG}}", + arguments = listOf( + navArgument(AutoPayNavigation.SOURCE_ARG) { + type = NavType.StringType + nullable = false + defaultValue = "direct" + }, + ), + ) { + AddBillerScreen( + onNavigateBack = onNavigateBack, + onNavigateToBillerList = { + navController.navigateToBillerList() + }, + ) + } + + composableWithFadeTransitions(AutoPayNavigation.AUTO_PAY_BILLER_LIST_ROUTE) { + BillerListScreen( + onNavigateBack = { + navController.popBackStack(AutoPayNavigation.AUTO_PAY_ROUTE, false) + }, + onNavigateToAddBiller = { + navController.navigateToAddBiller(source = "direct") + }, + onNavigateToEditBiller = { billerId -> + navController.navigateToEditBiller(billerId) + }, + ) + } + + composableWithFadeTransitions( + route = "${AutoPayNavigation.AUTO_PAY_EDIT_BILLER_ROUTE}?${AutoPayNavigation.BILLER_ID_ARG}={${AutoPayNavigation.BILLER_ID_ARG}}", + arguments = listOf( + navArgument(AutoPayNavigation.BILLER_ID_ARG) { + type = NavType.StringType + nullable = false + }, + ), + ) { + EditBillerScreen( + onNavigateBack = onNavigateBack, + ) + } + + composableWithFadeTransitions(AutoPayNavigation.AUTO_PAY_ADD_BILL_ROUTE) { + AddBillScreen( + onNavigateBack = onNavigateBack, + onNavigateToBillList = { + navController.navigateToBillList( + navOptions = navOptions { + popUpTo(AutoPayNavigation.AUTO_PAY_ROUTE) { + inclusive = false + } + }, + ) + }, + onNavigateToAddBiller = { + navController.navigateToAddBiller(source = "bill_creation") + }, + ) + } + + composableWithFadeTransitions(AutoPayNavigation.AUTO_PAY_BILL_LIST_ROUTE) { + BillListScreen( + onNavigateBack = onNavigateBack, + onNavigateToAddBill = { + navController.navigateToAddBill() + }, + onNavigateToEditBill = { billId -> + navController.navigateToEditBill(billId) + }, + onNavigateToAutopay = { + navController.popBackStack(AutoPayNavigation.AUTO_PAY_ROUTE, false) + }, + ) + } + + composableWithFadeTransitions( + route = "${AutoPayNavigation.AUTO_PAY_EDIT_BILL_ROUTE}?${AutoPayNavigation.BILL_ID_ARG}={${AutoPayNavigation.BILL_ID_ARG}}", + arguments = listOf( + navArgument(AutoPayNavigation.BILL_ID_ARG) { + type = NavType.StringType + nullable = false + }, + ), + ) { + EditBillScreen( + onNavigateBack = onNavigateBack, + onNavigateToAddBiller = { + navController.navigateToAddBiller(source = "bill_creation") + }, + ) + } +} diff --git a/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AutoPayPreferencesScreen.kt b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AutoPayPreferencesScreen.kt new file mode 100644 index 000000000..2d63ad123 --- /dev/null +++ b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AutoPayPreferencesScreen.kt @@ -0,0 +1,225 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.feature.autopay + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Switch +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import org.mifospay.core.designsystem.component.MifosScaffold +import org.mifospay.core.designsystem.icon.MifosIcons + +@Composable +fun AutoPayPreferencesScreen( + onNavigateBack: () -> Unit, + modifier: Modifier = Modifier, +) { + MifosScaffold( + modifier = modifier, + topBarTitle = "AutoPay Preferences", + backPress = onNavigateBack, + ) { paddingValues -> + Column( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + .padding(16.dp) + .verticalScroll(rememberScrollState()), + verticalArrangement = Arrangement.spacedBy(16.dp), + ) { + Column( + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Icon( + imageVector = MifosIcons.Settings, + contentDescription = null, + modifier = Modifier.size(64.dp), + tint = MaterialTheme.colorScheme.primary, + ) + + Spacer(modifier = Modifier.height(16.dp)) + + Text( + text = "AutoPay Preferences", + style = MaterialTheme.typography.headlineMedium, + fontWeight = FontWeight.Medium, + ) + + Text( + text = "Customize your AutoPay experience and notification settings.", + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + + Spacer(modifier = Modifier.height(16.dp)) + + PreferencesSection( + title = "Notifications", + preferences = listOf( + PreferenceItem( + title = "Payment Confirmations", + description = "Receive notifications when payments are processed", + icon = MifosIcons.OutlinedNotifications, + ), + PreferenceItem( + title = "Failed Payment Alerts", + description = "Get notified when payments fail", + icon = MifosIcons.Warning, + ), + PreferenceItem( + title = "Schedule Reminders", + description = "Receive reminders before scheduled payments", + icon = MifosIcons.Schedule, + ), + ), + ) + + PreferencesSection( + title = "Security", + preferences = listOf( + PreferenceItem( + title = "Two-Factor Authentication", + description = "Require 2FA for AutoPay changes", + icon = MifosIcons.Security, + ), + PreferenceItem( + title = "Payment Limits", + description = "Set maximum payment amounts", + icon = MifosIcons.AttachMoney, + ), + ), + ) + + PreferencesSection( + title = "General", + preferences = listOf( + PreferenceItem( + title = "AutoPay Enabled", + description = "Enable or disable AutoPay functionality", + icon = MifosIcons.Power, + ), + PreferenceItem( + title = "Default Payment Method", + description = "Set your preferred payment method", + icon = MifosIcons.CreditCard, + ), + ), + ) + } + } +} + +@Composable +private fun PreferencesSection( + title: String, + preferences: List, + modifier: Modifier = Modifier, +) { + Card( + modifier = modifier.fillMaxSize(), + colors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surface, + ), + elevation = CardDefaults.cardElevation(defaultElevation = 2.dp), + ) { + Column( + modifier = Modifier.padding(16.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), + ) { + Text( + text = title, + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Medium, + ) + + Column( + verticalArrangement = Arrangement.spacedBy(12.dp), + ) { + preferences.forEach { preference -> + PreferenceRow(preference = preference) + } + } + } + } +} + +@Composable +private fun PreferenceRow( + preference: PreferenceItem, + modifier: Modifier = Modifier, +) { + var isEnabled by remember { mutableStateOf(true) } + + Row( + modifier = modifier + .fillMaxWidth() + .padding(vertical = 8.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Icon( + imageVector = preference.icon, + contentDescription = null, + modifier = Modifier.size(24.dp), + tint = MaterialTheme.colorScheme.onSurfaceVariant, + ) + + Spacer(modifier = Modifier.size(12.dp)) + + Column( + modifier = Modifier.weight(1f), + ) { + Text( + text = preference.title, + style = MaterialTheme.typography.bodyMedium, + fontWeight = FontWeight.Medium, + ) + + Text( + text = preference.description, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + + Switch( + checked = isEnabled, + onCheckedChange = { isEnabled = it }, + ) + } +} + +private data class PreferenceItem( + val title: String, + val description: String, + val icon: androidx.compose.ui.graphics.vector.ImageVector, +) diff --git a/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AutoPayRulesScreen.kt b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AutoPayRulesScreen.kt new file mode 100644 index 000000000..742e7a552 --- /dev/null +++ b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AutoPayRulesScreen.kt @@ -0,0 +1,180 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.feature.autopay + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import org.mifospay.core.designsystem.component.MifosScaffold +import org.mifospay.core.designsystem.icon.MifosIcons + +@Composable +fun AutoPayRulesScreen( + onNavigateBack: () -> Unit, + modifier: Modifier = Modifier, +) { + MifosScaffold( + modifier = modifier, + topBarTitle = "AutoPay Rules", + backPress = onNavigateBack, + ) { paddingValues -> + Column( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + .padding(16.dp) + .verticalScroll(rememberScrollState()), + verticalArrangement = Arrangement.spacedBy(16.dp), + ) { + Column( + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Icon( + imageVector = MifosIcons.Rule, + contentDescription = null, + modifier = Modifier.size(64.dp), + tint = MaterialTheme.colorScheme.primary, + ) + + Spacer(modifier = Modifier.height(16.dp)) + + Text( + text = "AutoPay Rules & Policies", + style = MaterialTheme.typography.headlineMedium, + fontWeight = FontWeight.Medium, + ) + + Text( + text = "Understand how AutoPay works and the rules that govern automatic payments.", + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + + Spacer(modifier = Modifier.height(16.dp)) + + RulesSection( + title = "General Rules", + rules = listOf( + "AutoPay schedules can be set up for recurring payments", + "Maximum payment amount is limited to $10,000 per transaction", + "Payments are processed on the scheduled date", + "Failed payments will be retried up to 3 times", + "You can pause or cancel schedules at any time", + ), + ) + + RulesSection( + title = "Frequency Limits", + rules = listOf( + "Daily: Maximum 1 payment per day", + "Weekly: Maximum 2 payments per week", + "Monthly: Maximum 4 payments per month", + "Yearly: Maximum 12 payments per year", + ), + ) + + RulesSection( + title = "Security & Privacy", + rules = listOf( + "All payment data is encrypted and secure", + "You will receive notifications for all AutoPay activities", + "You can view payment history and status anytime", + "AutoPay can be disabled temporarily or permanently", + ), + ) + + RulesSection( + title = "Cancellation Policy", + rules = listOf( + "Schedules can be cancelled before the next payment date", + "Cancelled schedules cannot be reactivated", + "You must create a new schedule after cancellation", + "No fees are charged for cancelling AutoPay schedules", + ), + ) + } + } +} + +@Composable +private fun RulesSection( + title: String, + rules: List, + modifier: Modifier = Modifier, +) { + Card( + modifier = modifier.fillMaxSize(), + colors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surface, + ), + elevation = CardDefaults.cardElevation(defaultElevation = 2.dp), + ) { + Column( + modifier = Modifier.padding(16.dp), + verticalArrangement = Arrangement.spacedBy(12.dp), + ) { + Text( + text = title, + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Medium, + ) + + Column( + verticalArrangement = Arrangement.spacedBy(8.dp), + ) { + rules.forEach { rule -> + RuleItem(rule = rule) + } + } + } + } +} + +@Composable +private fun RuleItem( + rule: String, + modifier: Modifier = Modifier, +) { + Row( + modifier = modifier, + verticalAlignment = Alignment.Top, + ) { + Text( + text = "•", + style = MaterialTheme.typography.bodyMedium, + fontWeight = FontWeight.Medium, + modifier = Modifier.padding(end = 8.dp), + ) + + Text( + text = rule, + style = MaterialTheme.typography.bodyMedium, + modifier = Modifier.weight(1f), + ) + } +} diff --git a/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AutoPayScheduleDetailsScreen.kt b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AutoPayScheduleDetailsScreen.kt new file mode 100644 index 000000000..d09056c2c --- /dev/null +++ b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AutoPayScheduleDetailsScreen.kt @@ -0,0 +1,434 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.feature.autopay + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.Button +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import org.koin.compose.viewmodel.koinViewModel +import org.mifospay.core.common.CurrencyFormatter +import org.mifospay.core.designsystem.component.MifosScaffold +import org.mifospay.core.designsystem.icon.MifosIcons +import org.mifospay.core.ui.utils.EventsEffect + +@Composable +fun AutoPayScheduleDetailsScreen( + onNavigateBack: () -> Unit, + modifier: Modifier = Modifier, + viewModel: AutoPayScheduleDetailsViewModel = koinViewModel(), +) { + val state by viewModel.stateFlow.collectAsStateWithLifecycle() + + MifosScaffold( + modifier = modifier, + topBarTitle = "Schedule Details", + backPress = onNavigateBack, + ) { paddingValues -> + if (state.isLoading) { + Box( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues), + contentAlignment = Alignment.Center, + ) { + CircularProgressIndicator() + } + } else if (state.schedule == null) { + Column( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + .padding(16.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center, + ) { + Icon( + imageVector = MifosIcons.Info, + contentDescription = null, + modifier = Modifier.size(64.dp), + tint = MaterialTheme.colorScheme.onSurfaceVariant, + ) + + Spacer(modifier = Modifier.height(16.dp)) + + Text( + text = "Schedule Not Found", + style = MaterialTheme.typography.headlineSmall, + fontWeight = FontWeight.Medium, + ) + + Spacer(modifier = Modifier.height(8.dp)) + + Text( + text = "The requested AutoPay schedule could not be found.", + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + } else { + ScheduleDetailsContent( + schedule = state.schedule!!, + modifier = Modifier.padding(paddingValues), + onPauseResume = { + if (state.schedule!!.status == AutoPayStatus.ACTIVE) { + viewModel.trySendAction(AutoPayScheduleDetailsAction.PauseSchedule) + } else { + viewModel.trySendAction(AutoPayScheduleDetailsAction.ResumeSchedule) + } + }, + onEdit = { viewModel.trySendAction(AutoPayScheduleDetailsAction.EditSchedule) }, + onCancel = { viewModel.trySendAction(AutoPayScheduleDetailsAction.CancelSchedule) }, + ) + } + } + + EventsEffect(viewModel) { event -> + when (event) { + is AutoPayScheduleDetailsEvent.NavigateBack -> onNavigateBack() + is AutoPayScheduleDetailsEvent.SchedulePaused -> { /* TODO: Show success message */ } + is AutoPayScheduleDetailsEvent.ScheduleResumed -> { /* TODO: Show success message */ } + is AutoPayScheduleDetailsEvent.ScheduleCancelled -> { /* TODO: Show success message */ } + is AutoPayScheduleDetailsEvent.NavigateToEdit -> { /* TODO: Navigate to edit screen */ } + } + } +} + +@Composable +private fun ScheduleDetailsContent( + schedule: AutoPaySchedule, + onPauseResume: () -> Unit, + onEdit: () -> Unit, + onCancel: () -> Unit, + modifier: Modifier = Modifier, +) { + Column( + modifier = modifier + .fillMaxSize() + .padding(16.dp) + .verticalScroll(rememberScrollState()), + verticalArrangement = Arrangement.spacedBy(16.dp), + ) { + ScheduleHeaderCard(schedule = schedule) + + ScheduleInfoCard(schedule = schedule) + + PaymentDetailsCard(schedule = schedule) + + ScheduleActionsCard( + schedule = schedule, + onPauseResume = onPauseResume, + onEdit = onEdit, + onCancel = onCancel, + ) + } +} + +@Composable +private fun ScheduleHeaderCard( + schedule: AutoPaySchedule, + modifier: Modifier = Modifier, +) { + Card( + modifier = modifier.fillMaxWidth(), + colors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.primaryContainer, + ), + elevation = CardDefaults.cardElevation(defaultElevation = 4.dp), + ) { + Column( + modifier = Modifier.padding(20.dp), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Text( + text = schedule.name, + style = MaterialTheme.typography.headlineMedium, + fontWeight = FontWeight.Medium, + color = MaterialTheme.colorScheme.onPrimaryContainer, + ) + + Spacer(modifier = Modifier.height(8.dp)) + + StatusChip(status = schedule.status) + + Spacer(modifier = Modifier.height(16.dp)) + + Text( + text = CurrencyFormatter.format(schedule.amount, schedule.currency, 2), + style = MaterialTheme.typography.headlineLarge, + fontWeight = FontWeight.Medium, + color = MaterialTheme.colorScheme.onPrimaryContainer, + ) + + Text( + text = "per ${schedule.frequency.lowercase()}", + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.onPrimaryContainer.copy(alpha = 0.8f), + ) + } + } +} + +@Composable +private fun ScheduleInfoCard( + schedule: AutoPaySchedule, + modifier: Modifier = Modifier, +) { + Card( + modifier = modifier.fillMaxWidth(), + colors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surface, + ), + elevation = CardDefaults.cardElevation(defaultElevation = 2.dp), + ) { + Column( + modifier = Modifier.padding(16.dp), + ) { + Text( + text = "Schedule Information", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Medium, + ) + + Spacer(modifier = Modifier.height(16.dp)) + + InfoRow( + label = "Recipient", + value = schedule.recipientName, + icon = MifosIcons.Person, + ) + + InfoRow( + label = "Account Number", + value = schedule.accountNumber, + icon = MifosIcons.Bank, + ) + + InfoRow( + label = "Frequency", + value = schedule.frequency, + icon = MifosIcons.CalenderMonth, + ) + + InfoRow( + label = "Next Payment", + value = schedule.nextPaymentDate, + icon = MifosIcons.CalenderMonth, + ) + } + } +} + +@Composable +private fun PaymentDetailsCard( + schedule: AutoPaySchedule, + modifier: Modifier = Modifier, +) { + Card( + modifier = modifier.fillMaxWidth(), + colors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surface, + ), + elevation = CardDefaults.cardElevation(defaultElevation = 2.dp), + ) { + Column( + modifier = Modifier.padding(16.dp), + ) { + Text( + text = "Payment Details", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Medium, + ) + + Spacer(modifier = Modifier.height(16.dp)) + + InfoRow( + label = "Amount", + value = CurrencyFormatter.format(schedule.amount, schedule.currency, 2), + icon = MifosIcons.AttachMoney, + ) + + InfoRow( + label = "Status", + value = schedule.status.name, + icon = MifosIcons.Info, + ) + } + } +} + +@Composable +private fun ScheduleActionsCard( + schedule: AutoPaySchedule, + onPauseResume: () -> Unit, + onEdit: () -> Unit, + onCancel: () -> Unit, + modifier: Modifier = Modifier, +) { + Card( + modifier = modifier.fillMaxWidth(), + colors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surface, + ), + elevation = CardDefaults.cardElevation(defaultElevation = 2.dp), + ) { + Column( + modifier = Modifier.padding(16.dp), + ) { + Text( + text = "Actions", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Medium, + ) + + Spacer(modifier = Modifier.height(16.dp)) + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(12.dp), + ) { + ActionButton( + text = if (schedule.status == AutoPayStatus.ACTIVE) "Pause" else "Resume", + icon = if (schedule.status == AutoPayStatus.ACTIVE) MifosIcons.FlashOff else MifosIcons.FlashOn, + onClick = onPauseResume, + modifier = Modifier.weight(1f), + ) + + ActionButton( + text = "Edit", + icon = MifosIcons.Edit, + onClick = onEdit, + modifier = Modifier.weight(1f), + ) + } + + Spacer(modifier = Modifier.height(12.dp)) + + ActionButton( + text = "Cancel Schedule", + icon = MifosIcons.Delete, + onClick = onCancel, + modifier = Modifier.fillMaxWidth(), + ) + } + } +} + +@Composable +private fun InfoRow( + label: String, + value: String, + icon: ImageVector, + modifier: Modifier = Modifier, +) { + Row( + modifier = modifier + .fillMaxWidth() + .padding(vertical = 8.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Icon( + imageVector = icon, + contentDescription = null, + modifier = Modifier.size(20.dp), + tint = MaterialTheme.colorScheme.onSurfaceVariant, + ) + + Spacer(modifier = Modifier.size(12.dp)) + + Column( + modifier = Modifier.weight(1f), + ) { + Text( + text = label, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + + Text( + text = value, + style = MaterialTheme.typography.bodyMedium, + fontWeight = FontWeight.Medium, + ) + } + } +} + +@Composable +private fun ActionButton( + text: String, + icon: ImageVector, + onClick: () -> Unit, + modifier: Modifier = Modifier, +) { + Button( + onClick = onClick, + modifier = modifier, + ) { + Icon( + imageVector = icon, + contentDescription = null, + modifier = Modifier.size(16.dp), + ) + + Spacer(modifier = Modifier.size(8.dp)) + + Text(text = text) + } +} + +@Composable +private fun StatusChip( + status: AutoPayStatus, + modifier: Modifier = Modifier, +) { + val (backgroundColor, textColor) = when (status) { + AutoPayStatus.ACTIVE -> MaterialTheme.colorScheme.primary to MaterialTheme.colorScheme.onPrimary + AutoPayStatus.PAUSED -> MaterialTheme.colorScheme.tertiary to MaterialTheme.colorScheme.onTertiary + AutoPayStatus.CANCELLED -> MaterialTheme.colorScheme.error to MaterialTheme.colorScheme.onError + AutoPayStatus.COMPLETED -> MaterialTheme.colorScheme.secondary to MaterialTheme.colorScheme.onSecondary + } + + Card( + modifier = modifier, + colors = CardDefaults.cardColors(containerColor = backgroundColor), + ) { + Text( + text = status.name, + modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp), + style = MaterialTheme.typography.bodySmall, + color = textColor, + fontWeight = FontWeight.Medium, + ) + } +} diff --git a/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AutoPayScheduleDetailsViewModel.kt b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AutoPayScheduleDetailsViewModel.kt new file mode 100644 index 000000000..8fb3c46d2 --- /dev/null +++ b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AutoPayScheduleDetailsViewModel.kt @@ -0,0 +1,148 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.feature.autopay + +import androidx.lifecycle.SavedStateHandle +import androidx.lifecycle.viewModelScope +import kotlinx.coroutines.delay +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import kotlinx.serialization.Serializable +import org.mifospay.core.common.getSerialized +import org.mifospay.core.common.setSerialized +import org.mifospay.core.ui.utils.BaseViewModel + +class AutoPayScheduleDetailsViewModel( + savedStateHandle: SavedStateHandle, +) : BaseViewModel( + initialState = savedStateHandle.getSerialized(KEY_STATE) ?: AutoPayScheduleDetailsState( + scheduleId = requireNotNull(savedStateHandle.get("scheduleId")), + ), +) { + + companion object { + private const val KEY_STATE = "autopay_schedule_details_state" + } + + init { + stateFlow + .onEach { savedStateHandle.setSerialized(key = KEY_STATE, value = it) } + .launchIn(viewModelScope) + + loadScheduleDetails() + } + + override fun handleAction(action: AutoPayScheduleDetailsAction) { + when (action) { + is AutoPayScheduleDetailsAction.PauseSchedule -> { + pauseSchedule() + } + is AutoPayScheduleDetailsAction.ResumeSchedule -> { + resumeSchedule() + } + is AutoPayScheduleDetailsAction.EditSchedule -> { + editSchedule() + } + is AutoPayScheduleDetailsAction.CancelSchedule -> { + cancelSchedule() + } + is AutoPayScheduleDetailsAction.NavigateBack -> { + sendEvent(AutoPayScheduleDetailsEvent.NavigateBack) + } + } + } + + private fun loadScheduleDetails() { + mutableStateFlow.update { it.copy(isLoading = true) } + + // Simulate API call delay + viewModelScope.launch { + delay(500) + + // For now, we'll use dummy data + // In a real implementation, this would fetch from a repository + val dummySchedule = AutoPaySchedule( + id = state.scheduleId, + name = "Monthly Rent Payment", + amount = 1200.0, + currency = "USD", + frequency = "Monthly", + nextPaymentDate = "2024-02-15", + status = AutoPayStatus.ACTIVE, + recipientName = "Landlord Corp", + accountNumber = "****1234", + ) + + mutableStateFlow.update { + it.copy( + isLoading = false, + schedule = dummySchedule, + ) + } + } + } + + private fun pauseSchedule() { + mutableStateFlow.update { + it.copy( + schedule = it.schedule?.copy(status = AutoPayStatus.PAUSED), + ) + } + sendEvent(AutoPayScheduleDetailsEvent.SchedulePaused) + } + + private fun resumeSchedule() { + mutableStateFlow.update { + it.copy( + schedule = it.schedule?.copy(status = AutoPayStatus.ACTIVE), + ) + } + sendEvent(AutoPayScheduleDetailsEvent.ScheduleResumed) + } + + private fun editSchedule() { + sendEvent(AutoPayScheduleDetailsEvent.NavigateToEdit(state.scheduleId)) + } + + private fun cancelSchedule() { + mutableStateFlow.update { + it.copy( + schedule = it.schedule?.copy(status = AutoPayStatus.CANCELLED), + ) + } + sendEvent(AutoPayScheduleDetailsEvent.ScheduleCancelled) + } +} + +@Serializable +data class AutoPayScheduleDetailsState( + val scheduleId: String, + val isLoading: Boolean = false, + val schedule: AutoPaySchedule? = null, + val error: String? = null, +) + +sealed interface AutoPayScheduleDetailsEvent { + data object NavigateBack : AutoPayScheduleDetailsEvent + data object SchedulePaused : AutoPayScheduleDetailsEvent + data object ScheduleResumed : AutoPayScheduleDetailsEvent + data object ScheduleCancelled : AutoPayScheduleDetailsEvent + data class NavigateToEdit(val scheduleId: String) : AutoPayScheduleDetailsEvent +} + +sealed interface AutoPayScheduleDetailsAction { + data object PauseSchedule : AutoPayScheduleDetailsAction + data object ResumeSchedule : AutoPayScheduleDetailsAction + data object EditSchedule : AutoPayScheduleDetailsAction + data object CancelSchedule : AutoPayScheduleDetailsAction + data object NavigateBack : AutoPayScheduleDetailsAction +} diff --git a/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AutoPayScreen.kt b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AutoPayScreen.kt new file mode 100644 index 000000000..493e5bc89 --- /dev/null +++ b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AutoPayScreen.kt @@ -0,0 +1,671 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.feature.autopay + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material3.Button +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import org.koin.compose.viewmodel.koinViewModel +import org.mifospay.core.common.CurrencyFormatter +import org.mifospay.core.designsystem.component.MifosScaffold +import org.mifospay.core.designsystem.component.rememberMifosPullToRefreshState +import org.mifospay.core.designsystem.icon.MifosIcons +import org.mifospay.core.ui.utils.EventsEffect + +@Composable +fun AutoPayScreen( + onNavigateToSetup: () -> Unit, + onNavigateToRules: () -> Unit, + onNavigateToPreferences: () -> Unit, + onNavigateToHistory: () -> Unit, + onNavigateToScheduleDetails: (String) -> Unit, + onNavigateToAddBiller: () -> Unit, + onNavigateToBillerList: () -> Unit, + onNavigateToAddBill: () -> Unit, + onNavigateToBillList: () -> Unit, + onNavigateBack: () -> Unit = {}, + showTopBar: Boolean = true, + modifier: Modifier = Modifier, + viewModel: AutoPayViewModel = koinViewModel(), +) { + val state by viewModel.stateFlow.collectAsStateWithLifecycle() + + val pullRefreshState = rememberMifosPullToRefreshState( + isEnabled = true, + isRefreshing = state.isLoading, + onRefresh = { viewModel.trySendAction(AutoPayAction.RefreshDashboard) }, + ) + + MifosScaffold( + modifier = modifier, + topBarTitle = if (showTopBar) "AutoPay Dashboard" else null, + backPress = onNavigateBack, + pullToRefreshState = pullRefreshState, + ) { paddingValues -> + if (state.isLoading && state.activeSchedules.isEmpty()) { + Box( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues), + contentAlignment = Alignment.Center, + ) { + CircularProgressIndicator() + } + } else { + AutoPayDashboardContent( + state = state, + viewModel = viewModel, + onRefresh = { viewModel.trySendAction(AutoPayAction.RefreshDashboard) }, + onAddNewSchedule = { viewModel.trySendAction(AutoPayAction.AddNewSchedule) }, + onManageSchedules = { viewModel.trySendAction(AutoPayAction.ManageExistingSchedules) }, + onAddNewBiller = { viewModel.trySendAction(AutoPayAction.AddNewBiller) }, + onViewBillerList = { viewModel.trySendAction(AutoPayAction.ViewBillerList) }, + onViewScheduleDetails = { scheduleId -> + viewModel.trySendAction(AutoPayAction.ViewScheduleDetails(scheduleId)) + }, + onNavigateToSetup = onNavigateToSetup, + onNavigateToRules = onNavigateToRules, + onNavigateToPreferences = onNavigateToPreferences, + onNavigateToHistory = onNavigateToHistory, + onNavigateToScheduleDetails = onNavigateToScheduleDetails, + modifier = Modifier.padding(paddingValues), + ) + } + } + + EventsEffect(viewModel) { event -> + when (event) { + is AutoPayEvent.NavigateToSetup -> onNavigateToSetup() + is AutoPayEvent.NavigateToRules -> onNavigateToRules() + is AutoPayEvent.NavigateToPreferences -> onNavigateToPreferences() + is AutoPayEvent.NavigateToHistory -> onNavigateToHistory() + is AutoPayEvent.NavigateToAddBiller -> onNavigateToAddBiller() + is AutoPayEvent.NavigateToBillerList -> onNavigateToBillerList() + is AutoPayEvent.NavigateToAddBill -> onNavigateToAddBill() + is AutoPayEvent.NavigateToBillList -> onNavigateToBillList() + is AutoPayEvent.NavigateToScheduleDetails -> onNavigateToScheduleDetails(event.scheduleId) + } + } +} + +@Composable +private fun AutoPayDashboardContent( + state: AutoPayState, + viewModel: AutoPayViewModel, + onRefresh: () -> Unit, + onAddNewSchedule: () -> Unit, + onManageSchedules: () -> Unit, + onAddNewBiller: () -> Unit, + onViewBillerList: () -> Unit, + onViewScheduleDetails: (String) -> Unit, + onNavigateToSetup: () -> Unit, + onNavigateToRules: () -> Unit, + onNavigateToPreferences: () -> Unit, + onNavigateToHistory: () -> Unit, + onNavigateToScheduleDetails: (String) -> Unit, + modifier: Modifier = Modifier, +) { + LazyColumn( + modifier = modifier + .fillMaxSize() + .padding(16.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), + ) { + item { + DashboardHeader( + totalActiveSchedules = state.totalActiveSchedules, + totalUpcomingPayments = state.totalUpcomingPayments, + ) + } + + item { + QuickActionsSection( + onAddNewSchedule = onAddNewSchedule, + onManageSchedules = onManageSchedules, + onAddNewBiller = onAddNewBiller, + onViewBillerList = onViewBillerList, + onAddNewBill = { viewModel.trySendAction(AutoPayAction.AddNewBill) }, + onViewBillList = { viewModel.trySendAction(AutoPayAction.ViewBillList) }, + ) + } + + item { + Text( + text = "Active Schedules", + style = MaterialTheme.typography.titleLarge, + fontWeight = FontWeight.Medium, + ) + } + + if (state.activeSchedules.isEmpty()) { + item { + EmptyStateCard( + title = "No Active Schedules", + description = "You don't have any active AutoPay schedules. Create one to get started!", + icon = MifosIcons.Payment, + ) + } + } else { + items(state.activeSchedules) { schedule -> + ActiveScheduleCard( + schedule = schedule, + onClick = { onViewScheduleDetails(schedule.id) }, + ) + } + } + + item { + Spacer(modifier = Modifier.height(16.dp)) + Text( + text = "Upcoming Payments", + style = MaterialTheme.typography.titleLarge, + fontWeight = FontWeight.Medium, + ) + } + + if (state.upcomingPayments.isEmpty()) { + item { + EmptyStateCard( + title = "No Upcoming Payments", + description = "No payments are scheduled for the near future.", + icon = MifosIcons.CalenderMonth, + ) + } + } else { + items(state.upcomingPayments) { payment -> + UpcomingPaymentCard( + payment = payment, + ) + } + } + } +} + +@Composable +private fun DashboardHeader( + totalActiveSchedules: Int, + totalUpcomingPayments: Int, + modifier: Modifier = Modifier, +) { + Card( + modifier = modifier.fillMaxWidth(), + colors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.primaryContainer, + ), + elevation = CardDefaults.cardElevation(defaultElevation = 4.dp), + ) { + Column( + modifier = Modifier.padding(20.dp), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceEvenly, + ) { + DashboardStat( + label = "Active Schedules", + value = totalActiveSchedules.toString(), + icon = MifosIcons.Payment, + ) + + DashboardStat( + label = "Upcoming Payments", + value = totalUpcomingPayments.toString(), + icon = MifosIcons.CalenderMonth, + ) + } + } + } +} + +@Composable +private fun DashboardStat( + label: String, + value: String, + icon: ImageVector, + modifier: Modifier = Modifier, +) { + Column( + modifier = modifier, + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Icon( + imageVector = icon, + contentDescription = null, + modifier = Modifier.size(32.dp), + tint = MaterialTheme.colorScheme.onPrimaryContainer, + ) + + Spacer(modifier = Modifier.height(8.dp)) + + Text( + text = value, + style = MaterialTheme.typography.headlineMedium, + fontWeight = FontWeight.Medium, + color = MaterialTheme.colorScheme.onPrimaryContainer, + ) + + Text( + text = label, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onPrimaryContainer.copy(alpha = 0.8f), + ) + } +} + +@Composable +private fun QuickActionsSection( + onAddNewSchedule: () -> Unit, + onManageSchedules: () -> Unit, + onAddNewBiller: () -> Unit, + onViewBillerList: () -> Unit, + onAddNewBill: () -> Unit, + onViewBillList: () -> Unit, + modifier: Modifier = Modifier, +) { + Card( + modifier = modifier.fillMaxWidth(), + colors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surface, + ), + elevation = CardDefaults.cardElevation(defaultElevation = 2.dp), + ) { + Column( + modifier = Modifier.padding(16.dp), + ) { + Text( + text = "Quick Actions", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Medium, + ) + + Spacer(modifier = Modifier.height(12.dp)) + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(12.dp), + ) { + QuickActionButton( + text = "Add New", + icon = MifosIcons.Add, + onClick = onAddNewSchedule, + modifier = Modifier.weight(1f), + ) + + QuickActionButton( + text = "Manage", + icon = MifosIcons.Settings, + onClick = onManageSchedules, + modifier = Modifier.weight(1f), + ) + } + + Spacer(modifier = Modifier.height(12.dp)) + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(12.dp), + ) { + QuickActionButton( + text = "Add Biller", + icon = MifosIcons.PersonAdd, + onClick = onAddNewBiller, + modifier = Modifier.weight(1f), + ) + + QuickActionButton( + text = "View Billers", + icon = MifosIcons.Person, + onClick = onViewBillerList, + modifier = Modifier.weight(1f), + ) + } + + Spacer(modifier = Modifier.height(12.dp)) + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(12.dp), + ) { + QuickActionButton( + text = "Add Bill", + icon = MifosIcons.Receipt, + onClick = onAddNewBill, + modifier = Modifier.weight(1f), + ) + + QuickActionButton( + text = "View Bills", + icon = MifosIcons.List, + onClick = onViewBillList, + modifier = Modifier.weight(1f), + ) + } + } + } +} + +@Composable +private fun QuickActionButton( + text: String, + icon: ImageVector, + onClick: () -> Unit, + modifier: Modifier = Modifier, +) { + Button( + onClick = onClick, + modifier = modifier, + ) { + Icon( + imageVector = icon, + contentDescription = null, + modifier = Modifier.size(20.dp), + ) + + Spacer(modifier = Modifier.width(8.dp)) + + Text(text = text) + } +} + +@Composable +private fun ActiveScheduleCard( + schedule: AutoPaySchedule, + onClick: () -> Unit, + modifier: Modifier = Modifier, +) { + Card( + modifier = modifier.fillMaxWidth(), + colors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surface, + ), + elevation = CardDefaults.cardElevation(defaultElevation = 2.dp), + ) { + Button( + onClick = onClick, + modifier = Modifier.fillMaxWidth(), + colors = androidx.compose.material3.ButtonDefaults.buttonColors( + containerColor = MaterialTheme.colorScheme.surface, + contentColor = MaterialTheme.colorScheme.onSurface, + ), + ) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(16.dp), + ) { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + ) { + Column( + modifier = Modifier.weight(1f), + ) { + Text( + text = schedule.name, + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Medium, + ) + + Text( + text = schedule.recipientName, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + + StatusChip(status = schedule.status) + } + + Spacer(modifier = Modifier.height(12.dp)) + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + ) { + Column { + Text( + text = "Amount", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Text( + text = CurrencyFormatter.format(schedule.amount, schedule.currency, 2), + style = MaterialTheme.typography.bodyLarge, + fontWeight = FontWeight.Medium, + ) + } + + Column { + Text( + text = "Next Payment", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Text( + text = schedule.nextPaymentDate, + style = MaterialTheme.typography.bodyMedium, + ) + } + + Column { + Text( + text = "Frequency", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Text( + text = schedule.frequency, + style = MaterialTheme.typography.bodyMedium, + ) + } + } + } + } + } +} + +@Composable +private fun UpcomingPaymentCard( + payment: UpcomingPayment, + modifier: Modifier = Modifier, +) { + Card( + modifier = modifier.fillMaxWidth(), + colors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surface, + ), + elevation = CardDefaults.cardElevation(defaultElevation = 2.dp), + ) { + Column( + modifier = Modifier.padding(16.dp), + ) { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + ) { + Column( + modifier = Modifier.weight(1f), + ) { + Text( + text = payment.scheduleName, + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Medium, + ) + + Text( + text = payment.recipientName, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + + StatusChip(status = payment.status) + } + + Spacer(modifier = Modifier.height(12.dp)) + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + ) { + Column { + Text( + text = "Amount", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Text( + text = CurrencyFormatter.format(payment.amount, payment.currency, 2), + style = MaterialTheme.typography.bodyLarge, + fontWeight = FontWeight.Medium, + ) + } + + Column { + Text( + text = "Due Date", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Text( + text = payment.dueDate, + style = MaterialTheme.typography.bodyMedium, + ) + } + } + } + } +} + +@Composable +private fun StatusChip( + status: AutoPayStatus, + modifier: Modifier = Modifier, +) { + val (backgroundColor, textColor) = when (status) { + AutoPayStatus.ACTIVE -> MaterialTheme.colorScheme.primary to MaterialTheme.colorScheme.onPrimary + AutoPayStatus.PAUSED -> MaterialTheme.colorScheme.tertiary to MaterialTheme.colorScheme.onTertiary + AutoPayStatus.CANCELLED -> MaterialTheme.colorScheme.error to MaterialTheme.colorScheme.onError + AutoPayStatus.COMPLETED -> MaterialTheme.colorScheme.secondary to MaterialTheme.colorScheme.onSecondary + } + + Card( + modifier = modifier, + colors = CardDefaults.cardColors(containerColor = backgroundColor), + ) { + Text( + text = status.name, + modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp), + style = MaterialTheme.typography.bodySmall, + color = textColor, + fontWeight = FontWeight.Medium, + ) + } +} + +@Composable +private fun StatusChip( + status: PaymentStatus, + modifier: Modifier = Modifier, +) { + val (backgroundColor, textColor) = when (status) { + PaymentStatus.UPCOMING -> MaterialTheme.colorScheme.primary to MaterialTheme.colorScheme.onPrimary + PaymentStatus.PROCESSING -> MaterialTheme.colorScheme.tertiary to MaterialTheme.colorScheme.onTertiary + PaymentStatus.COMPLETED -> MaterialTheme.colorScheme.secondary to MaterialTheme.colorScheme.onSecondary + PaymentStatus.FAILED -> MaterialTheme.colorScheme.error to MaterialTheme.colorScheme.onError + } + + Card( + modifier = modifier, + colors = CardDefaults.cardColors(containerColor = backgroundColor), + ) { + Text( + text = status.name, + modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp), + style = MaterialTheme.typography.bodySmall, + color = textColor, + fontWeight = FontWeight.Medium, + ) + } +} + +@Composable +private fun EmptyStateCard( + title: String, + description: String, + icon: ImageVector, + modifier: Modifier = Modifier, +) { + Card( + modifier = modifier.fillMaxWidth(), + colors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surfaceVariant, + ), + elevation = CardDefaults.cardElevation(defaultElevation = 1.dp), + ) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(24.dp), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Icon( + imageVector = icon, + contentDescription = null, + modifier = Modifier.size(48.dp), + tint = MaterialTheme.colorScheme.onSurfaceVariant, + ) + + Spacer(modifier = Modifier.height(16.dp)) + + Text( + text = title, + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Medium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + + Spacer(modifier = Modifier.height(8.dp)) + + Text( + text = description, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + textAlign = androidx.compose.ui.text.style.TextAlign.Center, + ) + } + } +} diff --git a/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AutoPaySetupScreen.kt b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AutoPaySetupScreen.kt new file mode 100644 index 000000000..bd323f59e --- /dev/null +++ b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AutoPaySetupScreen.kt @@ -0,0 +1,146 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.feature.autopay + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import org.mifospay.core.designsystem.component.MifosScaffold +import org.mifospay.core.designsystem.icon.MifosIcons + +@Composable +fun AutoPaySetupScreen( + onNavigateBack: () -> Unit, + modifier: Modifier = Modifier, +) { + MifosScaffold( + modifier = modifier, + topBarTitle = "AutoPay Setup", + backPress = onNavigateBack, + ) { paddingValues -> + Column( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + .padding(16.dp) + .verticalScroll(rememberScrollState()), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(16.dp), + ) { + Icon( + imageVector = MifosIcons.Settings, + contentDescription = null, + modifier = Modifier.size(64.dp), + tint = MaterialTheme.colorScheme.primary, + ) + + Text( + text = "AutoPay Setup", + style = MaterialTheme.typography.headlineMedium, + fontWeight = FontWeight.Medium, + ) + + Text( + text = "Configure your automatic payment settings and preferences.", + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + + Spacer(modifier = Modifier.height(16.dp)) + + Card( + modifier = Modifier.fillMaxSize(), + colors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surface, + ), + elevation = CardDefaults.cardElevation(defaultElevation = 2.dp), + ) { + Column( + modifier = Modifier.padding(16.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), + ) { + Text( + text = "Setup Options", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Medium, + ) + + Text( + text = "This screen will allow users to:", + style = MaterialTheme.typography.bodyMedium, + ) + + Column( + verticalArrangement = Arrangement.spacedBy(8.dp), + ) { + SetupOptionItem( + title = "Create New Schedule", + description = "Set up recurring payments with custom frequency and amounts", + ) + + SetupOptionItem( + title = "Link Bank Account", + description = "Connect your bank account for automatic transfers", + ) + + SetupOptionItem( + title = "Set Payment Limits", + description = "Configure maximum payment amounts and frequency limits", + ) + + SetupOptionItem( + title = "Choose Recipients", + description = "Add and manage payment recipients", + ) + } + } + } + } + } +} + +@Composable +private fun SetupOptionItem( + title: String, + description: String, + modifier: Modifier = Modifier, +) { + Column( + modifier = modifier.padding(vertical = 8.dp), + ) { + Text( + text = "• $title", + style = MaterialTheme.typography.bodyMedium, + fontWeight = FontWeight.Medium, + ) + + Text( + text = description, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } +} diff --git a/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AutoPayViewModel.kt b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AutoPayViewModel.kt new file mode 100644 index 000000000..db9ce8a48 --- /dev/null +++ b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/AutoPayViewModel.kt @@ -0,0 +1,294 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.feature.autopay + +import androidx.lifecycle.SavedStateHandle +import androidx.lifecycle.viewModelScope +import kotlinx.coroutines.delay +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import kotlinx.serialization.Serializable +import org.mifospay.core.common.getSerialized +import org.mifospay.core.common.setSerialized +import org.mifospay.core.ui.utils.BaseViewModel + +class AutoPayViewModel( + savedStateHandle: SavedStateHandle, +) : BaseViewModel( + initialState = savedStateHandle.getSerialized(KEY_STATE) ?: AutoPayState(), +) { + + companion object { + private const val KEY_STATE = "autopay_state" + } + + init { + stateFlow + .onEach { savedStateHandle.setSerialized(key = KEY_STATE, value = it) } + .launchIn(viewModelScope) + + loadDashboardData() + } + + override fun handleAction(action: AutoPayAction) { + when (action) { + is AutoPayAction.SetupRecurringPayment -> { + setupRecurringPayment() + } + is AutoPayAction.ConfigurePaymentRules -> { + configurePaymentRules() + } + is AutoPayAction.ManagePaymentPreferences -> { + managePaymentPreferences() + } + is AutoPayAction.ToggleAutoPay -> { + toggleAutoPay(action.enabled) + } + is AutoPayAction.GetPaymentHistory -> { + getPaymentHistory() + } + is AutoPayAction.RefreshDashboard -> { + refreshDashboard() + } + is AutoPayAction.AddNewSchedule -> { + addNewSchedule() + } + is AutoPayAction.ManageExistingSchedules -> { + manageExistingSchedules() + } + is AutoPayAction.ViewScheduleDetails -> { + viewScheduleDetails(action.scheduleId) + } + is AutoPayAction.AddNewBiller -> { + addNewBiller() + } + is AutoPayAction.ViewBillerList -> { + viewBillerList() + } + is AutoPayAction.AddNewBill -> { + addNewBill() + } + is AutoPayAction.ViewBillList -> { + viewBillList() + } + } + } + + private fun loadDashboardData() { + mutableStateFlow.update { it.copy(isLoading = true) } + + // Simulate API call delay + viewModelScope.launch { + delay(1000) + + val dummySchedules = listOf( + AutoPaySchedule( + id = "1", + name = "Monthly Rent Payment", + amount = 1200.0, + currency = "USD", + frequency = "Monthly", + nextPaymentDate = "2024-02-15", + status = AutoPayStatus.ACTIVE, + recipientName = "Landlord Corp", + accountNumber = "****1234", + ), + AutoPaySchedule( + id = "2", + name = "Internet Bill", + amount = 89.99, + currency = "USD", + frequency = "Monthly", + nextPaymentDate = "2024-02-20", + status = AutoPayStatus.ACTIVE, + recipientName = "NetConnect", + accountNumber = "****5678", + ), + AutoPaySchedule( + id = "3", + name = "Gym Membership", + amount = 45.0, + currency = "USD", + frequency = "Monthly", + nextPaymentDate = "2024-02-25", + status = AutoPayStatus.PAUSED, + recipientName = "FitLife Gym", + accountNumber = "****9012", + ), + ) + + val dummyUpcomingPayments = listOf( + UpcomingPayment( + id = "1", + scheduleName = "Monthly Rent Payment", + amount = 1200.0, + currency = "USD", + dueDate = "2024-02-15", + status = PaymentStatus.UPCOMING, + recipientName = "Landlord Corp", + ), + UpcomingPayment( + id = "2", + scheduleName = "Internet Bill", + amount = 89.99, + currency = "USD", + dueDate = "2024-02-20", + status = PaymentStatus.UPCOMING, + recipientName = "NetConnect", + ), + ) + + mutableStateFlow.update { + it.copy( + isLoading = false, + activeSchedules = dummySchedules, + upcomingPayments = dummyUpcomingPayments, + totalActiveSchedules = dummySchedules.size, + totalUpcomingPayments = dummyUpcomingPayments.size, + ) + } + } + } + + private fun refreshDashboard() { + loadDashboardData() + } + + private fun addNewSchedule() { + sendEvent(AutoPayEvent.NavigateToSetup) + } + + private fun manageExistingSchedules() { + sendEvent(AutoPayEvent.NavigateToRules) + } + + private fun viewScheduleDetails(scheduleId: String) { + sendEvent(AutoPayEvent.NavigateToScheduleDetails(scheduleId)) + } + + private fun setupRecurringPayment() { + sendEvent(AutoPayEvent.NavigateToSetup) + } + + private fun configurePaymentRules() { + sendEvent(AutoPayEvent.NavigateToRules) + } + + private fun managePaymentPreferences() { + sendEvent(AutoPayEvent.NavigateToPreferences) + } + + private fun toggleAutoPay(enabled: Boolean) { + mutableStateFlow.update { + it.copy(isAutoPayEnabled = enabled) + } + } + + private fun getPaymentHistory() { + sendEvent(AutoPayEvent.NavigateToHistory) + } + + private fun addNewBiller() { + sendEvent(AutoPayEvent.NavigateToAddBiller) + } + + private fun viewBillerList() { + sendEvent(AutoPayEvent.NavigateToBillerList) + } + + private fun addNewBill() { + sendEvent(AutoPayEvent.NavigateToAddBill) + } + + private fun viewBillList() { + sendEvent(AutoPayEvent.NavigateToBillList) + } +} + +@Serializable +data class AutoPayState( + val isAutoPayEnabled: Boolean = false, + val isLoading: Boolean = false, + val error: String? = null, + val activeSchedules: List = emptyList(), + val upcomingPayments: List = emptyList(), + val totalActiveSchedules: Int = 0, + val totalUpcomingPayments: Int = 0, +) + +@Serializable +data class AutoPaySchedule( + val id: String, + val name: String, + val amount: Double, + val currency: String, + val frequency: String, + val nextPaymentDate: String, + val status: AutoPayStatus, + val recipientName: String, + val accountNumber: String, +) + +@Serializable +data class UpcomingPayment( + val id: String, + val scheduleName: String, + val amount: Double, + val currency: String, + val dueDate: String, + val status: PaymentStatus, + val recipientName: String, +) + +@Serializable +enum class AutoPayStatus { + ACTIVE, + PAUSED, + CANCELLED, + COMPLETED, +} + +@Serializable +enum class PaymentStatus { + UPCOMING, + PROCESSING, + COMPLETED, + FAILED, +} + +sealed interface AutoPayEvent { + data object NavigateToSetup : AutoPayEvent + data object NavigateToRules : AutoPayEvent + data object NavigateToPreferences : AutoPayEvent + data object NavigateToHistory : AutoPayEvent + data object NavigateToAddBiller : AutoPayEvent + data object NavigateToBillerList : AutoPayEvent + data object NavigateToAddBill : AutoPayEvent + data object NavigateToBillList : AutoPayEvent + data class NavigateToScheduleDetails(val scheduleId: String) : AutoPayEvent +} + +sealed interface AutoPayAction { + data object SetupRecurringPayment : AutoPayAction + data object ConfigurePaymentRules : AutoPayAction + data object ManagePaymentPreferences : AutoPayAction + data object GetPaymentHistory : AutoPayAction + data class ToggleAutoPay(val enabled: Boolean) : AutoPayAction + data object RefreshDashboard : AutoPayAction + data object AddNewSchedule : AutoPayAction + data object ManageExistingSchedules : AutoPayAction + data object AddNewBiller : AutoPayAction + data object ViewBillerList : AutoPayAction + data object AddNewBill : AutoPayAction + data object ViewBillList : AutoPayAction + data class ViewScheduleDetails(val scheduleId: String) : AutoPayAction +} diff --git a/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/BillListScreen.kt b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/BillListScreen.kt new file mode 100644 index 000000000..103dbaf78 --- /dev/null +++ b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/BillListScreen.kt @@ -0,0 +1,373 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.feature.autopay + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material3.Button +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.DropdownMenu +import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import kotlinx.datetime.Instant +import kotlinx.datetime.TimeZone +import kotlinx.datetime.toLocalDateTime +import org.koin.compose.viewmodel.koinViewModel +import org.mifospay.core.common.CurrencyFormatter +import org.mifospay.core.designsystem.component.MifosButton +import org.mifospay.core.designsystem.component.MifosScaffold +import org.mifospay.core.designsystem.component.rememberMifosPullToRefreshState +import org.mifospay.core.designsystem.icon.MifosIcons +import org.mifospay.core.model.autopay.Bill +import org.mifospay.core.model.autopay.BillStatus +import org.mifospay.core.ui.utils.EventsEffect + +@Composable +fun BillListScreen( + onNavigateBack: () -> Unit, + onNavigateToAddBill: () -> Unit, + onNavigateToEditBill: (String) -> Unit, + onNavigateToAutopay: () -> Unit, + modifier: Modifier = Modifier, + viewModel: BillListViewModel = koinViewModel(), +) { + val state by viewModel.stateFlow.collectAsStateWithLifecycle() + + val pullRefreshState = rememberMifosPullToRefreshState( + isEnabled = true, + isRefreshing = state.isLoading, + onRefresh = { viewModel.trySendAction(BillListAction.RefreshBills) }, + ) + + Box(modifier = modifier.fillMaxSize()) { + MifosScaffold( + topBarTitle = "Bill List", + backPress = onNavigateBack, + pullToRefreshState = pullRefreshState, + ) { paddingValues -> + if (state.isLoading && state.bills.isEmpty()) { + Box( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues), + contentAlignment = Alignment.Center, + ) { + CircularProgressIndicator() + } + } else { + LazyColumn( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + .padding(16.dp), + verticalArrangement = Arrangement.spacedBy(12.dp), + contentPadding = androidx.compose.foundation.layout.PaddingValues(bottom = 80.dp), + ) { + if (state.bills.isEmpty()) { + item { + EmptyStateCard( + title = "No Bills Found", + description = "You don't have any bills yet. Add your first bill to get started!", + icon = MifosIcons.Receipt, + onAddBill = onNavigateToAddBill, + ) + } + } else { + items(state.bills) { bill -> + BillCard( + bill = bill, + onEdit = { onNavigateToEditBill(bill.id ?: "") }, + onDelete = { viewModel.trySendAction(BillListAction.DeleteBill(bill.id ?: "")) }, + ) + } + } + } + } + } + + MifosButton( + text = { Text("Back to AutoPay") }, + onClick = onNavigateToAutopay, + modifier = Modifier + .align(Alignment.BottomCenter) + .padding(16.dp) + .fillMaxWidth(), + ) + } + + EventsEffect(viewModel) { event -> + when (event) { + is BillListEvent.NavigateToAddBill -> onNavigateToAddBill() + is BillListEvent.NavigateToEditBill -> onNavigateToEditBill(event.billId) + is BillListEvent.BillDeleted -> { + // Bill deleted successfully, no action needed + } + } + } +} + +@Composable +private fun BillCard( + bill: Bill, + onEdit: () -> Unit, + onDelete: () -> Unit, + modifier: Modifier = Modifier, +) { + var showMenu by remember { mutableStateOf(false) } + + Card( + modifier = modifier.fillMaxWidth(), + colors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surface, + ), + elevation = CardDefaults.cardElevation(defaultElevation = 2.dp), + ) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(16.dp), + ) { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + ) { + Column( + modifier = Modifier.weight(1f), + ) { + Text( + text = bill.name, + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Medium, + ) + + Text( + text = bill.billerName ?: "", + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + + BillStatusChip(status = bill.status) + + Box { + IconButton( + onClick = { showMenu = true }, + ) { + Icon( + imageVector = MifosIcons.MoreVert, + contentDescription = "More options", + ) + } + + DropdownMenu( + expanded = showMenu, + onDismissRequest = { showMenu = false }, + ) { + DropdownMenuItem( + text = { Text("Edit") }, + leadingIcon = { + Icon( + imageVector = MifosIcons.Edit, + contentDescription = null, + ) + }, + onClick = { + showMenu = false + onEdit() + }, + ) + DropdownMenuItem( + text = { Text("Delete") }, + leadingIcon = { + Icon( + imageVector = MifosIcons.Delete, + contentDescription = null, + ) + }, + onClick = { + showMenu = false + onDelete() + }, + ) + } + } + } + + Spacer(modifier = Modifier.height(12.dp)) + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + ) { + Column { + Text( + text = "Amount", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Text( + text = CurrencyFormatter.format(bill.amount, bill.currency, 2), + style = MaterialTheme.typography.bodyLarge, + fontWeight = FontWeight.Medium, + ) + } + + Column { + Text( + text = "Due Date", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Text( + text = formatDate(bill.dueDate), + style = MaterialTheme.typography.bodyMedium, + ) + } + + Column { + Text( + text = "Frequency", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Text( + text = bill.recurrencePattern.displayName, + style = MaterialTheme.typography.bodyMedium, + ) + } + } + } + } +} + +@Composable +private fun BillStatusChip( + status: BillStatus, + modifier: Modifier = Modifier, +) { + val (backgroundColor, textColor) = when (status) { + BillStatus.ACTIVE -> MaterialTheme.colorScheme.primary to MaterialTheme.colorScheme.onPrimary + BillStatus.PAUSED -> MaterialTheme.colorScheme.tertiary to MaterialTheme.colorScheme.onTertiary + BillStatus.CANCELLED -> MaterialTheme.colorScheme.error to MaterialTheme.colorScheme.onError + BillStatus.COMPLETED -> MaterialTheme.colorScheme.secondary to MaterialTheme.colorScheme.onSecondary + } + + Card( + modifier = modifier, + colors = CardDefaults.cardColors(containerColor = backgroundColor), + ) { + Text( + text = status.name, + modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp), + style = MaterialTheme.typography.bodySmall, + color = textColor, + fontWeight = FontWeight.Medium, + ) + } +} + +@Composable +private fun EmptyStateCard( + title: String, + description: String, + icon: androidx.compose.ui.graphics.vector.ImageVector, + onAddBill: () -> Unit, + modifier: Modifier = Modifier, +) { + Card( + modifier = modifier.fillMaxWidth(), + colors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surfaceVariant, + ), + elevation = CardDefaults.cardElevation(defaultElevation = 1.dp), + ) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(24.dp), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Icon( + imageVector = icon, + contentDescription = null, + modifier = Modifier.size(48.dp), + tint = MaterialTheme.colorScheme.onSurfaceVariant, + ) + + Spacer(modifier = Modifier.height(16.dp)) + + Text( + text = title, + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Medium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + + Spacer(modifier = Modifier.height(8.dp)) + + Text( + text = description, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + textAlign = androidx.compose.ui.text.style.TextAlign.Center, + ) + + Spacer(modifier = Modifier.height(24.dp)) + + Button( + onClick = onAddBill, + ) { + Icon( + imageVector = MifosIcons.Add, + contentDescription = null, + modifier = Modifier.size(20.dp), + ) + Spacer(modifier = Modifier.width(8.dp)) + Text("Add Bill") + } + } + } +} + +private fun formatDate(timestamp: Long): String { + return try { + val instant = Instant.fromEpochMilliseconds(timestamp) + val localDateTime = instant.toLocalDateTime(TimeZone.currentSystemDefault()) + "${localDateTime.monthNumber}/${localDateTime.dayOfMonth}/${localDateTime.year}" + } catch (e: Exception) { + "Invalid Date" + } +} diff --git a/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/BillListViewModel.kt b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/BillListViewModel.kt new file mode 100644 index 000000000..db1ede37d --- /dev/null +++ b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/BillListViewModel.kt @@ -0,0 +1,138 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.feature.autopay + +import androidx.lifecycle.SavedStateHandle +import androidx.lifecycle.viewModelScope +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import kotlinx.serialization.Serializable +import org.mifospay.core.common.DataState +import org.mifospay.core.common.getSerialized +import org.mifospay.core.common.setSerialized +import org.mifospay.core.datastore.BillRepository +import org.mifospay.core.model.autopay.Bill +import org.mifospay.core.ui.utils.BaseViewModel + +class BillListViewModel( + savedStateHandle: SavedStateHandle, + private val billRepository: BillRepository, +) : BaseViewModel( + initialState = savedStateHandle.getSerialized(KEY_STATE) ?: BillListState(), +) { + + companion object { + private const val KEY_STATE = "bill_list_state" + } + + init { + stateFlow + .onEach { savedStateHandle.setSerialized(key = KEY_STATE, value = it) } + .launchIn(viewModelScope) + + loadBills() + } + + override fun handleAction(action: BillListAction) { + when (action) { + is BillListAction.RefreshBills -> { + loadBills() + } + is BillListAction.AddNewBill -> { + addNewBill() + } + is BillListAction.EditBill -> { + editBill(action.billId) + } + is BillListAction.DeleteBill -> { + deleteBill(action.billId) + } + } + } + + private fun loadBills() { + viewModelScope.launch { + mutableStateFlow.update { it.copy(isLoading = true) } + + try { + billRepository.getAllBills().collect { bills -> + mutableStateFlow.update { + it.copy( + bills = bills, + isLoading = false, + error = null, + ) + } + } + } catch (e: Exception) { + mutableStateFlow.update { + it.copy( + isLoading = false, + error = "Failed to load bills: ${e.message}", + ) + } + } + } + } + + private fun addNewBill() { + sendEvent(BillListEvent.NavigateToAddBill) + } + + private fun editBill(billId: String) { + sendEvent(BillListEvent.NavigateToEditBill(billId)) + } + + private fun deleteBill(billId: String) { + viewModelScope.launch { + mutableStateFlow.update { it.copy(isLoading = true) } + + when (val result = billRepository.deleteBill(billId)) { + is DataState.Loading -> { + // Already set loading state above + } + is DataState.Success -> { + sendEvent(BillListEvent.BillDeleted) + loadBills() // Reload the list + } + is DataState.Error -> { + mutableStateFlow.update { + it.copy( + isLoading = false, + error = "Failed to delete bill: ${result.exception.message}", + ) + } + } + } + } + } +} + +@Serializable +data class BillListState( + val isLoading: Boolean = false, + val error: String? = null, + val bills: List = emptyList(), +) + +sealed interface BillListEvent { + data object NavigateToAddBill : BillListEvent + data class NavigateToEditBill(val billId: String) : BillListEvent + data object BillDeleted : BillListEvent +} + +sealed interface BillListAction { + data object RefreshBills : BillListAction + data object AddNewBill : BillListAction + data class EditBill(val billId: String) : BillListAction + data class DeleteBill(val billId: String) : BillListAction +} diff --git a/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/BillerListScreen.kt b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/BillerListScreen.kt new file mode 100644 index 000000000..f2e768fe6 --- /dev/null +++ b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/BillerListScreen.kt @@ -0,0 +1,338 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.feature.autopay + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material3.Button +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.DropdownMenu +import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import org.koin.compose.viewmodel.koinViewModel +import org.mifospay.core.designsystem.component.MifosButton +import org.mifospay.core.designsystem.component.MifosScaffold +import org.mifospay.core.designsystem.component.MifosTopBar +import org.mifospay.core.designsystem.icon.MifosIcons +import org.mifospay.core.model.autopay.Biller +import org.mifospay.core.ui.utils.EventsEffect + +@Composable +fun BillerListScreen( + onNavigateBack: () -> Unit, + onNavigateToAddBiller: () -> Unit, + onNavigateToEditBiller: (String) -> Unit, + viewModel: BillerListViewModel = koinViewModel(), +) { + val state by viewModel.stateFlow.collectAsStateWithLifecycle() + var searchQuery by remember { mutableStateOf("") } + var showSearchBar by remember { mutableStateOf(false) } + + EventsEffect(viewModel) { event -> + when (event) { + is BillerListEvent.NavigateToAddBiller -> onNavigateToAddBiller() + is BillerListEvent.NavigateToEditBiller -> onNavigateToEditBiller(event.billerId) + is BillerListEvent.BillerDeleted -> { + // Biller deleted successfully, no action needed + } + } + } + + MifosScaffold( + topBar = { + MifosTopBar( + topBarTitle = "My Billers", + backPress = onNavigateBack, + actions = { + IconButton( + onClick = { showSearchBar = !showSearchBar }, + ) { + Icon( + imageVector = MifosIcons.Search, + contentDescription = "Search billers", + ) + } + }, + ) + }, + ) { paddingValues -> + Box( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues), + ) { + Column( + modifier = Modifier + .fillMaxSize() + .padding(16.dp), + ) { + if (showSearchBar) { + OutlinedTextField( + value = searchQuery, + onValueChange = { + searchQuery = it + viewModel.trySendAction(BillerListAction.SearchBillers(it)) + }, + placeholder = { Text("Search billers...") }, + modifier = Modifier.fillMaxWidth(), + singleLine = true, + ) + Spacer(modifier = Modifier.height(16.dp)) + } + + if (state.isLoading) { + Box( + modifier = Modifier.fillMaxSize(), + contentAlignment = Alignment.Center, + ) { + CircularProgressIndicator() + } + } else if (state.billers.isEmpty()) { + EmptyStateCard( + title = "No Billers Found", + description = "You don't have any billers yet. Add your first biller to get started!", + icon = MifosIcons.Person, + onAddBiller = { viewModel.trySendAction(BillerListAction.AddNewBiller) }, + ) + } else { + BillerList( + billers = state.billers, + onEditBiller = { billerId -> + viewModel.trySendAction(BillerListAction.EditBiller(billerId)) + }, + onDeleteBiller = { billerId -> + viewModel.trySendAction(BillerListAction.DeleteBiller(billerId)) + }, + ) + } + } + + MifosButton( + text = { Text("Back to AutoPay") }, + onClick = onNavigateBack, + modifier = Modifier + .align(Alignment.BottomCenter) + .padding(16.dp) + .fillMaxWidth(), + ) + } + } +} + +@Composable +private fun EmptyStateCard( + title: String, + description: String, + icon: androidx.compose.ui.graphics.vector.ImageVector, + onAddBiller: () -> Unit, + modifier: Modifier = Modifier, +) { + Card( + modifier = modifier.fillMaxWidth(), + colors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surfaceVariant, + ), + elevation = CardDefaults.cardElevation(defaultElevation = 1.dp), + ) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(24.dp), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Icon( + imageVector = icon, + contentDescription = null, + modifier = Modifier.size(48.dp), + tint = MaterialTheme.colorScheme.onSurfaceVariant, + ) + + Spacer(modifier = Modifier.height(16.dp)) + + Text( + text = title, + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Medium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + + Spacer(modifier = Modifier.height(8.dp)) + + Text( + text = description, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + textAlign = androidx.compose.ui.text.style.TextAlign.Center, + ) + + Spacer(modifier = Modifier.height(24.dp)) + + Button( + onClick = onAddBiller, + ) { + Icon( + imageVector = MifosIcons.Add, + contentDescription = null, + modifier = Modifier.size(20.dp), + ) + Spacer(modifier = Modifier.width(8.dp)) + Text("Add Biller") + } + } + } +} + +@Composable +private fun BillerList( + billers: List, + onEditBiller: (String) -> Unit, + onDeleteBiller: (String) -> Unit, + modifier: Modifier = Modifier, +) { + LazyColumn( + modifier = modifier.fillMaxWidth(), + verticalArrangement = Arrangement.spacedBy(12.dp), + contentPadding = PaddingValues(bottom = 80.dp), + ) { + items( + items = billers, + key = { it.id ?: it.name }, + ) { biller -> + BillerCard( + biller = biller, + onEdit = { onEditBiller(biller.id ?: "") }, + onDelete = { onDeleteBiller(biller.id ?: "") }, + ) + } + } +} + +@Composable +private fun BillerCard( + biller: Biller, + onEdit: () -> Unit, + onDelete: () -> Unit, + modifier: Modifier = Modifier, +) { + var showMenu by remember { mutableStateOf(false) } + + Card( + modifier = modifier.fillMaxWidth(), + colors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surface, + ), + elevation = CardDefaults.cardElevation(defaultElevation = 2.dp), + ) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(16.dp), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically, + ) { + Column( + modifier = Modifier.weight(1f), + ) { + Text( + text = biller.name, + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Medium, + ) + + Spacer(modifier = Modifier.height(4.dp)) + + Text( + text = "Account: ${biller.accountNumber}", + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + + Spacer(modifier = Modifier.height(2.dp)) + + Text( + text = biller.category.displayName, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.primary, + ) + } + + Box { + IconButton( + onClick = { showMenu = true }, + ) { + Icon( + imageVector = MifosIcons.MoreVert, + contentDescription = "More options", + ) + } + + DropdownMenu( + expanded = showMenu, + onDismissRequest = { showMenu = false }, + ) { + DropdownMenuItem( + text = { Text("Edit") }, + leadingIcon = { + Icon( + imageVector = MifosIcons.Edit, + contentDescription = null, + ) + }, + onClick = { + showMenu = false + onEdit() + }, + ) + DropdownMenuItem( + text = { Text("Delete") }, + leadingIcon = { + Icon( + imageVector = MifosIcons.Delete, + contentDescription = null, + ) + }, + onClick = { + showMenu = false + onDelete() + }, + ) + } + } + } + } +} diff --git a/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/BillerListViewModel.kt b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/BillerListViewModel.kt new file mode 100644 index 000000000..efe3f38f0 --- /dev/null +++ b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/BillerListViewModel.kt @@ -0,0 +1,153 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.feature.autopay + +import androidx.lifecycle.SavedStateHandle +import androidx.lifecycle.viewModelScope +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import kotlinx.serialization.Serializable +import org.mifospay.core.common.DataState +import org.mifospay.core.common.getSerialized +import org.mifospay.core.datastore.BillerRepository +import org.mifospay.core.model.autopay.Biller +import org.mifospay.core.ui.utils.BaseViewModel + +class BillerListViewModel( + savedStateHandle: SavedStateHandle, + private val billerRepository: BillerRepository, +) : BaseViewModel( + initialState = savedStateHandle.getSerialized(KEY_STATE) ?: BillerListState(), +) { + + init { + loadBillers() + } + + override fun handleAction(action: BillerListAction) { + when (action) { + is BillerListAction.LoadBillers -> { + loadBillers() + } + is BillerListAction.SearchBillers -> { + searchBillers(action.query) + } + is BillerListAction.DeleteBiller -> { + deleteBiller(action.billerId) + } + is BillerListAction.EditBiller -> { + sendEvent(BillerListEvent.NavigateToEditBiller(action.billerId)) + } + is BillerListAction.AddNewBiller -> { + sendEvent(BillerListEvent.NavigateToAddBiller) + } + } + } + + private fun loadBillers() { + viewModelScope.launch { + mutableStateFlow.update { it.copy(isLoading = true) } + + try { + billerRepository.getAllBillers().collect { billers -> + mutableStateFlow.update { + it.copy( + billers = billers, + isLoading = false, + error = null, + ) + } + } + } catch (e: Exception) { + mutableStateFlow.update { + it.copy( + isLoading = false, + error = "Failed to load billers: ${e.message}", + ) + } + } + } + } + + private fun searchBillers(query: String) { + viewModelScope.launch { + if (query.isBlank()) { + loadBillers() + } else { + try { + val searchResults = billerRepository.searchBillersByName(query) + mutableStateFlow.update { + it.copy( + billers = searchResults, + isLoading = false, + error = null, + ) + } + } catch (e: Exception) { + mutableStateFlow.update { + it.copy( + isLoading = false, + error = "Failed to search billers: ${e.message}", + ) + } + } + } + } + } + + private fun deleteBiller(billerId: String) { + viewModelScope.launch { + mutableStateFlow.update { it.copy(isLoading = true) } + + when (val result = billerRepository.deleteBiller(billerId)) { + is DataState.Loading -> { + // Already set loading state above + } + is DataState.Success -> { + sendEvent(BillerListEvent.BillerDeleted) + loadBillers() // Reload the list + } + is DataState.Error -> { + mutableStateFlow.update { + it.copy( + isLoading = false, + error = "Failed to delete biller: ${result.exception.message}", + ) + } + } + } + } + } + + companion object { + private const val KEY_STATE = "biller_list_state" + } +} + +@Serializable +data class BillerListState( + val billers: List = emptyList(), + val isLoading: Boolean = false, + val error: String? = null, +) + +sealed interface BillerListEvent { + data class NavigateToEditBiller(val billerId: String) : BillerListEvent + data object NavigateToAddBiller : BillerListEvent + data object BillerDeleted : BillerListEvent +} + +sealed interface BillerListAction { + data object LoadBillers : BillerListAction + data class SearchBillers(val query: String) : BillerListAction + data class DeleteBiller(val billerId: String) : BillerListAction + data class EditBiller(val billerId: String) : BillerListAction + data object AddNewBiller : BillerListAction +} diff --git a/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/EditBillScreen.kt b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/EditBillScreen.kt new file mode 100644 index 000000000..eef66a134 --- /dev/null +++ b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/EditBillScreen.kt @@ -0,0 +1,338 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.feature.autopay + +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.DatePicker +import androidx.compose.material3.DatePickerDialog +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.IconButtonDefaults +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.material3.rememberDatePickerState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.derivedStateOf +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.unit.dp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import kotlinx.datetime.Clock +import org.koin.compose.viewmodel.koinViewModel +import org.mifospay.core.common.DateHelper +import org.mifospay.core.designsystem.component.BasicDialogState +import org.mifospay.core.designsystem.component.LoadingDialogState +import org.mifospay.core.designsystem.component.MifosBasicDialog +import org.mifospay.core.designsystem.component.MifosButton +import org.mifospay.core.designsystem.component.MifosLoadingDialog +import org.mifospay.core.designsystem.component.MifosOutlinedButton +import org.mifospay.core.designsystem.component.MifosOutlinedTextField +import org.mifospay.core.designsystem.component.MifosScaffold +import org.mifospay.core.designsystem.component.MifosTextField +import org.mifospay.core.designsystem.component.MifosTopBar +import org.mifospay.core.designsystem.icon.MifosIcons +import org.mifospay.core.designsystem.utils.onClick +import org.mifospay.core.model.autopay.RecurrencePattern +import org.mifospay.core.ui.DropdownBox +import org.mifospay.core.ui.DropdownBoxItem +import org.mifospay.core.ui.utils.EventsEffect +import template.core.base.designsystem.theme.KptTheme + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun EditBillScreen( + onNavigateBack: () -> Unit, + onNavigateToAddBiller: () -> Unit, + viewModel: EditBillViewModel = koinViewModel(), +) { + val state by viewModel.stateFlow.collectAsStateWithLifecycle() + var showRecurrenceDropdown by remember { mutableStateOf(false) } + var showBillerDropdown by remember { mutableStateOf(false) } + var showDatePicker by remember { mutableStateOf(false) } + + EventsEffect(viewModel) { event -> + when (event) { + is EditBillEvent.BillUpdated -> { + onNavigateBack() + } + } + } + + MifosScaffold( + topBar = { + MifosTopBar( + topBarTitle = "Edit Bill", + backPress = onNavigateBack, + ) + }, + ) { paddingValues -> + Column( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + .padding(16.dp), + ) { + Column( + modifier = Modifier + .weight(1f) + .verticalScroll(rememberScrollState()), + verticalArrangement = Arrangement.spacedBy(16.dp), + ) { + Text( + text = "Edit bill details", + modifier = Modifier.padding(bottom = 8.dp), + ) + + MifosOutlinedTextField( + label = "Bill Name *", + value = state.formData.name, + onValueChange = { viewModel.trySendAction(EditBillAction.UpdateBillName(it)) }, + isError = state.validationResult.nameError != null, + errorMessage = state.validationResult.nameError, + singleLine = true, + keyboardOptions = KeyboardOptions( + imeAction = ImeAction.Next, + ), + ) + + DropdownBox( + expanded = showBillerDropdown, + label = "Select Biller *", + value = state.formData.billerName ?: "Select a biller", + readOnly = true, + isError = state.validationResult.billerError != null, + errorText = state.validationResult.billerError, + onExpandChange = { showBillerDropdown = it }, + ) { + state.availableBillers.forEach { biller -> + DropdownBoxItem( + text = biller.name, + onClick = { + viewModel.trySendAction(EditBillAction.SelectBiller(biller)) + showBillerDropdown = false + }, + ) + } + DropdownBoxItem( + text = "+ Add New Biller", + onClick = { + showBillerDropdown = false + onNavigateToAddBiller() + }, + ) + } + + MifosOutlinedTextField( + label = "Amount *", + value = state.formData.amount, + onValueChange = { viewModel.trySendAction(EditBillAction.UpdateAmount(it)) }, + isError = state.validationResult.amountError != null, + errorMessage = state.validationResult.amountError, + singleLine = true, + keyboardOptions = KeyboardOptions( + keyboardType = KeyboardType.Decimal, + imeAction = ImeAction.Next, + ), + ) + + Box( + modifier = Modifier.onClick { showDatePicker = true }, + ) { + MifosTextField( + label = "Due Date *", + value = if (state.formData.dueDate > 0L) { + formatDateForDisplay(state.formData.dueDate) + } else { + "" + }, + onValueChange = { }, + isError = state.validationResult.dueDateError != null, + errorText = state.validationResult.dueDateError, + singleLine = true, + readOnly = true, + showClearIcon = false, + trailingIcon = { + IconButton( + onClick = { showDatePicker = true }, + colors = IconButtonDefaults.iconButtonColors( + containerColor = KptTheme.colorScheme.tertiary, + contentColor = KptTheme.colorScheme.tertiaryContainer, + ), + ) { + Icon( + imageVector = MifosIcons.CalenderMonth, + contentDescription = "Choose Date", + ) + } + }, + ) + } + + DropdownBox( + expanded = showRecurrenceDropdown, + label = "Recurrence Pattern *", + value = state.formData.recurrencePattern.displayName, + readOnly = true, + isError = state.validationResult.recurrencePatternError != null, + errorText = state.validationResult.recurrencePatternError, + onExpandChange = { showRecurrenceDropdown = it }, + ) { + RecurrencePattern.entries.forEach { pattern -> + DropdownBoxItem( + text = pattern.displayName, + onClick = { + viewModel.trySendAction(EditBillAction.UpdateRecurrencePattern(pattern)) + showRecurrenceDropdown = false + }, + ) + } + } + + MifosOutlinedTextField( + label = "Description (Optional)", + value = state.formData.description, + onValueChange = { viewModel.trySendAction(EditBillAction.UpdateDescription(it)) }, + singleLine = false, + keyboardOptions = KeyboardOptions( + imeAction = ImeAction.Done, + ), + ) + + if (state.nextPaymentDates.isNotEmpty()) { + Spacer(modifier = Modifier.height(16.dp)) + + Text( + text = "Next Payment Dates:", + style = KptTheme.typography.titleMedium, + ) + + state.nextPaymentDates.forEach { nextDate -> + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically, + ) { + Text( + text = nextDate.formattedDate, + style = KptTheme.typography.bodyMedium, + ) + if (nextDate.isOverdue) { + Text( + text = "Overdue", + style = KptTheme.typography.bodySmall, + color = KptTheme.colorScheme.error, + ) + } + } + } + } + } + + Spacer(modifier = Modifier.height(24.dp)) + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(16.dp), + ) { + MifosOutlinedButton( + text = { Text("Cancel") }, + onClick = onNavigateBack, + modifier = Modifier.weight(1f), + ) + MifosButton( + text = { Text("Update Bill") }, + onClick = { viewModel.trySendAction(EditBillAction.UpdateBill) }, + modifier = Modifier.weight(1f), + enabled = !state.isLoading, + ) + } + } + } + + AnimatedVisibility(showDatePicker) { + val dateState = rememberDatePickerState( + initialSelectedDateMillis = if (state.formData.dueDate > 0L) { + state.formData.dueDate + } else { + Clock.System.now().toEpochMilliseconds() + }, + ) + + val confirmEnabled = remember { + derivedStateOf { dateState.selectedDateMillis != null } + } + + DatePickerDialog( + onDismissRequest = { showDatePicker = false }, + confirmButton = { + TextButton( + onClick = { + dateState.selectedDateMillis?.let { timestamp -> + viewModel.trySendAction(EditBillAction.UpdateDueDate(timestamp)) + } + showDatePicker = false + }, + enabled = confirmEnabled.value, + ) { + Text("OK") + } + }, + dismissButton = { + TextButton( + onClick = { showDatePicker = false }, + ) { + Text("Cancel") + } + }, + content = { + DatePicker(state = dateState) + }, + ) + } + + if (state.isLoading) { + MifosLoadingDialog( + visibilityState = LoadingDialogState.Shown, + ) + } + + state.error?.let { error -> + MifosBasicDialog( + visibilityState = BasicDialogState.Shown( + title = "Error", + message = error, + ), + onDismissRequest = { viewModel.trySendAction(EditBillAction.ClearError) }, + ) + } +} + +private fun formatDateForDisplay(timestamp: Long): String { + return DateHelper.getDateAsStringFromLong(timestamp) +} diff --git a/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/EditBillViewModel.kt b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/EditBillViewModel.kt new file mode 100644 index 000000000..6d5b40949 --- /dev/null +++ b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/EditBillViewModel.kt @@ -0,0 +1,347 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.feature.autopay + +import androidx.lifecycle.SavedStateHandle +import androidx.lifecycle.viewModelScope +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import kotlinx.datetime.Clock +import kotlinx.serialization.Serializable +import org.mifospay.core.common.DataState +import org.mifospay.core.common.DateHelper +import org.mifospay.core.common.getSerialized +import org.mifospay.core.data.util.BillValidator +import org.mifospay.core.datastore.BillRepository +import org.mifospay.core.model.autopay.Bill +import org.mifospay.core.model.autopay.BillFormData +import org.mifospay.core.model.autopay.BillValidationResult +import org.mifospay.core.model.autopay.Biller +import org.mifospay.core.model.autopay.NextPaymentDate +import org.mifospay.core.model.autopay.RecurrencePattern +import org.mifospay.core.ui.utils.BaseViewModel + +class EditBillViewModel( + savedStateHandle: SavedStateHandle, + private val billRepository: BillRepository, + private val billerRepository: org.mifospay.core.datastore.BillerRepository, +) : BaseViewModel( + initialState = savedStateHandle.getSerialized(KEY_STATE) ?: EditBillState(), +) { + + private val billId: String = savedStateHandle["billId"] ?: "" + + init { + loadBill() + loadAvailableBillers() + } + + override fun handleAction(action: EditBillAction) { + when (action) { + is EditBillAction.UpdateBillName -> { + updateBillName(action.name) + } + is EditBillAction.UpdateAmount -> { + updateAmount(action.amount) + } + is EditBillAction.UpdateDueDate -> { + updateDueDate(action.dueDate) + } + is EditBillAction.UpdateRecurrencePattern -> { + updateRecurrencePattern(action.recurrencePattern) + } + is EditBillAction.UpdateDescription -> { + updateDescription(action.description) + } + is EditBillAction.UpdateBill -> { + updateBill() + } + is EditBillAction.ValidateForm -> { + validateForm() + } + is EditBillAction.ClearError -> { + clearError() + } + is EditBillAction.ClearValidationErrors -> { + clearValidationErrors() + } + is EditBillAction.CalculateNextPaymentDates -> { + calculateNextPaymentDates() + } + is EditBillAction.SelectBiller -> { + selectBiller(action.biller) + } + } + } + + private fun loadBill() { + viewModelScope.launch { + mutableStateFlow.update { it.copy(isLoading = true) } + + try { + val bill = billRepository.getBillById(billId) + if (bill != null) { + val formData = BillFormData( + name = bill.name, + amount = bill.amount.toString(), + currency = bill.currency, + dueDate = bill.dueDate, + recurrencePattern = bill.recurrencePattern, + billerId = bill.billerId, + billerName = bill.billerName, + description = bill.description ?: "", + ) + mutableStateFlow.update { + it.copy( + formData = formData, + isLoading = false, + error = null, + ) + } + calculateNextPaymentDates() + } else { + mutableStateFlow.update { + it.copy( + isLoading = false, + error = "Bill not found", + ) + } + } + } catch (e: Exception) { + mutableStateFlow.update { + it.copy( + isLoading = false, + error = "Failed to load bill: ${e.message}", + ) + } + } + } + } + + private fun updateBillName(name: String) { + val nameError = BillValidator.validateNameField(name) + mutableStateFlow.update { + it.copy( + formData = it.formData.copy(name = name), + validationResult = it.validationResult.copy(nameError = nameError), + ) + } + } + + private fun updateAmount(amount: String) { + val amountError = BillValidator.validateAmountField(amount) + mutableStateFlow.update { + it.copy( + formData = it.formData.copy(amount = amount), + validationResult = it.validationResult.copy(amountError = amountError), + ) + } + } + + private fun updateDueDate(dueDate: Long) { + val dueDateError = BillValidator.validateDueDateField(dueDate) + mutableStateFlow.update { + it.copy( + formData = it.formData.copy(dueDate = dueDate), + validationResult = it.validationResult.copy(dueDateError = dueDateError), + ) + } + calculateNextPaymentDates() + } + + private fun updateRecurrencePattern(recurrencePattern: RecurrencePattern) { + val recurrencePatternError = BillValidator.validateRecurrencePatternField(recurrencePattern) + mutableStateFlow.update { + it.copy( + formData = it.formData.copy(recurrencePattern = recurrencePattern), + validationResult = it.validationResult.copy(recurrencePatternError = recurrencePatternError), + ) + } + calculateNextPaymentDates() + } + + private fun updateDescription(description: String) { + mutableStateFlow.update { + it.copy(formData = it.formData.copy(description = description)) + } + } + + private fun validateForm(): BillValidationResult { + val currentState = stateFlow.value + val formData = currentState.formData + + val validationResult = BillValidator.validateBillForm(formData) + + mutableStateFlow.update { it.copy(validationResult = validationResult) } + return validationResult + } + + private fun calculateNextPaymentDates() { + val currentState = stateFlow.value + val formData = currentState.formData + + if (formData.dueDate == 0L || formData.recurrencePattern == RecurrencePattern.NONE) { + mutableStateFlow.update { it.copy(nextPaymentDates = emptyList()) } + return + } + + val nextDates = mutableListOf() + val currentTime = Clock.System.now().toEpochMilliseconds() + var nextDate = formData.dueDate + + // Generate next 5 payment dates + repeat(5) { + if (nextDate >= currentTime) { + val isOverdue = nextDate < currentTime + val formattedDate = formatDate(nextDate) + nextDates.add(NextPaymentDate(nextDate, formattedDate, isOverdue)) + } + + // Calculate next date based on recurrence pattern + nextDate += (formData.recurrencePattern.interval * 24 * 60 * 60 * 1000L) + } + + mutableStateFlow.update { it.copy(nextPaymentDates = nextDates) } + } + + private fun formatDate(timestamp: Long): String { + return DateHelper.getDateAsStringFromLong(timestamp) + } + + private fun updateBill() { + val validationResult = validateForm() + + if (!validationResult.isValid) { + return + } + + viewModelScope.launch { + mutableStateFlow.update { it.copy(isLoading = true) } + + try { + val formData = mutableStateFlow.value.formData + + val bill = Bill( + id = billId, + name = formData.name.trim(), + amount = formData.amount.toDoubleOrNull() ?: 0.0, + currency = formData.currency, + dueDate = formData.dueDate, + recurrencePattern = formData.recurrencePattern, + billerId = formData.billerId, + billerName = formData.billerName, + description = formData.description.takeIf { it.isNotBlank() }, + ) + + val result = billRepository.updateBill(bill) + + when (result) { + is DataState.Loading -> { + // Loading state is already handled by setting isLoading = true above + } + is DataState.Success -> { + mutableStateFlow.update { + it.copy( + isLoading = false, + isSuccess = true, + ) + } + sendEvent(EditBillEvent.BillUpdated(result.data)) + } + is DataState.Error -> { + mutableStateFlow.update { + it.copy( + isLoading = false, + error = "Failed to update bill: ${result.exception.message}", + ) + } + } + } + } catch (exception: Exception) { + mutableStateFlow.update { + it.copy( + isLoading = false, + error = "Failed to update bill: ${exception.message}", + ) + } + } + } + } + + private fun loadAvailableBillers() { + viewModelScope.launch { + try { + billerRepository.getAllBillers().collect { billers -> + mutableStateFlow.update { it.copy(availableBillers = billers) } + } + } catch (exception: Exception) { + // Handle error silently for now + } + } + } + + private fun selectBiller(biller: Biller) { + val billerError = BillValidator.validateBillerField(biller.id, biller.name) + mutableStateFlow.update { + it.copy( + formData = it.formData.copy( + billerId = biller.id, + billerName = biller.name, + ), + validationResult = it.validationResult.copy(billerError = billerError), + ) + } + } + + private fun clearError() { + mutableStateFlow.update { it.copy(error = null) } + } + + private fun clearValidationErrors() { + mutableStateFlow.update { + it.copy( + validationResult = BillValidationResult(isValid = false), + ) + } + } + + companion object { + private const val KEY_STATE = "edit_bill_state" + } +} + +@Serializable +data class EditBillState( + val formData: BillFormData = BillFormData(), + val validationResult: BillValidationResult = BillValidationResult(isValid = false), + val isLoading: Boolean = false, + val isSuccess: Boolean = false, + val error: String? = null, + val nextPaymentDates: List = emptyList(), + val availableBillers: List = emptyList(), +) + +sealed interface EditBillEvent { + data class BillUpdated(val bill: Bill) : EditBillEvent +} + +sealed interface EditBillAction { + data class UpdateBillName(val name: String) : EditBillAction + data class UpdateAmount(val amount: String) : EditBillAction + data class UpdateDueDate(val dueDate: Long) : EditBillAction + data class UpdateRecurrencePattern(val recurrencePattern: RecurrencePattern) : EditBillAction + data class UpdateDescription(val description: String) : EditBillAction + data object UpdateBill : EditBillAction + data object ValidateForm : EditBillAction + data object ClearError : EditBillAction + data object ClearValidationErrors : EditBillAction + data object CalculateNextPaymentDates : EditBillAction + data class SelectBiller(val biller: Biller) : EditBillAction +} diff --git a/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/EditBillerScreen.kt b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/EditBillerScreen.kt new file mode 100644 index 000000000..8ae4702f7 --- /dev/null +++ b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/EditBillerScreen.kt @@ -0,0 +1,202 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.feature.autopay + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.unit.dp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import org.koin.compose.viewmodel.koinViewModel +import org.mifospay.core.designsystem.component.BasicDialogState +import org.mifospay.core.designsystem.component.LoadingDialogState +import org.mifospay.core.designsystem.component.MifosBasicDialog +import org.mifospay.core.designsystem.component.MifosButton +import org.mifospay.core.designsystem.component.MifosLoadingDialog +import org.mifospay.core.designsystem.component.MifosOutlinedButton +import org.mifospay.core.designsystem.component.MifosOutlinedTextField +import org.mifospay.core.designsystem.component.MifosScaffold +import org.mifospay.core.designsystem.component.MifosTopBar +import org.mifospay.core.model.autopay.BillerCategory +import org.mifospay.core.ui.DropdownBox +import org.mifospay.core.ui.DropdownBoxItem +import org.mifospay.core.ui.utils.EventsEffect + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun EditBillerScreen( + onNavigateBack: () -> Unit, + viewModel: EditBillerViewModel = koinViewModel(), +) { + val state by viewModel.stateFlow.collectAsStateWithLifecycle() + var showCategoryDropdown by remember { mutableStateOf(false) } + + EventsEffect(viewModel) { event -> + when (event) { + is EditBillerEvent.BillerUpdated -> { + onNavigateBack() + } + } + } + + MifosScaffold( + topBar = { + MifosTopBar( + topBarTitle = "Edit Biller", + backPress = onNavigateBack, + ) + }, + ) { paddingValues -> + Column( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + .padding(16.dp) + .verticalScroll(rememberScrollState()), + verticalArrangement = Arrangement.spacedBy(16.dp), + ) { + Text( + text = "Update biller details", + modifier = Modifier.padding(bottom = 8.dp), + ) + + MifosOutlinedTextField( + label = "Biller Name *", + value = state.formData.name, + onValueChange = { viewModel.trySendAction(EditBillerAction.UpdateBillerName(it)) }, + isError = state.validationResult.nameError != null, + errorMessage = state.validationResult.nameError, + singleLine = true, + keyboardOptions = KeyboardOptions( + imeAction = ImeAction.Next, + ), + ) + + MifosOutlinedTextField( + label = "Account Number *", + value = state.formData.accountNumber, + onValueChange = { viewModel.trySendAction(EditBillerAction.UpdateAccountNumber(it)) }, + isError = state.validationResult.accountNumberError != null, + errorMessage = state.validationResult.accountNumberError, + singleLine = true, + keyboardOptions = KeyboardOptions( + keyboardType = KeyboardType.Number, + imeAction = ImeAction.Next, + ), + ) + + MifosOutlinedTextField( + label = "Contact Number *", + value = state.formData.contactNumber, + onValueChange = { viewModel.trySendAction(EditBillerAction.UpdateContactNumber(it)) }, + isError = state.validationResult.contactNumberError != null, + errorMessage = state.validationResult.contactNumberError, + singleLine = true, + keyboardOptions = KeyboardOptions( + keyboardType = KeyboardType.Phone, + imeAction = ImeAction.Next, + ), + ) + + MifosOutlinedTextField( + label = "Email (Optional)", + value = state.formData.email, + onValueChange = { viewModel.trySendAction(EditBillerAction.UpdateEmail(it)) }, + singleLine = true, + keyboardOptions = KeyboardOptions( + keyboardType = KeyboardType.Email, + imeAction = ImeAction.Next, + ), + ) + + DropdownBox( + expanded = showCategoryDropdown, + label = "Biller Category *", + value = state.formData.category?.displayName ?: "", + isError = state.validationResult.categoryError != null, + errorText = state.validationResult.categoryError, + onExpandChange = { showCategoryDropdown = it }, + ) { + BillerCategory.entries.forEach { category -> + DropdownBoxItem( + text = category.displayName, + onClick = { + viewModel.trySendAction(EditBillerAction.UpdateCategory(category)) + showCategoryDropdown = false + }, + ) + } + } + + MifosOutlinedTextField( + label = "Address (Optional)", + value = state.formData.address, + onValueChange = { viewModel.trySendAction(EditBillerAction.UpdateAddress(it)) }, + singleLine = false, + keyboardOptions = KeyboardOptions( + imeAction = ImeAction.Done, + ), + ) + + Spacer(modifier = Modifier.height(24.dp)) + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(16.dp), + ) { + MifosOutlinedButton( + text = { Text("Cancel") }, + onClick = onNavigateBack, + modifier = Modifier.weight(1f), + ) + MifosButton( + text = { Text("Update Biller") }, + onClick = { viewModel.trySendAction(EditBillerAction.UpdateBiller) }, + modifier = Modifier.weight(1f), + enabled = !state.isLoading, + ) + } + } + } + + if (state.isLoading) { + MifosLoadingDialog( + visibilityState = LoadingDialogState.Shown, + ) + } + + state.error?.let { error -> + MifosBasicDialog( + visibilityState = BasicDialogState.Shown( + title = "Error", + message = error, + ), + onDismissRequest = { viewModel.trySendAction(EditBillerAction.ClearError) }, + ) + } +} diff --git a/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/EditBillerViewModel.kt b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/EditBillerViewModel.kt new file mode 100644 index 000000000..a2309c139 --- /dev/null +++ b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/EditBillerViewModel.kt @@ -0,0 +1,273 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.feature.autopay + +import androidx.lifecycle.SavedStateHandle +import androidx.lifecycle.viewModelScope +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import kotlinx.serialization.Serializable +import org.mifospay.core.common.DataState +import org.mifospay.core.common.getSerialized +import org.mifospay.core.data.util.BillerValidator +import org.mifospay.core.datastore.BillerRepository +import org.mifospay.core.model.autopay.Biller +import org.mifospay.core.model.autopay.BillerCategory +import org.mifospay.core.model.autopay.BillerFormData +import org.mifospay.core.model.autopay.BillerValidationResult +import org.mifospay.core.ui.utils.BaseViewModel + +class EditBillerViewModel( + savedStateHandle: SavedStateHandle, + private val billerRepository: BillerRepository, +) : BaseViewModel( + initialState = savedStateHandle.getSerialized(KEY_STATE) ?: EditBillerState(), +) { + + private val billerId: String = savedStateHandle["billerId"] ?: "" + + init { + loadBiller() + } + + override fun handleAction(action: EditBillerAction) { + when (action) { + is EditBillerAction.UpdateBillerName -> { + updateBillerName(action.name) + } + is EditBillerAction.UpdateAccountNumber -> { + updateAccountNumber(action.accountNumber) + } + is EditBillerAction.UpdateContactNumber -> { + updateContactNumber(action.contactNumber) + } + is EditBillerAction.UpdateEmail -> { + updateEmail(action.email) + } + is EditBillerAction.UpdateCategory -> { + updateCategory(action.category) + } + is EditBillerAction.UpdateAddress -> { + updateAddress(action.address) + } + is EditBillerAction.UpdateBiller -> { + updateBiller() + } + is EditBillerAction.ValidateForm -> { + validateForm() + } + is EditBillerAction.ClearError -> { + clearError() + } + is EditBillerAction.ClearValidationErrors -> { + clearValidationErrors() + } + } + } + + private fun loadBiller() { + viewModelScope.launch { + mutableStateFlow.update { it.copy(isLoading = true) } + + try { + val biller = billerRepository.getBillerById(billerId) + if (biller != null) { + val formData = BillerFormData( + name = biller.name, + accountNumber = biller.accountNumber, + contactNumber = biller.contactNumber, + email = biller.email ?: "", + category = biller.category, + address = biller.address ?: "", + ) + mutableStateFlow.update { + it.copy( + formData = formData, + isLoading = false, + error = null, + ) + } + } else { + mutableStateFlow.update { + it.copy( + isLoading = false, + error = "Biller not found", + ) + } + } + } catch (e: Exception) { + mutableStateFlow.update { + it.copy( + isLoading = false, + error = "Failed to load biller: ${e.message}", + ) + } + } + } + } + + private fun updateBillerName(name: String) { + val nameError = BillerValidator.validateNameField(name) + mutableStateFlow.update { + it.copy( + formData = it.formData.copy(name = name), + validationResult = it.validationResult.copy(nameError = nameError), + ) + } + } + + private fun updateAccountNumber(accountNumber: String) { + val accountNumberError = BillerValidator.validateAccountNumberField(accountNumber) + mutableStateFlow.update { + it.copy( + formData = it.formData.copy(accountNumber = accountNumber), + validationResult = it.validationResult.copy(accountNumberError = accountNumberError), + ) + } + } + + private fun updateContactNumber(contactNumber: String) { + val contactNumberError = BillerValidator.validateContactNumberField(contactNumber) + mutableStateFlow.update { + it.copy( + formData = it.formData.copy(contactNumber = contactNumber), + validationResult = it.validationResult.copy(contactNumberError = contactNumberError), + ) + } + } + + private fun updateEmail(email: String) { + val emailError = BillerValidator.validateEmailField(email) + mutableStateFlow.update { + it.copy( + formData = it.formData.copy(email = email), + validationResult = it.validationResult.copy(emailError = emailError), + ) + } + } + + private fun updateCategory(category: BillerCategory) { + mutableStateFlow.update { + it.copy( + formData = it.formData.copy(category = category), + validationResult = it.validationResult.copy(categoryError = null), + ) + } + } + + private fun updateAddress(address: String) { + mutableStateFlow.update { + it.copy( + formData = it.formData.copy(address = address), + ) + } + } + + private fun validateForm(): BillerValidationResult { + val formData = mutableStateFlow.value.formData + + val validationResult = BillerValidator.validateBillerForm(formData) + + mutableStateFlow.update { + it.copy(validationResult = validationResult) + } + + return validationResult + } + + private fun updateBiller() { + val validationResult = validateForm() + if (!validationResult.isValid) { + return + } + + viewModelScope.launch { + mutableStateFlow.update { it.copy(isLoading = true) } + + try { + val formData = mutableStateFlow.value.formData + val biller = Biller( + id = billerId, + name = formData.name, + accountNumber = formData.accountNumber, + contactNumber = formData.contactNumber, + email = formData.email.takeIf { it.isNotBlank() }, + category = formData.category!!, + address = formData.address.takeIf { it.isNotBlank() }, + ) + + when (val result = billerRepository.updateBiller(biller)) { + is DataState.Success -> { + sendEvent(EditBillerEvent.BillerUpdated(result.data)) + } + is DataState.Error -> { + mutableStateFlow.update { + it.copy( + isLoading = false, + error = "Failed to update biller: ${result.exception.message}", + ) + } + } + is DataState.Loading -> { + // Loading state is already handled by setting isLoading = true above + } + } + } catch (e: Exception) { + mutableStateFlow.update { + it.copy( + isLoading = false, + error = "Failed to update biller: ${e.message}", + ) + } + } + } + } + + private fun clearError() { + mutableStateFlow.update { it.copy(error = null) } + } + + private fun clearValidationErrors() { + mutableStateFlow.update { + it.copy( + validationResult = BillerValidationResult(isValid = false), + ) + } + } + + companion object { + private const val KEY_STATE = "edit_biller_state" + } +} + +@Serializable +data class EditBillerState( + val formData: BillerFormData = BillerFormData(), + val validationResult: BillerValidationResult = BillerValidationResult(isValid = false), + val isLoading: Boolean = false, + val error: String? = null, +) + +sealed interface EditBillerEvent { + data class BillerUpdated(val biller: Biller) : EditBillerEvent +} + +sealed interface EditBillerAction { + data class UpdateBillerName(val name: String) : EditBillerAction + data class UpdateAccountNumber(val accountNumber: String) : EditBillerAction + data class UpdateContactNumber(val contactNumber: String) : EditBillerAction + data class UpdateEmail(val email: String) : EditBillerAction + data class UpdateCategory(val category: BillerCategory) : EditBillerAction + data class UpdateAddress(val address: String) : EditBillerAction + data object UpdateBiller : EditBillerAction + data object ValidateForm : EditBillerAction + data object ClearError : EditBillerAction + data object ClearValidationErrors : EditBillerAction +} diff --git a/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/di/AutoPayModule.kt b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/di/AutoPayModule.kt new file mode 100644 index 000000000..50297fed2 --- /dev/null +++ b/feature/autopay/src/commonMain/kotlin/org/mifospay/feature/autopay/di/AutoPayModule.kt @@ -0,0 +1,32 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.feature.autopay.di + +import org.koin.core.module.dsl.viewModelOf +import org.koin.dsl.module +import org.mifospay.feature.autopay.AddBillViewModel +import org.mifospay.feature.autopay.AddBillerViewModel +import org.mifospay.feature.autopay.AutoPayScheduleDetailsViewModel +import org.mifospay.feature.autopay.AutoPayViewModel +import org.mifospay.feature.autopay.BillListViewModel +import org.mifospay.feature.autopay.BillerListViewModel +import org.mifospay.feature.autopay.EditBillViewModel +import org.mifospay.feature.autopay.EditBillerViewModel + +val AutoPayModule = module { + viewModelOf(::AutoPayViewModel) + viewModelOf(::AutoPayScheduleDetailsViewModel) + viewModelOf(::AddBillerViewModel) + viewModelOf(::BillerListViewModel) + viewModelOf(::EditBillerViewModel) + viewModelOf(::AddBillViewModel) + viewModelOf(::EditBillViewModel) + viewModelOf(::BillListViewModel) +} diff --git a/feature/home/src/commonMain/composeResources/values/strings.xml b/feature/home/src/commonMain/composeResources/values/strings.xml index 6c0266da6..4c44be41b 100644 --- a/feature/home/src/commonMain/composeResources/values/strings.xml +++ b/feature/home/src/commonMain/composeResources/values/strings.xml @@ -22,6 +22,7 @@ Request Money Send Send Money + AutoPay Coin Account type diff --git a/feature/home/src/commonMain/kotlin/org/mifospay/feature/home/HomeScreen.kt b/feature/home/src/commonMain/kotlin/org/mifospay/feature/home/HomeScreen.kt index a2b31672f..eea5654fe 100644 --- a/feature/home/src/commonMain/kotlin/org/mifospay/feature/home/HomeScreen.kt +++ b/feature/home/src/commonMain/kotlin/org/mifospay/feature/home/HomeScreen.kt @@ -78,6 +78,7 @@ import mobile_wallet.feature.home.generated.resources.arrow_backward import mobile_wallet.feature.home.generated.resources.coin_image import mobile_wallet.feature.home.generated.resources.feature_home_account_type import mobile_wallet.feature.home.generated.resources.feature_home_arrow_up +import mobile_wallet.feature.home.generated.resources.feature_home_autopay import mobile_wallet.feature.home.generated.resources.feature_home_coin_image import mobile_wallet.feature.home.generated.resources.feature_home_desc import mobile_wallet.feature.home.generated.resources.feature_home_loading @@ -124,6 +125,7 @@ internal fun HomeScreen( onNavigateBack: () -> Unit, onRequest: (String) -> Unit, onPay: () -> Unit, + onAutoPay: () -> Unit, navigateToTransactionDetail: (Long, Long) -> Unit, navigateToAccountDetail: (Long) -> Unit, modifier: Modifier = Modifier, @@ -141,6 +143,7 @@ internal fun HomeScreen( is HomeEvent.NavigateBack -> onNavigateBack.invoke() is HomeEvent.NavigateToRequestScreen -> onRequest(event.vpa) is HomeEvent.NavigateToSendScreen -> onPay.invoke() + is HomeEvent.NavigateToAutoPayScreen -> onAutoPay.invoke() is HomeEvent.NavigateToClientDetailScreen -> {} is HomeEvent.NavigateToTransactionDetail -> { navigateToTransactionDetail(event.accountId, event.transactionId) @@ -277,6 +280,9 @@ private fun HomeScreenContent( onSend = { onAction(HomeAction.SendClicked) }, + onAutoPay = { + onAction(HomeAction.AutoPayClicked) + }, ) } @@ -507,45 +513,66 @@ fun CardDropdownBox( private fun PayRequestScreen( onRequest: () -> Unit, onSend: () -> Unit, + onAutoPay: () -> Unit, modifier: Modifier = Modifier, ) { - Row( + Column( modifier = modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.SpaceBetween, + verticalArrangement = Arrangement.spacedBy(12.dp), ) { - PaymentButton( - modifier = Modifier - .weight(1f) - .height(55.dp), - text = stringResource(Res.string.feature_home_request), - onClick = onRequest, - leadingIcon = { - Icon( - modifier = Modifier - .size(26.dp), - imageVector = vectorResource( - Res.drawable.arrow_backward, - ), - contentDescription = stringResource(Res.string.feature_home_request_money), - ) - }, - ) + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + ) { + PaymentButton( + modifier = Modifier + .weight(1f) + .height(55.dp), + text = stringResource(Res.string.feature_home_request), + onClick = onRequest, + leadingIcon = { + Icon( + modifier = Modifier + .size(26.dp), + imageVector = vectorResource( + Res.drawable.arrow_backward, + ), + contentDescription = stringResource(Res.string.feature_home_request_money), + ) + }, + ) + + Spacer(modifier = Modifier.width(20.dp)) - Spacer(modifier = Modifier.width(20.dp)) + PaymentButton( + modifier = Modifier + .weight(1f) + .height(55.dp), + text = stringResource(Res.string.feature_home_send), + onClick = onSend, + leadingIcon = { + Icon( + modifier = Modifier + .size(26.dp) + .graphicsLayer(rotationZ = 180f), + imageVector = vectorResource(Res.drawable.arrow_backward), + contentDescription = stringResource(Res.string.feature_home_send_money), + ) + }, + ) + } PaymentButton( modifier = Modifier - .weight(1f) + .fillMaxWidth() .height(55.dp), - text = stringResource(Res.string.feature_home_send), - onClick = onSend, + text = stringResource(Res.string.feature_home_autopay), + onClick = onAutoPay, leadingIcon = { Icon( - modifier = Modifier - .size(26.dp) - .graphicsLayer(rotationZ = 180f), - imageVector = vectorResource(Res.drawable.arrow_backward), - contentDescription = stringResource(Res.string.feature_home_send_money), + modifier = Modifier.size(26.dp), + imageVector = MifosIcons.Payment, + contentDescription = stringResource(Res.string.feature_home_autopay), ) }, ) diff --git a/feature/home/src/commonMain/kotlin/org/mifospay/feature/home/HomeViewModel.kt b/feature/home/src/commonMain/kotlin/org/mifospay/feature/home/HomeViewModel.kt index 35b00c469..68db98948 100644 --- a/feature/home/src/commonMain/kotlin/org/mifospay/feature/home/HomeViewModel.kt +++ b/feature/home/src/commonMain/kotlin/org/mifospay/feature/home/HomeViewModel.kt @@ -117,6 +117,10 @@ class HomeViewModel( sendEvent(HomeEvent.NavigateToSendScreen) } + is HomeAction.AutoPayClicked -> { + sendEvent(HomeEvent.NavigateToAutoPayScreen) + } + is HomeAction.ClientDetailsClicked -> { sendEvent(HomeEvent.NavigateToClientDetailScreen) } @@ -218,6 +222,7 @@ sealed interface ViewState { sealed interface HomeEvent { data object NavigateBack : HomeEvent data object NavigateToSendScreen : HomeEvent + data object NavigateToAutoPayScreen : HomeEvent data object NavigateToTransactionScreen : HomeEvent data object NavigateToClientDetailScreen : HomeEvent data class NavigateToRequestScreen(val vpa: String) : HomeEvent @@ -230,6 +235,7 @@ sealed interface HomeEvent { sealed interface HomeAction { data object RequestClicked : HomeAction data object SendClicked : HomeAction + data object AutoPayClicked : HomeAction data object ClientDetailsClicked : HomeAction data object OnClickSeeAllTransactions : HomeAction data object OnDismissDialog : HomeAction diff --git a/feature/home/src/commonMain/kotlin/org/mifospay/feature/home/navigation/HomeNavigation.kt b/feature/home/src/commonMain/kotlin/org/mifospay/feature/home/navigation/HomeNavigation.kt index 5ea8e9776..e028a5192 100644 --- a/feature/home/src/commonMain/kotlin/org/mifospay/feature/home/navigation/HomeNavigation.kt +++ b/feature/home/src/commonMain/kotlin/org/mifospay/feature/home/navigation/HomeNavigation.kt @@ -23,6 +23,7 @@ fun NavGraphBuilder.homeScreen( onNavigateBack: () -> Unit, onRequest: (String) -> Unit, onPay: () -> Unit, + onAutoPay: () -> Unit, navigateToTransactionDetail: (Long, Long) -> Unit, navigateToAccountDetail: (Long) -> Unit, ) { @@ -30,6 +31,7 @@ fun NavGraphBuilder.homeScreen( HomeScreen( onRequest = onRequest, onPay = onPay, + onAutoPay = onAutoPay, onNavigateBack = onNavigateBack, navigateToTransactionDetail = navigateToTransactionDetail, navigateToAccountDetail = navigateToAccountDetail, diff --git a/feature/make-transfer/src/commonMain/kotlin/org/mifospay/feature/make/transfer/MakeTransferViewModel.kt b/feature/make-transfer/src/commonMain/kotlin/org/mifospay/feature/make/transfer/MakeTransferViewModel.kt index 7df3fb44d..fe7c7a09d 100644 --- a/feature/make-transfer/src/commonMain/kotlin/org/mifospay/feature/make/transfer/MakeTransferViewModel.kt +++ b/feature/make-transfer/src/commonMain/kotlin/org/mifospay/feature/make/transfer/MakeTransferViewModel.kt @@ -20,6 +20,7 @@ import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch import kotlinx.serialization.Serializable +import kotlinx.serialization.Transient import mobile_wallet.feature.make_transfer.generated.resources.Res import mobile_wallet.feature.make_transfer.generated.resources.feature_make_transfer_error_empty_amount import mobile_wallet.feature.make_transfer.generated.resources.feature_make_transfer_error_empty_description @@ -207,7 +208,7 @@ internal data class MakeTransferState( val amount: String = toClientData.amount, val description: String = "", val selectedAccount: Account? = null, - val dialogState: DialogState? = null, + @Transient val dialogState: DialogState? = null, ) { val amountIsValid: Boolean get() = amount.isNotEmpty() && amount.toDoubleOrNull() != null @@ -232,12 +233,9 @@ internal data class MakeTransferState( transferDate = DateHelper.formattedShortDate, ) - @Serializable sealed interface DialogState { - @Serializable data object Loading : DialogState - @Serializable sealed interface Error : DialogState { data class StringMessage(val message: String) : Error data class ResourceMessage(val message: StringResource) : Error diff --git a/feature/payments/src/commonMain/kotlin/org/mifospay/feature/payments/PaymentsScreen.kt b/feature/payments/src/commonMain/kotlin/org/mifospay/feature/payments/PaymentsScreen.kt index 66263af9c..59e9b02bd 100644 --- a/feature/payments/src/commonMain/kotlin/org/mifospay/feature/payments/PaymentsScreen.kt +++ b/feature/payments/src/commonMain/kotlin/org/mifospay/feature/payments/PaymentsScreen.kt @@ -62,6 +62,7 @@ enum class PaymentsScreenContents { HISTORY, SI, INVOICES, + AUTOPAY, } @Preview diff --git a/feature/qr/src/commonMain/kotlin/org/mifospay/feature/qr/ScanQrCodeScreen.kt b/feature/qr/src/commonMain/kotlin/org/mifospay/feature/qr/ScanQrCodeScreen.kt index 66513f281..0cbfbadb1 100644 --- a/feature/qr/src/commonMain/kotlin/org/mifospay/feature/qr/ScanQrCodeScreen.kt +++ b/feature/qr/src/commonMain/kotlin/org/mifospay/feature/qr/ScanQrCodeScreen.kt @@ -30,6 +30,7 @@ import org.mifospay.core.designsystem.component.MifosScaffold internal fun ScanQrCodeScreen( navigateBack: () -> Unit, navigateToSendScreen: (String) -> Unit, + navigateToPayeeDetailsScreen: (String) -> Unit, modifier: Modifier = Modifier, viewModel: ScanQrViewModel = koinViewModel(), ) { @@ -44,6 +45,10 @@ internal fun ScanQrCodeScreen( navigateToSendScreen.invoke((eventFlow as ScanQrEvent.OnNavigateToSendScreen).data) } + is ScanQrEvent.OnNavigateToPayeeDetails -> { + navigateToPayeeDetailsScreen.invoke((eventFlow as ScanQrEvent.OnNavigateToPayeeDetails).data) + } + is ScanQrEvent.ShowToast -> { scope.launch { snackbarHostState.showSnackbar((eventFlow as ScanQrEvent.ShowToast).message) diff --git a/feature/qr/src/commonMain/kotlin/org/mifospay/feature/qr/ScanQrViewModel.kt b/feature/qr/src/commonMain/kotlin/org/mifospay/feature/qr/ScanQrViewModel.kt index cea7f82b7..33b8d7e20 100644 --- a/feature/qr/src/commonMain/kotlin/org/mifospay/feature/qr/ScanQrViewModel.kt +++ b/feature/qr/src/commonMain/kotlin/org/mifospay/feature/qr/ScanQrViewModel.kt @@ -13,6 +13,7 @@ import androidx.lifecycle.ViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asSharedFlow import kotlinx.coroutines.flow.update +import org.mifospay.core.data.util.StandardUpiQrCodeProcessor import org.mifospay.core.data.util.UpiQrCodeProcessor class ScanQrViewModel : ViewModel() { @@ -22,10 +23,24 @@ class ScanQrViewModel : ViewModel() { fun onScanned(data: String): Boolean { return try { - UpiQrCodeProcessor.decodeUpiString(data) + val isUpiQr = try { + UpiQrCodeProcessor.decodeUpiString(data) + true + } catch (e: Exception) { + if (StandardUpiQrCodeProcessor.isValidUpiQrCode(data)) { + StandardUpiQrCodeProcessor.parseUpiQrCode(data) + true + } else { + false + } + } _eventFlow.update { - ScanQrEvent.OnNavigateToSendScreen(data) + if (isUpiQr) { + ScanQrEvent.OnNavigateToPayeeDetails(data) + } else { + ScanQrEvent.OnNavigateToSendScreen(data) + } } true @@ -40,5 +55,6 @@ class ScanQrViewModel : ViewModel() { sealed interface ScanQrEvent { data class OnNavigateToSendScreen(val data: String) : ScanQrEvent + data class OnNavigateToPayeeDetails(val data: String) : ScanQrEvent data class ShowToast(val message: String) : ScanQrEvent } diff --git a/feature/qr/src/commonMain/kotlin/org/mifospay/feature/qr/navigation/ReadQrNavigation.kt b/feature/qr/src/commonMain/kotlin/org/mifospay/feature/qr/navigation/ReadQrNavigation.kt index 89bbe6b19..c8a3e25dd 100644 --- a/feature/qr/src/commonMain/kotlin/org/mifospay/feature/qr/navigation/ReadQrNavigation.kt +++ b/feature/qr/src/commonMain/kotlin/org/mifospay/feature/qr/navigation/ReadQrNavigation.kt @@ -23,11 +23,13 @@ fun NavController.navigateToScanQr(navOptions: NavOptions? = null) = fun NavGraphBuilder.scanQrScreen( navigateBack: () -> Unit, navigateToSendScreen: (String) -> Unit, + navigateToPayeeDetailsScreen: (String) -> Unit, ) { composableWithSlideTransitions(route = SCAN_QR_ROUTE) { ScanQrCodeScreen( navigateBack = navigateBack, navigateToSendScreen = navigateToSendScreen, + navigateToPayeeDetailsScreen = navigateToPayeeDetailsScreen, ) } } diff --git a/feature/send-money/src/androidMain/kotlin/org/mifospay/feature/send/money/QrScanner.android.kt b/feature/send-money/src/androidMain/kotlin/org/mifospay/feature/send/money/QrScanner.android.kt index 135592b86..5d2e1ff55 100644 --- a/feature/send-money/src/androidMain/kotlin/org/mifospay/feature/send/money/QrScanner.android.kt +++ b/feature/send-money/src/androidMain/kotlin/org/mifospay/feature/send/money/QrScanner.android.kt @@ -39,11 +39,12 @@ class QrScannerImp( override fun startScanning(): Flow { return callbackFlow { scanner.startScan() - .addOnSuccessListener { + .addOnSuccessListener { barcode -> launch { - send(it.rawValue) + val rawValue = barcode.rawValue + send(rawValue) } - }.addOnFailureListener { + }.addOnFailureListener { exception -> launch { send(null) } diff --git a/feature/send-money/src/commonMain/composeResources/values/strings.xml b/feature/send-money/src/commonMain/composeResources/values/strings.xml index a4680e64d..a1ea3ebb2 100644 --- a/feature/send-money/src/commonMain/composeResources/values/strings.xml +++ b/feature/send-money/src/commonMain/composeResources/values/strings.xml @@ -38,4 +38,15 @@ Account cannot be empty Requesting payment QR but found - %1$s Failed to request payment QR: required data is missing + UPI QR code parsed successfully + External UPI Payment + Choose how you want to send money + Scan any QR code + Pay anyone + Bank Transfer + Fineract Payments + People + Merchants + More + AutoPay \ No newline at end of file diff --git a/feature/send-money/src/commonMain/kotlin/org/mifospay/feature/send/money/PayeeDetailsScreen.kt b/feature/send-money/src/commonMain/kotlin/org/mifospay/feature/send/money/PayeeDetailsScreen.kt new file mode 100644 index 000000000..59a4fdc13 --- /dev/null +++ b/feature/send-money/src/commonMain/kotlin/org/mifospay/feature/send/money/PayeeDetailsScreen.kt @@ -0,0 +1,526 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.feature.send.money + +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.animation.core.repeatable +import androidx.compose.animation.core.tween +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.wrapContentWidth +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.text.BasicTextField +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.focus.onFocusChanged +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.compose.ui.unit.times +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import org.koin.compose.viewmodel.koinViewModel +import org.mifospay.core.designsystem.component.MifosGradientBackground +import org.mifospay.core.designsystem.component.MifosScaffold +import org.mifospay.core.designsystem.component.MifosTopBar +import org.mifospay.core.designsystem.icon.MifosIcons +import org.mifospay.core.ui.utils.EventsEffect +import template.core.base.designsystem.theme.KptTheme + +@Composable +fun PayeeDetailsScreen( + onBackClick: () -> Unit, + onNavigateToUpiPayment: (PayeeDetailsState) -> Unit, + onNavigateToFineractPayment: (PayeeDetailsState) -> Unit, + modifier: Modifier = Modifier, + viewModel: PayeeDetailsViewModel = koinViewModel(), +) { + val state by viewModel.stateFlow.collectAsStateWithLifecycle() + + EventsEffect(viewModel) { event -> + when (event) { + PayeeDetailsEvent.NavigateBack -> onBackClick.invoke() + is PayeeDetailsEvent.NavigateToUpiPayment -> onNavigateToUpiPayment.invoke(event.state) + is PayeeDetailsEvent.NavigateToFineractPayment -> onNavigateToFineractPayment.invoke(event.state) + } + } + + MifosGradientBackground { + MifosScaffold( + modifier = modifier, + topBar = { + MifosTopBar( + topBarTitle = "Payee Details", + backPress = { + viewModel.trySendAction(PayeeDetailsAction.NavigateBack) + }, + ) + }, + ) { paddingValues -> + Box( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues), + ) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = KptTheme.spacing.lg) + .verticalScroll(rememberScrollState()), + verticalArrangement = Arrangement.spacedBy(KptTheme.spacing.lg), + ) { + Spacer(modifier = Modifier.height(KptTheme.spacing.md)) + + PayeeProfileSection(state) + + Spacer(modifier = Modifier.height(KptTheme.spacing.xs)) + + PaymentDetailsSection( + state = state, + onAmountChange = { amount -> + viewModel.trySendAction(PayeeDetailsAction.UpdateAmount(amount)) + }, + onNoteChange = { note -> + viewModel.trySendAction(PayeeDetailsAction.UpdateNote(note)) + }, + onNoteFieldFocused = { + viewModel.trySendAction(PayeeDetailsAction.NoteFieldFocused) + }, + ) + + Spacer(modifier = Modifier.height(KptTheme.spacing.xl)) + } + + ProceedButton( + state = state, + onProceedClick = { + viewModel.trySendAction(PayeeDetailsAction.ProceedToPayment) + }, + modifier = Modifier + .align(Alignment.BottomEnd) + .padding( + end = KptTheme.spacing.lg, + bottom = KptTheme.spacing.lg, + ), + ) + } + } + } +} + +@Composable +private fun PayeeProfileSection( + state: PayeeDetailsState, + modifier: Modifier = Modifier, +) { + Card( + modifier = modifier.fillMaxWidth(), + colors = CardDefaults.cardColors( + containerColor = KptTheme.colorScheme.surface, + ), + shape = RoundedCornerShape(KptTheme.spacing.md), + elevation = CardDefaults.cardElevation(defaultElevation = 4.dp), + ) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(KptTheme.spacing.lg), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(KptTheme.spacing.md), + ) { + Box( + modifier = Modifier + .size(80.dp) + .background( + color = KptTheme.colorScheme.primaryContainer, + shape = CircleShape, + ), + contentAlignment = Alignment.Center, + ) { + if (state.payeeName.isNotEmpty() && state.payeeName != "UNKNOWN") { + val firstLetter = state.payeeName + .replace("%20", " ") + .trim() + .firstOrNull() + ?.uppercase() + + if (firstLetter != null) { + Text( + text = firstLetter, + style = KptTheme.typography.headlineLarge.copy( + fontSize = 32.sp, + fontWeight = FontWeight.Bold, + ), + color = KptTheme.colorScheme.onPrimaryContainer, + textAlign = TextAlign.Center, + ) + } else { + Icon( + imageVector = MifosIcons.Person, + contentDescription = "Payee Profile", + modifier = Modifier.size(40.dp), + tint = KptTheme.colorScheme.onPrimaryContainer, + ) + } + } else { + Icon( + imageVector = MifosIcons.Person, + contentDescription = "Payee Profile", + modifier = Modifier.size(40.dp), + tint = KptTheme.colorScheme.onPrimaryContainer, + ) + } + } + + if (state.payeeName.isNotEmpty() && state.payeeName != "UNKNOWN") { + val decodedName = state.payeeName + .replace("%20", " ") + .trim() + + Text( + text = "Paying ${decodedName.uppercase()}", + style = KptTheme.typography.headlineSmall, + fontWeight = FontWeight.SemiBold, + color = KptTheme.colorScheme.onSurface, + textAlign = TextAlign.Center, + ) + } + + val contactInfo = if (state.isUpiCode) { + "UPI ID: ${state.upiId}" + } else { + state.phoneNumber + } + + if (contactInfo.isNotEmpty()) { + Text( + text = contactInfo, + style = KptTheme.typography.bodyLarge, + color = KptTheme.colorScheme.onSurfaceVariant, + textAlign = TextAlign.Center, + ) + } + } + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +private fun PaymentDetailsSection( + state: PayeeDetailsState, + onAmountChange: (String) -> Unit, + onNoteChange: (String) -> Unit, + onNoteFieldFocused: () -> Unit, + modifier: Modifier = Modifier, +) { + Column( + modifier = modifier.fillMaxWidth(), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(KptTheme.spacing.lg), + ) { + ExpandableAmountInput( + value = state.formattedAmount, + onValueChange = onAmountChange, + enabled = state.isAmountEditable, + modifier = Modifier.wrapContentWidth(), + ) + + AnimatedVisibility( + visible = state.showMaxAmountMessage, + enter = fadeIn(animationSpec = tween(300)), + exit = fadeOut(animationSpec = tween(300)), + ) { + val vibrationOffset by animateFloatAsState( + targetValue = if (state.showMaxAmountMessage) 1f else 0f, + animationSpec = repeatable( + iterations = 3, + animation = tween(100, delayMillis = 0), + ), + label = "vibration", + ) + + Text( + text = "Amount cannot be more than ₹ 5,00,000", + style = KptTheme.typography.bodySmall, + color = KptTheme.colorScheme.error, + modifier = Modifier + .padding(top = KptTheme.spacing.xs) + .graphicsLayer { + translationX = if (state.showMaxAmountMessage) { + (vibrationOffset * 10f * (if (vibrationOffset % 2 == 0f) 1f else -1f)) + } else { + 0f + } + }, + ) + } + + ExpandableNoteInput( + value = state.note, + onValueChange = onNoteChange, + onFieldFocused = onNoteFieldFocused, + modifier = Modifier.wrapContentWidth(), + ) + } +} + +// TODO improve amount validation and UI/UX +@Composable +private fun ExpandableAmountInput( + value: String, + onValueChange: (String) -> Unit, + enabled: Boolean, + modifier: Modifier = Modifier, +) { + val focusRequester = remember { FocusRequester() } + val displayValue = value.ifEmpty { "0" } + + /** + * Calculate width based on the display value + * When showing "0" (single digit), use minimal width + * When user enters decimal or additional digits, expand dynamically + * Maximum amount is ₹5,00,000 (6 digits + decimal + up to 2 decimal places = max 9 characters) + */ + val textFieldWidth = when { + displayValue == "0" -> 24.dp + displayValue.length == 2 -> 32.dp + displayValue.length == 3 -> 48.dp + displayValue.length == 4 -> 64.dp + displayValue.length == 5 -> 80.dp + displayValue.length == 6 -> 96.dp + displayValue.length == 7 -> 112.dp + displayValue.length == 8 -> 128.dp + displayValue.length == 9 -> 144.dp + else -> 144.dp // Maximum width for ₹5,00,000.00 + } + + LaunchedEffect(enabled) { + if (enabled) { + focusRequester.requestFocus() + } + } + + Column(modifier = modifier) { + Row( + modifier = Modifier + .wrapContentWidth() + .clip(RoundedCornerShape(KptTheme.spacing.sm)) + .background( + color = KptTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f), + shape = RoundedCornerShape(KptTheme.spacing.sm), + ) + .padding( + horizontal = KptTheme.spacing.md, + vertical = KptTheme.spacing.sm, + ), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.Center, + ) { + Icon( + imageVector = MifosIcons.CurrencyRupee, + contentDescription = "Rupee Icon", + tint = KptTheme.colorScheme.onSurface, + ) + + Spacer(modifier = Modifier.width(KptTheme.spacing.sm)) + + BasicTextField( + value = displayValue, + onValueChange = { newValue -> + val cleanValue = newValue.replace(",", "") + if (cleanValue.isEmpty() || cleanValue.toDoubleOrNull() != null) { + val amount = cleanValue.toDoubleOrNull() ?: 0.0 + + /** + * Allow the input to be processed by ViewModel for error handling + * The ViewModel will show error message briefly for invalid amounts + */ + onValueChange(cleanValue) + } + }, + enabled = enabled, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Decimal), + textStyle = TextStyle( + fontSize = 24.sp, + fontWeight = FontWeight.Medium, + color = KptTheme.colorScheme.onSurface, + textAlign = TextAlign.Center, + ), + modifier = Modifier + .width(textFieldWidth) + .focusRequester(focusRequester), + singleLine = true, + ) + } + } +} + +// TODO improve add note UI/UX +@Composable +private fun ExpandableNoteInput( + value: String, + onValueChange: (String) -> Unit, + onFieldFocused: () -> Unit, + modifier: Modifier = Modifier, +) { + val focusRequester = remember { FocusRequester() } + var isFocused by remember { mutableStateOf(false) } + + Column(modifier = modifier) { + Row( + modifier = Modifier + .wrapContentWidth() + .clip(RoundedCornerShape(KptTheme.spacing.sm)) + .background( + color = KptTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f), + shape = RoundedCornerShape(KptTheme.spacing.sm), + ) + .padding( + horizontal = KptTheme.spacing.md, + vertical = KptTheme.spacing.sm, + ), + verticalAlignment = Alignment.CenterVertically, + ) { + BasicTextField( + value = value, + onValueChange = { newValue -> + if (newValue.length <= 50) { + onValueChange(newValue) + } + }, + enabled = true, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Text), + textStyle = TextStyle( + fontSize = 16.sp, + fontWeight = FontWeight.Normal, + color = if (value.isEmpty()) KptTheme.colorScheme.onSurfaceVariant else KptTheme.colorScheme.onSurface, + textAlign = TextAlign.Center, + ), + modifier = Modifier + .width( + when { + value.length <= 7 -> 7 * 12.dp + value.length <= 28 -> (value.length + 1) * 12.dp + else -> 28 * 12.dp + }, + ) + .focusRequester(focusRequester) + .onFocusChanged { focusState -> + if (focusState.isFocused && !isFocused) { + isFocused = true + onFieldFocused() + } + }, + singleLine = value.length <= 28, + maxLines = if (value.length > 28) 2 else 1, + decorationBox = { innerTextField -> + if (value.isEmpty()) { + Text( + text = "Add note", + style = TextStyle( + fontSize = 16.sp, + fontWeight = FontWeight.Normal, + color = KptTheme.colorScheme.onSurfaceVariant, + textAlign = TextAlign.Center, + ), + ) + } + innerTextField() + }, + ) + } + } +} + +// TODO improve UI/UX of proceed button +@Composable +private fun ProceedButton( + state: PayeeDetailsState, + onProceedClick: () -> Unit, + modifier: Modifier = Modifier, +) { + val isAmountValid = if (state.isUpiCode) { + state.amount.isNotEmpty() && + state.amount.toDoubleOrNull() != null && + state.amount.toDouble() >= 0 && + !state.isAmountExceedingMax + } else { + state.amount.isNotEmpty() && + state.amount.toDoubleOrNull() != null && + state.amount.toDouble() > 0 && + !state.isAmountExceedingMax + } + val isContactValid = state.upiId.isNotEmpty() || state.phoneNumber.isNotEmpty() + val isAmountPrefilled = !state.isAmountEditable + val showCheckMark = isAmountValid && isContactValid && (isAmountPrefilled || state.hasNoteFieldBeenFocused) + + Button( + onClick = onProceedClick, + enabled = isAmountValid && isContactValid, + modifier = modifier.size(56.dp), + colors = ButtonDefaults.buttonColors( + containerColor = if (isAmountValid && isContactValid) { + KptTheme.colorScheme.primary + } else { + KptTheme.colorScheme.surfaceVariant + }, + contentColor = if (isAmountValid && isContactValid) { + KptTheme.colorScheme.onPrimary + } else { + KptTheme.colorScheme.onSurfaceVariant + }, + ), + shape = RoundedCornerShape(KptTheme.spacing.sm), + contentPadding = PaddingValues(0.dp), + ) { + Icon( + imageVector = if (showCheckMark) MifosIcons.Check else MifosIcons.ArrowForward, + contentDescription = if (showCheckMark) "Proceed" else "Next", + modifier = Modifier.size(32.dp), + ) + } +} diff --git a/feature/send-money/src/commonMain/kotlin/org/mifospay/feature/send/money/PayeeDetailsViewModel.kt b/feature/send-money/src/commonMain/kotlin/org/mifospay/feature/send/money/PayeeDetailsViewModel.kt new file mode 100644 index 000000000..87baf0e9e --- /dev/null +++ b/feature/send-money/src/commonMain/kotlin/org/mifospay/feature/send/money/PayeeDetailsViewModel.kt @@ -0,0 +1,200 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.feature.send.money + +import androidx.lifecycle.SavedStateHandle +import androidx.lifecycle.viewModelScope +import kotlinx.coroutines.delay +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import org.mifospay.core.data.util.StandardUpiQrCodeProcessor +import org.mifospay.core.ui.utils.BaseViewModel + +class PayeeDetailsViewModel( + savedStateHandle: SavedStateHandle, +) : BaseViewModel( + initialState = PayeeDetailsState(), +) { + + init { + val safeQrCodeDataString = savedStateHandle.get("qrCodeData") ?: "" + + if (safeQrCodeDataString.isNotEmpty()) { + val qrCodeDataString = safeQrCodeDataString.urlDecode() + val isUpiCode = StandardUpiQrCodeProcessor.isValidUpiQrCode(qrCodeDataString) + + val qrCodeData = if (isUpiCode) { + StandardUpiQrCodeProcessor.parseUpiQrCode(qrCodeDataString) + } else { + StandardUpiQrCodeProcessor.parseUpiQrCode("upi://pay?pa=$qrCodeDataString&pn=Unknown") + } + + mutableStateFlow.update { + it.copy( + payeeName = qrCodeData.payeeName, + upiId = qrCodeData.payeeVpa, + phoneNumber = "", + amount = qrCodeData.amount, + note = qrCodeData.transactionNote, + isAmountEditable = qrCodeData.amount.isEmpty(), + isUpiCode = true, + ) + } + } + } + + override fun handleAction(action: PayeeDetailsAction) { + when (action) { + is PayeeDetailsAction.NavigateBack -> { + sendEvent(PayeeDetailsEvent.NavigateBack) + } + is PayeeDetailsAction.UpdateAmount -> { + val cleanAmount = action.amount.replace(",", "") + val isValidAmount = cleanAmount.isEmpty() || cleanAmount.toDoubleOrNull() != null + + if (isValidAmount) { + val amountValue = cleanAmount.toDoubleOrNull() ?: 0.0 + val showMessage = amountValue > 500000 + + mutableStateFlow.value = stateFlow.value.copy( + amount = cleanAmount, + showMaxAmountMessage = showMessage, + ) + + if (showMessage) { + viewModelScope.launch { + delay(2000) + mutableStateFlow.value = stateFlow.value.copy( + showMaxAmountMessage = false, + ) + } + } + } + } + is PayeeDetailsAction.UpdateNote -> { + mutableStateFlow.value = stateFlow.value.copy(note = action.note) + } + is PayeeDetailsAction.NoteFieldFocused -> { + mutableStateFlow.value = stateFlow.value.copy(hasNoteFieldBeenFocused = true) + } + is PayeeDetailsAction.ProceedToPayment -> { + val currentState = stateFlow.value + if (currentState.isUpiCode) { + sendEvent(PayeeDetailsEvent.NavigateToUpiPayment(currentState)) + } else { + sendEvent(PayeeDetailsEvent.NavigateToFineractPayment(currentState)) + } + } + } + } +} + +data class PayeeDetailsState( + val payeeName: String = "", + val upiId: String = "", + val phoneNumber: String = "", + val amount: String = "", + val note: String = "", + val isAmountEditable: Boolean = true, + val isUpiCode: Boolean = false, + val isLoading: Boolean = false, + val showMaxAmountMessage: Boolean = false, + val hasNoteFieldBeenFocused: Boolean = false, +) { + val formattedAmount: String + get() = if (amount.isEmpty()) "0" else formatAmountWithCommas(amount) + + val isAmountExceedingMax: Boolean + get() = amount.toDoubleOrNull()?.let { it > 500000 } ?: false + + private fun formatAmountWithCommas(amountStr: String): String { + val cleanAmount = amountStr.replace(",", "") + return try { + val amount = cleanAmount.toDouble() + if (amount == 0.0) return if (isUpiCode) "0.00" else "0" + + val parts = amount.toString().split(".") + val integerPart = parts[0] + val decimalPart = if (parts.size > 1) parts[1] else "" + + val formattedInteger = integerPart.reversed() + .chunked(3) + .joinToString(",") + .reversed() + + if (isUpiCode) { + val paddedDecimalPart = decimalPart.padEnd(2, '0').take(2) + "$formattedInteger.$paddedDecimalPart" + } else { + if (decimalPart.isNotEmpty()) { + "$formattedInteger.$decimalPart" + } else { + formattedInteger + } + } + } catch (e: NumberFormatException) { + amountStr + } + } +} + +sealed interface PayeeDetailsEvent { + data object NavigateBack : PayeeDetailsEvent + data class NavigateToUpiPayment(val state: PayeeDetailsState) : PayeeDetailsEvent + data class NavigateToFineractPayment(val state: PayeeDetailsState) : PayeeDetailsEvent +} + +sealed interface PayeeDetailsAction { + data object NavigateBack : PayeeDetailsAction + data class UpdateAmount(val amount: String) : PayeeDetailsAction + data class UpdateNote(val note: String) : PayeeDetailsAction + data object NoteFieldFocused : PayeeDetailsAction + data object ProceedToPayment : PayeeDetailsAction +} + +/** + * URL decodes a string to restore special characters from navigation + * + * Optimized for UPI QR codes with future-proofing for common special characters. + * + * Essential UPI characters (12): + * - URL structure: ?, &, =, % + * - VPA format: @ + * - Common text: space, ", ', comma + * - URLs: /, :, #, + + * + * Future-proofing characters (5): + * - Currency symbols: $ + * - URL parameters: ; + * - JSON/structured data: [, ], {, } + * + * Note: %25 (percent) must be decoded last to avoid double decoding. + */ +private fun String.urlDecode(): String { + return this.replace("%20", " ") + .replace("%26", "&") + .replace("%3D", "=") + .replace("%3F", "?") + .replace("%40", "@") + .replace("%2B", "+") + .replace("%2F", "/") + .replace("%3A", ":") + .replace("%23", "#") + .replace("%22", "\"") + .replace("%27", "'") + .replace("%2C", ",") + .replace("%24", "$") + .replace("%3B", ";") + .replace("%5B", "[") + .replace("%5D", "]") + .replace("%7B", "{") + .replace("%7D", "}") + .replace("%25", "%") +} diff --git a/feature/send-money/src/commonMain/kotlin/org/mifospay/feature/send/money/SendMoneyOptionsScreen.kt b/feature/send-money/src/commonMain/kotlin/org/mifospay/feature/send/money/SendMoneyOptionsScreen.kt new file mode 100644 index 000000000..71db8acbe --- /dev/null +++ b/feature/send-money/src/commonMain/kotlin/org/mifospay/feature/send/money/SendMoneyOptionsScreen.kt @@ -0,0 +1,494 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.feature.send.money + +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.Icon +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import mobile_wallet.feature.send_money.generated.resources.Res +import mobile_wallet.feature.send_money.generated.resources.feature_send_money_autopay +import mobile_wallet.feature.send_money.generated.resources.feature_send_money_bank_transfer +import mobile_wallet.feature.send_money.generated.resources.feature_send_money_choose_method +import mobile_wallet.feature.send_money.generated.resources.feature_send_money_fineract_payments +import mobile_wallet.feature.send_money.generated.resources.feature_send_money_merchants +import mobile_wallet.feature.send_money.generated.resources.feature_send_money_more +import mobile_wallet.feature.send_money.generated.resources.feature_send_money_pay_anyone +import mobile_wallet.feature.send_money.generated.resources.feature_send_money_people +import mobile_wallet.feature.send_money.generated.resources.feature_send_money_scan_qr_code +import mobile_wallet.feature.send_money.generated.resources.feature_send_money_send +import org.jetbrains.compose.resources.stringResource +import org.koin.compose.viewmodel.koinViewModel +import org.mifospay.core.designsystem.component.MifosGradientBackground +import org.mifospay.core.designsystem.component.MifosScaffold +import org.mifospay.core.designsystem.component.MifosTopBar +import org.mifospay.core.designsystem.icon.MifosIcons +import org.mifospay.core.ui.utils.EventsEffect +import template.core.base.designsystem.theme.KptTheme + +@Composable +fun SendMoneyOptionsScreen( + onBackClick: () -> Unit, + onScanQrClick: () -> Unit, + onPayAnyoneClick: () -> Unit, + onBankTransferClick: () -> Unit, + onFineractPaymentsClick: () -> Unit, + onAutoPayClick: () -> Unit, + onQrCodeScanned: (String) -> Unit, + onNavigateToPayeeDetails: (String) -> Unit, + modifier: Modifier = Modifier, + viewModel: SendMoneyOptionsViewModel = koinViewModel(), +) { + val state by viewModel.stateFlow.collectAsStateWithLifecycle() + + EventsEffect(viewModel) { event -> + when (event) { + SendMoneyOptionsEvent.NavigateBack -> { + onBackClick.invoke() + } + SendMoneyOptionsEvent.NavigateToPayAnyone -> { + onPayAnyoneClick.invoke() + } + SendMoneyOptionsEvent.NavigateToBankTransfer -> { + onBankTransferClick.invoke() + } + SendMoneyOptionsEvent.NavigateToFineractPayments -> { + onFineractPaymentsClick.invoke() + } + SendMoneyOptionsEvent.NavigateToAutoPay -> { + onAutoPayClick.invoke() + } + is SendMoneyOptionsEvent.QrCodeScanned -> { + onQrCodeScanned.invoke(event.data) + } + is SendMoneyOptionsEvent.NavigateToPayeeDetails -> { + onNavigateToPayeeDetails.invoke(event.qrCodeData) + } + } + } + MifosGradientBackground { + MifosScaffold( + modifier = modifier, + topBar = { + MifosTopBar( + topBarTitle = stringResource(Res.string.feature_send_money_send), + backPress = { + viewModel.trySendAction(SendMoneyOptionsAction.NavigateBack) + }, + ) + }, + ) { paddingValues -> + Column( + modifier = Modifier + .fillMaxWidth() + .padding(paddingValues) + .padding(horizontal = KptTheme.spacing.lg) + .verticalScroll(rememberScrollState()), + verticalArrangement = Arrangement.spacedBy(KptTheme.spacing.md), + ) { + SendMoneyBanner() + + Spacer(modifier = Modifier.height(KptTheme.spacing.md)) + + SendMoneyOptionsRow( + onScanQrClick = { + viewModel.trySendAction(SendMoneyOptionsAction.ScanQrClicked) + }, + onPayAnyoneClick = { + viewModel.trySendAction(SendMoneyOptionsAction.PayAnyoneClicked) + }, + onBankTransferClick = { + viewModel.trySendAction(SendMoneyOptionsAction.BankTransferClicked) + }, + onFineractPaymentsClick = { + viewModel.trySendAction(SendMoneyOptionsAction.FineractPaymentsClicked) + }, + onAutoPayClick = { + viewModel.trySendAction(SendMoneyOptionsAction.AutoPayClicked) + }, + ) + + Spacer(modifier = Modifier.height(KptTheme.spacing.md)) + + PeopleSection() + + Spacer(modifier = Modifier.height(KptTheme.spacing.md)) + + MerchantsSection() + + Spacer(modifier = Modifier.height(KptTheme.spacing.md)) + } + } + } +} + +@Composable +private fun SendMoneyBanner( + modifier: Modifier = Modifier, +) { + Card( + modifier = modifier.fillMaxWidth(), + colors = CardDefaults.cardColors( + containerColor = KptTheme.colorScheme.primaryContainer, + ), + shape = RoundedCornerShape(KptTheme.spacing.md), + ) { + Box( + modifier = Modifier + .fillMaxWidth() + .padding(KptTheme.spacing.xl), + contentAlignment = Alignment.Center, + ) { + Text( + text = stringResource(Res.string.feature_send_money_choose_method), + style = KptTheme.typography.headlineSmall, + fontWeight = FontWeight.Medium, + textAlign = TextAlign.Center, + color = KptTheme.colorScheme.onPrimaryContainer, + ) + } + } +} + +@Composable +private fun SendMoneyOptionsRow( + onScanQrClick: () -> Unit, + onPayAnyoneClick: () -> Unit, + onBankTransferClick: () -> Unit, + onFineractPaymentsClick: () -> Unit, + onAutoPayClick: () -> Unit, + modifier: Modifier = Modifier, +) { + Column( + modifier = modifier.fillMaxWidth(), + verticalArrangement = Arrangement.spacedBy(KptTheme.spacing.lg), + ) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(KptTheme.spacing.md), + ) { + SendMoneyOptionButton( + icon = MifosIcons.Scan, + label = stringResource(Res.string.feature_send_money_scan_qr_code), + onClick = onScanQrClick, + modifier = Modifier.weight(1f), + ) + + SendMoneyOptionButton( + icon = MifosIcons.Person, + label = stringResource(Res.string.feature_send_money_pay_anyone), + onClick = onPayAnyoneClick, + modifier = Modifier.weight(1f), + ) + + SendMoneyOptionButton( + icon = MifosIcons.Bank, + label = stringResource(Res.string.feature_send_money_bank_transfer), + onClick = onBankTransferClick, + modifier = Modifier.weight(1f), + ) + + SendMoneyOptionButton( + icon = MifosIcons.Payment, + label = stringResource(Res.string.feature_send_money_fineract_payments), + onClick = onFineractPaymentsClick, + modifier = Modifier.weight(1f), + ) + } + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(KptTheme.spacing.md), + ) { + SendMoneyOptionButton( + icon = MifosIcons.CalenderMonth, + label = stringResource(Res.string.feature_send_money_autopay), + onClick = onAutoPayClick, + modifier = Modifier.weight(1f), + ) + + // Empty space for future icons (UPI Lite, Tap & Pay, etc.) + Spacer(modifier = Modifier.weight(3f)) + } + } +} + +@Composable +private fun SendMoneyOptionButton( + icon: ImageVector, + label: String, + onClick: () -> Unit, + modifier: Modifier = Modifier, +) { + Surface( + modifier = modifier + .clickable { onClick() }, + color = KptTheme.colorScheme.surface, + tonalElevation = 2.dp, + ) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = KptTheme.spacing.xs), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(KptTheme.spacing.md), + ) { + Box( + modifier = Modifier + .size(56.dp) + .background( + color = KptTheme.colorScheme.primaryContainer, + shape = RoundedCornerShape(KptTheme.spacing.sm), + ), + contentAlignment = Alignment.Center, + ) { + Icon( + imageVector = icon, + contentDescription = label, + modifier = Modifier.size(28.dp), + tint = KptTheme.colorScheme.onPrimaryContainer, + ) + } + + Text( + text = label, + style = KptTheme.typography.bodyMedium, + fontWeight = FontWeight.SemiBold, + textAlign = TextAlign.Center, + color = KptTheme.colorScheme.onSurface, + maxLines = 2, + ) + } + } +} + +@Composable +private fun PeopleSection( + modifier: Modifier = Modifier, +) { + // TODO: This is a placeholder section. People functionality is not implemented yet. + Column( + modifier = modifier.fillMaxWidth(), + verticalArrangement = Arrangement.spacedBy(KptTheme.spacing.md), + ) { + Text( + text = stringResource(Res.string.feature_send_money_people), + style = KptTheme.typography.titleMedium, + fontWeight = FontWeight.SemiBold, + color = KptTheme.colorScheme.onSurface, + ) + + Column( + verticalArrangement = Arrangement.spacedBy(KptTheme.spacing.md), + ) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(KptTheme.spacing.md), + ) { + PersonItem( + name = "John Doe", + modifier = Modifier.weight(1f), + ) + PersonItem( + name = "Jane Smith", + modifier = Modifier.weight(1f), + ) + PersonItem( + name = "Mike Johnson", + modifier = Modifier.weight(1f), + ) + PersonItem( + name = "Sarah Wilson", + modifier = Modifier.weight(1f), + ) + } + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(KptTheme.spacing.md), + ) { + PersonItem( + name = "David Brown", + modifier = Modifier.weight(1f), + ) + PersonItem( + name = "Lisa Davis", + modifier = Modifier.weight(1f), + ) + PersonItem( + name = "Tom Miller", + modifier = Modifier.weight(1f), + ) + PersonItem( + name = stringResource(Res.string.feature_send_money_more), + isMoreButton = true, + modifier = Modifier.weight(1f), + ) + } + } + } +} + +@Composable +private fun MerchantsSection( + modifier: Modifier = Modifier, +) { + // TODO: This is a placeholder section. Merchants functionality is not implemented yet. + Column( + modifier = modifier.fillMaxWidth(), + verticalArrangement = Arrangement.spacedBy(KptTheme.spacing.md), + ) { + Text( + text = stringResource(Res.string.feature_send_money_merchants), + style = KptTheme.typography.titleMedium, + fontWeight = FontWeight.SemiBold, + color = KptTheme.colorScheme.onSurface, + ) + + Column( + verticalArrangement = Arrangement.spacedBy(KptTheme.spacing.md), + ) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(KptTheme.spacing.md), + ) { + PersonItem( + name = "Coffee Shop", + modifier = Modifier.weight(1f), + ) + PersonItem( + name = "Grocery Store", + modifier = Modifier.weight(1f), + ) + PersonItem( + name = "Restaurant", + modifier = Modifier.weight(1f), + ) + PersonItem( + name = "Gas Station", + modifier = Modifier.weight(1f), + ) + } + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(KptTheme.spacing.md), + ) { + PersonItem( + name = "Pharmacy", + modifier = Modifier.weight(1f), + ) + PersonItem( + name = "Bookstore", + modifier = Modifier.weight(1f), + ) + PersonItem( + name = "Bakery", + modifier = Modifier.weight(1f), + ) + PersonItem( + name = stringResource(Res.string.feature_send_money_more), + isMoreButton = true, + modifier = Modifier.weight(1f), + ) + } + } + } +} + +@Composable +private fun PersonItem( + name: String, + isMoreButton: Boolean = false, + modifier: Modifier = Modifier, +) { + Surface( + modifier = modifier + .clickable { /* TODO: Handle click */ } + .clip(RoundedCornerShape(KptTheme.spacing.sm)), + color = KptTheme.colorScheme.surface, + tonalElevation = 1.dp, + ) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = KptTheme.spacing.xs), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(KptTheme.spacing.xs), + ) { + Box( + modifier = Modifier + .size(48.dp) + .background( + color = if (isMoreButton) { + KptTheme.colorScheme.secondaryContainer + } else { + KptTheme.colorScheme.primaryContainer + }, + shape = CircleShape, + ), + contentAlignment = Alignment.Center, + ) { + if (isMoreButton) { + Icon( + imageVector = MifosIcons.Add, + contentDescription = name, + modifier = Modifier.size(24.dp), + tint = KptTheme.colorScheme.onSecondaryContainer, + ) + } else { + Text( + text = name.take(1).uppercase(), + style = KptTheme.typography.bodyLarge, + fontWeight = FontWeight.Bold, + color = KptTheme.colorScheme.onPrimaryContainer, + ) + } + } + + Text( + text = name, + style = KptTheme.typography.bodySmall, + fontWeight = FontWeight.Medium, + textAlign = TextAlign.Center, + color = KptTheme.colorScheme.onSurface, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + ) + } + } +} diff --git a/feature/send-money/src/commonMain/kotlin/org/mifospay/feature/send/money/SendMoneyOptionsViewModel.kt b/feature/send-money/src/commonMain/kotlin/org/mifospay/feature/send/money/SendMoneyOptionsViewModel.kt new file mode 100644 index 000000000..0df5f00f6 --- /dev/null +++ b/feature/send-money/src/commonMain/kotlin/org/mifospay/feature/send/money/SendMoneyOptionsViewModel.kt @@ -0,0 +1,82 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md + */ +package org.mifospay.feature.send.money + +import androidx.lifecycle.viewModelScope +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.onEach +import org.mifospay.core.data.util.StandardUpiQrCodeProcessor +import org.mifospay.core.ui.utils.BackgroundEvent +import org.mifospay.core.ui.utils.BaseViewModel + +class SendMoneyOptionsViewModel( + private val scanner: QrScanner, +) : BaseViewModel( + initialState = SendMoneyOptionsState(), +) { + + override fun handleAction(action: SendMoneyOptionsAction) { + when (action) { + is SendMoneyOptionsAction.NavigateBack -> { + sendEvent(SendMoneyOptionsEvent.NavigateBack) + } + is SendMoneyOptionsAction.ScanQrClicked -> { + // Use ML Kit QR scanner directly + scanner.startScanning().onEach { data -> + data?.let { result -> + // Check if it's a UPI QR code or regular QR code + if (StandardUpiQrCodeProcessor.isValidUpiQrCode(result)) { + // Navigate to payee details screen for UPI QR codes + sendEvent(SendMoneyOptionsEvent.NavigateToPayeeDetails(result)) + } else { + // For non-UPI QR codes, navigate to Fineract payment + sendEvent(SendMoneyOptionsEvent.QrCodeScanned(result)) + } + } + }.launchIn(viewModelScope) + } + is SendMoneyOptionsAction.PayAnyoneClicked -> { + sendEvent(SendMoneyOptionsEvent.NavigateToPayAnyone) + } + is SendMoneyOptionsAction.BankTransferClicked -> { + sendEvent(SendMoneyOptionsEvent.NavigateToBankTransfer) + } + is SendMoneyOptionsAction.FineractPaymentsClicked -> { + sendEvent(SendMoneyOptionsEvent.NavigateToFineractPayments) + } + is SendMoneyOptionsAction.AutoPayClicked -> { + sendEvent(SendMoneyOptionsEvent.NavigateToAutoPay) + } + } + } +} + +data class SendMoneyOptionsState( + val isLoading: Boolean = false, +) + +sealed interface SendMoneyOptionsEvent { + data object NavigateBack : SendMoneyOptionsEvent + data object NavigateToPayAnyone : SendMoneyOptionsEvent + data object NavigateToBankTransfer : SendMoneyOptionsEvent + data object NavigateToFineractPayments : SendMoneyOptionsEvent + data object NavigateToAutoPay : SendMoneyOptionsEvent + data class QrCodeScanned(val data: String) : SendMoneyOptionsEvent, BackgroundEvent + data class NavigateToPayeeDetails(val qrCodeData: String) : SendMoneyOptionsEvent, BackgroundEvent +} + +sealed interface SendMoneyOptionsAction { + data object NavigateBack : SendMoneyOptionsAction + data object ScanQrClicked : SendMoneyOptionsAction + data object PayAnyoneClicked : SendMoneyOptionsAction + data object BankTransferClicked : SendMoneyOptionsAction + data object FineractPaymentsClicked : SendMoneyOptionsAction + data object AutoPayClicked : SendMoneyOptionsAction +} diff --git a/feature/send-money/src/commonMain/kotlin/org/mifospay/feature/send/money/SendMoneyScreen.kt b/feature/send-money/src/commonMain/kotlin/org/mifospay/feature/send/money/SendMoneyScreen.kt index 66d7bebd2..cd49c6f32 100644 --- a/feature/send-money/src/commonMain/kotlin/org/mifospay/feature/send/money/SendMoneyScreen.kt +++ b/feature/send-money/src/commonMain/kotlin/org/mifospay/feature/send/money/SendMoneyScreen.kt @@ -16,7 +16,6 @@ import androidx.compose.animation.fadeOut import androidx.compose.animation.slideInVertically import androidx.compose.animation.slideOutVertically import androidx.compose.foundation.BorderStroke -import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -92,6 +91,7 @@ import template.core.base.designsystem.theme.KptTheme fun SendMoneyScreen( onBackClick: () -> Unit, navigateToTransferScreen: (String) -> Unit, + navigateToPayeeDetails: (String) -> Unit, navigateToScanQrScreen: () -> Unit, showTopBar: Boolean = true, modifier: Modifier = Modifier, @@ -108,7 +108,16 @@ fun SendMoneyScreen( navigateToTransferScreen(event.data) } + is SendMoneyEvent.NavigateToPayeeDetails -> { + navigateToPayeeDetails(event.qrCodeData) + } + is SendMoneyEvent.NavigateToScanQrScreen -> navigateToScanQrScreen.invoke() + + is SendMoneyEvent.ShowToast -> { + // TODO: Implement toast message display + // For now, we'll just ignore it + } } } @@ -130,7 +139,6 @@ fun SendMoneyScreen( ) } -@OptIn(ExperimentalFoundationApi::class) @Composable private fun SendMoneyScreen( state: SendMoneyState, diff --git a/feature/send-money/src/commonMain/kotlin/org/mifospay/feature/send/money/SendMoneyViewModel.kt b/feature/send-money/src/commonMain/kotlin/org/mifospay/feature/send/money/SendMoneyViewModel.kt index 3ee69208a..6a9e9bb73 100644 --- a/feature/send-money/src/commonMain/kotlin/org/mifospay/feature/send/money/SendMoneyViewModel.kt +++ b/feature/send-money/src/commonMain/kotlin/org/mifospay/feature/send/money/SendMoneyViewModel.kt @@ -25,23 +25,26 @@ import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch -import kotlinx.serialization.Contextual import kotlinx.serialization.Serializable +import kotlinx.serialization.Transient import mobile_wallet.feature.send_money.generated.resources.Res import mobile_wallet.feature.send_money.generated.resources.feature_send_money_error_account_cannot_be_empty import mobile_wallet.feature.send_money.generated.resources.feature_send_money_error_amount_cannot_be_empty import mobile_wallet.feature.send_money.generated.resources.feature_send_money_error_invalid_amount import mobile_wallet.feature.send_money.generated.resources.feature_send_money_error_requesting_payment_qr_but_found import mobile_wallet.feature.send_money.generated.resources.feature_send_money_error_requesting_payment_qr_data_missing +import mobile_wallet.feature.send_money.generated.resources.feature_send_money_upi_qr_parsed_successfully import org.jetbrains.compose.resources.StringResource import org.mifospay.core.common.DataState import org.mifospay.core.common.getSerialized import org.mifospay.core.common.setSerialized import org.mifospay.core.data.repository.AccountRepository +import org.mifospay.core.data.util.StandardUpiQrCodeProcessor import org.mifospay.core.data.util.UpiQrCodeProcessor import org.mifospay.core.model.search.AccountResult import org.mifospay.core.model.utils.PaymentQrData import org.mifospay.core.model.utils.toAccount +import org.mifospay.core.ui.utils.BackgroundEvent import org.mifospay.core.ui.utils.BaseViewModel import org.mifospay.feature.send.money.SendMoneyAction.HandleRequestData import org.mifospay.feature.send.money.SendMoneyState.DialogState.Error @@ -120,7 +123,11 @@ class SendMoneyViewModel( SendMoneyAction.OnClickScan -> { scanner.startScanning().onEach { data -> data?.let { result -> - sendAction(HandleRequestData(result)) + if (StandardUpiQrCodeProcessor.isValidUpiQrCode(result)) { + sendEvent(SendMoneyEvent.NavigateToPayeeDetails(result)) + } else { + sendAction(HandleRequestData(result)) + } } }.launchIn(viewModelScope) // Using Play Service Code Scanner until Qr Scan module is stable @@ -176,7 +183,16 @@ class SendMoneyViewModel( private fun handleRequestData(action: HandleRequestData) { viewModelScope.launch { try { - val requestData = UpiQrCodeProcessor.decodeUpiString(action.requestData) + val requestData = try { + UpiQrCodeProcessor.decodeUpiString(action.requestData) + } catch (e: Exception) { + if (StandardUpiQrCodeProcessor.isValidUpiQrCode(action.requestData)) { + val standardData = StandardUpiQrCodeProcessor.parseUpiQrCode(action.requestData) + StandardUpiQrCodeProcessor.toPaymentQrData(standardData) + } else { + throw e + } + } mutableStateFlow.update { state -> state.copy( @@ -185,6 +201,8 @@ class SendMoneyViewModel( selectedAccount = requestData.toAccount(), ) } + + sendEvent(SendMoneyEvent.ShowToast(Res.string.feature_send_money_upi_qr_parsed_successfully)) } catch (e: Exception) { val errorState = if (action.requestData.isNotEmpty()) { Error.GenericResourceMessage( @@ -210,7 +228,7 @@ data class SendMoneyState( val amount: String = "", val accountNumber: String = "", val selectedAccount: AccountResult? = null, - val dialogState: DialogState? = null, + @Transient val dialogState: DialogState? = null, ) { val amountIsValid: Boolean get() = amount.isNotEmpty() && @@ -229,19 +247,16 @@ data class SendMoneyState( amount = amount, ) - @Serializable sealed interface DialogState { - @Serializable + data object Loading : DialogState - @Serializable sealed interface Error : DialogState { - @Serializable - data class ResourceMessage(@Contextual val message: StringResource) : Error - @Serializable + data class ResourceMessage(val message: StringResource) : Error + data class GenericResourceMessage( - @Contextual val message: StringResource, + val message: StringResource, val args: List, ) : Error } @@ -260,6 +275,9 @@ sealed interface SendMoneyEvent { data object OnNavigateBack : SendMoneyEvent data class NavigateToTransferScreen(val data: String) : SendMoneyEvent data object NavigateToScanQrScreen : SendMoneyEvent + + data class NavigateToPayeeDetails(val qrCodeData: String) : SendMoneyEvent, BackgroundEvent + data class ShowToast(val message: StringResource) : SendMoneyEvent } sealed interface SendMoneyAction { diff --git a/feature/send-money/src/commonMain/kotlin/org/mifospay/feature/send/money/di/SendMoneyModule.kt b/feature/send-money/src/commonMain/kotlin/org/mifospay/feature/send/money/di/SendMoneyModule.kt index 16dd21815..8af69abde 100644 --- a/feature/send-money/src/commonMain/kotlin/org/mifospay/feature/send/money/di/SendMoneyModule.kt +++ b/feature/send-money/src/commonMain/kotlin/org/mifospay/feature/send/money/di/SendMoneyModule.kt @@ -11,10 +11,14 @@ package org.mifospay.feature.send.money.di import org.koin.core.module.dsl.viewModelOf import org.koin.dsl.module +import org.mifospay.feature.send.money.PayeeDetailsViewModel import org.mifospay.feature.send.money.ScannerModule +import org.mifospay.feature.send.money.SendMoneyOptionsViewModel import org.mifospay.feature.send.money.SendMoneyViewModel val SendMoneyModule = module { includes(ScannerModule) viewModelOf(::SendMoneyViewModel) + viewModelOf(::SendMoneyOptionsViewModel) + viewModelOf(::PayeeDetailsViewModel) } diff --git a/feature/send-money/src/commonMain/kotlin/org/mifospay/feature/send/money/navigation/SendNavigation.kt b/feature/send-money/src/commonMain/kotlin/org/mifospay/feature/send/money/navigation/SendNavigation.kt index 04af30a0a..74defd7a4 100644 --- a/feature/send-money/src/commonMain/kotlin/org/mifospay/feature/send/money/navigation/SendNavigation.kt +++ b/feature/send-money/src/commonMain/kotlin/org/mifospay/feature/send/money/navigation/SendNavigation.kt @@ -14,7 +14,11 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.NavType import androidx.navigation.navArgument +import androidx.navigation.navOptions import org.mifospay.core.ui.composableWithSlideTransitions +import org.mifospay.feature.send.money.PayeeDetailsScreen +import org.mifospay.feature.send.money.PayeeDetailsState +import org.mifospay.feature.send.money.SendMoneyOptionsScreen import org.mifospay.feature.send.money.SendMoneyScreen const val SEND_MONEY_ROUTE = "send_money_route" @@ -22,13 +26,36 @@ const val SEND_MONEY_ARG = "requestData" const val SEND_MONEY_BASE_ROUTE = "$SEND_MONEY_ROUTE?$SEND_MONEY_ARG={$SEND_MONEY_ARG}" +const val SEND_MONEY_OPTIONS_ROUTE = "send_money_options_route" +const val PAYEE_DETAILS_ROUTE = "payee_details_route" +const val PAYEE_DETAILS_ARG = "qrCodeData" + +const val PAYEE_DETAILS_BASE_ROUTE = "$PAYEE_DETAILS_ROUTE?$PAYEE_DETAILS_ARG={$PAYEE_DETAILS_ARG}" + fun NavController.navigateToSendMoneyScreen( navOptions: NavOptions? = null, ) = navigate(SEND_MONEY_ROUTE, navOptions) +fun NavController.navigateToSendMoneyOptionsScreen( + navOptions: NavOptions? = null, +) = navigate(SEND_MONEY_OPTIONS_ROUTE, navOptions) + +fun NavController.navigateToPayeeDetailsScreen( + qrCodeData: String, + navOptions: NavOptions? = null, +) { + // URL encode the QR code data to handle special characters like &, =, etc. + val encodedQrCodeData = qrCodeData.urlEncode() + val route = "$PAYEE_DETAILS_ROUTE?$PAYEE_DETAILS_ARG=$encodedQrCodeData" + val options = navOptions ?: navOptions { + popUpTo(SEND_MONEY_OPTIONS_ROUTE) { inclusive = false } + } + navigate(route, options) +} fun NavGraphBuilder.sendMoneyScreen( onBackClick: () -> Unit, navigateToTransferScreen: (String) -> Unit, + navigateToPayeeDetailsScreen: (String) -> Unit, navigateToScanQrScreen: () -> Unit, ) { composableWithSlideTransitions( @@ -45,6 +72,55 @@ fun NavGraphBuilder.sendMoneyScreen( onBackClick = onBackClick, navigateToTransferScreen = navigateToTransferScreen, navigateToScanQrScreen = navigateToScanQrScreen, + navigateToPayeeDetails = navigateToPayeeDetailsScreen, + ) + } +} + +fun NavGraphBuilder.sendMoneyOptionsScreen( + onBackClick: () -> Unit, + onScanQrClick: () -> Unit, + onPayAnyoneClick: () -> Unit, + onBankTransferClick: () -> Unit, + onFineractPaymentsClick: () -> Unit, + onAutoPayClick: () -> Unit, + onQrCodeScanned: (String) -> Unit, + onNavigateToPayeeDetails: (String) -> Unit, +) { + composableWithSlideTransitions( + route = SEND_MONEY_OPTIONS_ROUTE, + ) { + SendMoneyOptionsScreen( + onBackClick = onBackClick, + onScanQrClick = onScanQrClick, + onPayAnyoneClick = onPayAnyoneClick, + onBankTransferClick = onBankTransferClick, + onFineractPaymentsClick = onFineractPaymentsClick, + onAutoPayClick = onAutoPayClick, + onQrCodeScanned = onQrCodeScanned, + onNavigateToPayeeDetails = onNavigateToPayeeDetails, + ) + } +} + +fun NavGraphBuilder.payeeDetailsScreen( + onBackClick: () -> Unit, + onNavigateToUpiPayment: (PayeeDetailsState) -> Unit, + onNavigateToFineractPayment: (PayeeDetailsState) -> Unit, +) { + composableWithSlideTransitions( + route = PAYEE_DETAILS_BASE_ROUTE, + arguments = listOf( + navArgument(PAYEE_DETAILS_ARG) { + type = NavType.StringType + nullable = false + }, + ), + ) { + PayeeDetailsScreen( + onBackClick = onBackClick, + onNavigateToUpiPayment = onNavigateToUpiPayment, + onNavigateToFineractPayment = onNavigateToFineractPayment, ) } } @@ -54,9 +130,47 @@ fun NavController.navigateToSendMoneyScreen( navOptions: NavOptions? = null, ) { val route = "$SEND_MONEY_ROUTE?$SEND_MONEY_ARG=$requestData" - val options = navOptions ?: NavOptions.Builder() - .setPopUpTo(SEND_MONEY_ROUTE, inclusive = true) - .build() + val options = navOptions ?: navOptions { + popUpTo(SEND_MONEY_ROUTE) { inclusive = true } + } navigate(route, options) } + +/** + * URL encodes a string to handle special characters in navigation + * + * Optimized for UPI QR codes with future-proofing for common special characters. + * + * Essential UPI characters (12): + * - URL structure: ?, &, =, % + * - VPA format: @ + * - Common text: space, ", ', comma + * - URLs: /, :, #, + + * + * Future-proofing characters (5): + * - Currency symbols: $ + * - URL parameters: ; + * - JSON/structured data: [, ], {, } + */ +private fun String.urlEncode(): String { + return this.replace("%", "%25") + .replace(" ", "%20") + .replace("&", "%26") + .replace("=", "%3D") + .replace("?", "%3F") + .replace("@", "%40") + .replace("+", "%2B") + .replace("/", "%2F") + .replace(":", "%3A") + .replace("#", "%23") + .replace("\"", "%22") + .replace("'", "%27") + .replace(",", "%2C") + .replace("$", "%24") + .replace(";", "%3B") + .replace("[", "%5B") + .replace("]", "%5D") + .replace("{", "%7B") + .replace("}", "%7D") +} diff --git a/settings.gradle.kts b/settings.gradle.kts index 63c88a74f..bc520718e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -83,5 +83,6 @@ include(":feature:payments") include(":feature:request-money") include(":feature:upi-setup") include(":feature:qr") +include(":feature:autopay") include(":libs:mifos-passcode")