diff --git a/.gitignore b/.gitignore index 2d7324f4f..140feef8b 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,6 @@ captures/ /app/app-release.apk app/app.iml app/manifest-merger-release-report.txt + +# Exclude Google services from prod flavour +mifospay/src/prod/google-services.json diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts index f8affd7e5..f6887b7f4 100644 --- a/build-logic/convention/build.gradle.kts +++ b/build-logic/convention/build.gradle.kts @@ -4,7 +4,7 @@ plugins { `kotlin-dsl` } -group = "org.mifos.mobilewallet.mifospay.buildlogic" +group = "org.mifospay.buildlogic" // Configure the build-logic plugins to target JDK 17 // This matches the JDK used to build the project, and is not related to what is running on device. diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt index cdcc319a4..0b45d8607 100644 --- a/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt @@ -2,7 +2,7 @@ import com.android.build.api.dsl.ApplicationExtension import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.getByType -import org.mifos.mobilewallet.mifospay.configureAndroidCompose +import org.mifospay.configureAndroidCompose class AndroidApplicationComposeConventionPlugin : Plugin { override fun apply(target: Project) { diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt index 2c3de1feb..b6df4f6c3 100644 --- a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt @@ -5,9 +5,9 @@ import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.getByType -import org.mifos.mobilewallet.mifospay.configureBadgingTasks -import org.mifos.mobilewallet.mifospay.configureKotlinAndroid -import org.mifos.mobilewallet.mifospay.configurePrintApksTask +import org.mifospay.configureBadgingTasks +import org.mifospay.configureKotlinAndroid +import org.mifospay.configurePrintApksTask class AndroidApplicationConventionPlugin : Plugin { override fun apply(target: Project) { diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt index fe876afd9..83a97395c 100644 --- a/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt @@ -4,7 +4,7 @@ import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.dependencies -import org.mifos.mobilewallet.mifospay.libs +import org.mifospay.libs class AndroidApplicationFirebaseConventionPlugin : Plugin { override fun apply(target: Project) { diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationFlavorsConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationFlavorsConventionPlugin.kt index 43ddd5e67..1f7f9d58e 100644 --- a/build-logic/convention/src/main/kotlin/AndroidApplicationFlavorsConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidApplicationFlavorsConventionPlugin.kt @@ -2,7 +2,7 @@ import com.android.build.api.dsl.ApplicationExtension import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.configure -import org.mifos.mobilewallet.mifospay.configureFlavors +import org.mifospay.configureFlavors class AndroidApplicationFlavorsConventionPlugin : Plugin { override fun apply(target: Project) { diff --git a/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt index eea20975e..1593aceff 100644 --- a/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt @@ -3,7 +3,7 @@ import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.dependencies -import org.mifos.mobilewallet.mifospay.libs +import org.mifospay.libs class AndroidFeatureConventionPlugin : Plugin { override fun apply(target: Project) { diff --git a/build-logic/convention/src/main/kotlin/AndroidHiltConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidHiltConventionPlugin.kt index 8c54b481c..c93d1abf8 100644 --- a/build-logic/convention/src/main/kotlin/AndroidHiltConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidHiltConventionPlugin.kt @@ -1,8 +1,8 @@ -import org.mifos.mobilewallet.mifospay.libs import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.dependencies +import org.mifospay.libs class AndroidHiltConventionPlugin : Plugin { override fun apply(target: Project) { diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt index 913cf35a1..a7fe3e0b9 100644 --- a/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt @@ -2,7 +2,7 @@ import com.android.build.gradle.LibraryExtension import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.getByType -import org.mifos.mobilewallet.mifospay.configureAndroidCompose +import org.mifospay.configureAndroidCompose class AndroidLibraryComposeConventionPlugin : Plugin { override fun apply(target: Project) { diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt index c100e295f..a749b93e6 100644 --- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt @@ -5,10 +5,11 @@ import org.gradle.api.Project import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.dependencies import org.gradle.kotlin.dsl.kotlin -import org.mifos.mobilewallet.mifospay.configureKotlinAndroid -import org.mifos.mobilewallet.mifospay.configurePrintApksTask -import org.mifos.mobilewallet.mifospay.disableUnnecessaryAndroidTests -import org.mifos.mobilewallet.mifospay.libs +import org.mifospay.configureFlavors +import org.mifospay.configureKotlinAndroid +import org.mifospay.configurePrintApksTask +import org.mifospay.disableUnnecessaryAndroidTests +import org.mifospay.libs class AndroidLibraryConventionPlugin : Plugin { override fun apply(target: Project) { @@ -23,6 +24,7 @@ class AndroidLibraryConventionPlugin : Plugin { configureKotlinAndroid(this) defaultConfig.targetSdk = 34 testOptions.animationsDisabled = true + configureFlavors(this) // The resource prefix is derived from the module name, // so resources inside ":core:module1" must be prefixed with "core_module1_" resourcePrefix = path.split("""\W""".toRegex()).drop(1).distinct().joinToString(separator = "_").lowercase() + "_" diff --git a/build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt index dc7d24086..b26d22035 100644 --- a/build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt @@ -3,7 +3,7 @@ import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.dependencies -import org.mifos.mobilewallet.mifospay.libs +import org.mifospay.libs class AndroidRoomConventionPlugin : Plugin { diff --git a/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt index cbacc8444..f726b8b8c 100644 --- a/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt @@ -2,7 +2,7 @@ import com.android.build.gradle.TestExtension import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.configure -import org.mifos.mobilewallet.mifospay.configureKotlinAndroid +import org.mifospay.configureKotlinAndroid class AndroidTestConventionPlugin : Plugin { override fun apply(target: Project) { diff --git a/build-logic/convention/src/main/kotlin/JvmLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/JvmLibraryConventionPlugin.kt index d3c778e9a..8fcc18712 100644 --- a/build-logic/convention/src/main/kotlin/JvmLibraryConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/JvmLibraryConventionPlugin.kt @@ -1,6 +1,6 @@ import org.gradle.api.Plugin import org.gradle.api.Project -import org.mifos.mobilewallet.mifospay.configureKotlinJvm +import org.mifospay.configureKotlinJvm class JvmLibraryConventionPlugin : Plugin { override fun apply(target: Project) { diff --git a/build-logic/convention/src/main/kotlin/org/mifos/mobilewallet/mifospay/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/org/mifospay/AndroidCompose.kt similarity index 98% rename from build-logic/convention/src/main/kotlin/org/mifos/mobilewallet/mifospay/AndroidCompose.kt rename to build-logic/convention/src/main/kotlin/org/mifospay/AndroidCompose.kt index 9abbca312..8144d31c2 100644 --- a/build-logic/convention/src/main/kotlin/org/mifos/mobilewallet/mifospay/AndroidCompose.kt +++ b/build-logic/convention/src/main/kotlin/org/mifospay/AndroidCompose.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay +package org.mifospay import com.android.build.api.dsl.CommonExtension import org.gradle.api.Project diff --git a/build-logic/convention/src/main/kotlin/org/mifos/mobilewallet/mifospay/AndroidInstrumentedTests.kt b/build-logic/convention/src/main/kotlin/org/mifospay/AndroidInstrumentedTests.kt similarity index 94% rename from build-logic/convention/src/main/kotlin/org/mifos/mobilewallet/mifospay/AndroidInstrumentedTests.kt rename to build-logic/convention/src/main/kotlin/org/mifospay/AndroidInstrumentedTests.kt index 2c62d69a9..fdff2f5f4 100644 --- a/build-logic/convention/src/main/kotlin/org/mifos/mobilewallet/mifospay/AndroidInstrumentedTests.kt +++ b/build-logic/convention/src/main/kotlin/org/mifospay/AndroidInstrumentedTests.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay +package org.mifospay import com.android.build.api.variant.LibraryAndroidComponentsExtension import org.gradle.api.Project diff --git a/build-logic/convention/src/main/kotlin/org/mifos/mobilewallet/mifospay/Badging.kt b/build-logic/convention/src/main/kotlin/org/mifospay/Badging.kt similarity index 99% rename from build-logic/convention/src/main/kotlin/org/mifos/mobilewallet/mifospay/Badging.kt rename to build-logic/convention/src/main/kotlin/org/mifospay/Badging.kt index 315a07a85..25c81ca17 100644 --- a/build-logic/convention/src/main/kotlin/org/mifos/mobilewallet/mifospay/Badging.kt +++ b/build-logic/convention/src/main/kotlin/org/mifospay/Badging.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay +package org.mifospay import com.android.build.api.artifact.SingleArtifact import com.android.build.api.variant.ApplicationAndroidComponentsExtension diff --git a/build-logic/convention/src/main/kotlin/org/mifos/mobilewallet/mifospay/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/org/mifospay/KotlinAndroid.kt similarity index 98% rename from build-logic/convention/src/main/kotlin/org/mifos/mobilewallet/mifospay/KotlinAndroid.kt rename to build-logic/convention/src/main/kotlin/org/mifospay/KotlinAndroid.kt index 9d2391951..cf765fdff 100644 --- a/build-logic/convention/src/main/kotlin/org/mifos/mobilewallet/mifospay/KotlinAndroid.kt +++ b/build-logic/convention/src/main/kotlin/org/mifospay/KotlinAndroid.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay +package org.mifospay import com.android.build.api.dsl.CommonExtension import org.gradle.api.JavaVersion diff --git a/build-logic/convention/src/main/kotlin/org/mifos/mobilewallet/mifospay/MifosBuildType.kt b/build-logic/convention/src/main/kotlin/org/mifospay/MifosBuildType.kt similarity index 83% rename from build-logic/convention/src/main/kotlin/org/mifos/mobilewallet/mifospay/MifosBuildType.kt rename to build-logic/convention/src/main/kotlin/org/mifospay/MifosBuildType.kt index 37d3c9e71..9ee74517c 100644 --- a/build-logic/convention/src/main/kotlin/org/mifos/mobilewallet/mifospay/MifosBuildType.kt +++ b/build-logic/convention/src/main/kotlin/org/mifospay/MifosBuildType.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay +package org.mifospay /** * This is shared between :app and :benchmarks module to provide configurations type safety. diff --git a/build-logic/convention/src/main/kotlin/org/mifos/mobilewallet/mifospay/MifosFlavor.kt b/build-logic/convention/src/main/kotlin/org/mifospay/MifosFlavor.kt similarity index 83% rename from build-logic/convention/src/main/kotlin/org/mifos/mobilewallet/mifospay/MifosFlavor.kt rename to build-logic/convention/src/main/kotlin/org/mifospay/MifosFlavor.kt index 93c4ae966..86eefa26b 100644 --- a/build-logic/convention/src/main/kotlin/org/mifos/mobilewallet/mifospay/MifosFlavor.kt +++ b/build-logic/convention/src/main/kotlin/org/mifospay/MifosFlavor.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay +package org.mifospay import com.android.build.api.dsl.ApplicationExtension import com.android.build.api.dsl.ApplicationProductFlavor @@ -14,19 +14,19 @@ enum class FlavorDimension { // purposes, or from a production backend server which supplies up-to-date, real content. // These two product flavors reflect this behaviour. @Suppress("EnumEntryName") -enum class NiaFlavor(val dimension: FlavorDimension, val applicationIdSuffix: String? = null) { +enum class MifosFlavor(val dimension: FlavorDimension, val applicationIdSuffix: String? = null) { demo(FlavorDimension.contentType, applicationIdSuffix = ".demo"), prod(FlavorDimension.contentType) } fun configureFlavors( commonExtension: CommonExtension<*, *, *, *, *, *>, - flavorConfigurationBlock: ProductFlavor.(flavor: NiaFlavor) -> Unit = {} + flavorConfigurationBlock: ProductFlavor.(flavor: MifosFlavor) -> Unit = {} ) { commonExtension.apply { flavorDimensions += FlavorDimension.contentType.name productFlavors { - NiaFlavor.values().forEach { + MifosFlavor.values().forEach { create(it.name) { dimension = it.dimension.name flavorConfigurationBlock(this, it) diff --git a/build-logic/convention/src/main/kotlin/org/mifos/mobilewallet/mifospay/PrintTestApks.kt b/build-logic/convention/src/main/kotlin/org/mifospay/PrintTestApks.kt similarity index 98% rename from build-logic/convention/src/main/kotlin/org/mifos/mobilewallet/mifospay/PrintTestApks.kt rename to build-logic/convention/src/main/kotlin/org/mifospay/PrintTestApks.kt index e5642b04d..00bf33863 100644 --- a/build-logic/convention/src/main/kotlin/org/mifos/mobilewallet/mifospay/PrintTestApks.kt +++ b/build-logic/convention/src/main/kotlin/org/mifospay/PrintTestApks.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay +package org.mifospay import com.android.build.api.artifact.SingleArtifact import com.android.build.api.variant.AndroidComponentsExtension diff --git a/build-logic/convention/src/main/kotlin/org/mifos/mobilewallet/mifospay/ProjectExtensions.kt b/build-logic/convention/src/main/kotlin/org/mifospay/ProjectExtensions.kt similarity index 87% rename from build-logic/convention/src/main/kotlin/org/mifos/mobilewallet/mifospay/ProjectExtensions.kt rename to build-logic/convention/src/main/kotlin/org/mifospay/ProjectExtensions.kt index 17ae7f843..083999627 100644 --- a/build-logic/convention/src/main/kotlin/org/mifos/mobilewallet/mifospay/ProjectExtensions.kt +++ b/build-logic/convention/src/main/kotlin/org/mifospay/ProjectExtensions.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay +package org.mifospay import org.gradle.api.Project import org.gradle.api.artifacts.VersionCatalog diff --git a/core/analytics/build.gradle.kts b/core/analytics/build.gradle.kts index 58c9d0cd6..b3e6224f9 100644 --- a/core/analytics/build.gradle.kts +++ b/core/analytics/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } android { - namespace = "org.mifos.mobilewallet.mifospay.core.analytics" + namespace = "org.mifospay.core.analytics" } dependencies { diff --git a/core/analytics/src/main/java/org/mifos/mobilewallet/mifospay/core/analytics/AnalyticsEvent.kt b/core/analytics/src/main/kotlin/org/mifospay/core/analytics/AnalyticsEvent.kt similarity index 96% rename from core/analytics/src/main/java/org/mifos/mobilewallet/mifospay/core/analytics/AnalyticsEvent.kt rename to core/analytics/src/main/kotlin/org/mifospay/core/analytics/AnalyticsEvent.kt index e3825afe0..d26e91f5a 100644 --- a/core/analytics/src/main/java/org/mifos/mobilewallet/mifospay/core/analytics/AnalyticsEvent.kt +++ b/core/analytics/src/main/kotlin/org/mifospay/core/analytics/AnalyticsEvent.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.core.analytics +package org.mifospay.core.analytics /** * Represents an analytics event. diff --git a/core/analytics/src/main/java/org/mifos/mobilewallet/mifospay/core/analytics/AnalyticsHelper.kt b/core/analytics/src/main/kotlin/org/mifospay/core/analytics/AnalyticsHelper.kt similarity index 78% rename from core/analytics/src/main/java/org/mifos/mobilewallet/mifospay/core/analytics/AnalyticsHelper.kt rename to core/analytics/src/main/kotlin/org/mifospay/core/analytics/AnalyticsHelper.kt index 875e3e718..e0104341d 100644 --- a/core/analytics/src/main/java/org/mifos/mobilewallet/mifospay/core/analytics/AnalyticsHelper.kt +++ b/core/analytics/src/main/kotlin/org/mifospay/core/analytics/AnalyticsHelper.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.core.analytics +package org.mifospay.core.analytics /** * Interface for logging analytics events. See `FirebaseAnalyticsHelper` and diff --git a/core/analytics/src/main/java/org/mifos/mobilewallet/mifospay/core/analytics/NoOpAnalyticsHelper.kt b/core/analytics/src/main/kotlin/org/mifospay/core/analytics/NoOpAnalyticsHelper.kt similarity index 78% rename from core/analytics/src/main/java/org/mifos/mobilewallet/mifospay/core/analytics/NoOpAnalyticsHelper.kt rename to core/analytics/src/main/kotlin/org/mifospay/core/analytics/NoOpAnalyticsHelper.kt index 9a18c9d08..c06e3d6d9 100644 --- a/core/analytics/src/main/java/org/mifos/mobilewallet/mifospay/core/analytics/NoOpAnalyticsHelper.kt +++ b/core/analytics/src/main/kotlin/org/mifospay/core/analytics/NoOpAnalyticsHelper.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.core.analytics +package org.mifospay.core.analytics /** * Implementation of AnalyticsHelper which does nothing. Useful for tests and previews. diff --git a/core/analytics/src/main/java/org/mifos/mobilewallet/mifospay/core/analytics/StubAnalyticsHelper.kt b/core/analytics/src/main/kotlin/org/mifospay/core/analytics/StubAnalyticsHelper.kt similarity index 89% rename from core/analytics/src/main/java/org/mifos/mobilewallet/mifospay/core/analytics/StubAnalyticsHelper.kt rename to core/analytics/src/main/kotlin/org/mifospay/core/analytics/StubAnalyticsHelper.kt index 65a5ea5f4..890d19344 100644 --- a/core/analytics/src/main/java/org/mifos/mobilewallet/mifospay/core/analytics/StubAnalyticsHelper.kt +++ b/core/analytics/src/main/kotlin/org/mifospay/core/analytics/StubAnalyticsHelper.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.core.analytics +package org.mifospay.core.analytics import android.util.Log import javax.inject.Inject diff --git a/core/analytics/src/main/java/org/mifos/mobilewallet/mifospay/core/analytics/UiHelpers.kt b/core/analytics/src/main/kotlin/org/mifospay/core/analytics/UiHelpers.kt similarity index 88% rename from core/analytics/src/main/java/org/mifos/mobilewallet/mifospay/core/analytics/UiHelpers.kt rename to core/analytics/src/main/kotlin/org/mifospay/core/analytics/UiHelpers.kt index 4e7ea6922..6e0a80a6a 100644 --- a/core/analytics/src/main/java/org/mifos/mobilewallet/mifospay/core/analytics/UiHelpers.kt +++ b/core/analytics/src/main/kotlin/org/mifospay/core/analytics/UiHelpers.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.core.analytics +package org.mifospay.core.analytics import androidx.compose.runtime.staticCompositionLocalOf diff --git a/core/analytics/src/main/java/org/mifos/mobilewallet/mifospay/core/analytics/di/AnalyticsModule.kt b/core/analytics/src/main/kotlin/org/mifospay/core/analytics/di/AnalyticsModule.kt similarity index 84% rename from core/analytics/src/main/java/org/mifos/mobilewallet/mifospay/core/analytics/di/AnalyticsModule.kt rename to core/analytics/src/main/kotlin/org/mifospay/core/analytics/di/AnalyticsModule.kt index 49c63b660..85767cbd2 100644 --- a/core/analytics/src/main/java/org/mifos/mobilewallet/mifospay/core/analytics/di/AnalyticsModule.kt +++ b/core/analytics/src/main/kotlin/org/mifospay/core/analytics/di/AnalyticsModule.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.core.analytics.di +package org.mifospay.core.analytics.di import com.google.firebase.analytics.FirebaseAnalytics import com.google.firebase.analytics.ktx.analytics @@ -8,7 +8,7 @@ import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import org.mifos.mobilewallet.mifospay.core.analytics.AnalyticsHelper +import org.mifospay.core.analytics.AnalyticsHelper import javax.inject.Singleton @Module diff --git a/core/analytics/src/main/java/org/mifos/mobilewallet/mifospay/core/analytics/di/FirebaseAnalyticsHelper.kt b/core/analytics/src/main/kotlin/org/mifospay/core/analytics/di/FirebaseAnalyticsHelper.kt similarity index 79% rename from core/analytics/src/main/java/org/mifos/mobilewallet/mifospay/core/analytics/di/FirebaseAnalyticsHelper.kt rename to core/analytics/src/main/kotlin/org/mifospay/core/analytics/di/FirebaseAnalyticsHelper.kt index dc56e3bc9..197e9cb9a 100644 --- a/core/analytics/src/main/java/org/mifos/mobilewallet/mifospay/core/analytics/di/FirebaseAnalyticsHelper.kt +++ b/core/analytics/src/main/kotlin/org/mifospay/core/analytics/di/FirebaseAnalyticsHelper.kt @@ -1,9 +1,9 @@ -package org.mifos.mobilewallet.mifospay.core.analytics.di +package org.mifospay.core.analytics.di import com.google.firebase.analytics.FirebaseAnalytics import com.google.firebase.analytics.ktx.logEvent -import org.mifos.mobilewallet.mifospay.core.analytics.AnalyticsEvent -import org.mifos.mobilewallet.mifospay.core.analytics.AnalyticsHelper +import org.mifospay.core.analytics.AnalyticsEvent +import org.mifospay.core.analytics.AnalyticsHelper import javax.inject.Inject /** diff --git a/core/designsystem/src/test/java/org/mifos/mobilewallet/mifospay/designsystem/ExampleUnitTest.kt b/core/analytics/src/test/java/org/mifospay/mobilewallet/mifospay/analytics/ExampleUnitTest.kt similarity index 85% rename from core/designsystem/src/test/java/org/mifos/mobilewallet/mifospay/designsystem/ExampleUnitTest.kt rename to core/analytics/src/test/java/org/mifospay/mobilewallet/mifospay/analytics/ExampleUnitTest.kt index 749d46955..9b7dcdd30 100644 --- a/core/designsystem/src/test/java/org/mifos/mobilewallet/mifospay/designsystem/ExampleUnitTest.kt +++ b/core/analytics/src/test/java/org/mifospay/mobilewallet/mifospay/analytics/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.designsystem +package org.mifospay.mobilewallet.mifospay.analytics import org.junit.Test diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts index f45b559a0..f081e4321 100644 --- a/core/common/build.gradle.kts +++ b/core/common/build.gradle.kts @@ -6,7 +6,7 @@ plugins { apply(from = "${project.rootDir}/config/quality/quality.gradle") android { - namespace = "org.mifos.mobilewallet.mifospay.common" + namespace = "org.mifospay.common" } dependencies { diff --git a/core/common/src/main/java/org/mifos/mobilewallet/mifospay/common/Constants.kt b/core/common/src/main/kotlin/org/mifospay/common/Constants.kt similarity index 99% rename from core/common/src/main/java/org/mifos/mobilewallet/mifospay/common/Constants.kt rename to core/common/src/main/kotlin/org/mifospay/common/Constants.kt index ec0d83f04..4c34922a8 100644 --- a/core/common/src/main/java/org/mifos/mobilewallet/mifospay/common/Constants.kt +++ b/core/common/src/main/kotlin/org/mifospay/common/Constants.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.common +package org.mifospay.common /** * Created by naman on 17/6/17. diff --git a/core/common/src/main/java/org/mifos/mobilewallet/mifospay/common/CreditCardUtils.kt b/core/common/src/main/kotlin/org/mifospay/common/CreditCardUtils.kt similarity index 94% rename from core/common/src/main/java/org/mifos/mobilewallet/mifospay/common/CreditCardUtils.kt rename to core/common/src/main/kotlin/org/mifospay/common/CreditCardUtils.kt index 7af730f09..b5a417ad5 100644 --- a/core/common/src/main/java/org/mifos/mobilewallet/mifospay/common/CreditCardUtils.kt +++ b/core/common/src/main/kotlin/org/mifospay/common/CreditCardUtils.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.common +package org.mifospay.common object CreditCardUtils { fun validateCreditCardNumber(str: String): Boolean { diff --git a/core/common/src/main/java/org/mifos/mobilewallet/mifospay/common/DebugUtil.kt b/core/common/src/main/kotlin/org/mifospay/common/DebugUtil.kt similarity index 89% rename from core/common/src/main/java/org/mifos/mobilewallet/mifospay/common/DebugUtil.kt rename to core/common/src/main/kotlin/org/mifospay/common/DebugUtil.kt index 7682c29b5..bac8d0b70 100644 --- a/core/common/src/main/java/org/mifos/mobilewallet/mifospay/common/DebugUtil.kt +++ b/core/common/src/main/kotlin/org/mifospay/common/DebugUtil.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.common +package org.mifospay.common import android.util.Log diff --git a/core/common/src/main/java/org/mifos/mobilewallet/mifospay/common/Utils.kt b/core/common/src/main/kotlin/org/mifospay/common/Utils.kt similarity index 96% rename from core/common/src/main/java/org/mifos/mobilewallet/mifospay/common/Utils.kt rename to core/common/src/main/kotlin/org/mifospay/common/Utils.kt index 420cfeb79..f275692ec 100644 --- a/core/common/src/main/java/org/mifos/mobilewallet/mifospay/common/Utils.kt +++ b/core/common/src/main/kotlin/org/mifospay/common/Utils.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.common +package org.mifospay.common import android.app.Activity import android.content.Context diff --git a/core/common/src/main/java/org/mifos/mobilewallet/mifospay/core/network/MifosDispatchers.kt b/core/common/src/main/kotlin/org/mifospay/core/network/MifosDispatchers.kt similarity index 81% rename from core/common/src/main/java/org/mifos/mobilewallet/mifospay/core/network/MifosDispatchers.kt rename to core/common/src/main/kotlin/org/mifospay/core/network/MifosDispatchers.kt index 3323bcf39..1224be7e7 100644 --- a/core/common/src/main/java/org/mifos/mobilewallet/mifospay/core/network/MifosDispatchers.kt +++ b/core/common/src/main/kotlin/org/mifospay/core/network/MifosDispatchers.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.core.network +package org.mifospay.core.network import javax.inject.Qualifier import kotlin.annotation.AnnotationRetention.RUNTIME diff --git a/core/common/src/main/java/org/mifos/mobilewallet/mifospay/core/network/di/CoroutineScopesModule.kt b/core/common/src/main/kotlin/org/mifospay/core/network/di/CoroutineScopesModule.kt similarity index 78% rename from core/common/src/main/java/org/mifos/mobilewallet/mifospay/core/network/di/CoroutineScopesModule.kt rename to core/common/src/main/kotlin/org/mifospay/core/network/di/CoroutineScopesModule.kt index 5222a7e99..07f52c2a2 100644 --- a/core/common/src/main/java/org/mifos/mobilewallet/mifospay/core/network/di/CoroutineScopesModule.kt +++ b/core/common/src/main/kotlin/org/mifospay/core/network/di/CoroutineScopesModule.kt @@ -1,7 +1,7 @@ -package org.mifos.mobilewallet.mifospay.core.network.di +package org.mifospay.core.network.di -import org.mifos.mobilewallet.mifospay.core.network.Dispatcher -import org.mifos.mobilewallet.mifospay.core.network.MifosDispatchers.Default +import org.mifospay.core.network.Dispatcher +import org.mifospay.core.network.MifosDispatchers.Default import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/core/common/src/main/java/org/mifos/mobilewallet/mifospay/core/network/di/DispatchersModule.kt b/core/common/src/main/kotlin/org/mifospay/core/network/di/DispatchersModule.kt similarity index 65% rename from core/common/src/main/java/org/mifos/mobilewallet/mifospay/core/network/di/DispatchersModule.kt rename to core/common/src/main/kotlin/org/mifospay/core/network/di/DispatchersModule.kt index f299d4cc7..3218268b9 100644 --- a/core/common/src/main/java/org/mifos/mobilewallet/mifospay/core/network/di/DispatchersModule.kt +++ b/core/common/src/main/kotlin/org/mifospay/core/network/di/DispatchersModule.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.mifospay.core.network.di +package org.mifospay.core.network.di -import org.mifos.mobilewallet.mifospay.core.network.Dispatcher -import org.mifos.mobilewallet.mifospay.core.network.MifosDispatchers.Default -import org.mifos.mobilewallet.mifospay.core.network.MifosDispatchers.IO +import org.mifospay.core.network.Dispatcher +import org.mifospay.core.network.MifosDispatchers.Default +import org.mifospay.core.network.MifosDispatchers.IO import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/core/datastore/src/test/java/org/mifos/mobilewallet/datastore/ExampleUnitTest.kt b/core/common/src/test/java/org/mifospay/common/ExampleUnitTest.kt similarity index 88% rename from core/datastore/src/test/java/org/mifos/mobilewallet/datastore/ExampleUnitTest.kt rename to core/common/src/test/java/org/mifospay/common/ExampleUnitTest.kt index ad7a8ced3..b51d0704e 100644 --- a/core/datastore/src/test/java/org/mifos/mobilewallet/datastore/ExampleUnitTest.kt +++ b/core/common/src/test/java/org/mifospay/common/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.datastore +package org.mifospay.common import org.junit.Test diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts index 036850185..7713ed2d1 100644 --- a/core/data/build.gradle.kts +++ b/core/data/build.gradle.kts @@ -10,7 +10,7 @@ apply(from = "${project.rootDir}/config/quality/quality.gradle") group = "com.github.ankurs287" android { - namespace = "org.mifos.mobilewallet.core" + namespace = "org.mifospay.core.data" testOptions { unitTests { isIncludeAndroidResources = true diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/account/PayFunds.kt b/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/account/PayFunds.kt deleted file mode 100644 index 9b3bc464a..000000000 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/account/PayFunds.kt +++ /dev/null @@ -1,3 +0,0 @@ -package org.mifos.mobilewallet.core.domain.usecase.account - -class PayFunds \ No newline at end of file diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/base/TaskLooper.kt b/core/data/src/main/java/org/mifospay/core/data/base/TaskLooper.kt similarity index 93% rename from core/data/src/main/java/org/mifos/mobilewallet/core/base/TaskLooper.kt rename to core/data/src/main/java/org/mifospay/core/data/base/TaskLooper.kt index 6bed3aaae..91693aa7a 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/base/TaskLooper.kt +++ b/core/data/src/main/java/org/mifospay/core/data/base/TaskLooper.kt @@ -1,6 +1,6 @@ -package org.mifos.mobilewallet.core.base +package org.mifospay.core.data.base -import org.mifos.mobilewallet.core.base.UseCase.UseCaseCallback +import org.mifospay.core.data.base.UseCase.UseCaseCallback import javax.inject.Inject /** diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/base/ThreadPoolQueue.kt b/core/data/src/main/java/org/mifospay/core/data/base/ThreadPoolQueue.kt similarity index 89% rename from core/data/src/main/java/org/mifos/mobilewallet/core/base/ThreadPoolQueue.kt rename to core/data/src/main/java/org/mifospay/core/data/base/ThreadPoolQueue.kt index d7b33787e..703cb8eba 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/base/ThreadPoolQueue.kt +++ b/core/data/src/main/java/org/mifospay/core/data/base/ThreadPoolQueue.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.core.base +package org.mifospay.core.data.base import java.util.concurrent.ArrayBlockingQueue diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/base/UseCase.kt b/core/data/src/main/java/org/mifospay/core/data/base/UseCase.kt similarity index 95% rename from core/data/src/main/java/org/mifos/mobilewallet/core/base/UseCase.kt rename to core/data/src/main/java/org/mifospay/core/data/base/UseCase.kt index f168719b1..e3c6b3f0f 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/base/UseCase.kt +++ b/core/data/src/main/java/org/mifospay/core/data/base/UseCase.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.core.base +package org.mifospay.core.data.base /** * Use cases are the entry points to the domain layer. diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/base/UseCaseFactory.kt b/core/data/src/main/java/org/mifospay/core/data/base/UseCaseFactory.kt similarity index 63% rename from core/data/src/main/java/org/mifos/mobilewallet/core/base/UseCaseFactory.kt rename to core/data/src/main/java/org/mifospay/core/data/base/UseCaseFactory.kt index 65a603b79..f37ef91a5 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/base/UseCaseFactory.kt +++ b/core/data/src/main/java/org/mifospay/core/data/base/UseCaseFactory.kt @@ -1,9 +1,9 @@ -package org.mifos.mobilewallet.core.base +package org.mifospay.core.data.base -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.core.domain.usecase.account.FetchAccountTransfer -import org.mifos.mobilewallet.core.domain.usecase.client.FetchClientDetails -import org.mifos.mobilewallet.core.util.Constants +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.data.domain.usecase.account.FetchAccountTransfer +import org.mifospay.core.data.domain.usecase.client.FetchClientDetails +import org.mifospay.core.data.util.Constants import javax.inject.Inject /** diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/base/UseCaseHandler.kt b/core/data/src/main/java/org/mifospay/core/data/base/UseCaseHandler.kt similarity index 93% rename from core/data/src/main/java/org/mifos/mobilewallet/core/base/UseCaseHandler.kt rename to core/data/src/main/java/org/mifospay/core/data/base/UseCaseHandler.kt index 6e64d5612..cc0159af2 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/base/UseCaseHandler.kt +++ b/core/data/src/main/java/org/mifospay/core/data/base/UseCaseHandler.kt @@ -1,6 +1,6 @@ -package org.mifos.mobilewallet.core.base +package org.mifospay.core.data.base -import org.mifos.mobilewallet.core.base.UseCase.UseCaseCallback +import org.mifospay.core.data.base.UseCase.UseCaseCallback /** * Runs [UseCase]s using a [UseCaseScheduler]. diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/base/UseCaseScheduler.kt b/core/data/src/main/java/org/mifospay/core/data/base/UseCaseScheduler.kt similarity index 78% rename from core/data/src/main/java/org/mifos/mobilewallet/core/base/UseCaseScheduler.kt rename to core/data/src/main/java/org/mifospay/core/data/base/UseCaseScheduler.kt index 244a1db03..cb388b8d1 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/base/UseCaseScheduler.kt +++ b/core/data/src/main/java/org/mifospay/core/data/base/UseCaseScheduler.kt @@ -1,6 +1,6 @@ -package org.mifos.mobilewallet.core.base +package org.mifospay.core.data.base -import org.mifos.mobilewallet.core.base.UseCase.UseCaseCallback +import org.mifospay.core.data.base.UseCase.UseCaseCallback /** * Interface for schedulers, see [UseCaseThreadPoolScheduler]. diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/base/UseCaseThreadPoolScheduler.kt b/core/data/src/main/java/org/mifospay/core/data/base/UseCaseThreadPoolScheduler.kt similarity index 92% rename from core/data/src/main/java/org/mifos/mobilewallet/core/base/UseCaseThreadPoolScheduler.kt rename to core/data/src/main/java/org/mifospay/core/data/base/UseCaseThreadPoolScheduler.kt index 362d534d2..681435f6e 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/base/UseCaseThreadPoolScheduler.kt +++ b/core/data/src/main/java/org/mifospay/core/data/base/UseCaseThreadPoolScheduler.kt @@ -1,7 +1,7 @@ -package org.mifos.mobilewallet.core.base +package org.mifospay.core.data.base import android.os.Handler -import org.mifos.mobilewallet.core.base.UseCase.UseCaseCallback +import org.mifospay.core.data.base.UseCase.UseCaseCallback import java.util.concurrent.ThreadPoolExecutor import java.util.concurrent.TimeUnit diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/di/DataModule.kt b/core/data/src/main/java/org/mifospay/core/data/di/DataModule.kt similarity index 67% rename from core/data/src/main/java/org/mifos/mobilewallet/core/di/DataModule.kt rename to core/data/src/main/java/org/mifospay/core/data/di/DataModule.kt index cf47c8675..604bb014e 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/di/DataModule.kt +++ b/core/data/src/main/java/org/mifospay/core/data/di/DataModule.kt @@ -1,14 +1,14 @@ -package org.mifos.mobilewallet.core.di +package org.mifospay.core.data.di import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.base.UseCaseThreadPoolScheduler -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.mifospay.network.FineractApiManager -import org.mifos.mobilewallet.mifospay.network.SelfServiceApiManager +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.base.UseCaseThreadPoolScheduler +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.network.FineractApiManager +import org.mifospay.core.network.SelfServiceApiManager @Module @InstallIn(SingletonComponent::class) diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/di/LocalDataModule.kt b/core/data/src/main/java/org/mifospay/core/data/di/LocalDataModule.kt similarity index 56% rename from core/data/src/main/java/org/mifos/mobilewallet/core/di/LocalDataModule.kt rename to core/data/src/main/java/org/mifospay/core/data/di/LocalDataModule.kt index be0d87160..972ec7529 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/di/LocalDataModule.kt +++ b/core/data/src/main/java/org/mifospay/core/data/di/LocalDataModule.kt @@ -1,17 +1,17 @@ -package org.mifos.mobilewallet.core.di +package org.mifospay.core.data.di import dagger.Binds import dagger.Module import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import org.mifos.mobilewallet.core.repository.auth.AuthenticationUserRepository -import org.mifos.mobilewallet.core.repository.auth.UserDataRepository -import org.mifos.mobilewallet.core.repository.local.LocalAssetRepository -import org.mifos.mobilewallet.core.repository.local.MifosLocalAssetRepository -import org.mifos.mobilewallet.core.util.ConnectivityManagerNetworkMonitor -import org.mifos.mobilewallet.core.util.NetworkMonitor -import org.mifos.mobilewallet.core.util.TimeZoneBroadcastMonitor -import org.mifos.mobilewallet.core.util.TimeZoneMonitor +import org.mifospay.core.data.repository.auth.AuthenticationUserRepository +import org.mifospay.core.data.repository.auth.UserDataRepository +import org.mifospay.core.data.repository.local.LocalAssetRepository +import org.mifospay.core.data.repository.local.MifosLocalAssetRepository +import org.mifospay.core.data.util.ConnectivityManagerNetworkMonitor +import org.mifospay.core.data.util.NetworkMonitor +import org.mifospay.core.data.util.TimeZoneBroadcastMonitor +import org.mifospay.core.data.util.TimeZoneMonitor @Module @InstallIn(SingletonComponent::class) diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/account/BlockUnblockCommand.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/BlockUnblockCommand.kt similarity index 83% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/account/BlockUnblockCommand.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/BlockUnblockCommand.kt index 5e9d4f93e..fab98a4a9 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/account/BlockUnblockCommand.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/BlockUnblockCommand.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.core.domain.usecase.account +package org.mifospay.core.data.domain.usecase.account -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.mifospay.network.GenericResponse +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.network.GenericResponse import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/account/DownloadTransactionReceipt.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/DownloadTransactionReceipt.kt similarity index 85% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/account/DownloadTransactionReceipt.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/DownloadTransactionReceipt.kt index c71d84d6f..fad50a0d6 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/account/DownloadTransactionReceipt.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/DownloadTransactionReceipt.kt @@ -1,9 +1,9 @@ -package org.mifos.mobilewallet.core.domain.usecase.account +package org.mifospay.core.data.domain.usecase.account import okhttp3.ResponseBody -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.core.util.Constants +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.data.util.Constants import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/account/FetchAccount.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/FetchAccount.kt similarity index 82% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/account/FetchAccount.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/FetchAccount.kt index f83bda27c..7c65629d6 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/account/FetchAccount.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/FetchAccount.kt @@ -1,12 +1,12 @@ -package org.mifos.mobilewallet.core.domain.usecase.account +package org.mifospay.core.data.domain.usecase.account -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.data.fineract.entity.mapper.AccountMapper -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.core.util.Constants -import com.mifos.mobilewallet.model.domain.Account -import com.mifos.mobilewallet.model.entity.client.ClientAccounts +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.fineract.entity.mapper.AccountMapper +import org.mifospay.core.data.fineract.repository.FineractRepository +import com.mifospay.core.model.domain.Account +import com.mifospay.core.model.entity.client.ClientAccounts +import org.mifospay.core.data.util.Constants import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/account/FetchAccountTransaction.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/FetchAccountTransaction.kt similarity index 80% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/account/FetchAccountTransaction.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/FetchAccountTransaction.kt index 979330d6e..b84c25a4e 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/account/FetchAccountTransaction.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/FetchAccountTransaction.kt @@ -1,11 +1,11 @@ -package org.mifos.mobilewallet.core.domain.usecase.account +package org.mifospay.core.data.domain.usecase.account -import com.mifos.mobilewallet.model.domain.Transaction -import com.mifos.mobilewallet.model.entity.accounts.savings.Transactions -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.data.fineract.entity.mapper.TransactionMapper -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.core.util.Constants +import com.mifospay.core.model.domain.Transaction +import com.mifospay.core.model.entity.accounts.savings.Transactions +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.fineract.entity.mapper.TransactionMapper +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.data.util.Constants import rx.Observer import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/account/FetchAccountTransactions.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/FetchAccountTransactions.kt similarity index 76% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/account/FetchAccountTransactions.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/FetchAccountTransactions.kt index 24c01a8a9..53a7a7507 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/account/FetchAccountTransactions.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/FetchAccountTransactions.kt @@ -1,11 +1,11 @@ -package org.mifos.mobilewallet.core.domain.usecase.account +package org.mifospay.core.data.domain.usecase.account -import com.mifos.mobilewallet.model.domain.Transaction -import com.mifos.mobilewallet.model.entity.accounts.savings.SavingsWithAssociations -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.data.fineract.entity.mapper.TransactionMapper -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.core.util.Constants +import com.mifospay.core.model.domain.Transaction +import com.mifospay.core.model.entity.accounts.savings.SavingsWithAssociations +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.fineract.entity.mapper.TransactionMapper +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.data.util.Constants import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/account/FetchAccountTransfer.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/FetchAccountTransfer.kt similarity index 82% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/account/FetchAccountTransfer.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/FetchAccountTransfer.kt index f025489f3..dcb413760 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/account/FetchAccountTransfer.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/FetchAccountTransfer.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.core.domain.usecase.account +package org.mifospay.core.data.domain.usecase.account -import com.mifos.mobilewallet.model.entity.accounts.savings.TransferDetail -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository +import com.mifospay.core.model.entity.accounts.savings.TransferDetail +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.fineract.repository.FineractRepository import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/account/FetchAccounts.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/FetchAccounts.kt similarity index 78% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/account/FetchAccounts.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/FetchAccounts.kt index 5fa026aec..9e29c8ace 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/account/FetchAccounts.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/FetchAccounts.kt @@ -1,11 +1,11 @@ -package org.mifos.mobilewallet.core.domain.usecase.account +package org.mifospay.core.data.domain.usecase.account -import com.mifos.mobilewallet.model.domain.Account -import com.mifos.mobilewallet.model.entity.client.ClientAccounts -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.data.fineract.entity.mapper.AccountMapper -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.core.util.Constants +import com.mifospay.core.model.domain.Account +import com.mifospay.core.model.entity.client.ClientAccounts +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.fineract.entity.mapper.AccountMapper +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.data.util.Constants import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/account/FetchMerchants.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/FetchMerchants.kt similarity index 82% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/account/FetchMerchants.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/FetchMerchants.kt index 0fcc47c7b..ae00bc663 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/account/FetchMerchants.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/FetchMerchants.kt @@ -1,10 +1,10 @@ -package org.mifos.mobilewallet.core.domain.usecase.account +package org.mifospay.core.data.domain.usecase.account -import com.mifos.mobilewallet.model.entity.Page -import com.mifos.mobilewallet.model.entity.accounts.savings.SavingsWithAssociations -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.core.util.Constants +import com.mifospay.core.model.entity.Page +import com.mifospay.core.model.entity.accounts.savings.SavingsWithAssociations +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.data.util.Constants import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/PayFunds.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/PayFunds.kt new file mode 100644 index 000000000..0b1fe53b0 --- /dev/null +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/PayFunds.kt @@ -0,0 +1,3 @@ +package org.mifospay.core.data.domain.usecase.account + +class PayFunds \ No newline at end of file diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/account/TransferFunds.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/TransferFunds.kt similarity index 91% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/account/TransferFunds.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/TransferFunds.kt index 0dbbecf0d..eda384ffc 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/account/TransferFunds.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/account/TransferFunds.kt @@ -1,18 +1,18 @@ -package org.mifos.mobilewallet.core.domain.usecase.account +package org.mifospay.core.data.domain.usecase.account import okhttp3.ResponseBody -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.core.util.Constants -import com.mifos.mobilewallet.model.entity.beneficary.Beneficiary -import com.mifos.mobilewallet.model.entity.beneficary.BeneficiaryPayload -import com.mifos.mobilewallet.model.entity.beneficary.BeneficiaryUpdatePayload -import com.mifos.mobilewallet.model.entity.payload.TransferPayload -import com.mifos.mobilewallet.model.entity.TPTResponse -import com.mifos.mobilewallet.model.entity.accounts.savings.SavingAccount -import com.mifos.mobilewallet.model.entity.client.Client -import com.mifos.mobilewallet.model.entity.client.ClientAccounts -import com.mifos.mobilewallet.model.utils.DateHelper +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.fineract.repository.FineractRepository +import com.mifospay.core.model.entity.beneficary.Beneficiary +import com.mifospay.core.model.entity.beneficary.BeneficiaryPayload +import com.mifospay.core.model.entity.beneficary.BeneficiaryUpdatePayload +import com.mifospay.core.model.entity.payload.TransferPayload +import com.mifospay.core.model.entity.TPTResponse +import com.mifospay.core.model.entity.accounts.savings.SavingAccount +import com.mifospay.core.model.entity.client.Client +import com.mifospay.core.model.entity.client.ClientAccounts +import com.mifospay.core.model.utils.DateHelper +import org.mifospay.core.data.util.Constants import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/client/CreateClient.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/client/CreateClient.kt similarity index 78% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/client/CreateClient.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/client/CreateClient.kt index 442f3d95f..789f2bb7a 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/client/CreateClient.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/client/CreateClient.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.core.domain.usecase.client +package org.mifospay.core.data.domain.usecase.client -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.core.util.ErrorJsonMessageHelper.getUserMessage +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.data.util.ErrorJsonMessageHelper.getUserMessage import retrofit2.HttpException import rx.Subscriber import rx.android.schedulers.AndroidSchedulers @@ -15,7 +15,7 @@ import javax.inject.Inject class CreateClient @Inject constructor(private val apiRepository: FineractRepository) : UseCase() { - data class RequestValues(val client: com.mifos.mobilewallet.model.domain.client.NewClient) : UseCase.RequestValues + data class RequestValues(val client: com.mifospay.core.model.domain.client.NewClient) : UseCase.RequestValues data class ResponseValue(val clientId: Int) : UseCase.ResponseValue override fun executeUseCase(requestValues: RequestValues) { diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/client/FetchClientData.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/client/FetchClientData.kt similarity index 82% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/client/FetchClientData.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/client/FetchClientData.kt index 44dc84fa7..d13fef6df 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/client/FetchClientData.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/client/FetchClientData.kt @@ -1,11 +1,11 @@ -package org.mifos.mobilewallet.core.domain.usecase.client +package org.mifospay.core.data.domain.usecase.client -import org.mifos.mobilewallet.core.base.UseCase -import com.mifos.mobilewallet.model.entity.Page -import com.mifos.mobilewallet.model.entity.client.Client -import org.mifos.mobilewallet.core.data.fineract.entity.mapper.ClientDetailsMapper -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.core.util.Constants +import org.mifospay.core.data.base.UseCase +import com.mifospay.core.model.entity.Page +import com.mifospay.core.model.entity.client.Client +import org.mifospay.core.data.fineract.entity.mapper.ClientDetailsMapper +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.data.util.Constants import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers @@ -59,6 +59,6 @@ class FetchClientData @Inject constructor(private val fineractRepository: Finera data class RequestValues(val clientId: Long?) : UseCase.RequestValues data class ResponseValue( - val clientDetails: com.mifos.mobilewallet.model.domain.client.Client + val clientDetails: com.mifospay.core.model.domain.client.Client ) : UseCase.ResponseValue } diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/client/FetchClientDetails.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/client/FetchClientDetails.kt similarity index 79% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/client/FetchClientDetails.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/client/FetchClientDetails.kt index 447f9376a..98c528aa7 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/client/FetchClientDetails.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/client/FetchClientDetails.kt @@ -1,9 +1,9 @@ -package org.mifos.mobilewallet.core.domain.usecase.client +package org.mifospay.core.data.domain.usecase.client -import org.mifos.mobilewallet.core.base.UseCase -import com.mifos.mobilewallet.model.entity.client.Client -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.core.util.Constants +import org.mifospay.core.data.base.UseCase +import com.mifospay.core.model.entity.client.Client +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.data.util.Constants import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/client/FetchClientImage.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/client/FetchClientImage.kt similarity index 78% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/client/FetchClientImage.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/client/FetchClientImage.kt index 26078f6b7..f8f4f8e00 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/client/FetchClientImage.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/client/FetchClientImage.kt @@ -1,17 +1,14 @@ -package org.mifos.mobilewallet.core.domain.usecase.client +package org.mifospay.core.data.domain.usecase.client import okhttp3.ResponseBody -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.core.util.ErrorJsonMessageHelper.getUserMessage +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.data.util.ErrorJsonMessageHelper.getUserMessage import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers import javax.inject.Inject -/** - * Created by ankur on 02/August/2018 - */ class FetchClientImage @Inject constructor(private val mFineractRepository: FineractRepository) : UseCase() { diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/client/SearchClient.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/client/SearchClient.kt similarity index 78% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/client/SearchClient.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/client/SearchClient.kt index f34816d91..a986a010c 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/client/SearchClient.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/client/SearchClient.kt @@ -1,11 +1,11 @@ -package org.mifos.mobilewallet.core.domain.usecase.client +package org.mifospay.core.data.domain.usecase.client -import org.mifos.mobilewallet.core.base.UseCase -import com.mifos.mobilewallet.model.entity.SearchedEntity -import org.mifos.mobilewallet.core.data.fineract.entity.mapper.SearchedEntitiesMapper -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import com.mifos.mobilewallet.model.domain.SearchResult -import org.mifos.mobilewallet.core.util.Constants +import org.mifospay.core.data.base.UseCase +import com.mifospay.core.model.entity.SearchedEntity +import org.mifospay.core.data.fineract.entity.mapper.SearchedEntitiesMapper +import org.mifospay.core.data.fineract.repository.FineractRepository +import com.mifospay.core.model.domain.SearchResult +import org.mifospay.core.data.util.Constants import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/client/UpdateClient.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/client/UpdateClient.kt similarity index 85% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/client/UpdateClient.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/client/UpdateClient.kt index c3ec61768..cb6d2ecd8 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/client/UpdateClient.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/client/UpdateClient.kt @@ -1,9 +1,9 @@ -package org.mifos.mobilewallet.core.domain.usecase.client +package org.mifospay.core.data.domain.usecase.client import okhttp3.ResponseBody -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.core.util.ErrorJsonMessageHelper.getUserMessage +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.data.util.ErrorJsonMessageHelper.getUserMessage import retrofit2.HttpException import rx.Subscriber import rx.android.schedulers.AndroidSchedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/invoice/FetchInvoice.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/invoice/FetchInvoice.kt similarity index 87% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/invoice/FetchInvoice.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/invoice/FetchInvoice.kt index 6ce1872d0..62f1c5a83 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/invoice/FetchInvoice.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/invoice/FetchInvoice.kt @@ -1,10 +1,10 @@ -package org.mifos.mobilewallet.core.domain.usecase.invoice +package org.mifospay.core.data.domain.usecase.invoice import android.net.Uri -import org.mifos.mobilewallet.core.base.UseCase -import com.mifos.mobilewallet.model.entity.Invoice -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.core.util.Constants +import org.mifospay.core.data.base.UseCase +import com.mifospay.core.model.entity.Invoice +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.data.util.Constants import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/invoice/FetchInvoices.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/invoice/FetchInvoices.kt similarity index 82% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/invoice/FetchInvoices.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/invoice/FetchInvoices.kt index e9ed54f0a..146b95f8b 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/invoice/FetchInvoices.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/invoice/FetchInvoices.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.core.domain.usecase.invoice +package org.mifospay.core.data.domain.usecase.invoice -import org.mifos.mobilewallet.core.base.UseCase -import com.mifos.mobilewallet.model.entity.Invoice -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository +import org.mifospay.core.data.base.UseCase +import com.mifospay.core.model.entity.Invoice +import org.mifospay.core.data.fineract.repository.FineractRepository import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/kyc/FetchKYCLevel1Details.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/kyc/FetchKYCLevel1Details.kt similarity index 83% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/kyc/FetchKYCLevel1Details.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/kyc/FetchKYCLevel1Details.kt index 76c505064..f36b6c20c 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/kyc/FetchKYCLevel1Details.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/kyc/FetchKYCLevel1Details.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.core.domain.usecase.kyc +package org.mifospay.core.data.domain.usecase.kyc -import org.mifos.mobilewallet.core.base.UseCase -import com.mifos.mobilewallet.model.entity.kyc.KYCLevel1Details -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository +import org.mifospay.core.data.base.UseCase +import com.mifospay.core.model.entity.kyc.KYCLevel1Details +import org.mifospay.core.data.fineract.repository.FineractRepository import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/kyc/UpdateKYCLevel1Details.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/kyc/UpdateKYCLevel1Details.kt similarity index 80% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/kyc/UpdateKYCLevel1Details.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/kyc/UpdateKYCLevel1Details.kt index b985ff060..d4d178d8f 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/kyc/UpdateKYCLevel1Details.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/kyc/UpdateKYCLevel1Details.kt @@ -1,9 +1,9 @@ -package org.mifos.mobilewallet.core.domain.usecase.kyc +package org.mifospay.core.data.domain.usecase.kyc -import org.mifos.mobilewallet.core.base.UseCase -import com.mifos.mobilewallet.model.entity.kyc.KYCLevel1Details -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.mifospay.network.GenericResponse +import org.mifospay.core.data.base.UseCase +import com.mifospay.core.model.entity.kyc.KYCLevel1Details +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.network.GenericResponse import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/kyc/UploadKYCDocs.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/kyc/UploadKYCDocs.kt similarity index 84% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/kyc/UploadKYCDocs.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/kyc/UploadKYCDocs.kt index fba6ec991..f4238e713 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/kyc/UploadKYCDocs.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/kyc/UploadKYCDocs.kt @@ -1,9 +1,9 @@ -package org.mifos.mobilewallet.core.domain.usecase.kyc +package org.mifospay.core.data.domain.usecase.kyc import okhttp3.MultipartBody -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.mifospay.network.GenericResponse +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.network.GenericResponse import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/kyc/UploadKYCLevel1Details.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/kyc/UploadKYCLevel1Details.kt similarity index 80% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/kyc/UploadKYCLevel1Details.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/kyc/UploadKYCLevel1Details.kt index 1325cd92e..93a92ddcc 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/kyc/UploadKYCLevel1Details.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/kyc/UploadKYCLevel1Details.kt @@ -1,9 +1,9 @@ -package org.mifos.mobilewallet.core.domain.usecase.kyc +package org.mifospay.core.data.domain.usecase.kyc -import org.mifos.mobilewallet.core.base.UseCase -import com.mifos.mobilewallet.model.entity.kyc.KYCLevel1Details -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.mifospay.network.GenericResponse +import org.mifospay.core.data.base.UseCase +import com.mifospay.core.model.entity.kyc.KYCLevel1Details +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.network.GenericResponse import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/notification/FetchNotifications.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/notification/FetchNotifications.kt similarity index 80% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/notification/FetchNotifications.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/notification/FetchNotifications.kt index dbc5e5ee4..b5d68c228 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/notification/FetchNotifications.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/notification/FetchNotifications.kt @@ -1,9 +1,9 @@ -package org.mifos.mobilewallet.core.domain.usecase.notification +package org.mifospay.core.data.domain.usecase.notification -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import com.mifos.mobilewallet.model.domain.NotificationPayload -import org.mifos.mobilewallet.core.util.Constants +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.fineract.repository.FineractRepository +import com.mifospay.core.model.domain.NotificationPayload +import org.mifospay.core.data.util.Constants import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/savedcards/AddCard.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/savedcards/AddCard.kt similarity index 78% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/savedcards/AddCard.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/savedcards/AddCard.kt index ad8f8d29e..ac6f93363 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/savedcards/AddCard.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/savedcards/AddCard.kt @@ -1,9 +1,9 @@ -package org.mifos.mobilewallet.core.domain.usecase.savedcards +package org.mifospay.core.data.domain.usecase.savedcards -import org.mifos.mobilewallet.core.base.UseCase -import com.mifos.mobilewallet.model.entity.savedcards.Card -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.mifospay.network.GenericResponse +import org.mifospay.core.data.base.UseCase +import com.mifospay.core.model.entity.savedcards.Card +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.network.GenericResponse import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/savedcards/DeleteCard.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/savedcards/DeleteCard.kt similarity index 81% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/savedcards/DeleteCard.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/savedcards/DeleteCard.kt index 3c5808b0a..b4161120b 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/savedcards/DeleteCard.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/savedcards/DeleteCard.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.core.domain.usecase.savedcards +package org.mifospay.core.data.domain.usecase.savedcards -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.mifospay.network.GenericResponse +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.network.GenericResponse import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/savedcards/EditCard.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/savedcards/EditCard.kt similarity index 78% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/savedcards/EditCard.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/savedcards/EditCard.kt index 4f571a39a..f96a1db3a 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/savedcards/EditCard.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/savedcards/EditCard.kt @@ -1,9 +1,9 @@ -package org.mifos.mobilewallet.core.domain.usecase.savedcards +package org.mifospay.core.data.domain.usecase.savedcards -import org.mifos.mobilewallet.core.base.UseCase -import com.mifos.mobilewallet.model.entity.savedcards.Card -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.mifospay.network.GenericResponse +import org.mifospay.core.data.base.UseCase +import com.mifospay.core.model.entity.savedcards.Card +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.network.GenericResponse import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/savedcards/FetchSavedCards.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/savedcards/FetchSavedCards.kt similarity index 81% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/savedcards/FetchSavedCards.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/savedcards/FetchSavedCards.kt index 890916d58..994351885 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/savedcards/FetchSavedCards.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/savedcards/FetchSavedCards.kt @@ -1,9 +1,9 @@ -package org.mifos.mobilewallet.core.domain.usecase.savedcards +package org.mifospay.core.data.domain.usecase.savedcards -import org.mifos.mobilewallet.core.base.UseCase -import com.mifos.mobilewallet.model.entity.savedcards.Card -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.core.util.Constants +import org.mifospay.core.data.base.UseCase +import com.mifospay.core.model.entity.savedcards.Card +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.data.util.Constants import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/standinginstruction/CreateStandingTransaction.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/standinginstruction/CreateStandingTransaction.kt similarity index 92% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/standinginstruction/CreateStandingTransaction.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/standinginstruction/CreateStandingTransaction.kt index c9dd5f7e4..5a11f2612 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/standinginstruction/CreateStandingTransaction.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/standinginstruction/CreateStandingTransaction.kt @@ -1,13 +1,13 @@ -package org.mifos.mobilewallet.core.domain.usecase.standinginstruction - -import org.mifos.mobilewallet.core.base.UseCase -import com.mifos.mobilewallet.model.entity.accounts.savings.SavingAccount -import com.mifos.mobilewallet.model.entity.client.Client -import com.mifos.mobilewallet.model.entity.client.ClientAccounts -import com.mifos.mobilewallet.model.entity.standinginstruction.SDIResponse -import com.mifos.mobilewallet.model.entity.payload.StandingInstructionPayload -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.core.util.Constants +package org.mifospay.core.data.domain.usecase.standinginstruction + +import org.mifospay.core.data.base.UseCase +import com.mifospay.core.model.entity.accounts.savings.SavingAccount +import com.mifospay.core.model.entity.client.Client +import com.mifospay.core.model.entity.client.ClientAccounts +import com.mifospay.core.model.entity.standinginstruction.SDIResponse +import com.mifospay.core.model.entity.payload.StandingInstructionPayload +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.data.util.Constants import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/standinginstruction/DeleteStandingInstruction.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/standinginstruction/DeleteStandingInstruction.kt similarity index 82% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/standinginstruction/DeleteStandingInstruction.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/standinginstruction/DeleteStandingInstruction.kt index bbdb1fbe0..7ab5ee612 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/standinginstruction/DeleteStandingInstruction.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/standinginstruction/DeleteStandingInstruction.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.core.domain.usecase.standinginstruction +package org.mifospay.core.data.domain.usecase.standinginstruction -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.mifospay.network.GenericResponse +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.network.GenericResponse import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/standinginstruction/FetchStandingInstruction.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/standinginstruction/FetchStandingInstruction.kt similarity index 82% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/standinginstruction/FetchStandingInstruction.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/standinginstruction/FetchStandingInstruction.kt index cd324455e..dd130788c 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/standinginstruction/FetchStandingInstruction.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/standinginstruction/FetchStandingInstruction.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.core.domain.usecase.standinginstruction +package org.mifospay.core.data.domain.usecase.standinginstruction -import org.mifos.mobilewallet.core.base.UseCase -import com.mifos.mobilewallet.model.entity.standinginstruction.StandingInstruction -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository +import org.mifospay.core.data.base.UseCase +import com.mifospay.core.model.entity.standinginstruction.StandingInstruction +import org.mifospay.core.data.fineract.repository.FineractRepository import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/standinginstruction/GetAllStandingInstructions.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/standinginstruction/GetAllStandingInstructions.kt similarity index 80% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/standinginstruction/GetAllStandingInstructions.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/standinginstruction/GetAllStandingInstructions.kt index a76ce280f..c33d74a16 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/standinginstruction/GetAllStandingInstructions.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/standinginstruction/GetAllStandingInstructions.kt @@ -1,9 +1,9 @@ -package org.mifos.mobilewallet.core.domain.usecase.standinginstruction +package org.mifospay.core.data.domain.usecase.standinginstruction -import org.mifos.mobilewallet.core.base.UseCase -import com.mifos.mobilewallet.model.entity.Page -import com.mifos.mobilewallet.model.entity.standinginstruction.StandingInstruction -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository +import org.mifospay.core.data.base.UseCase +import com.mifospay.core.model.entity.Page +import com.mifospay.core.model.entity.standinginstruction.StandingInstruction +import org.mifospay.core.data.fineract.repository.FineractRepository import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/standinginstruction/UpdateStandingInstruction.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/standinginstruction/UpdateStandingInstruction.kt similarity index 87% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/standinginstruction/UpdateStandingInstruction.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/standinginstruction/UpdateStandingInstruction.kt index 525016a96..2ee580f3e 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/standinginstruction/UpdateStandingInstruction.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/standinginstruction/UpdateStandingInstruction.kt @@ -1,10 +1,10 @@ -package org.mifos.mobilewallet.core.domain.usecase.standinginstruction +package org.mifospay.core.data.domain.usecase.standinginstruction -import org.mifos.mobilewallet.core.base.UseCase -import com.mifos.mobilewallet.model.entity.payload.StandingInstructionPayload -import com.mifos.mobilewallet.model.entity.standinginstruction.StandingInstruction -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.mifospay.network.GenericResponse +import org.mifospay.core.data.base.UseCase +import com.mifospay.core.model.entity.payload.StandingInstructionPayload +import com.mifospay.core.model.entity.standinginstruction.StandingInstruction +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.network.GenericResponse import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/twofactor/FetchDeliveryMethods.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/twofactor/FetchDeliveryMethods.kt similarity index 82% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/twofactor/FetchDeliveryMethods.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/twofactor/FetchDeliveryMethods.kt index fd46a7283..699be8f9b 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/twofactor/FetchDeliveryMethods.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/twofactor/FetchDeliveryMethods.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.core.domain.usecase.twofactor +package org.mifospay.core.data.domain.usecase.twofactor -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import com.mifos.mobilewallet.model.domain.twofactor.DeliveryMethod +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.fineract.repository.FineractRepository +import com.mifospay.core.model.domain.twofactor.DeliveryMethod import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/twofactor/RequestOTP.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/twofactor/RequestOTP.kt similarity index 85% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/twofactor/RequestOTP.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/twofactor/RequestOTP.kt index 37e0a0c9e..c22c9784a 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/twofactor/RequestOTP.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/twofactor/RequestOTP.kt @@ -1,7 +1,7 @@ -package org.mifos.mobilewallet.core.domain.usecase.twofactor +package org.mifospay.core.data.domain.usecase.twofactor -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.fineract.repository.FineractRepository import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/twofactor/ValidateOTP.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/twofactor/ValidateOTP.kt similarity index 81% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/twofactor/ValidateOTP.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/twofactor/ValidateOTP.kt index 0719aba5c..a60baf165 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/twofactor/ValidateOTP.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/twofactor/ValidateOTP.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.core.domain.usecase.twofactor +package org.mifospay.core.data.domain.usecase.twofactor -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import com.mifos.mobilewallet.model.domain.twofactor.AccessToken +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.fineract.repository.FineractRepository +import com.mifospay.core.model.domain.twofactor.AccessToken import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/user/AuthenticateUser.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/user/AuthenticateUser.kt similarity index 73% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/user/AuthenticateUser.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/user/AuthenticateUser.kt index ac6b9b608..c009d6543 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/user/AuthenticateUser.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/user/AuthenticateUser.kt @@ -1,18 +1,15 @@ -package org.mifos.mobilewallet.core.domain.usecase.user +package org.mifospay.core.data.domain.usecase.user -import com.mifos.mobilewallet.model.domain.user.User -import com.mifos.mobilewallet.model.entity.authentication.AuthenticationPayload -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.core.util.Constants +import com.mifospay.core.model.domain.user.User +import com.mifospay.core.model.entity.authentication.AuthenticationPayload +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.data.util.Constants import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers import javax.inject.Inject -/** - * Created by naman on 16/6/17. - */ class AuthenticateUser @Inject constructor( private val apiRepository: FineractRepository ) : UseCase() { diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/user/CreateUser.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/user/CreateUser.kt similarity index 82% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/user/CreateUser.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/user/CreateUser.kt index d045eb937..270230474 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/user/CreateUser.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/user/CreateUser.kt @@ -1,9 +1,9 @@ -package org.mifos.mobilewallet.core.domain.usecase.user +package org.mifospay.core.data.domain.usecase.user -import com.mifos.mobilewallet.model.domain.user.NewUser -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.core.util.ErrorJsonMessageHelper.getUserMessage +import com.mifospay.core.model.domain.user.NewUser +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.data.util.ErrorJsonMessageHelper.getUserMessage import retrofit2.HttpException import rx.Subscriber import rx.android.schedulers.AndroidSchedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/user/DeleteUser.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/user/DeleteUser.kt similarity index 81% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/user/DeleteUser.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/user/DeleteUser.kt index c3f0558c5..00483dc36 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/user/DeleteUser.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/user/DeleteUser.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.core.domain.usecase.user +package org.mifospay.core.data.domain.usecase.user -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.mifospay.network.GenericResponse +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.network.GenericResponse import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/user/FetchUserDetails.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/user/FetchUserDetails.kt similarity index 82% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/user/FetchUserDetails.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/user/FetchUserDetails.kt index da6d46b52..513ede86e 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/user/FetchUserDetails.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/user/FetchUserDetails.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.core.domain.usecase.user +package org.mifospay.core.data.domain.usecase.user -import com.mifos.mobilewallet.model.entity.UserWithRole -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository +import com.mifospay.core.model.entity.UserWithRole +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.fineract.repository.FineractRepository import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/user/FetchUsers.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/user/FetchUsers.kt similarity index 83% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/user/FetchUsers.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/user/FetchUsers.kt index 179d69f8b..97938f9ab 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/user/FetchUsers.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/user/FetchUsers.kt @@ -1,9 +1,9 @@ -package org.mifos.mobilewallet.core.domain.usecase.user +package org.mifospay.core.data.domain.usecase.user -import com.mifos.mobilewallet.model.entity.UserWithRole -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.core.util.Constants +import com.mifospay.core.model.entity.UserWithRole +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.data.util.Constants import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/user/RegisterUser.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/user/RegisterUser.kt similarity index 79% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/user/RegisterUser.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/user/RegisterUser.kt index 217d0d2b8..6be2a3dbc 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/user/RegisterUser.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/user/RegisterUser.kt @@ -1,10 +1,10 @@ -package org.mifos.mobilewallet.core.domain.usecase.user +package org.mifospay.core.data.domain.usecase.user -import com.mifos.mobilewallet.model.entity.register.RegisterPayload +import com.mifospay.core.model.entity.register.RegisterPayload import okhttp3.ResponseBody -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.core.util.Constants +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.data.util.Constants import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/user/UpdateUser.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/user/UpdateUser.kt similarity index 82% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/user/UpdateUser.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/user/UpdateUser.kt index 7b0346b58..af1102cd3 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/user/UpdateUser.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/user/UpdateUser.kt @@ -1,9 +1,9 @@ -package org.mifos.mobilewallet.core.domain.usecase.user +package org.mifospay.core.data.domain.usecase.user -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.core.util.ErrorJsonMessageHelper.getUserMessage -import org.mifos.mobilewallet.mifospay.network.GenericResponse +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.data.util.ErrorJsonMessageHelper.getUserMessage +import org.mifospay.core.network.GenericResponse import retrofit2.HttpException import rx.Subscriber import rx.android.schedulers.AndroidSchedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/user/VerifyUser.kt b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/user/VerifyUser.kt similarity index 79% rename from core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/user/VerifyUser.kt rename to core/data/src/main/java/org/mifospay/core/data/domain/usecase/user/VerifyUser.kt index a67d6d600..b3be9fbc3 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/user/VerifyUser.kt +++ b/core/data/src/main/java/org/mifospay/core/data/domain/usecase/user/VerifyUser.kt @@ -1,10 +1,10 @@ -package org.mifos.mobilewallet.core.domain.usecase.user +package org.mifospay.core.data.domain.usecase.user -import com.mifos.mobilewallet.model.entity.register.UserVerify +import com.mifospay.core.model.entity.register.UserVerify import okhttp3.ResponseBody -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.core.util.Constants +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.fineract.repository.FineractRepository +import org.mifospay.core.data.util.Constants import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/data/fineract/entity/mapper/AccountMapper.kt b/core/data/src/main/java/org/mifospay/core/data/fineract/entity/mapper/AccountMapper.kt similarity index 75% rename from core/data/src/main/java/org/mifos/mobilewallet/core/data/fineract/entity/mapper/AccountMapper.kt rename to core/data/src/main/java/org/mifospay/core/data/fineract/entity/mapper/AccountMapper.kt index b2b4ae612..7fcd21127 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/data/fineract/entity/mapper/AccountMapper.kt +++ b/core/data/src/main/java/org/mifospay/core/data/fineract/entity/mapper/AccountMapper.kt @@ -1,8 +1,7 @@ -package org.mifos.mobilewallet.core.data.fineract.entity.mapper +package org.mifospay.core.data.fineract.entity.mapper -import com.mifos.mobilewallet.model.entity.accounts.savings.SavingAccount -import com.mifos.mobilewallet.model.entity.client.ClientAccounts -import com.mifos.mobilewallet.model.domain.Account +import com.mifospay.core.model.entity.client.ClientAccounts +import com.mifospay.core.model.domain.Account import javax.inject.Inject class AccountMapper @Inject constructor(private val currencyMapper: CurrencyMapper) { diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/data/fineract/entity/mapper/ClientDetailsMapper.kt b/core/data/src/main/java/org/mifospay/core/data/fineract/entity/mapper/ClientDetailsMapper.kt similarity index 75% rename from core/data/src/main/java/org/mifos/mobilewallet/core/data/fineract/entity/mapper/ClientDetailsMapper.kt rename to core/data/src/main/java/org/mifospay/core/data/fineract/entity/mapper/ClientDetailsMapper.kt index e379a5e26..5cb38667c 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/data/fineract/entity/mapper/ClientDetailsMapper.kt +++ b/core/data/src/main/java/org/mifospay/core/data/fineract/entity/mapper/ClientDetailsMapper.kt @@ -1,11 +1,9 @@ -package org.mifos.mobilewallet.core.data.fineract.entity.mapper +package org.mifospay.core.data.fineract.entity.mapper -import com.mifos.mobilewallet.model.entity.client.Client +import com.mifospay.core.model.entity.client.Client import javax.inject.Inject -import com.mifos.mobilewallet.model.domain.client.Client as DomainClient -/** - * Created by naman on 10/7/17. - */ +import com.mifospay.core.model.domain.client.Client as DomainClient + class ClientDetailsMapper @Inject constructor() { fun transformList(clients: List?): List { val clientList: MutableList = ArrayList() diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/data/fineract/entity/mapper/CurrencyMapper.kt b/core/data/src/main/java/org/mifospay/core/data/fineract/entity/mapper/CurrencyMapper.kt similarity index 63% rename from core/data/src/main/java/org/mifos/mobilewallet/core/data/fineract/entity/mapper/CurrencyMapper.kt rename to core/data/src/main/java/org/mifospay/core/data/fineract/entity/mapper/CurrencyMapper.kt index 086c32697..6a873d845 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/data/fineract/entity/mapper/CurrencyMapper.kt +++ b/core/data/src/main/java/org/mifospay/core/data/fineract/entity/mapper/CurrencyMapper.kt @@ -1,12 +1,10 @@ -package org.mifos.mobilewallet.core.data.fineract.entity.mapper +package org.mifospay.core.data.fineract.entity.mapper -import com.mifos.mobilewallet.model.entity.accounts.savings.Currency +import com.mifospay.core.model.entity.accounts.savings.Currency import javax.inject.Inject -import com.mifos.mobilewallet.model.domain.Currency as DomainCurrency +import com.mifospay.core.model.domain.Currency as DomainCurrency + -/** - * Created by naman on 17/8/17. - */ class CurrencyMapper @Inject internal constructor() { fun transform(savingsCurrency: Currency): DomainCurrency { val currency: DomainCurrency = diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/data/fineract/entity/mapper/FetchAccount.kt b/core/data/src/main/java/org/mifospay/core/data/fineract/entity/mapper/FetchAccount.kt similarity index 84% rename from core/data/src/main/java/org/mifos/mobilewallet/core/data/fineract/entity/mapper/FetchAccount.kt rename to core/data/src/main/java/org/mifospay/core/data/fineract/entity/mapper/FetchAccount.kt index f6a22f6c4..37d156b07 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/data/fineract/entity/mapper/FetchAccount.kt +++ b/core/data/src/main/java/org/mifospay/core/data/fineract/entity/mapper/FetchAccount.kt @@ -1,10 +1,10 @@ -package org.mifos.mobilewallet.core.data.fineract.entity.mapper +package org.mifospay.core.data.fineract.entity.mapper -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.data.fineract.repository.FineractRepository -import org.mifos.mobilewallet.core.util.Constants -import com.mifos.mobilewallet.model.domain.Account -import com.mifos.mobilewallet.model.entity.client.ClientAccounts +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.fineract.repository.FineractRepository +import com.mifospay.core.model.domain.Account +import com.mifospay.core.model.entity.client.ClientAccounts +import org.mifospay.core.data.util.Constants import rx.Subscriber import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/data/fineract/entity/mapper/SearchedEntitiesMapper.kt b/core/data/src/main/java/org/mifospay/core/data/fineract/entity/mapper/SearchedEntitiesMapper.kt similarity index 80% rename from core/data/src/main/java/org/mifos/mobilewallet/core/data/fineract/entity/mapper/SearchedEntitiesMapper.kt rename to core/data/src/main/java/org/mifospay/core/data/fineract/entity/mapper/SearchedEntitiesMapper.kt index 53d134b0f..61a4ac134 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/data/fineract/entity/mapper/SearchedEntitiesMapper.kt +++ b/core/data/src/main/java/org/mifospay/core/data/fineract/entity/mapper/SearchedEntitiesMapper.kt @@ -1,7 +1,7 @@ -package org.mifos.mobilewallet.core.data.fineract.entity.mapper +package org.mifospay.core.data.fineract.entity.mapper -import com.mifos.mobilewallet.model.domain.SearchResult -import com.mifos.mobilewallet.model.entity.SearchedEntity +import com.mifospay.core.model.domain.SearchResult +import com.mifospay.core.model.entity.SearchedEntity import javax.inject.Inject /** diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/data/fineract/entity/mapper/TransactionMapper.kt b/core/data/src/main/java/org/mifospay/core/data/fineract/entity/mapper/TransactionMapper.kt similarity index 80% rename from core/data/src/main/java/org/mifos/mobilewallet/core/data/fineract/entity/mapper/TransactionMapper.kt rename to core/data/src/main/java/org/mifospay/core/data/fineract/entity/mapper/TransactionMapper.kt index 6f6068daa..34bf9ad28 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/data/fineract/entity/mapper/TransactionMapper.kt +++ b/core/data/src/main/java/org/mifospay/core/data/fineract/entity/mapper/TransactionMapper.kt @@ -1,10 +1,10 @@ -package org.mifos.mobilewallet.core.data.fineract.entity.mapper +package org.mifospay.core.data.fineract.entity.mapper -import com.mifos.mobilewallet.model.entity.accounts.savings.SavingsWithAssociations -import com.mifos.mobilewallet.model.entity.accounts.savings.Transactions -import com.mifos.mobilewallet.model.domain.Transaction -import com.mifos.mobilewallet.model.domain.TransactionType -import com.mifos.mobilewallet.model.utils.DateHelper +import com.mifospay.core.model.entity.accounts.savings.SavingsWithAssociations +import com.mifospay.core.model.entity.accounts.savings.Transactions +import com.mifospay.core.model.domain.Transaction +import com.mifospay.core.model.domain.TransactionType +import com.mifospay.core.model.utils.DateHelper import javax.inject.Inject class TransactionMapper @Inject constructor(private val currencyMapper: CurrencyMapper) { diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/data/fineract/repository/FineractRepository.kt b/core/data/src/main/java/org/mifospay/core/data/fineract/repository/FineractRepository.kt similarity index 79% rename from core/data/src/main/java/org/mifos/mobilewallet/core/data/fineract/repository/FineractRepository.kt rename to core/data/src/main/java/org/mifospay/core/data/fineract/repository/FineractRepository.kt index 4c8eeba24..dd35b4ac6 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/data/fineract/repository/FineractRepository.kt +++ b/core/data/src/main/java/org/mifospay/core/data/fineract/repository/FineractRepository.kt @@ -1,49 +1,47 @@ -package org.mifos.mobilewallet.core.data.fineract.repository - -import com.mifos.mobilewallet.model.domain.NewAccount -import com.mifos.mobilewallet.model.domain.NotificationPayload -import com.mifos.mobilewallet.model.domain.client.NewClient -import com.mifos.mobilewallet.model.domain.twofactor.AccessToken -import com.mifos.mobilewallet.model.domain.twofactor.DeliveryMethod -import com.mifos.mobilewallet.model.domain.user.NewUser -import com.mifos.mobilewallet.model.domain.user.User -import com.mifos.mobilewallet.model.entity.Invoice -import com.mifos.mobilewallet.model.entity.Page -import com.mifos.mobilewallet.model.entity.SearchedEntity -import com.mifos.mobilewallet.model.entity.TPTResponse -import com.mifos.mobilewallet.model.entity.UserWithRole -import com.mifos.mobilewallet.model.entity.accounts.savings.SavingsWithAssociations -import com.mifos.mobilewallet.model.entity.accounts.savings.Transactions -import com.mifos.mobilewallet.model.entity.accounts.savings.TransferDetail -import com.mifos.mobilewallet.model.entity.authentication.AuthenticationPayload -import com.mifos.mobilewallet.model.entity.beneficary.Beneficiary -import com.mifos.mobilewallet.model.entity.beneficary.BeneficiaryPayload -import com.mifos.mobilewallet.model.entity.beneficary.BeneficiaryUpdatePayload -import com.mifos.mobilewallet.model.entity.client.Client -import com.mifos.mobilewallet.model.entity.client.ClientAccounts -import com.mifos.mobilewallet.model.entity.kyc.KYCLevel1Details -import com.mifos.mobilewallet.model.entity.payload.StandingInstructionPayload -import com.mifos.mobilewallet.model.entity.payload.TransferPayload -import com.mifos.mobilewallet.model.entity.register.RegisterPayload -import com.mifos.mobilewallet.model.entity.register.UserVerify -import com.mifos.mobilewallet.model.entity.savedcards.Card -import com.mifos.mobilewallet.model.entity.standinginstruction.SDIResponse -import com.mifos.mobilewallet.model.entity.standinginstruction.StandingInstruction +package org.mifospay.core.data.fineract.repository + +import com.mifospay.core.model.domain.NewAccount +import com.mifospay.core.model.domain.NotificationPayload +import com.mifospay.core.model.domain.client.NewClient +import com.mifospay.core.model.domain.twofactor.AccessToken +import com.mifospay.core.model.domain.twofactor.DeliveryMethod +import com.mifospay.core.model.domain.user.NewUser +import com.mifospay.core.model.domain.user.User +import com.mifospay.core.model.entity.Invoice +import com.mifospay.core.model.entity.Page +import com.mifospay.core.model.entity.SearchedEntity +import com.mifospay.core.model.entity.TPTResponse +import com.mifospay.core.model.entity.UserWithRole +import com.mifospay.core.model.entity.accounts.savings.SavingsWithAssociations +import com.mifospay.core.model.entity.accounts.savings.Transactions +import com.mifospay.core.model.entity.accounts.savings.TransferDetail +import com.mifospay.core.model.entity.authentication.AuthenticationPayload +import com.mifospay.core.model.entity.beneficary.Beneficiary +import com.mifospay.core.model.entity.beneficary.BeneficiaryPayload +import com.mifospay.core.model.entity.beneficary.BeneficiaryUpdatePayload +import com.mifospay.core.model.entity.client.Client +import com.mifospay.core.model.entity.client.ClientAccounts +import com.mifospay.core.model.entity.kyc.KYCLevel1Details +import com.mifospay.core.model.entity.payload.StandingInstructionPayload +import com.mifospay.core.model.entity.payload.TransferPayload +import com.mifospay.core.model.entity.register.RegisterPayload +import com.mifospay.core.model.entity.register.UserVerify +import com.mifospay.core.model.entity.savedcards.Card +import com.mifospay.core.model.entity.standinginstruction.SDIResponse +import com.mifospay.core.model.entity.standinginstruction.StandingInstruction import okhttp3.MultipartBody import okhttp3.ResponseBody -import org.mifos.mobilewallet.core.domain.usecase.client.CreateClient -import org.mifos.mobilewallet.core.domain.usecase.user.CreateUser -import org.mifos.mobilewallet.core.util.Constants -import org.mifos.mobilewallet.mifospay.network.FineractApiManager -import org.mifos.mobilewallet.mifospay.network.GenericResponse -import org.mifos.mobilewallet.mifospay.network.SelfServiceApiManager +import org.mifospay.core.data.domain.usecase.client.CreateClient +import org.mifospay.core.data.domain.usecase.user.CreateUser +import org.mifospay.core.data.util.Constants +import org.mifospay.core.network.FineractApiManager +import org.mifospay.core.network.GenericResponse +import org.mifospay.core.network.SelfServiceApiManager import rx.Observable import javax.inject.Inject import javax.inject.Singleton -/** - * Created by naman on 16/6/17. - */ + @Singleton class FineractRepository @Inject constructor( private val fineractApiManager: FineractApiManager, diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/repository/auth/AuthenticationUserRepository.kt b/core/data/src/main/java/org/mifospay/core/data/repository/auth/AuthenticationUserRepository.kt similarity index 77% rename from core/data/src/main/java/org/mifos/mobilewallet/core/repository/auth/AuthenticationUserRepository.kt rename to core/data/src/main/java/org/mifospay/core/data/repository/auth/AuthenticationUserRepository.kt index 847799999..abc54553a 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/repository/auth/AuthenticationUserRepository.kt +++ b/core/data/src/main/java/org/mifospay/core/data/repository/auth/AuthenticationUserRepository.kt @@ -1,9 +1,9 @@ -package org.mifos.mobilewallet.core.repository.auth +package org.mifospay.core.data.repository.auth -import com.mifos.mobilewallet.model.UserData +import com.mifospay.core.model.UserData import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow -import org.mifos.mobilewallet.mifospay.core.datastore.PreferencesHelper +import org.mifospay.core.datastore.PreferencesHelper import javax.inject.Inject diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/repository/auth/UserDataRepository.kt b/core/data/src/main/java/org/mifospay/core/data/repository/auth/UserDataRepository.kt similarity index 60% rename from core/data/src/main/java/org/mifos/mobilewallet/core/repository/auth/UserDataRepository.kt rename to core/data/src/main/java/org/mifospay/core/data/repository/auth/UserDataRepository.kt index 79c444ed7..aeaed4912 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/repository/auth/UserDataRepository.kt +++ b/core/data/src/main/java/org/mifospay/core/data/repository/auth/UserDataRepository.kt @@ -1,6 +1,6 @@ -package org.mifos.mobilewallet.core.repository.auth +package org.mifospay.core.data.repository.auth -import com.mifos.mobilewallet.model.UserData +import com.mifospay.core.model.UserData import kotlinx.coroutines.flow.Flow interface UserDataRepository { diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/repository/local/LocalAssetRepository.kt b/core/data/src/main/java/org/mifospay/core/data/repository/local/LocalAssetRepository.kt similarity index 57% rename from core/data/src/main/java/org/mifos/mobilewallet/core/repository/local/LocalAssetRepository.kt rename to core/data/src/main/java/org/mifospay/core/data/repository/local/LocalAssetRepository.kt index ea8a3db47..2444d476a 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/repository/local/LocalAssetRepository.kt +++ b/core/data/src/main/java/org/mifospay/core/data/repository/local/LocalAssetRepository.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.core.repository.local +package org.mifospay.core.data.repository.local -import com.mifos.mobilewallet.model.City -import com.mifos.mobilewallet.model.Country -import com.mifos.mobilewallet.model.State +import com.mifospay.core.model.City +import com.mifospay.core.model.Country +import com.mifospay.core.model.State import kotlinx.coroutines.flow.Flow interface LocalAssetRepository { diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/repository/local/MifosLocalAssetRepository.kt b/core/data/src/main/java/org/mifospay/core/data/repository/local/MifosLocalAssetRepository.kt similarity index 72% rename from core/data/src/main/java/org/mifos/mobilewallet/core/repository/local/MifosLocalAssetRepository.kt rename to core/data/src/main/java/org/mifospay/core/data/repository/local/MifosLocalAssetRepository.kt index e252cd498..ce541cb0c 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/repository/local/MifosLocalAssetRepository.kt +++ b/core/data/src/main/java/org/mifospay/core/data/repository/local/MifosLocalAssetRepository.kt @@ -1,15 +1,15 @@ -package org.mifos.mobilewallet.core.repository.local +package org.mifospay.core.data.repository.local -import com.mifos.mobilewallet.model.City -import com.mifos.mobilewallet.model.Country -import com.mifos.mobilewallet.model.State +import com.mifospay.core.model.City +import com.mifospay.core.model.Country +import com.mifospay.core.model.State import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.flowOn -import org.mifos.mobilewallet.mifospay.core.network.Dispatcher -import org.mifos.mobilewallet.mifospay.core.network.MifosDispatchers -import org.mifos.mobilewallet.mifospay.network.local_assets.MifosLocalAssetDataSource +import org.mifospay.core.network.Dispatcher +import org.mifospay.core.network.MifosDispatchers +import org.mifospay.core.network.local_assets.MifosLocalAssetDataSource import javax.inject.Inject /** diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/util/ConnectivityManagerNetworkMonitor.kt b/core/data/src/main/java/org/mifospay/core/data/util/ConnectivityManagerNetworkMonitor.kt similarity index 98% rename from core/data/src/main/java/org/mifos/mobilewallet/core/util/ConnectivityManagerNetworkMonitor.kt rename to core/data/src/main/java/org/mifospay/core/data/util/ConnectivityManagerNetworkMonitor.kt index e71527984..3c8504137 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/util/ConnectivityManagerNetworkMonitor.kt +++ b/core/data/src/main/java/org/mifospay/core/data/util/ConnectivityManagerNetworkMonitor.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.core.util +package org.mifospay.core.data.util import android.content.Context import android.net.ConnectivityManager diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/util/Constants.kt b/core/data/src/main/java/org/mifospay/core/data/util/Constants.kt similarity index 98% rename from core/data/src/main/java/org/mifos/mobilewallet/core/util/Constants.kt rename to core/data/src/main/java/org/mifospay/core/data/util/Constants.kt index 5192f24ba..18c99760e 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/util/Constants.kt +++ b/core/data/src/main/java/org/mifospay/core/data/util/Constants.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.core.util +package org.mifospay.core.data.util import java.util.Arrays import java.util.Collections diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/util/ErrorJsonMessageHelper.kt b/core/data/src/main/java/org/mifospay/core/data/util/ErrorJsonMessageHelper.kt similarity index 95% rename from core/data/src/main/java/org/mifos/mobilewallet/core/util/ErrorJsonMessageHelper.kt rename to core/data/src/main/java/org/mifospay/core/data/util/ErrorJsonMessageHelper.kt index 9e5e1ecb8..d00e28b01 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/util/ErrorJsonMessageHelper.kt +++ b/core/data/src/main/java/org/mifospay/core/data/util/ErrorJsonMessageHelper.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.core.util +package org.mifospay.core.data.util import org.json.JSONException import org.json.JSONObject diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/util/NetworkMonitor.kt b/core/data/src/main/java/org/mifospay/core/data/util/NetworkMonitor.kt similarity index 79% rename from core/data/src/main/java/org/mifos/mobilewallet/core/util/NetworkMonitor.kt rename to core/data/src/main/java/org/mifospay/core/data/util/NetworkMonitor.kt index f74471df9..757b87931 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/util/NetworkMonitor.kt +++ b/core/data/src/main/java/org/mifospay/core/data/util/NetworkMonitor.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.core.util +package org.mifospay.core.data.util import kotlinx.coroutines.flow.Flow diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/util/TimeZoneMonitor.kt b/core/data/src/main/java/org/mifospay/core/data/util/TimeZoneMonitor.kt similarity index 93% rename from core/data/src/main/java/org/mifos/mobilewallet/core/util/TimeZoneMonitor.kt rename to core/data/src/main/java/org/mifospay/core/data/util/TimeZoneMonitor.kt index 222f1e11a..bbbbd6202 100644 --- a/core/data/src/main/java/org/mifos/mobilewallet/core/util/TimeZoneMonitor.kt +++ b/core/data/src/main/java/org/mifospay/core/data/util/TimeZoneMonitor.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.core.util +package org.mifospay.core.data.util import android.content.BroadcastReceiver import android.content.Context @@ -21,9 +21,9 @@ import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.shareIn import kotlinx.datetime.TimeZone import kotlinx.datetime.toKotlinTimeZone -import org.mifos.mobilewallet.mifospay.core.network.Dispatcher -import org.mifos.mobilewallet.mifospay.core.network.MifosDispatchers -import org.mifos.mobilewallet.mifospay.core.network.di.ApplicationScope +import org.mifospay.core.network.Dispatcher +import org.mifospay.core.network.MifosDispatchers +import org.mifospay.core.network.di.ApplicationScope import java.time.ZoneId import javax.inject.Inject import javax.inject.Singleton diff --git a/mifospay/src/test/java/org/mifos/mobilewallet/mifospay/ExampleUnitTest.kt b/core/data/src/test/java/org/mifospay/mobilewallet/core/ExampleUnitTest.kt similarity index 89% rename from mifospay/src/test/java/org/mifos/mobilewallet/mifospay/ExampleUnitTest.kt rename to core/data/src/test/java/org/mifospay/mobilewallet/core/ExampleUnitTest.kt index 9826c4963..ee178ee9a 100644 --- a/mifospay/src/test/java/org/mifos/mobilewallet/mifospay/ExampleUnitTest.kt +++ b/core/data/src/test/java/org/mifospay/mobilewallet/core/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay +package org.mifospay.mobilewallet.core import org.junit.Assert import org.junit.Test diff --git a/core/datastore-proto/src/main/proto/org.migos.mobilewallet.mifospay.data/user_preferences.proto b/core/datastore-proto/src/main/proto/org.mifospay.core.data/user_preferences.proto similarity index 72% rename from core/datastore-proto/src/main/proto/org.migos.mobilewallet.mifospay.data/user_preferences.proto rename to core/datastore-proto/src/main/proto/org.mifospay.core.data/user_preferences.proto index a22da7a7a..03791d71b 100644 --- a/core/datastore-proto/src/main/proto/org.migos.mobilewallet.mifospay.data/user_preferences.proto +++ b/core/datastore-proto/src/main/proto/org.mifospay.core.data/user_preferences.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option java_package = "org.mifos.mobilewallet.mifospay.core.datastore.proto"; +option java_package = "org.mifospay.core.datastore.proto"; option java_multiple_files = true; message UserPreferences { diff --git a/core/datastore/build.gradle.kts b/core/datastore/build.gradle.kts index e48d06cea..2ba8e3e58 100644 --- a/core/datastore/build.gradle.kts +++ b/core/datastore/build.gradle.kts @@ -6,7 +6,7 @@ plugins { apply(from = "${project.rootDir}/config/quality/quality.gradle") android { - namespace = "org.mifos.mobilewallet.mifospay.core.datastore" + namespace = "org.mifospay.core.datastore" defaultConfig { consumerProguardFiles("consumer-rules.pro") } diff --git a/core/datastore/src/main/java/org/mifos/mobilewallet/mifospay/core/datastore/PreferencesHelper.kt b/core/datastore/src/main/java/org/mifospay/core/datastore/PreferencesHelper.kt similarity index 96% rename from core/datastore/src/main/java/org/mifos/mobilewallet/mifospay/core/datastore/PreferencesHelper.kt rename to core/datastore/src/main/java/org/mifospay/core/datastore/PreferencesHelper.kt index 106cca0c8..867aab098 100644 --- a/core/datastore/src/main/java/org/mifos/mobilewallet/mifospay/core/datastore/PreferencesHelper.kt +++ b/core/datastore/src/main/java/org/mifospay/core/datastore/PreferencesHelper.kt @@ -1,11 +1,11 @@ -package org.mifos.mobilewallet.mifospay.core.datastore +package org.mifospay.core.datastore import android.content.Context import android.content.SharedPreferences import android.preference.PreferenceManager import com.google.gson.Gson -import com.mifos.mobilewallet.model.domain.client.Client -import com.mifos.mobilewallet.model.domain.user.User +import com.mifospay.core.model.domain.client.Client +import com.mifospay.core.model.domain.user.User import dagger.hilt.android.qualifiers.ApplicationContext import javax.inject.Inject import javax.inject.Singleton diff --git a/core/datastore/src/main/java/org/mifos/mobilewallet/mifospay/core/datastore/di/DataStoreModule.kt b/core/datastore/src/main/java/org/mifospay/core/datastore/di/DataStoreModule.kt similarity index 78% rename from core/datastore/src/main/java/org/mifos/mobilewallet/mifospay/core/datastore/di/DataStoreModule.kt rename to core/datastore/src/main/java/org/mifospay/core/datastore/di/DataStoreModule.kt index 67dddbaac..76492909f 100644 --- a/core/datastore/src/main/java/org/mifos/mobilewallet/mifospay/core/datastore/di/DataStoreModule.kt +++ b/core/datastore/src/main/java/org/mifospay/core/datastore/di/DataStoreModule.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.core.datastore.di +package org.mifospay.core.datastore.di import android.content.Context import dagger.Module @@ -6,7 +6,7 @@ import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent -import org.mifos.mobilewallet.mifospay.core.datastore.PreferencesHelper +import org.mifospay.core.datastore.PreferencesHelper import javax.inject.Singleton @Module diff --git a/core/ui/src/test/java/org/mifos/mobilewallet/mifospay/ui/ExampleUnitTest.kt b/core/datastore/src/test/java/org/mifospay/core/datastore/ExampleUnitTest.kt similarity index 87% rename from core/ui/src/test/java/org/mifos/mobilewallet/mifospay/ui/ExampleUnitTest.kt rename to core/datastore/src/test/java/org/mifospay/core/datastore/ExampleUnitTest.kt index a812a1574..2529d1a43 100644 --- a/core/ui/src/test/java/org/mifos/mobilewallet/mifospay/ui/ExampleUnitTest.kt +++ b/core/datastore/src/test/java/org/mifospay/core/datastore/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.ui +package org.mifospay.core.datastore import org.junit.Test diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts index 7e18378c1..95a6b997d 100644 --- a/core/designsystem/build.gradle.kts +++ b/core/designsystem/build.gradle.kts @@ -9,7 +9,7 @@ android { defaultConfig { testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } - namespace = "org.mifos.mobilewallet.mifospay.designsystem" + namespace = "org.mifospay.core.designsystem" } dependencies { diff --git a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/AlertDialog.kt b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/AlertDialog.kt similarity index 95% rename from core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/AlertDialog.kt rename to core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/AlertDialog.kt index 19107435a..c925e96a8 100644 --- a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/AlertDialog.kt +++ b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/AlertDialog.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.designsystem.component +package org.mifospay.core.designsystem.component import androidx.compose.material3.AlertDialog import androidx.compose.material3.Text diff --git a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/Background.kt b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/Background.kt similarity index 94% rename from core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/Background.kt rename to core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/Background.kt index d8f13db68..932640564 100644 --- a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/Background.kt +++ b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/Background.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.designsystem.component +package org.mifospay.core.designsystem.component import android.content.res.Configuration import androidx.compose.foundation.layout.Box @@ -18,10 +18,10 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import org.mifos.mobilewallet.mifospay.designsystem.theme.GradientColors -import org.mifos.mobilewallet.mifospay.designsystem.theme.LocalBackgroundTheme -import org.mifos.mobilewallet.mifospay.designsystem.theme.LocalGradientColors -import org.mifos.mobilewallet.mifospay.designsystem.theme.MifosTheme +import org.mifospay.core.designsystem.theme.GradientColors +import org.mifospay.core.designsystem.theme.LocalBackgroundTheme +import org.mifospay.core.designsystem.theme.LocalGradientColors +import org.mifospay.core.designsystem.theme.MifosTheme import kotlin.math.tan /** diff --git a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/BottomSheet.kt b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/BottomSheet.kt similarity index 96% rename from core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/BottomSheet.kt rename to core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/BottomSheet.kt index 916742f50..6a9335d0d 100644 --- a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/BottomSheet.kt +++ b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/BottomSheet.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.designsystem.component +package org.mifospay.core.designsystem.component import androidx.activity.compose.BackHandler import androidx.compose.animation.AnimatedVisibility diff --git a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/Button.kt b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/Button.kt similarity index 97% rename from core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/Button.kt rename to core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/Button.kt index f2167dde7..7e3bfbbe2 100644 --- a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/Button.kt +++ b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/Button.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.designsystem.component +package org.mifospay.core.designsystem.component import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.Box @@ -18,8 +18,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import org.mifos.mobilewallet.mifospay.designsystem.icon.MifosIcons -import org.mifos.mobilewallet.mifospay.designsystem.theme.MifosTheme +import org.mifospay.core.designsystem.icon.MifosIcons +import org.mifospay.core.designsystem.theme.MifosTheme /** * Mifos Wallet filled button with generic content slot. Wraps Material 3 [Button]. diff --git a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/Card.kt b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/Card.kt similarity index 94% rename from core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/Card.kt rename to core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/Card.kt index 90a94460e..d0609c628 100644 --- a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/Card.kt +++ b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/Card.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.designsystem.component +package org.mifospay.core.designsystem.component import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.ColumnScope diff --git a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/LoadingWheel.kt b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/LoadingWheel.kt similarity index 98% rename from core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/LoadingWheel.kt rename to core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/LoadingWheel.kt index f90689c7d..3e7d350ef 100644 --- a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/LoadingWheel.kt +++ b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/LoadingWheel.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.designsystem.component +package org.mifospay.core.designsystem.component import androidx.compose.animation.animateColor import androidx.compose.animation.core.Animatable @@ -40,7 +40,7 @@ import androidx.compose.ui.semantics.semantics import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import kotlinx.coroutines.launch -import org.mifos.mobilewallet.mifospay.designsystem.theme.MifosTheme +import org.mifospay.core.designsystem.theme.MifosTheme @Composable fun MifosLoadingWheel( diff --git a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/MifosTopBar.kt b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/MifosTopBar.kt similarity index 85% rename from core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/MifosTopBar.kt rename to core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/MifosTopBar.kt index fe3ac830f..b9bf369b0 100644 --- a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/MifosTopBar.kt +++ b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/MifosTopBar.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.designsystem.component +package org.mifospay.core.designsystem.component import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.ArrowBack @@ -11,8 +11,8 @@ import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource -import org.mifos.mobilewallet.mifospay.designsystem.theme.mifosText -import org.mifos.mobilewallet.mifospay.designsystem.theme.styleMifosTopBar +import org.mifospay.core.designsystem.theme.mifosText +import org.mifospay.core.designsystem.theme.styleMifosTopBar @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/Navigation.kt b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/Navigation.kt similarity index 97% rename from core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/Navigation.kt rename to core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/Navigation.kt index cc2040ab5..ba08ed614 100644 --- a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/Navigation.kt +++ b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/Navigation.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.designsystem.component +package org.mifospay.core.designsystem.component import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.RowScope @@ -15,8 +15,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import org.mifos.mobilewallet.mifospay.designsystem.icon.MifosIcons -import org.mifos.mobilewallet.mifospay.designsystem.theme.MifosTheme +import org.mifospay.core.designsystem.icon.MifosIcons +import org.mifospay.core.designsystem.theme.MifosTheme /** * Now in Android navigation bar item with icon and label content slots. Wraps Material 3 diff --git a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/OutlineTextField.kt b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/OutlineTextField.kt similarity index 97% rename from core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/OutlineTextField.kt rename to core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/OutlineTextField.kt index 687fa0e4b..7d47c88dc 100644 --- a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/OutlineTextField.kt +++ b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/OutlineTextField.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.designsystem.component +package org.mifospay.core.designsystem.component import androidx.compose.foundation.Image import androidx.compose.foundation.isSystemInDarkTheme diff --git a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/TextField.kt b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/TextField.kt similarity index 89% rename from core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/TextField.kt rename to core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/TextField.kt index 5907ad543..516052c21 100644 --- a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/TextField.kt +++ b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/TextField.kt @@ -1,32 +1,21 @@ -package org.mifos.mobilewallet.mifospay.designsystem.component +package org.mifospay.core.designsystem.component import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Visibility import androidx.compose.material.icons.filled.VisibilityOff -import androidx.compose.material3.DropdownMenu -import androidx.compose.material3.DropdownMenuItem -import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.ExposedDropdownMenuBox -import androidx.compose.material3.ExposedDropdownMenuDefaults import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.OutlinedTextFieldDefaults import androidx.compose.material3.Text -import androidx.compose.material3.TextField import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.saveable.rememberSaveable -import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.ColorFilter @@ -40,8 +29,7 @@ import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.sp -import com.mifos.mobilewallet.model.State -import org.mifos.mobilewallet.mifospay.designsystem.theme.MifosTheme +import org.mifospay.core.designsystem.theme.MifosTheme @Composable diff --git a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/TextUserImage.kt b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/TextUserImage.kt similarity index 94% rename from core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/TextUserImage.kt rename to core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/TextUserImage.kt index 9b608bccc..62b3beda1 100644 --- a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/TextUserImage.kt +++ b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/TextUserImage.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.designsystem.component +package org.mifospay.core.designsystem.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/TopAppBar.kt b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/TopAppBar.kt similarity index 92% rename from core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/TopAppBar.kt rename to core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/TopAppBar.kt index 23bd42f9e..a6330a969 100644 --- a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/component/TopAppBar.kt +++ b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/component/TopAppBar.kt @@ -1,7 +1,7 @@ @file:OptIn(ExperimentalMaterial3Api::class) -package org.mifos.mobilewallet.mifospay.designsystem.component +package org.mifospay.core.designsystem.component import androidx.annotation.StringRes import androidx.compose.material3.CenterAlignedTopAppBar @@ -19,9 +19,8 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview -import org.mifos.mobilewallet.mifospay.designsystem.R -import org.mifos.mobilewallet.mifospay.designsystem.icon.MifosIcons -import org.mifos.mobilewallet.mifospay.designsystem.theme.MifosTheme +import org.mifospay.core.designsystem.icon.MifosIcons +import org.mifospay.core.designsystem.theme.MifosTheme @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/icon/MifosIcons.kt b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/icon/MifosIcons.kt similarity index 95% rename from core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/icon/MifosIcons.kt rename to core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/icon/MifosIcons.kt index fa2250b50..04b95c8ce 100644 --- a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/icon/MifosIcons.kt +++ b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/icon/MifosIcons.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.designsystem.icon +package org.mifospay.core.designsystem.icon import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.outlined.ArrowBack diff --git a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/theme/Background.kt b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/theme/Background.kt similarity index 89% rename from core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/theme/Background.kt rename to core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/theme/Background.kt index 111682012..6e11ed88b 100644 --- a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/theme/Background.kt +++ b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/theme/Background.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.designsystem.theme +package org.mifospay.core.designsystem.theme import androidx.compose.runtime.Immutable import androidx.compose.runtime.staticCompositionLocalOf diff --git a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/theme/Color.kt b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/theme/Color.kt similarity index 98% rename from core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/theme/Color.kt rename to core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/theme/Color.kt index f84299eef..999bfeaec 100644 --- a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/theme/Color.kt +++ b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/theme/Color.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.designsystem.theme +package org.mifospay.core.designsystem.theme import androidx.compose.ui.graphics.Color diff --git a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/theme/Gradient.kt b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/theme/Gradient.kt similarity index 92% rename from core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/theme/Gradient.kt rename to core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/theme/Gradient.kt index dc19bcfb9..5490c8562 100644 --- a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/theme/Gradient.kt +++ b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/theme/Gradient.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.designsystem.theme +package org.mifospay.core.designsystem.theme import androidx.compose.runtime.Immutable import androidx.compose.runtime.staticCompositionLocalOf diff --git a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/theme/MifosTextStyle.kt b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/theme/MifosTextStyle.kt similarity index 94% rename from core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/theme/MifosTextStyle.kt rename to core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/theme/MifosTextStyle.kt index be7377b46..533943a00 100644 --- a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/theme/MifosTextStyle.kt +++ b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/theme/MifosTextStyle.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.designsystem.theme +package org.mifospay.core.designsystem.theme import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.TextStyle diff --git a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/theme/Theme.kt b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/theme/Theme.kt similarity index 98% rename from core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/theme/Theme.kt rename to core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/theme/Theme.kt index fb8800042..acf5f35f3 100644 --- a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/theme/Theme.kt +++ b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/theme/Theme.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.designsystem.theme +package org.mifospay.core.designsystem.theme import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme diff --git a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/theme/Tint.kt b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/theme/Tint.kt similarity index 87% rename from core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/theme/Tint.kt rename to core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/theme/Tint.kt index bd9ae2aaa..ad63e0003 100644 --- a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/theme/Tint.kt +++ b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/theme/Tint.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.designsystem.theme +package org.mifospay.core.designsystem.theme import androidx.compose.runtime.Immutable import androidx.compose.runtime.staticCompositionLocalOf diff --git a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/theme/Type.kt b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/theme/Type.kt similarity index 98% rename from core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/theme/Type.kt rename to core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/theme/Type.kt index 8e63a6cbb..f0a45f48e 100644 --- a/core/designsystem/src/main/kotlin/org/mifos/mobilewallet/mifospay/designsystem/theme/Type.kt +++ b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/theme/Type.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.designsystem.theme +package org.mifospay.core.designsystem.theme import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle diff --git a/core/model/build.gradle.kts b/core/model/build.gradle.kts index eb32010e2..f3c451a59 100644 --- a/core/model/build.gradle.kts +++ b/core/model/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } android { - namespace = "org.mifos.mobilewallet.core.model" + namespace = "org.mifospay.core.model" } apply(from = "${project.rootDir}/config/quality/quality.gradle") diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/UserData.kt b/core/model/src/main/java/com/mifos/mobilewallet/model/UserData.kt deleted file mode 100644 index 15c18a53f..000000000 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/UserData.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.mifos.mobilewallet.model - -import com.mifos.mobilewallet.model.domain.user.User - -data class UserData( - val isAuthenticated: Boolean, - val userName: String, - val clientId: Long, - // val user: User -) \ No newline at end of file diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/SavingAccountsListResponse.kt b/core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/SavingAccountsListResponse.kt deleted file mode 100644 index 58e03520f..000000000 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/SavingAccountsListResponse.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.mifos.mobilewallet.model.entity.accounts - -import com.mifos.mobilewallet.model.entity.accounts.savings.SavingAccount - -data class SavingAccountsListResponse( - var savingsAccounts: List = ArrayList() -) diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/TransferDetail.kt b/core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/TransferDetail.kt deleted file mode 100644 index d3eb3442a..000000000 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/TransferDetail.kt +++ /dev/null @@ -1,27 +0,0 @@ -package com.mifos.mobilewallet.model.entity.accounts.savings - -import android.os.Parcelable -import com.google.gson.annotations.SerializedName -import com.mifos.mobilewallet.model.domain.client.Client -import kotlinx.parcelize.Parcelize - - -@Parcelize -data class TransferDetail( - @SerializedName("id") - var id: Long = 0L, - - @SerializedName("fromClient") - var fromClient: Client = Client(), - - @SerializedName("fromAccount") - var fromAccount: SavingAccount = SavingAccount(), - - @SerializedName("toClient") - var toClient: Client = Client(), - - @SerializedName("toAccount") - var toAccount: SavingAccount = SavingAccount(), -) : Parcelable { - constructor() : this(0L, Client(), SavingAccount(), Client(), SavingAccount()) -} diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/City.kt b/core/model/src/main/java/com/mifospay/core/model/City.kt similarity index 85% rename from core/model/src/main/java/com/mifos/mobilewallet/model/City.kt rename to core/model/src/main/java/com/mifospay/core/model/City.kt index dc66fd857..63fff72e2 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/City.kt +++ b/core/model/src/main/java/com/mifospay/core/model/City.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model +package com.mifospay.core.model import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/Country.kt b/core/model/src/main/java/com/mifospay/core/model/Country.kt similarity index 80% rename from core/model/src/main/java/com/mifos/mobilewallet/model/Country.kt rename to core/model/src/main/java/com/mifospay/core/model/Country.kt index 7c733c10b..7e00906f1 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/Country.kt +++ b/core/model/src/main/java/com/mifospay/core/model/Country.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model +package com.mifospay.core.model import kotlinx.serialization.Serializable diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/State.kt b/core/model/src/main/java/com/mifospay/core/model/State.kt similarity index 85% rename from core/model/src/main/java/com/mifos/mobilewallet/model/State.kt rename to core/model/src/main/java/com/mifospay/core/model/State.kt index 91cad5a82..2c182fb78 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/State.kt +++ b/core/model/src/main/java/com/mifospay/core/model/State.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model +package com.mifospay.core.model import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/core/model/src/main/java/com/mifospay/core/model/UserData.kt b/core/model/src/main/java/com/mifospay/core/model/UserData.kt new file mode 100644 index 000000000..e99556391 --- /dev/null +++ b/core/model/src/main/java/com/mifospay/core/model/UserData.kt @@ -0,0 +1,7 @@ +package com.mifospay.core.model + +data class UserData( + val isAuthenticated: Boolean, + val userName: String, + val clientId: Long +) \ No newline at end of file diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/Account.kt b/core/model/src/main/java/com/mifospay/core/model/domain/Account.kt similarity index 72% rename from core/model/src/main/java/com/mifos/mobilewallet/model/domain/Account.kt rename to core/model/src/main/java/com/mifospay/core/model/domain/Account.kt index 8499dd1d2..1baa7d40a 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/Account.kt +++ b/core/model/src/main/java/com/mifospay/core/model/domain/Account.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.domain +package com.mifospay.core.model.domain import android.os.Parcelable import kotlinx.parcelize.Parcelize @@ -11,5 +11,5 @@ data class Account( var balance: Double=0.0, var id: Long=0L, var productId: Long=0L, - var currency: Currency, + var currency: com.mifospay.core.model.domain.Currency, ) : Parcelable diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/BankAccountDetails.kt b/core/model/src/main/java/com/mifospay/core/model/domain/BankAccountDetails.kt similarity index 90% rename from core/model/src/main/java/com/mifos/mobilewallet/model/domain/BankAccountDetails.kt rename to core/model/src/main/java/com/mifospay/core/model/domain/BankAccountDetails.kt index e899bc199..19eb2bfd7 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/BankAccountDetails.kt +++ b/core/model/src/main/java/com/mifospay/core/model/domain/BankAccountDetails.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.domain +package com.mifospay.core.model.domain import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/Currency.kt b/core/model/src/main/java/com/mifospay/core/model/domain/Currency.kt similarity index 84% rename from core/model/src/main/java/com/mifos/mobilewallet/model/domain/Currency.kt rename to core/model/src/main/java/com/mifospay/core/model/domain/Currency.kt index 38725c660..1303f1400 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/Currency.kt +++ b/core/model/src/main/java/com/mifospay/core/model/domain/Currency.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.domain +package com.mifospay.core.model.domain import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/NewAccount.kt b/core/model/src/main/java/com/mifospay/core/model/domain/NewAccount.kt similarity index 84% rename from core/model/src/main/java/com/mifos/mobilewallet/model/domain/NewAccount.kt rename to core/model/src/main/java/com/mifospay/core/model/domain/NewAccount.kt index 7d0227d30..1b403eff1 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/NewAccount.kt +++ b/core/model/src/main/java/com/mifospay/core/model/domain/NewAccount.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.domain +package com.mifospay.core.model.domain import java.util.Date data class NewAccount( diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/NotificationPayload.kt b/core/model/src/main/java/com/mifospay/core/model/domain/NotificationPayload.kt similarity index 83% rename from core/model/src/main/java/com/mifos/mobilewallet/model/domain/NotificationPayload.kt rename to core/model/src/main/java/com/mifospay/core/model/domain/NotificationPayload.kt index d78317a6d..e35acf60d 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/NotificationPayload.kt +++ b/core/model/src/main/java/com/mifospay/core/model/domain/NotificationPayload.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.domain +package com.mifospay.core.model.domain import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/SearchResult.kt b/core/model/src/main/java/com/mifospay/core/model/domain/SearchResult.kt similarity index 84% rename from core/model/src/main/java/com/mifos/mobilewallet/model/domain/SearchResult.kt rename to core/model/src/main/java/com/mifospay/core/model/domain/SearchResult.kt index cbbfde143..c008958b7 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/SearchResult.kt +++ b/core/model/src/main/java/com/mifospay/core/model/domain/SearchResult.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.domain +package com.mifospay.core.model.domain import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/Transaction.kt b/core/model/src/main/java/com/mifospay/core/model/domain/Transaction.kt similarity index 54% rename from core/model/src/main/java/com/mifos/mobilewallet/model/domain/Transaction.kt rename to core/model/src/main/java/com/mifospay/core/model/domain/Transaction.kt index c7a35c709..bd3957586 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/Transaction.kt +++ b/core/model/src/main/java/com/mifospay/core/model/domain/Transaction.kt @@ -1,7 +1,7 @@ -package com.mifos.mobilewallet.model.domain +package com.mifospay.core.model.domain import android.os.Parcelable -import com.mifos.mobilewallet.model.entity.accounts.savings.TransferDetail +import com.mifospay.core.model.entity.accounts.savings.TransferDetail import kotlinx.parcelize.Parcelize @Parcelize @@ -11,8 +11,8 @@ data class Transaction( var accountId: Long = 0, var amount: Double = 0.0, var date: String? = null, - var currency: Currency = Currency(), - var transactionType: TransactionType = TransactionType.OTHER, + var currency: com.mifospay.core.model.domain.Currency = com.mifospay.core.model.domain.Currency(), + var transactionType: com.mifospay.core.model.domain.TransactionType = com.mifospay.core.model.domain.TransactionType.OTHER, var transferId: Long = 0, var transferDetail: TransferDetail = TransferDetail(), var receiptId: String? = null @@ -23,8 +23,8 @@ data class Transaction( 0, 0.0, "", - Currency(), - TransactionType.OTHER, + com.mifospay.core.model.domain.Currency(), + com.mifospay.core.model.domain.TransactionType.OTHER, 0, TransferDetail(), "" diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/TransactionType.kt b/core/model/src/main/java/com/mifospay/core/model/domain/TransactionType.kt similarity index 59% rename from core/model/src/main/java/com/mifos/mobilewallet/model/domain/TransactionType.kt rename to core/model/src/main/java/com/mifospay/core/model/domain/TransactionType.kt index 328c9efdb..dd8293953 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/TransactionType.kt +++ b/core/model/src/main/java/com/mifospay/core/model/domain/TransactionType.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.domain +package com.mifospay.core.model.domain enum class TransactionType { DEBIT, diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/client/Client.kt b/core/model/src/main/java/com/mifospay/core/model/domain/client/Client.kt similarity index 86% rename from core/model/src/main/java/com/mifos/mobilewallet/model/domain/client/Client.kt rename to core/model/src/main/java/com/mifospay/core/model/domain/client/Client.kt index 75b41812c..3f7b27c1a 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/client/Client.kt +++ b/core/model/src/main/java/com/mifospay/core/model/domain/client/Client.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.domain.client +package com.mifospay.core.model.domain.client import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/client/NewClient.kt b/core/model/src/main/java/com/mifospay/core/model/domain/client/NewClient.kt similarity index 68% rename from core/model/src/main/java/com/mifos/mobilewallet/model/domain/client/NewClient.kt rename to core/model/src/main/java/com/mifospay/core/model/domain/client/NewClient.kt index f18a49beb..85611580b 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/client/NewClient.kt +++ b/core/model/src/main/java/com/mifospay/core/model/domain/client/NewClient.kt @@ -1,6 +1,6 @@ -package com.mifos.mobilewallet.model.domain.client +package com.mifospay.core.model.domain.client -import com.mifos.mobilewallet.model.utils.DateHelper +import com.mifospay.core.model.utils.DateHelper data class NewClient( val fullname: String?, @@ -14,14 +14,23 @@ data class NewClient( val mobileNo: String?, val mifosSavingsProductId: Int? ) { - val address: MutableList
= mutableListOf() + val address: MutableList = mutableListOf() val activationDate: String = DateHelper.getDateAsStringFromLong(System.currentTimeMillis()) val submittedOnDate: String = activationDate val savingsProductId: Int = mifosSavingsProductId ?: 0 val externalId: String = userName+ "@mifos" init { - address.add(Address(addressLine1, addressLine2, city, postalCode, stateProvinceId, countryId)) + address.add( + com.mifospay.core.model.domain.client.NewClient.Address( + addressLine1, + addressLine2, + city, + postalCode, + stateProvinceId, + countryId + ) + ) } data class Address( diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/client/UpdateClientEntityMobile.kt b/core/model/src/main/java/com/mifospay/core/model/domain/client/UpdateClientEntityMobile.kt similarity index 53% rename from core/model/src/main/java/com/mifos/mobilewallet/model/domain/client/UpdateClientEntityMobile.kt rename to core/model/src/main/java/com/mifospay/core/model/domain/client/UpdateClientEntityMobile.kt index 3308c1553..1d711998a 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/client/UpdateClientEntityMobile.kt +++ b/core/model/src/main/java/com/mifospay/core/model/domain/client/UpdateClientEntityMobile.kt @@ -1,3 +1,3 @@ -package com.mifos.mobilewallet.model.domain.client +package com.mifospay.core.model.domain.client data class UpdateClientEntityMobile(val mobileNo: String) diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/twofactor/AccessToken.kt b/core/model/src/main/java/com/mifospay/core/model/domain/twofactor/AccessToken.kt similarity index 79% rename from core/model/src/main/java/com/mifos/mobilewallet/model/domain/twofactor/AccessToken.kt rename to core/model/src/main/java/com/mifospay/core/model/domain/twofactor/AccessToken.kt index 0b3cd8d92..aafd145d3 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/twofactor/AccessToken.kt +++ b/core/model/src/main/java/com/mifospay/core/model/domain/twofactor/AccessToken.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.domain.twofactor +package com.mifospay.core.model.domain.twofactor import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/twofactor/DeliveryMethod.kt b/core/model/src/main/java/com/mifospay/core/model/domain/twofactor/DeliveryMethod.kt similarity index 75% rename from core/model/src/main/java/com/mifos/mobilewallet/model/domain/twofactor/DeliveryMethod.kt rename to core/model/src/main/java/com/mifospay/core/model/domain/twofactor/DeliveryMethod.kt index f54532b55..15aa29306 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/twofactor/DeliveryMethod.kt +++ b/core/model/src/main/java/com/mifospay/core/model/domain/twofactor/DeliveryMethod.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.domain.twofactor +package com.mifospay.core.model.domain.twofactor import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/user/NewUser.kt b/core/model/src/main/java/com/mifospay/core/model/domain/user/NewUser.kt similarity index 92% rename from core/model/src/main/java/com/mifos/mobilewallet/model/domain/user/NewUser.kt rename to core/model/src/main/java/com/mifospay/core/model/domain/user/NewUser.kt index 999f318b5..07699d329 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/user/NewUser.kt +++ b/core/model/src/main/java/com/mifospay/core/model/domain/user/NewUser.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.domain.user +package com.mifospay.core.model.domain.user import java.util.Collections diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/user/UpdateUserEntityClients.kt b/core/model/src/main/java/com/mifospay/core/model/domain/user/UpdateUserEntityClients.kt similarity index 59% rename from core/model/src/main/java/com/mifos/mobilewallet/model/domain/user/UpdateUserEntityClients.kt rename to core/model/src/main/java/com/mifospay/core/model/domain/user/UpdateUserEntityClients.kt index 2b352cd53..d29de3ad0 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/user/UpdateUserEntityClients.kt +++ b/core/model/src/main/java/com/mifospay/core/model/domain/user/UpdateUserEntityClients.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.domain.user +package com.mifospay.core.model.domain.user data class UpdateUserEntityClients( var clients: ArrayList diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/user/UpdateUserEntityEmail.kt b/core/model/src/main/java/com/mifospay/core/model/domain/user/UpdateUserEntityEmail.kt similarity index 55% rename from core/model/src/main/java/com/mifos/mobilewallet/model/domain/user/UpdateUserEntityEmail.kt rename to core/model/src/main/java/com/mifospay/core/model/domain/user/UpdateUserEntityEmail.kt index eff0bac91..93aece53e 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/user/UpdateUserEntityEmail.kt +++ b/core/model/src/main/java/com/mifospay/core/model/domain/user/UpdateUserEntityEmail.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.domain.user +package com.mifospay.core.model.domain.user data class UpdateUserEntityEmail( var email: String? diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/user/UpdateUserEntityPassword.kt b/core/model/src/main/java/com/mifospay/core/model/domain/user/UpdateUserEntityPassword.kt similarity index 68% rename from core/model/src/main/java/com/mifos/mobilewallet/model/domain/user/UpdateUserEntityPassword.kt rename to core/model/src/main/java/com/mifospay/core/model/domain/user/UpdateUserEntityPassword.kt index 5f5bc0572..689821b0f 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/user/UpdateUserEntityPassword.kt +++ b/core/model/src/main/java/com/mifospay/core/model/domain/user/UpdateUserEntityPassword.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.domain.user +package com.mifospay.core.model.domain.user data class UpdateUserEntityPassword(val password: String) { val repeatPassword: String = password diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/user/User.kt b/core/model/src/main/java/com/mifospay/core/model/domain/user/User.kt similarity index 83% rename from core/model/src/main/java/com/mifos/mobilewallet/model/domain/user/User.kt rename to core/model/src/main/java/com/mifospay/core/model/domain/user/User.kt index ee53a2317..2fdcea1a8 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/user/User.kt +++ b/core/model/src/main/java/com/mifospay/core/model/domain/user/User.kt @@ -1,7 +1,7 @@ -package com.mifos.mobilewallet.model.domain.user +package com.mifospay.core.model.domain.user import android.os.Parcelable -import com.mifos.mobilewallet.model.entity.Role +import com.mifospay.core.model.entity.Role import kotlinx.parcelize.Parcelize @Parcelize diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/Invoice.kt b/core/model/src/main/java/com/mifospay/core/model/entity/Invoice.kt similarity index 95% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/Invoice.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/Invoice.kt index 2013a7005..ce00cc12a 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/Invoice.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/Invoice.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity +package com.mifospay.core.model.entity import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/Page.kt b/core/model/src/main/java/com/mifospay/core/model/entity/Page.kt similarity index 71% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/Page.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/Page.kt index 2676ef56b..af959dd3e 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/Page.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/Page.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity +package com.mifospay.core.model.entity data class Page( var totalFilteredRecords: Int = 0, diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/Role.kt b/core/model/src/main/java/com/mifospay/core/model/entity/Role.kt similarity index 83% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/Role.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/Role.kt index e076f12ee..2bc636734 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/Role.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/Role.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity +package com.mifospay.core.model.entity import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/SearchedEntity.kt b/core/model/src/main/java/com/mifospay/core/model/entity/SearchedEntity.kt similarity index 87% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/SearchedEntity.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/SearchedEntity.kt index 55503872b..1ba810d65 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/SearchedEntity.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/SearchedEntity.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity +package com.mifospay.core.model.entity import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/TPTResponse.kt b/core/model/src/main/java/com/mifospay/core/model/entity/TPTResponse.kt similarity index 80% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/TPTResponse.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/TPTResponse.kt index 3055e8ea2..b3ad02124 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/TPTResponse.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/TPTResponse.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity +package com.mifospay.core.model.entity import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/Timeline.kt b/core/model/src/main/java/com/mifospay/core/model/entity/Timeline.kt similarity index 94% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/Timeline.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/Timeline.kt index d60e58547..e26d8c4a8 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/Timeline.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/Timeline.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity +package com.mifospay.core.model.entity import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/UserEntity.kt b/core/model/src/main/java/com/mifospay/core/model/entity/UserEntity.kt similarity index 90% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/UserEntity.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/UserEntity.kt index 39c37e334..e75133fec 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/UserEntity.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/UserEntity.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity +package com.mifospay.core.model.entity data class UserEntity( val username: String, diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/UserWithRole.kt b/core/model/src/main/java/com/mifospay/core/model/entity/UserWithRole.kt similarity index 88% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/UserWithRole.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/UserWithRole.kt index 479e299c7..df237b2e8 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/UserWithRole.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/UserWithRole.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity +package com.mifospay.core.model.entity import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/java/com/mifospay/core/model/entity/accounts/SavingAccountsListResponse.kt b/core/model/src/main/java/com/mifospay/core/model/entity/accounts/SavingAccountsListResponse.kt new file mode 100644 index 000000000..8f5248d28 --- /dev/null +++ b/core/model/src/main/java/com/mifospay/core/model/entity/accounts/SavingAccountsListResponse.kt @@ -0,0 +1,7 @@ +package com.mifospay.core.model.entity.accounts + +import com.mifospay.core.model.entity.accounts.savings.SavingAccount + +data class SavingAccountsListResponse( + var savingsAccounts: List = ArrayList() +) diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/Currency.kt b/core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/Currency.kt similarity index 91% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/Currency.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/Currency.kt index ac8e8f25d..d6a396426 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/Currency.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/Currency.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.accounts.savings +package com.mifospay.core.model.entity.accounts.savings import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/PaymentDetailData.kt b/core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/PaymentDetailData.kt similarity index 92% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/PaymentDetailData.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/PaymentDetailData.kt index e81512873..e7ad8f1f1 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/PaymentDetailData.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/PaymentDetailData.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.accounts.savings +package com.mifospay.core.model.entity.accounts.savings import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/PaymentType.kt b/core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/PaymentType.kt similarity index 81% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/PaymentType.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/PaymentType.kt index a343c0746..63ebaeb1d 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/PaymentType.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/PaymentType.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.accounts.savings +package com.mifospay.core.model.entity.accounts.savings import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/SavingAccount.kt b/core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/SavingAccount.kt similarity index 92% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/SavingAccount.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/SavingAccount.kt index 30397333b..4bafd145b 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/SavingAccount.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/SavingAccount.kt @@ -1,8 +1,8 @@ -package com.mifos.mobilewallet.model.entity.accounts.savings +package com.mifospay.core.model.entity.accounts.savings import android.os.Parcelable import com.google.gson.annotations.SerializedName -import com.mifos.mobilewallet.model.entity.client.DepositType +import com.mifospay.core.model.entity.client.DepositType import kotlinx.parcelize.Parcelize @Parcelize diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/SavingsWithAssociations.kt b/core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/SavingsWithAssociations.kt similarity index 95% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/SavingsWithAssociations.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/SavingsWithAssociations.kt index f2906f784..424fc4506 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/SavingsWithAssociations.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/SavingsWithAssociations.kt @@ -1,8 +1,8 @@ -package com.mifos.mobilewallet.model.entity.accounts.savings +package com.mifospay.core.model.entity.accounts.savings import android.os.Parcelable import com.google.gson.annotations.SerializedName -import com.mifos.mobilewallet.model.entity.client.DepositType +import com.mifospay.core.model.entity.client.DepositType import kotlinx.parcelize.Parcelize @Parcelize diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/Status.kt b/core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/Status.kt similarity index 95% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/Status.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/Status.kt index 8e9af2ae0..83d434102 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/Status.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/Status.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.accounts.savings +package com.mifospay.core.model.entity.accounts.savings import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/Summary.kt b/core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/Summary.kt similarity index 93% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/Summary.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/Summary.kt index d14499991..0d04253df 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/Summary.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/Summary.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.accounts.savings +package com.mifospay.core.model.entity.accounts.savings import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/TimeLine.kt b/core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/TimeLine.kt similarity index 95% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/TimeLine.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/TimeLine.kt index 4cf8a49bb..4e3239809 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/TimeLine.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/TimeLine.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.accounts.savings +package com.mifospay.core.model.entity.accounts.savings import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/TransactionType.kt b/core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/TransactionType.kt similarity index 95% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/TransactionType.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/TransactionType.kt index 01fae1541..8ef8d580a 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/TransactionType.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/TransactionType.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.accounts.savings +package com.mifospay.core.model.entity.accounts.savings import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/Transactions.kt b/core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/Transactions.kt similarity index 95% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/Transactions.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/Transactions.kt index 3f2cee98e..640dcc17d 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/Transactions.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/Transactions.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.accounts.savings +package com.mifospay.core.model.entity.accounts.savings import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/Transfer.kt b/core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/Transfer.kt similarity index 80% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/Transfer.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/Transfer.kt index df1029f82..39c1d6bd9 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/accounts/savings/Transfer.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/Transfer.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.accounts.savings +package com.mifospay.core.model.entity.accounts.savings import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/TransferDetail.kt b/core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/TransferDetail.kt new file mode 100644 index 000000000..2b9040a18 --- /dev/null +++ b/core/model/src/main/java/com/mifospay/core/model/entity/accounts/savings/TransferDetail.kt @@ -0,0 +1,29 @@ +package com.mifospay.core.model.entity.accounts.savings + +import android.os.Parcelable +import com.google.gson.annotations.SerializedName +import com.mifospay.core.model.domain.client.Client +import kotlinx.parcelize.Parcelize + + +@Parcelize +data class TransferDetail( + @SerializedName("id") + var id: Long = 0L, + + @SerializedName("fromClient") + var fromClient: com.mifospay.core.model.domain.client.Client = com.mifospay.core.model.domain.client.Client(), + + @SerializedName("fromAccount") + var fromAccount: SavingAccount = SavingAccount(), + + @SerializedName("toClient") + var toClient: com.mifospay.core.model.domain.client.Client = com.mifospay.core.model.domain.client.Client(), + + @SerializedName("toAccount") + var toAccount: SavingAccount = SavingAccount(), +) : Parcelable { + constructor() : this(0L, + com.mifospay.core.model.domain.client.Client(), SavingAccount(), + com.mifospay.core.model.domain.client.Client(), SavingAccount()) +} diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/authentication/AuthenticationPayload.kt b/core/model/src/main/java/com/mifospay/core/model/entity/authentication/AuthenticationPayload.kt similarity index 82% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/authentication/AuthenticationPayload.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/authentication/AuthenticationPayload.kt index af76acb3c..f24ddb21d 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/authentication/AuthenticationPayload.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/authentication/AuthenticationPayload.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.authentication +package com.mifospay.core.model.entity.authentication import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/beneficary/Beneficiary.kt b/core/model/src/main/java/com/mifospay/core/model/entity/beneficary/Beneficiary.kt similarity index 83% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/beneficary/Beneficiary.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/beneficary/Beneficiary.kt index b32ca28c2..54797c711 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/beneficary/Beneficiary.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/beneficary/Beneficiary.kt @@ -1,8 +1,8 @@ -package com.mifos.mobilewallet.model.entity.beneficary +package com.mifospay.core.model.entity.beneficary import android.os.Parcelable import com.google.gson.annotations.SerializedName -import com.mifos.mobilewallet.model.entity.templates.account.AccountType +import com.mifospay.core.model.entity.templates.account.AccountType import kotlinx.parcelize.Parcelize @Parcelize diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/beneficary/BeneficiaryPayload.kt b/core/model/src/main/java/com/mifospay/core/model/entity/beneficary/BeneficiaryPayload.kt similarity index 91% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/beneficary/BeneficiaryPayload.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/beneficary/BeneficiaryPayload.kt index 31eb000ec..ea25285fa 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/beneficary/BeneficiaryPayload.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/beneficary/BeneficiaryPayload.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.beneficary +package com.mifospay.core.model.entity.beneficary import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/beneficary/BeneficiaryUpdatePayload.kt b/core/model/src/main/java/com/mifospay/core/model/entity/beneficary/BeneficiaryUpdatePayload.kt similarity index 79% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/beneficary/BeneficiaryUpdatePayload.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/beneficary/BeneficiaryUpdatePayload.kt index 76b0b9d63..f1cfa9f26 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/beneficary/BeneficiaryUpdatePayload.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/beneficary/BeneficiaryUpdatePayload.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.beneficary +package com.mifospay.core.model.entity.beneficary import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/client/Client.kt b/core/model/src/main/java/com/mifospay/core/model/entity/client/Client.kt similarity index 94% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/client/Client.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/client/Client.kt index a4be0df08..c4e8f4f12 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/client/Client.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/client/Client.kt @@ -1,8 +1,8 @@ -package com.mifos.mobilewallet.model.entity.client +package com.mifospay.core.model.entity.client import android.os.Parcelable import com.google.gson.annotations.SerializedName -import com.mifos.mobilewallet.model.entity.Timeline +import com.mifospay.core.model.entity.Timeline import kotlinx.parcelize.Parcelize @Parcelize diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/client/ClientAccounts.kt b/core/model/src/main/java/com/mifospay/core/model/entity/client/ClientAccounts.kt similarity index 87% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/client/ClientAccounts.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/client/ClientAccounts.kt index 64f4b2107..325e466ee 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/client/ClientAccounts.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/client/ClientAccounts.kt @@ -1,7 +1,7 @@ -package com.mifos.mobilewallet.model.entity.client +package com.mifospay.core.model.entity.client import android.os.Parcelable -import com.mifos.mobilewallet.model.entity.accounts.savings.SavingAccount +import com.mifospay.core.model.entity.accounts.savings.SavingAccount import kotlinx.parcelize.Parcelize @Parcelize diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/client/Currency.kt b/core/model/src/main/java/com/mifospay/core/model/entity/client/Currency.kt similarity index 92% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/client/Currency.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/client/Currency.kt index cc334e4ef..ae4901206 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/client/Currency.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/client/Currency.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.client +package com.mifospay.core.model.entity.client import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/client/DepositType.kt b/core/model/src/main/java/com/mifospay/core/model/entity/client/DepositType.kt similarity index 95% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/client/DepositType.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/client/DepositType.kt index 88d55030a..183d69b56 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/client/DepositType.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/client/DepositType.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.client +package com.mifospay.core.model.entity.client import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/client/Status.kt b/core/model/src/main/java/com/mifospay/core/model/entity/client/Status.kt similarity index 88% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/client/Status.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/client/Status.kt index 6f6777afa..3aa243e94 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/client/Status.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/client/Status.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.client +package com.mifospay.core.model.entity.client import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/client/Type.kt b/core/model/src/main/java/com/mifospay/core/model/entity/client/Type.kt similarity index 86% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/client/Type.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/client/Type.kt index 30b3e4d9c..d9222d900 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/client/Type.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/client/Type.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.client +package com.mifospay.core.model.entity.client import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/kyc/KYCLevel1Details.kt b/core/model/src/main/java/com/mifospay/core/model/entity/kyc/KYCLevel1Details.kt similarity index 93% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/kyc/KYCLevel1Details.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/kyc/KYCLevel1Details.kt index c4edd7a25..da741b1a4 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/kyc/KYCLevel1Details.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/kyc/KYCLevel1Details.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.kyc +package com.mifospay.core.model.entity.kyc import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/noncore/Document.kt b/core/model/src/main/java/com/mifospay/core/model/entity/noncore/Document.kt similarity index 87% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/noncore/Document.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/noncore/Document.kt index bd317eedc..8eedec3ee 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/noncore/Document.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/noncore/Document.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.noncore +package com.mifospay.core.model.entity.noncore import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/payload/ClientPayload.kt b/core/model/src/main/java/com/mifospay/core/model/entity/payload/ClientPayload.kt similarity index 96% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/payload/ClientPayload.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/payload/ClientPayload.kt index b5b159291..de7d082a2 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/payload/ClientPayload.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/payload/ClientPayload.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.payload +package com.mifospay.core.model.entity.payload import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/payload/DataTablePayload.kt b/core/model/src/main/java/com/mifospay/core/model/entity/payload/DataTablePayload.kt similarity index 89% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/payload/DataTablePayload.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/payload/DataTablePayload.kt index 75d9b2f2f..5270f5b2d 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/payload/DataTablePayload.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/payload/DataTablePayload.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.payload +package com.mifospay.core.model.entity.payload import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/payload/PayPayload.kt b/core/model/src/main/java/com/mifospay/core/model/entity/payload/PayPayload.kt similarity index 84% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/payload/PayPayload.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/payload/PayPayload.kt index 4acf00d65..32dc3b1cf 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/payload/PayPayload.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/payload/PayPayload.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.payload +package com.mifospay.core.model.entity.payload import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/payload/PayResponse.kt b/core/model/src/main/java/com/mifospay/core/model/entity/payload/PayResponse.kt similarity index 78% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/payload/PayResponse.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/payload/PayResponse.kt index f4ea18cfb..0dd706e7d 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/payload/PayResponse.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/payload/PayResponse.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.payload +package com.mifospay.core.model.entity.payload data class PayResponse( val officeId: Int, diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/payload/StandingInstructionPayload.kt b/core/model/src/main/java/com/mifospay/core/model/entity/payload/StandingInstructionPayload.kt similarity index 93% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/payload/StandingInstructionPayload.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/payload/StandingInstructionPayload.kt index d4b7906ba..1676f2d2e 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/payload/StandingInstructionPayload.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/payload/StandingInstructionPayload.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.payload +package com.mifospay.core.model.entity.payload import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/payload/TransferPayload.kt b/core/model/src/main/java/com/mifospay/core/model/entity/payload/TransferPayload.kt similarity index 95% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/payload/TransferPayload.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/payload/TransferPayload.kt index 18e18d609..e9a4d1ec4 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/payload/TransferPayload.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/payload/TransferPayload.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.payload +package com.mifospay.core.model.entity.payload import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/payload/UpdateVpaPayload.kt b/core/model/src/main/java/com/mifospay/core/model/entity/payload/UpdateVpaPayload.kt similarity index 56% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/payload/UpdateVpaPayload.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/payload/UpdateVpaPayload.kt index 4078faede..98ad5a596 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/payload/UpdateVpaPayload.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/payload/UpdateVpaPayload.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.payload +package com.mifospay.core.model.entity.payload data class UpdateVpaPayload( var externalId: String? = null diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/register/RegisterPayload.kt b/core/model/src/main/java/com/mifospay/core/model/entity/register/RegisterPayload.kt similarity index 92% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/register/RegisterPayload.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/register/RegisterPayload.kt index c3b1cc446..688269cf8 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/register/RegisterPayload.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/register/RegisterPayload.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.register +package com.mifospay.core.model.entity.register import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/register/UserVerify.kt b/core/model/src/main/java/com/mifospay/core/model/entity/register/UserVerify.kt similarity index 81% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/register/UserVerify.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/register/UserVerify.kt index 70fecef4b..a70dbdb25 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/register/UserVerify.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/register/UserVerify.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.register +package com.mifospay.core.model.entity.register import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/savedcards/Card.kt b/core/model/src/main/java/com/mifospay/core/model/entity/savedcards/Card.kt similarity index 90% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/savedcards/Card.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/savedcards/Card.kt index e63d7dfa1..4d0bf267f 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/savedcards/Card.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/savedcards/Card.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.savedcards +package com.mifospay.core.model.entity.savedcards import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/standinginstruction/SDIResponse.kt b/core/model/src/main/java/com/mifospay/core/model/entity/standinginstruction/SDIResponse.kt similarity index 71% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/standinginstruction/SDIResponse.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/standinginstruction/SDIResponse.kt index dc8840d2a..bd375d180 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/standinginstruction/SDIResponse.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/standinginstruction/SDIResponse.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.standinginstruction +package com.mifospay.core.model.entity.standinginstruction import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/standinginstruction/StandingInstruction.kt b/core/model/src/main/java/com/mifospay/core/model/entity/standinginstruction/StandingInstruction.kt similarity index 78% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/standinginstruction/StandingInstruction.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/standinginstruction/StandingInstruction.kt index 1d49be792..661ecdd83 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/standinginstruction/StandingInstruction.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/standinginstruction/StandingInstruction.kt @@ -1,11 +1,11 @@ -package com.mifos.mobilewallet.model.entity.standinginstruction +package com.mifospay.core.model.entity.standinginstruction import android.os.Parcelable import com.google.gson.annotations.SerializedName import kotlinx.parcelize.Parcelize -import com.mifos.mobilewallet.model.entity.accounts.savings.SavingAccount -import com.mifos.mobilewallet.model.entity.client.Client -import com.mifos.mobilewallet.model.entity.client.Status +import com.mifospay.core.model.entity.accounts.savings.SavingAccount +import com.mifospay.core.model.entity.client.Client +import com.mifospay.core.model.entity.client.Status @Parcelize data class StandingInstruction( diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/templates/account/AccountOption.kt b/core/model/src/main/java/com/mifospay/core/model/entity/templates/account/AccountOption.kt similarity index 91% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/templates/account/AccountOption.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/templates/account/AccountOption.kt index 03dd12261..6bffe780d 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/templates/account/AccountOption.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/templates/account/AccountOption.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.templates.account +package com.mifospay.core.model.entity.templates.account import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/templates/account/AccountOptionsTemplate.kt b/core/model/src/main/java/com/mifospay/core/model/entity/templates/account/AccountOptionsTemplate.kt similarity index 84% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/templates/account/AccountOptionsTemplate.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/templates/account/AccountOptionsTemplate.kt index d05fcda0a..afdd640a9 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/templates/account/AccountOptionsTemplate.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/templates/account/AccountOptionsTemplate.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.templates.account +package com.mifospay.core.model.entity.templates.account import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/templates/account/AccountType.kt b/core/model/src/main/java/com/mifospay/core/model/entity/templates/account/AccountType.kt similarity index 84% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/templates/account/AccountType.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/templates/account/AccountType.kt index 20222f006..13ee87508 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/templates/account/AccountType.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/templates/account/AccountType.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.templates.account +package com.mifospay.core.model.entity.templates.account import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/templates/beneficiary/AccountTypeOption.kt b/core/model/src/main/java/com/mifospay/core/model/entity/templates/beneficiary/AccountTypeOption.kt similarity index 83% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/templates/beneficiary/AccountTypeOption.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/templates/beneficiary/AccountTypeOption.kt index 082172745..6f71169a0 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/templates/beneficiary/AccountTypeOption.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/templates/beneficiary/AccountTypeOption.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.templates.beneficiary +package com.mifospay.core.model.entity.templates.beneficiary import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/templates/beneficiary/BeneficiaryTemplate.kt b/core/model/src/main/java/com/mifospay/core/model/entity/templates/beneficiary/BeneficiaryTemplate.kt similarity index 80% rename from core/model/src/main/java/com/mifos/mobilewallet/model/entity/templates/beneficiary/BeneficiaryTemplate.kt rename to core/model/src/main/java/com/mifospay/core/model/entity/templates/beneficiary/BeneficiaryTemplate.kt index 88721e449..f4c2927fd 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/templates/beneficiary/BeneficiaryTemplate.kt +++ b/core/model/src/main/java/com/mifospay/core/model/entity/templates/beneficiary/BeneficiaryTemplate.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.entity.templates.beneficiary +package com.mifospay.core.model.entity.templates.beneficiary import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/signup/PasswordStrength.kt b/core/model/src/main/java/com/mifospay/core/model/signup/PasswordStrength.kt similarity index 71% rename from core/model/src/main/java/com/mifos/mobilewallet/model/signup/PasswordStrength.kt rename to core/model/src/main/java/com/mifospay/core/model/signup/PasswordStrength.kt index 6b3bb281a..fc3ab405a 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/signup/PasswordStrength.kt +++ b/core/model/src/main/java/com/mifospay/core/model/signup/PasswordStrength.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.signup +package com.mifospay.core.model.signup enum class PasswordStrength { WEAK, diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/signup/SignupData.kt b/core/model/src/main/java/com/mifospay/core/model/signup/SignupData.kt similarity index 93% rename from core/model/src/main/java/com/mifos/mobilewallet/model/signup/SignupData.kt rename to core/model/src/main/java/com/mifospay/core/model/signup/SignupData.kt index 35aef8ebb..734d9e060 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/signup/SignupData.kt +++ b/core/model/src/main/java/com/mifospay/core/model/signup/SignupData.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.signup +package com.mifospay.core.model.signup import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/utils/DateHelper.kt b/core/model/src/main/java/com/mifospay/core/model/utils/DateHelper.kt similarity index 98% rename from core/model/src/main/java/com/mifos/mobilewallet/model/utils/DateHelper.kt rename to core/model/src/main/java/com/mifospay/core/model/utils/DateHelper.kt index 643bf1cc4..2fca45cf1 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/utils/DateHelper.kt +++ b/core/model/src/main/java/com/mifospay/core/model/utils/DateHelper.kt @@ -1,4 +1,4 @@ -package com.mifos.mobilewallet.model.utils +package com.mifospay.core.model.utils import android.util.Log import java.text.ParseException diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts index 5b9eb1096..5850c8241 100644 --- a/core/network/build.gradle.kts +++ b/core/network/build.gradle.kts @@ -7,7 +7,7 @@ plugins { apply(from = "${project.rootDir}/config/quality/quality.gradle") android { - namespace = "org.mifos.mobilewallet.mifospay.network" + namespace = "org.mifospay.core.network" defaultConfig { consumerProguardFiles("consumer-rules.pro") } diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/AuthenticationService.kt b/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/AuthenticationService.kt deleted file mode 100644 index 756671d42..000000000 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/AuthenticationService.kt +++ /dev/null @@ -1,13 +0,0 @@ -package org.mifos.mobilewallet.mifospay.network.services - -import com.mifos.mobilewallet.model.domain.user.User -import com.mifos.mobilewallet.model.entity.authentication.AuthenticationPayload -import org.mifos.mobilewallet.mifospay.network.ApiEndPoints -import retrofit2.http.Body -import retrofit2.http.POST -import rx.Observable - -interface AuthenticationService { - @POST(ApiEndPoints.AUTHENTICATION) - fun authenticate(@Body authPayload: AuthenticationPayload): Observable -} diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/ApiEndPoints.kt b/core/network/src/main/kotlin/org/mifospay/core/network/ApiEndPoints.kt similarity index 93% rename from core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/ApiEndPoints.kt rename to core/network/src/main/kotlin/org/mifospay/core/network/ApiEndPoints.kt index fc78c9c18..ae2308f71 100644 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/ApiEndPoints.kt +++ b/core/network/src/main/kotlin/org/mifospay/core/network/ApiEndPoints.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.network +package org.mifospay.core.network object ApiEndPoints { //This class contains all the Constants for API End Points diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/ApiInterceptor.kt b/core/network/src/main/kotlin/org/mifospay/core/network/ApiInterceptor.kt similarity index 62% rename from core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/ApiInterceptor.kt rename to core/network/src/main/kotlin/org/mifospay/core/network/ApiInterceptor.kt index 07fc085fb..966781178 100644 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/ApiInterceptor.kt +++ b/core/network/src/main/kotlin/org/mifospay/core/network/ApiInterceptor.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.mifospay.network +package org.mifospay.core.network import okhttp3.Interceptor import okhttp3.Response -import org.mifos.mobilewallet.mifospay.core.datastore.PreferencesHelper +import org.mifospay.core.datastore.PreferencesHelper import java.io.IOException class ApiInterceptor(private val preferencesHelper: PreferencesHelper) : Interceptor { @@ -10,10 +10,13 @@ class ApiInterceptor(private val preferencesHelper: PreferencesHelper) : Interce @Throws(IOException::class) override fun intercept(chain: Interceptor.Chain): Response { val chainRequest = chain.request() - val builder = chainRequest.newBuilder().header(HEADER_TENANT, DEFAULT) + val builder = chainRequest.newBuilder().header( + org.mifospay.core.network.ApiInterceptor.Companion.HEADER_TENANT, + org.mifospay.core.network.ApiInterceptor.Companion.DEFAULT + ) val authToken = preferencesHelper.token if (!authToken.isNullOrEmpty()) { - builder.header(HEADER_AUTH, authToken) + builder.header(org.mifospay.core.network.ApiInterceptor.Companion.HEADER_AUTH, authToken) } val request = builder.build() return chain.proceed(request) diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/BaseURL.kt b/core/network/src/main/kotlin/org/mifospay/core/network/BaseURL.kt similarity index 86% rename from core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/BaseURL.kt rename to core/network/src/main/kotlin/org/mifospay/core/network/BaseURL.kt index 251c190bb..2af67897d 100644 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/BaseURL.kt +++ b/core/network/src/main/kotlin/org/mifospay/core/network/BaseURL.kt @@ -1,8 +1,5 @@ -package org.mifos.mobilewallet.mifospay.network +package org.mifospay.core.network -/** - * Created by naman on 17/6/17. - */ class BaseURL { val url: String get() = PROTOCOL_HTTPS + API_ENDPOINT + API_PATH diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/FineractApiManager.kt b/core/network/src/main/kotlin/org/mifospay/core/network/FineractApiManager.kt similarity index 64% rename from core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/FineractApiManager.kt rename to core/network/src/main/kotlin/org/mifospay/core/network/FineractApiManager.kt index 28e50fa6d..7d0b8cf76 100644 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/FineractApiManager.kt +++ b/core/network/src/main/kotlin/org/mifospay/core/network/FineractApiManager.kt @@ -1,21 +1,21 @@ -package org.mifos.mobilewallet.mifospay.network - -import org.mifos.mobilewallet.mifospay.network.services.AccountTransfersService -import org.mifos.mobilewallet.mifospay.network.services.AuthenticationService -import org.mifos.mobilewallet.mifospay.network.services.ClientService -import org.mifos.mobilewallet.mifospay.network.services.DocumentService -import org.mifos.mobilewallet.mifospay.network.services.InvoiceService -import org.mifos.mobilewallet.mifospay.network.services.KYCLevel1Service -import org.mifos.mobilewallet.mifospay.network.services.NotificationService -import org.mifos.mobilewallet.mifospay.network.services.RegistrationService -import org.mifos.mobilewallet.mifospay.network.services.RunReportService -import org.mifos.mobilewallet.mifospay.network.services.SavedCardService -import org.mifos.mobilewallet.mifospay.network.services.SavingsAccountsService -import org.mifos.mobilewallet.mifospay.network.services.SearchService -import org.mifos.mobilewallet.mifospay.network.services.StandingInstructionService -import org.mifos.mobilewallet.mifospay.network.services.ThirdPartyTransferService -import org.mifos.mobilewallet.mifospay.network.services.TwoFactorAuthService -import org.mifos.mobilewallet.mifospay.network.services.UserService +package org.mifospay.core.network + +import org.mifospay.core.network.services.AccountTransfersService +import org.mifospay.core.network.services.AuthenticationService +import org.mifospay.core.network.services.ClientService +import org.mifospay.core.network.services.DocumentService +import org.mifospay.core.network.services.InvoiceService +import org.mifospay.core.network.services.KYCLevel1Service +import org.mifospay.core.network.services.NotificationService +import org.mifospay.core.network.services.RegistrationService +import org.mifospay.core.network.services.RunReportService +import org.mifospay.core.network.services.SavedCardService +import org.mifospay.core.network.services.SavingsAccountsService +import org.mifospay.core.network.services.SearchService +import org.mifospay.core.network.services.StandingInstructionService +import org.mifospay.core.network.services.ThirdPartyTransferService +import org.mifospay.core.network.services.TwoFactorAuthService +import org.mifospay.core.network.services.UserService import javax.inject.Inject class FineractApiManager @Inject constructor( diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/GenericResponse.kt b/core/network/src/main/kotlin/org/mifospay/core/network/GenericResponse.kt similarity index 65% rename from core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/GenericResponse.kt rename to core/network/src/main/kotlin/org/mifospay/core/network/GenericResponse.kt index ab34dd129..ae12d7100 100644 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/GenericResponse.kt +++ b/core/network/src/main/kotlin/org/mifospay/core/network/GenericResponse.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.network +package org.mifospay.core.network data class GenericResponse( var responseFields: HashMap = hashMapOf() diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/JvmLocalAssetManager.kt b/core/network/src/main/kotlin/org/mifospay/core/network/JvmLocalAssetManager.kt similarity index 90% rename from core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/JvmLocalAssetManager.kt rename to core/network/src/main/kotlin/org/mifospay/core/network/JvmLocalAssetManager.kt index 520f0f233..ed4a3c7ff 100644 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/JvmLocalAssetManager.kt +++ b/core/network/src/main/kotlin/org/mifospay/core/network/JvmLocalAssetManager.kt @@ -1,7 +1,7 @@ -package org.mifos.mobilewallet.mifospay.network +package org.mifospay.core.network import androidx.annotation.VisibleForTesting -import org.mifos.mobilewallet.mifospay.network.local_assets.LocalAssetManager +import org.mifospay.core.network.local_assets.LocalAssetManager import java.io.File import java.io.InputStream import java.util.Properties diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/MifosWalletOkHttpClient.kt b/core/network/src/main/kotlin/org/mifospay/core/network/MifosWalletOkHttpClient.kt similarity index 94% rename from core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/MifosWalletOkHttpClient.kt rename to core/network/src/main/kotlin/org/mifospay/core/network/MifosWalletOkHttpClient.kt index 5f6130505..1db7e8e60 100644 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/MifosWalletOkHttpClient.kt +++ b/core/network/src/main/kotlin/org/mifospay/core/network/MifosWalletOkHttpClient.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.mifospay.network +package org.mifospay.core.network import okhttp3.OkHttpClient import okhttp3.logging.HttpLoggingInterceptor -import org.mifos.mobilewallet.mifospay.core.datastore.PreferencesHelper +import org.mifospay.core.datastore.PreferencesHelper import java.security.SecureRandom import java.security.cert.CertificateException import java.security.cert.X509Certificate @@ -69,7 +69,7 @@ class MifosWalletOkHttpClient(private val preferences: PreferencesHelper) { // Interceptor :> Full Body Logger and ApiRequest Header builder.addInterceptor(logger) - builder.addInterceptor(ApiInterceptor(preferences)) + builder.addInterceptor(org.mifospay.core.network.ApiInterceptor(preferences)) return builder.build() } } diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/SelfServiceApiManager.kt b/core/network/src/main/kotlin/org/mifospay/core/network/SelfServiceApiManager.kt similarity index 64% rename from core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/SelfServiceApiManager.kt rename to core/network/src/main/kotlin/org/mifospay/core/network/SelfServiceApiManager.kt index f9d9cfee2..bb5ce1c27 100644 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/SelfServiceApiManager.kt +++ b/core/network/src/main/kotlin/org/mifospay/core/network/SelfServiceApiManager.kt @@ -1,11 +1,11 @@ -package org.mifos.mobilewallet.mifospay.network +package org.mifospay.core.network -import org.mifos.mobilewallet.mifospay.network.services.AuthenticationService -import org.mifos.mobilewallet.mifospay.network.services.BeneficiaryService -import org.mifos.mobilewallet.mifospay.network.services.ClientService -import org.mifos.mobilewallet.mifospay.network.services.RegistrationService -import org.mifos.mobilewallet.mifospay.network.services.SavingsAccountsService -import org.mifos.mobilewallet.mifospay.network.services.ThirdPartyTransferService +import org.mifospay.core.network.services.AuthenticationService +import org.mifospay.core.network.services.BeneficiaryService +import org.mifospay.core.network.services.ClientService +import org.mifospay.core.network.services.RegistrationService +import org.mifospay.core.network.services.SavingsAccountsService +import org.mifospay.core.network.services.ThirdPartyTransferService import javax.inject.Inject class SelfServiceApiManager @Inject constructor( diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/di/LocalModule.kt b/core/network/src/main/kotlin/org/mifospay/core/network/di/LocalModule.kt similarity index 56% rename from core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/di/LocalModule.kt rename to core/network/src/main/kotlin/org/mifospay/core/network/di/LocalModule.kt index da2ec751e..f484301da 100644 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/di/LocalModule.kt +++ b/core/network/src/main/kotlin/org/mifospay/core/network/di/LocalModule.kt @@ -1,11 +1,11 @@ -package org.mifos.mobilewallet.mifospay.network.di +package org.mifospay.core.network.di import dagger.Binds import dagger.Module import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import org.mifos.mobilewallet.mifospay.network.local_assets.LocalAssetDataSource -import org.mifos.mobilewallet.mifospay.network.local_assets.MifosLocalAssetDataSource +import org.mifospay.core.network.local_assets.LocalAssetDataSource +import org.mifospay.core.network.local_assets.MifosLocalAssetDataSource @Module @InstallIn(SingletonComponent::class) diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/di/NetworkModule.kt b/core/network/src/main/kotlin/org/mifospay/core/network/di/NetworkModule.kt similarity index 82% rename from core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/di/NetworkModule.kt rename to core/network/src/main/kotlin/org/mifospay/core/network/di/NetworkModule.kt index dfa1f3fff..ff523d153 100644 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/di/NetworkModule.kt +++ b/core/network/src/main/kotlin/org/mifospay/core/network/di/NetworkModule.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.network.di +package org.mifospay.core.network.di import android.content.Context import dagger.Module @@ -7,27 +7,29 @@ import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent import kotlinx.serialization.json.Json -import org.mifos.mobilewallet.mifospay.core.datastore.PreferencesHelper -import org.mifos.mobilewallet.mifospay.network.BaseURL -import org.mifos.mobilewallet.mifospay.network.MifosWalletOkHttpClient -import org.mifos.mobilewallet.mifospay.network.local_assets.LocalAssetManager -import org.mifos.mobilewallet.mifospay.network.services.AccountTransfersService -import org.mifos.mobilewallet.mifospay.network.services.AuthenticationService -import org.mifos.mobilewallet.mifospay.network.services.BeneficiaryService -import org.mifos.mobilewallet.mifospay.network.services.ClientService -import org.mifos.mobilewallet.mifospay.network.services.DocumentService -import org.mifos.mobilewallet.mifospay.network.services.InvoiceService -import org.mifos.mobilewallet.mifospay.network.services.KYCLevel1Service -import org.mifos.mobilewallet.mifospay.network.services.NotificationService -import org.mifos.mobilewallet.mifospay.network.services.RegistrationService -import org.mifos.mobilewallet.mifospay.network.services.RunReportService -import org.mifos.mobilewallet.mifospay.network.services.SavedCardService -import org.mifos.mobilewallet.mifospay.network.services.SavingsAccountsService -import org.mifos.mobilewallet.mifospay.network.services.SearchService -import org.mifos.mobilewallet.mifospay.network.services.StandingInstructionService -import org.mifos.mobilewallet.mifospay.network.services.ThirdPartyTransferService -import org.mifos.mobilewallet.mifospay.network.services.TwoFactorAuthService -import org.mifos.mobilewallet.mifospay.network.services.UserService +import org.mifospay.core.datastore.PreferencesHelper +import org.mifospay.core.network.BaseURL +import org.mifospay.core.network.FineractApiManager +import org.mifospay.core.network.MifosWalletOkHttpClient +import org.mifospay.core.network.SelfServiceApiManager +import org.mifospay.core.network.local_assets.LocalAssetManager +import org.mifospay.core.network.services.AccountTransfersService +import org.mifospay.core.network.services.AuthenticationService +import org.mifospay.core.network.services.BeneficiaryService +import org.mifospay.core.network.services.ClientService +import org.mifospay.core.network.services.DocumentService +import org.mifospay.core.network.services.InvoiceService +import org.mifospay.core.network.services.KYCLevel1Service +import org.mifospay.core.network.services.NotificationService +import org.mifospay.core.network.services.RegistrationService +import org.mifospay.core.network.services.RunReportService +import org.mifospay.core.network.services.SavedCardService +import org.mifospay.core.network.services.SavingsAccountsService +import org.mifospay.core.network.services.SearchService +import org.mifospay.core.network.services.StandingInstructionService +import org.mifospay.core.network.services.ThirdPartyTransferService +import org.mifospay.core.network.services.TwoFactorAuthService +import org.mifospay.core.network.services.UserService import retrofit2.Retrofit import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory import retrofit2.converter.gson.GsonConverterFactory @@ -93,8 +95,8 @@ class NetworkModule { @Named("FineractThirdPartyTransferService") thirdPartyTransferService: ThirdPartyTransferService, standingInstructionService: StandingInstructionService, notificationService: NotificationService, - ): org.mifos.mobilewallet.mifospay.network.FineractApiManager { - return org.mifos.mobilewallet.mifospay.network.FineractApiManager( + ): FineractApiManager { + return FineractApiManager( authenticationService, clientService, savingsAccountsService, @@ -123,8 +125,8 @@ class NetworkModule { @Named("SelfServiceRegistrationService") registrationService: RegistrationService, beneficiaryService: BeneficiaryService, @Named("SelfServiceThirdPartyTransferService") thirdPartyTransferService: ThirdPartyTransferService, - ): org.mifos.mobilewallet.mifospay.network.SelfServiceApiManager { - return org.mifos.mobilewallet.mifospay.network.SelfServiceApiManager( + ): SelfServiceApiManager { + return SelfServiceApiManager( authenticationService, clientService, savingsAccountsService, diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/di/Qualifier.kt b/core/network/src/main/kotlin/org/mifospay/core/network/di/Qualifier.kt similarity index 79% rename from core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/di/Qualifier.kt rename to core/network/src/main/kotlin/org/mifospay/core/network/di/Qualifier.kt index 125d025af..7b5815f34 100644 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/di/Qualifier.kt +++ b/core/network/src/main/kotlin/org/mifospay/core/network/di/Qualifier.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.network.di +package org.mifospay.core.network.di import javax.inject.Qualifier diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/local_assets/LocalAssetDataSource.kt b/core/network/src/main/kotlin/org/mifospay/core/network/local_assets/LocalAssetDataSource.kt similarity index 53% rename from core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/local_assets/LocalAssetDataSource.kt rename to core/network/src/main/kotlin/org/mifospay/core/network/local_assets/LocalAssetDataSource.kt index ff8973443..011870ed3 100644 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/local_assets/LocalAssetDataSource.kt +++ b/core/network/src/main/kotlin/org/mifospay/core/network/local_assets/LocalAssetDataSource.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.mifospay.network.local_assets +package org.mifospay.core.network.local_assets -import com.mifos.mobilewallet.model.City -import com.mifos.mobilewallet.model.Country -import com.mifos.mobilewallet.model.State +import com.mifospay.core.model.City +import com.mifospay.core.model.Country +import com.mifospay.core.model.State interface LocalAssetDataSource { diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/local_assets/LocalAssetManager.kt b/core/network/src/main/kotlin/org/mifospay/core/network/local_assets/LocalAssetManager.kt similarity index 64% rename from core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/local_assets/LocalAssetManager.kt rename to core/network/src/main/kotlin/org/mifospay/core/network/local_assets/LocalAssetManager.kt index f97913041..9d37058ab 100644 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/local_assets/LocalAssetManager.kt +++ b/core/network/src/main/kotlin/org/mifospay/core/network/local_assets/LocalAssetManager.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.network.local_assets +package org.mifospay.core.network.local_assets import java.io.InputStream diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/local_assets/MifosLocalAssetDataSource.kt b/core/network/src/main/kotlin/org/mifospay/core/network/local_assets/MifosLocalAssetDataSource.kt similarity index 82% rename from core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/local_assets/MifosLocalAssetDataSource.kt rename to core/network/src/main/kotlin/org/mifospay/core/network/local_assets/MifosLocalAssetDataSource.kt index c876d1090..f0db9c078 100644 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/local_assets/MifosLocalAssetDataSource.kt +++ b/core/network/src/main/kotlin/org/mifospay/core/network/local_assets/MifosLocalAssetDataSource.kt @@ -1,16 +1,16 @@ -package org.mifos.mobilewallet.mifospay.network.local_assets +package org.mifospay.core.network.local_assets -import com.mifos.mobilewallet.model.City -import com.mifos.mobilewallet.model.Country -import com.mifos.mobilewallet.model.State +import com.mifospay.core.model.City +import com.mifospay.core.model.Country +import com.mifospay.core.model.State import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.withContext import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.json.Json import kotlinx.serialization.json.decodeFromStream -import org.mifos.mobilewallet.mifospay.core.network.Dispatcher -import org.mifos.mobilewallet.mifospay.core.network.MifosDispatchers -import org.mifos.mobilewallet.mifospay.network.JvmLocalAssetManager +import org.mifospay.core.network.Dispatcher +import org.mifospay.core.network.JvmLocalAssetManager +import org.mifospay.core.network.MifosDispatchers import javax.inject.Inject class MifosLocalAssetDataSource @Inject constructor( diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/AccountTransfersService.kt b/core/network/src/main/kotlin/org/mifospay/core/network/services/AccountTransfersService.kt similarity index 61% rename from core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/AccountTransfersService.kt rename to core/network/src/main/kotlin/org/mifospay/core/network/services/AccountTransfersService.kt index acd464ddb..85f84e354 100644 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/AccountTransfersService.kt +++ b/core/network/src/main/kotlin/org/mifospay/core/network/services/AccountTransfersService.kt @@ -1,7 +1,7 @@ -package org.mifos.mobilewallet.mifospay.network.services +package org.mifospay.core.network.services -import com.mifos.mobilewallet.model.entity.accounts.savings.TransferDetail -import org.mifos.mobilewallet.mifospay.network.ApiEndPoints +import com.mifospay.core.model.entity.accounts.savings.TransferDetail +import org.mifospay.core.network.ApiEndPoints import retrofit2.http.GET import retrofit2.http.Path import rx.Observable diff --git a/core/network/src/main/kotlin/org/mifospay/core/network/services/AuthenticationService.kt b/core/network/src/main/kotlin/org/mifospay/core/network/services/AuthenticationService.kt new file mode 100644 index 000000000..0bd3d366e --- /dev/null +++ b/core/network/src/main/kotlin/org/mifospay/core/network/services/AuthenticationService.kt @@ -0,0 +1,13 @@ +package org.mifospay.core.network.services + +import com.mifospay.core.model.domain.user.User +import com.mifospay.core.model.entity.authentication.AuthenticationPayload +import org.mifospay.core.network.ApiEndPoints +import retrofit2.http.Body +import retrofit2.http.POST +import rx.Observable + +interface AuthenticationService { + @POST(ApiEndPoints.AUTHENTICATION) + fun authenticate(@Body authPayload: AuthenticationPayload): Observable +} diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/BeneficiaryService.kt b/core/network/src/main/kotlin/org/mifospay/core/network/services/BeneficiaryService.kt similarity index 71% rename from core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/BeneficiaryService.kt rename to core/network/src/main/kotlin/org/mifospay/core/network/services/BeneficiaryService.kt index f879647f5..427f114a4 100644 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/BeneficiaryService.kt +++ b/core/network/src/main/kotlin/org/mifospay/core/network/services/BeneficiaryService.kt @@ -1,11 +1,11 @@ -package org.mifos.mobilewallet.mifospay.network.services +package org.mifospay.core.network.services import okhttp3.ResponseBody -import com.mifos.mobilewallet.model.entity.beneficary.Beneficiary -import com.mifos.mobilewallet.model.entity.beneficary.BeneficiaryPayload -import com.mifos.mobilewallet.model.entity.beneficary.BeneficiaryUpdatePayload -import com.mifos.mobilewallet.model.entity.templates.beneficiary.BeneficiaryTemplate -import org.mifos.mobilewallet.mifospay.network.ApiEndPoints +import com.mifospay.core.model.entity.beneficary.Beneficiary +import com.mifospay.core.model.entity.beneficary.BeneficiaryPayload +import com.mifospay.core.model.entity.beneficary.BeneficiaryUpdatePayload +import com.mifospay.core.model.entity.templates.beneficiary.BeneficiaryTemplate +import org.mifospay.core.network.ApiEndPoints import retrofit2.http.Body import retrofit2.http.DELETE import retrofit2.http.GET diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/ClientService.kt b/core/network/src/main/kotlin/org/mifospay/core/network/services/ClientService.kt similarity index 74% rename from core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/ClientService.kt rename to core/network/src/main/kotlin/org/mifospay/core/network/services/ClientService.kt index 1ad73b5c0..972a90073 100644 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/ClientService.kt +++ b/core/network/src/main/kotlin/org/mifospay/core/network/services/ClientService.kt @@ -1,13 +1,13 @@ -package org.mifos.mobilewallet.mifospay.network.services +package org.mifospay.core.network.services +import com.mifospay.core.model.domain.NewAccount import okhttp3.MultipartBody import okhttp3.ResponseBody -import com.mifos.mobilewallet.model.entity.Page -import com.mifos.mobilewallet.model.entity.client.Client -import com.mifos.mobilewallet.model.entity.client.ClientAccounts -import com.mifos.mobilewallet.model.domain.NewAccount -import org.mifos.mobilewallet.mifospay.network.ApiEndPoints -import org.mifos.mobilewallet.mifospay.network.GenericResponse +import com.mifospay.core.model.entity.Page +import com.mifospay.core.model.entity.client.Client +import com.mifospay.core.model.entity.client.ClientAccounts +import org.mifospay.core.network.ApiEndPoints +import org.mifospay.core.network.GenericResponse import retrofit2.http.Body import retrofit2.http.GET import retrofit2.http.POST @@ -49,7 +49,7 @@ interface ClientService { ): Observable @POST(ApiEndPoints.CLIENTS) - fun createClient(@Body newClient: com.mifos.mobilewallet.model.domain.client.NewClient): Observable + fun createClient(@Body newClient: com.mifospay.core.model.domain.client.NewClient): Observable @POST fun createAccount(@Body newAccount: NewAccount?): Observable diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/DocumentService.kt b/core/network/src/main/kotlin/org/mifospay/core/network/services/DocumentService.kt similarity index 93% rename from core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/DocumentService.kt rename to core/network/src/main/kotlin/org/mifospay/core/network/services/DocumentService.kt index 7f31c841f..951f41b7b 100644 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/DocumentService.kt +++ b/core/network/src/main/kotlin/org/mifospay/core/network/services/DocumentService.kt @@ -1,10 +1,10 @@ -package org.mifos.mobilewallet.mifospay.network.services +package org.mifospay.core.network.services import okhttp3.MultipartBody import okhttp3.ResponseBody -import com.mifos.mobilewallet.model.entity.noncore.Document -import org.mifos.mobilewallet.mifospay.network.ApiEndPoints -import org.mifos.mobilewallet.mifospay.network.GenericResponse +import com.mifospay.core.model.entity.noncore.Document +import org.mifospay.core.network.ApiEndPoints +import org.mifospay.core.network.GenericResponse import retrofit2.http.DELETE import retrofit2.http.GET import retrofit2.http.Multipart diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/InvoiceService.kt b/core/network/src/main/kotlin/org/mifospay/core/network/services/InvoiceService.kt similarity index 84% rename from core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/InvoiceService.kt rename to core/network/src/main/kotlin/org/mifospay/core/network/services/InvoiceService.kt index 5198768ba..183923c5a 100644 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/InvoiceService.kt +++ b/core/network/src/main/kotlin/org/mifospay/core/network/services/InvoiceService.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.mifospay.network.services +package org.mifospay.core.network.services -import com.mifos.mobilewallet.model.entity.Invoice -import org.mifos.mobilewallet.mifospay.network.ApiEndPoints -import org.mifos.mobilewallet.mifospay.network.GenericResponse +import com.mifospay.core.model.entity.Invoice +import org.mifospay.core.network.ApiEndPoints +import org.mifospay.core.network.GenericResponse import retrofit2.http.Body import retrofit2.http.DELETE import retrofit2.http.GET diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/KYCLevel1Service.kt b/core/network/src/main/kotlin/org/mifospay/core/network/services/KYCLevel1Service.kt similarity index 76% rename from core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/KYCLevel1Service.kt rename to core/network/src/main/kotlin/org/mifospay/core/network/services/KYCLevel1Service.kt index 4543b1146..1b567187a 100644 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/KYCLevel1Service.kt +++ b/core/network/src/main/kotlin/org/mifospay/core/network/services/KYCLevel1Service.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.mifospay.network.services +package org.mifospay.core.network.services -import com.mifos.mobilewallet.model.entity.kyc.KYCLevel1Details -import org.mifos.mobilewallet.mifospay.network.ApiEndPoints -import org.mifos.mobilewallet.mifospay.network.GenericResponse +import com.mifospay.core.model.entity.kyc.KYCLevel1Details +import org.mifospay.core.network.ApiEndPoints +import org.mifospay.core.network.GenericResponse import retrofit2.http.Body import retrofit2.http.GET import retrofit2.http.POST diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/NotificationService.kt b/core/network/src/main/kotlin/org/mifospay/core/network/services/NotificationService.kt similarity index 63% rename from core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/NotificationService.kt rename to core/network/src/main/kotlin/org/mifospay/core/network/services/NotificationService.kt index c8a6e96cf..b8ad43d15 100644 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/NotificationService.kt +++ b/core/network/src/main/kotlin/org/mifospay/core/network/services/NotificationService.kt @@ -1,7 +1,7 @@ -package org.mifos.mobilewallet.mifospay.network.services +package org.mifospay.core.network.services -import com.mifos.mobilewallet.model.domain.NotificationPayload -import org.mifos.mobilewallet.mifospay.network.ApiEndPoints +import com.mifospay.core.model.domain.NotificationPayload +import org.mifospay.core.network.ApiEndPoints import retrofit2.http.GET import retrofit2.http.Path import rx.Observable diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/RegistrationService.kt b/core/network/src/main/kotlin/org/mifospay/core/network/services/RegistrationService.kt similarity index 60% rename from core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/RegistrationService.kt rename to core/network/src/main/kotlin/org/mifospay/core/network/services/RegistrationService.kt index db3cb02e0..2afc0fb8d 100644 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/RegistrationService.kt +++ b/core/network/src/main/kotlin/org/mifospay/core/network/services/RegistrationService.kt @@ -1,9 +1,9 @@ -package org.mifos.mobilewallet.mifospay.network.services +package org.mifospay.core.network.services +import com.mifospay.core.model.entity.register.RegisterPayload +import com.mifospay.core.model.entity.register.UserVerify import okhttp3.ResponseBody -import com.mifos.mobilewallet.model.entity.register.RegisterPayload -import com.mifos.mobilewallet.model.entity.register.UserVerify -import org.mifos.mobilewallet.mifospay.network.ApiEndPoints +import org.mifospay.core.network.ApiEndPoints import retrofit2.http.Body import retrofit2.http.POST import rx.Observable diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/RunReportService.kt b/core/network/src/main/kotlin/org/mifospay/core/network/services/RunReportService.kt similarity index 78% rename from core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/RunReportService.kt rename to core/network/src/main/kotlin/org/mifospay/core/network/services/RunReportService.kt index 92b41ade3..587a8dc75 100644 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/RunReportService.kt +++ b/core/network/src/main/kotlin/org/mifospay/core/network/services/RunReportService.kt @@ -1,7 +1,7 @@ -package org.mifos.mobilewallet.mifospay.network.services +package org.mifospay.core.network.services import okhttp3.ResponseBody -import org.mifos.mobilewallet.mifospay.network.ApiEndPoints +import org.mifospay.core.network.ApiEndPoints import retrofit2.http.GET import retrofit2.http.Query import rx.Observable diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/SavedCardService.kt b/core/network/src/main/kotlin/org/mifospay/core/network/services/SavedCardService.kt similarity index 81% rename from core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/SavedCardService.kt rename to core/network/src/main/kotlin/org/mifospay/core/network/services/SavedCardService.kt index 2e30adcd3..205c84a17 100644 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/SavedCardService.kt +++ b/core/network/src/main/kotlin/org/mifospay/core/network/services/SavedCardService.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.mifospay.network.services +package org.mifospay.core.network.services -import com.mifos.mobilewallet.model.entity.savedcards.Card -import org.mifos.mobilewallet.mifospay.network.ApiEndPoints -import org.mifos.mobilewallet.mifospay.network.GenericResponse +import com.mifospay.core.model.entity.savedcards.Card +import org.mifospay.core.network.ApiEndPoints +import org.mifospay.core.network.GenericResponse import retrofit2.http.Body import retrofit2.http.DELETE import retrofit2.http.GET diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/SavingsAccountsService.kt b/core/network/src/main/kotlin/org/mifospay/core/network/services/SavingsAccountsService.kt similarity index 75% rename from core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/SavingsAccountsService.kt rename to core/network/src/main/kotlin/org/mifospay/core/network/services/SavingsAccountsService.kt index efb0a7d11..34e9ef564 100644 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/SavingsAccountsService.kt +++ b/core/network/src/main/kotlin/org/mifospay/core/network/services/SavingsAccountsService.kt @@ -1,11 +1,11 @@ -package org.mifos.mobilewallet.mifospay.network.services +package org.mifospay.core.network.services -import com.mifos.mobilewallet.model.entity.Page -import com.mifos.mobilewallet.model.entity.accounts.savings.SavingAccount -import com.mifos.mobilewallet.model.entity.accounts.savings.SavingsWithAssociations -import com.mifos.mobilewallet.model.entity.accounts.savings.Transactions -import org.mifos.mobilewallet.mifospay.network.ApiEndPoints -import org.mifos.mobilewallet.mifospay.network.GenericResponse +import com.mifospay.core.model.entity.Page +import com.mifospay.core.model.entity.accounts.savings.SavingAccount +import com.mifospay.core.model.entity.accounts.savings.SavingsWithAssociations +import com.mifospay.core.model.entity.accounts.savings.Transactions +import org.mifospay.core.network.ApiEndPoints +import org.mifospay.core.network.GenericResponse import retrofit2.http.Body import retrofit2.http.GET import retrofit2.http.POST diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/SearchService.kt b/core/network/src/main/kotlin/org/mifospay/core/network/services/SearchService.kt similarity index 65% rename from core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/SearchService.kt rename to core/network/src/main/kotlin/org/mifospay/core/network/services/SearchService.kt index 9b706eb6c..3d342d10b 100644 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/SearchService.kt +++ b/core/network/src/main/kotlin/org/mifospay/core/network/services/SearchService.kt @@ -1,7 +1,7 @@ -package org.mifos.mobilewallet.mifospay.network.services +package org.mifospay.core.network.services -import com.mifos.mobilewallet.model.entity.SearchedEntity -import org.mifos.mobilewallet.mifospay.network.ApiEndPoints +import com.mifospay.core.model.entity.SearchedEntity +import org.mifospay.core.network.ApiEndPoints import retrofit2.http.GET import retrofit2.http.Query import rx.Observable diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/StandingInstructionService.kt b/core/network/src/main/kotlin/org/mifospay/core/network/services/StandingInstructionService.kt similarity index 79% rename from core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/StandingInstructionService.kt rename to core/network/src/main/kotlin/org/mifospay/core/network/services/StandingInstructionService.kt index c9c7fb1f4..aacdf56b0 100644 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/StandingInstructionService.kt +++ b/core/network/src/main/kotlin/org/mifospay/core/network/services/StandingInstructionService.kt @@ -1,11 +1,11 @@ -package org.mifos.mobilewallet.mifospay.network.services - -import com.mifos.mobilewallet.model.entity.Page -import com.mifos.mobilewallet.model.entity.standinginstruction.SDIResponse -import com.mifos.mobilewallet.model.entity.payload.StandingInstructionPayload -import com.mifos.mobilewallet.model.entity.standinginstruction.StandingInstruction -import org.mifos.mobilewallet.mifospay.network.ApiEndPoints -import org.mifos.mobilewallet.mifospay.network.GenericResponse +package org.mifospay.core.network.services + +import com.mifospay.core.model.entity.Page +import com.mifospay.core.model.entity.payload.StandingInstructionPayload +import com.mifospay.core.model.entity.standinginstruction.SDIResponse +import com.mifospay.core.model.entity.standinginstruction.StandingInstruction +import org.mifospay.core.network.ApiEndPoints +import org.mifospay.core.network.GenericResponse import retrofit2.http.Body import retrofit2.http.GET import retrofit2.http.POST diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/ThirdPartyTransferService.kt b/core/network/src/main/kotlin/org/mifospay/core/network/services/ThirdPartyTransferService.kt similarity index 59% rename from core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/ThirdPartyTransferService.kt rename to core/network/src/main/kotlin/org/mifospay/core/network/services/ThirdPartyTransferService.kt index f5273419f..664b415e2 100644 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/ThirdPartyTransferService.kt +++ b/core/network/src/main/kotlin/org/mifospay/core/network/services/ThirdPartyTransferService.kt @@ -1,9 +1,9 @@ -package org.mifos.mobilewallet.mifospay.network.services +package org.mifospay.core.network.services -import com.mifos.mobilewallet.model.entity.TPTResponse -import com.mifos.mobilewallet.model.entity.payload.TransferPayload -import com.mifos.mobilewallet.model.entity.templates.account.AccountOptionsTemplate -import org.mifos.mobilewallet.mifospay.network.ApiEndPoints +import com.mifospay.core.model.entity.TPTResponse +import com.mifospay.core.model.entity.payload.TransferPayload +import com.mifospay.core.model.entity.templates.account.AccountOptionsTemplate +import org.mifospay.core.network.ApiEndPoints import retrofit2.http.Body import retrofit2.http.GET import retrofit2.http.POST diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/TwoFactorAuthService.kt b/core/network/src/main/kotlin/org/mifospay/core/network/services/TwoFactorAuthService.kt similarity index 67% rename from core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/TwoFactorAuthService.kt rename to core/network/src/main/kotlin/org/mifospay/core/network/services/TwoFactorAuthService.kt index 4995cbc8a..a34b02d65 100644 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/TwoFactorAuthService.kt +++ b/core/network/src/main/kotlin/org/mifospay/core/network/services/TwoFactorAuthService.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.mifospay.network.services +package org.mifospay.core.network.services -import com.mifos.mobilewallet.model.domain.twofactor.AccessToken -import com.mifos.mobilewallet.model.domain.twofactor.DeliveryMethod -import org.mifos.mobilewallet.mifospay.network.ApiEndPoints +import com.mifospay.core.model.domain.twofactor.AccessToken +import com.mifospay.core.model.domain.twofactor.DeliveryMethod +import org.mifospay.core.network.ApiEndPoints import retrofit2.http.GET import retrofit2.http.POST import retrofit2.http.Query diff --git a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/UserService.kt b/core/network/src/main/kotlin/org/mifospay/core/network/services/UserService.kt similarity index 73% rename from core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/UserService.kt rename to core/network/src/main/kotlin/org/mifospay/core/network/services/UserService.kt index 6b111615c..a2a866c7a 100644 --- a/core/network/src/main/kotlin/org/mifos/mobilewallet/mifospay/network/services/UserService.kt +++ b/core/network/src/main/kotlin/org/mifospay/core/network/services/UserService.kt @@ -1,9 +1,9 @@ -package org.mifos.mobilewallet.mifospay.network.services +package org.mifospay.core.network.services -import com.mifos.mobilewallet.model.entity.UserWithRole -import com.mifos.mobilewallet.model.domain.user.NewUser -import org.mifos.mobilewallet.mifospay.network.ApiEndPoints -import org.mifos.mobilewallet.mifospay.network.GenericResponse +import com.mifospay.core.model.domain.user.NewUser +import com.mifospay.core.model.entity.UserWithRole +import org.mifospay.core.network.ApiEndPoints +import org.mifospay.core.network.GenericResponse import retrofit2.http.Body import retrofit2.http.DELETE import retrofit2.http.GET diff --git a/core/network/src/test/java/org/mifos/mobilewallet/mifospay/network/ExampleUnitTest.kt b/core/network/src/test/java/org/mifos/mobilewallet/mifospay/network/ExampleUnitTest.kt deleted file mode 100644 index 6e3709dfa..000000000 --- a/core/network/src/test/java/org/mifos/mobilewallet/mifospay/network/ExampleUnitTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package org.mifos.mobilewallet.mifospay.network - -import org.junit.Test - -import org.junit.Assert.* - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} \ No newline at end of file diff --git a/core/analytics/src/test/java/org/mifos/mobilewallet/mifospay/analytics/ExampleUnitTest.kt b/core/network/src/test/java/org/mifospay/mobilewallet/mifospay/network/ExampleUnitTest.kt similarity index 86% rename from core/analytics/src/test/java/org/mifos/mobilewallet/mifospay/analytics/ExampleUnitTest.kt rename to core/network/src/test/java/org/mifospay/mobilewallet/mifospay/network/ExampleUnitTest.kt index af89a743b..f31f36e6d 100644 --- a/core/analytics/src/test/java/org/mifos/mobilewallet/mifospay/analytics/ExampleUnitTest.kt +++ b/core/network/src/test/java/org/mifospay/mobilewallet/mifospay/network/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.analytics +package org.mifospay.mobilewallet.mifospay.network import org.junit.Test diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts index 4c906d5c0..0aa6f5933 100644 --- a/core/ui/build.gradle.kts +++ b/core/ui/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } android { - namespace = "org.mifos.mobilewallet.mifospay.ui" + namespace = "org.mifospay.core.ui" defaultConfig { consumerProguardFiles("consumer-rules.pro") } diff --git a/core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/DevicePreviews.kt b/core/ui/src/main/kotlin/org/mifospay/core/ui/DevicePreviews.kt similarity index 93% rename from core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/DevicePreviews.kt rename to core/ui/src/main/kotlin/org/mifospay/core/ui/DevicePreviews.kt index 31ddd1d07..4df509814 100644 --- a/core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/DevicePreviews.kt +++ b/core/ui/src/main/kotlin/org/mifospay/core/ui/DevicePreviews.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.ui +package org.mifospay.core.ui import androidx.compose.ui.tooling.preview.Preview diff --git a/core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/EmptyContentScreen.kt b/core/ui/src/main/kotlin/org/mifospay/core/ui/EmptyContentScreen.kt similarity index 96% rename from core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/EmptyContentScreen.kt rename to core/ui/src/main/kotlin/org/mifospay/core/ui/EmptyContentScreen.kt index 3704536d0..19bcbf83e 100644 --- a/core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/EmptyContentScreen.kt +++ b/core/ui/src/main/kotlin/org/mifospay/core/ui/EmptyContentScreen.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.ui +package org.mifospay.core.ui import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement @@ -26,8 +26,8 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.mifos.mobilewallet.mifospay.designsystem.theme.LocalTintTheme -import org.mifos.mobilewallet.mifospay.designsystem.theme.MifosTheme +import org.mifospay.core.designsystem.theme.LocalTintTheme +import org.mifospay.core.designsystem.theme.MifosTheme @Composable fun EmptyContentScreen( diff --git a/core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/ErrorScreenContent.kt b/core/ui/src/main/kotlin/org/mifospay/core/ui/ErrorScreenContent.kt similarity index 94% rename from core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/ErrorScreenContent.kt rename to core/ui/src/main/kotlin/org/mifospay/core/ui/ErrorScreenContent.kt index 0df52bc64..0f6c20862 100644 --- a/core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/ErrorScreenContent.kt +++ b/core/ui/src/main/kotlin/org/mifospay/core/ui/ErrorScreenContent.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.ui +package org.mifospay.core.ui import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -19,8 +19,8 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosButton -import org.mifos.mobilewallet.mifospay.designsystem.theme.MifosTheme +import org.mifospay.core.designsystem.component.MifosButton +import org.mifospay.core.designsystem.theme.MifosTheme @Composable fun ErrorScreenContent( diff --git a/core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/FaqItemScreen.kt b/core/ui/src/main/kotlin/org/mifospay/core/ui/FaqItemScreen.kt similarity index 98% rename from core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/FaqItemScreen.kt rename to core/ui/src/main/kotlin/org/mifospay/core/ui/FaqItemScreen.kt index 2e1940b09..06cafbe84 100644 --- a/core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/FaqItemScreen.kt +++ b/core/ui/src/main/kotlin/org/mifospay/core/ui/FaqItemScreen.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.ui +package org.mifospay.core.ui import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.core.Spring diff --git a/core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/JankStatsExtensions.kt b/core/ui/src/main/kotlin/org/mifospay/core/ui/JankStatsExtensions.kt similarity index 98% rename from core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/JankStatsExtensions.kt rename to core/ui/src/main/kotlin/org/mifospay/core/ui/JankStatsExtensions.kt index 5877889f8..c39cb16fb 100644 --- a/core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/JankStatsExtensions.kt +++ b/core/ui/src/main/kotlin/org/mifospay/core/ui/JankStatsExtensions.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.ui +package org.mifospay.core.ui import androidx.compose.foundation.gestures.ScrollableState import androidx.compose.runtime.Composable diff --git a/core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/LocalTimeZone.kt b/core/ui/src/main/kotlin/org/mifospay/core/ui/LocalTimeZone.kt similarity index 88% rename from core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/LocalTimeZone.kt rename to core/ui/src/main/kotlin/org/mifospay/core/ui/LocalTimeZone.kt index 6cd686e6c..c09ea1b86 100644 --- a/core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/LocalTimeZone.kt +++ b/core/ui/src/main/kotlin/org/mifospay/core/ui/LocalTimeZone.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.ui +package org.mifospay.core.ui import androidx.compose.runtime.compositionLocalOf import kotlinx.datetime.TimeZone diff --git a/core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/MifosUserImage.kt b/core/ui/src/main/kotlin/org/mifospay/core/ui/MifosUserImage.kt similarity index 89% rename from core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/MifosUserImage.kt rename to core/ui/src/main/kotlin/org/mifospay/core/ui/MifosUserImage.kt index 13d7c4ec2..7e3da32fc 100644 --- a/core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/MifosUserImage.kt +++ b/core/ui/src/main/kotlin/org/mifospay/core/ui/MifosUserImage.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.ui +package org.mifospay.core.ui import android.graphics.Bitmap import androidx.compose.foundation.Image @@ -10,7 +10,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.asImageBitmap import androidx.compose.ui.layout.ContentScale -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosTextUserImage +import org.mifospay.core.designsystem.component.MifosTextUserImage /** * @author pratyush diff --git a/core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/ProfileConcentricImage.kt b/core/ui/src/main/kotlin/org/mifospay/core/ui/ProfileConcentricImage.kt similarity index 96% rename from core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/ProfileConcentricImage.kt rename to core/ui/src/main/kotlin/org/mifospay/core/ui/ProfileConcentricImage.kt index 0ae305db9..58b79edb9 100644 --- a/core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/ProfileConcentricImage.kt +++ b/core/ui/src/main/kotlin/org/mifospay/core/ui/ProfileConcentricImage.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.ui +package org.mifospay.core.ui import android.graphics.Bitmap import androidx.compose.foundation.border diff --git a/core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/ScrollableTabRow.kt b/core/ui/src/main/kotlin/org/mifospay/core/ui/ScrollableTabRow.kt similarity index 94% rename from core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/ScrollableTabRow.kt rename to core/ui/src/main/kotlin/org/mifospay/core/ui/ScrollableTabRow.kt index 93ce5013f..e71a72e59 100644 --- a/core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/ScrollableTabRow.kt +++ b/core/ui/src/main/kotlin/org/mifospay/core/ui/ScrollableTabRow.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.ui +package org.mifospay.core.ui import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.pager.HorizontalPager @@ -13,7 +13,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import kotlinx.coroutines.launch -import org.mifos.mobilewallet.mifospay.ui.utility.TabContent +import org.mifospay.core.ui.utility.TabContent /** * @author pratyush diff --git a/core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/TransactionItemScreen.kt b/core/ui/src/main/kotlin/org/mifospay/core/ui/TransactionItemScreen.kt similarity index 85% rename from core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/TransactionItemScreen.kt rename to core/ui/src/main/kotlin/org/mifospay/core/ui/TransactionItemScreen.kt index e7507740b..be0c466c2 100644 --- a/core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/TransactionItemScreen.kt +++ b/core/ui/src/main/kotlin/org/mifospay/core/ui/TransactionItemScreen.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.ui +package org.mifospay.core.ui import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement @@ -19,16 +19,16 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.mifos.mobilewallet.model.domain.Transaction -import com.mifos.mobilewallet.model.domain.TransactionType -import org.mifos.mobilewallet.mifospay.common.Utils.getFormattedAccountBalance -import org.mifos.mobilewallet.mifospay.designsystem.theme.green -import org.mifos.mobilewallet.mifospay.designsystem.theme.red +import com.mifospay.core.model.domain.Transaction +import com.mifospay.core.model.domain.TransactionType +import org.mifospay.common.Utils.getFormattedAccountBalance +import org.mifospay.core.designsystem.theme.green +import org.mifospay.core.designsystem.theme.red @Composable fun TransactionItemScreen( modifier: Modifier = Modifier, - transaction: Transaction + transaction: com.mifospay.core.model.domain.Transaction ) { Row( modifier = modifier @@ -42,8 +42,8 @@ fun TransactionItemScreen( .padding(top = 2.dp), painter = painterResource( id = when (transaction.transactionType) { - TransactionType.DEBIT -> R.drawable.money_out - TransactionType.CREDIT -> R.drawable.money_in + com.mifospay.core.model.domain.TransactionType.DEBIT -> R.drawable.money_out + com.mifospay.core.model.domain.TransactionType.CREDIT -> R.drawable.money_in else -> R.drawable.money_in } ), diff --git a/core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/utility/AddBtnChip.kt b/core/ui/src/main/kotlin/org/mifospay/core/ui/utility/AddBtnChip.kt similarity index 96% rename from core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/utility/AddBtnChip.kt rename to core/ui/src/main/kotlin/org/mifospay/core/ui/utility/AddBtnChip.kt index 3eaedc1b2..61f1564d9 100644 --- a/core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/utility/AddBtnChip.kt +++ b/core/ui/src/main/kotlin/org/mifospay/core/ui/utility/AddBtnChip.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.ui.utility +package org.mifospay.core.ui.utility import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size diff --git a/core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/utility/DialogState.kt b/core/ui/src/main/kotlin/org/mifospay/core/ui/utility/DialogState.kt similarity index 67% rename from core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/utility/DialogState.kt rename to core/ui/src/main/kotlin/org/mifospay/core/ui/utility/DialogState.kt index f392afdf4..b76535209 100644 --- a/core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/utility/DialogState.kt +++ b/core/ui/src/main/kotlin/org/mifospay/core/ui/utility/DialogState.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.ui.utility +package org.mifospay.core.ui.utility data class DialogState( val type: DialogType = DialogType.NONE, diff --git a/core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/utility/DialogType.kt b/core/ui/src/main/kotlin/org/mifospay/core/ui/utility/DialogType.kt similarity index 57% rename from core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/utility/DialogType.kt rename to core/ui/src/main/kotlin/org/mifospay/core/ui/utility/DialogType.kt index 9c93764fd..6e3b3a03c 100644 --- a/core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/utility/DialogType.kt +++ b/core/ui/src/main/kotlin/org/mifospay/core/ui/utility/DialogType.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.ui.utility +package org.mifospay.core.ui.utility enum class DialogType { NONE, diff --git a/core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/utility/TabContent.kt b/core/ui/src/main/kotlin/org/mifospay/core/ui/utility/TabContent.kt similarity index 72% rename from core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/utility/TabContent.kt rename to core/ui/src/main/kotlin/org/mifospay/core/ui/utility/TabContent.kt index 42bc70860..673542749 100644 --- a/core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/utility/TabContent.kt +++ b/core/ui/src/main/kotlin/org/mifospay/core/ui/utility/TabContent.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.ui.utility +package org.mifospay.core.ui.utility import androidx.compose.runtime.Composable diff --git a/feature/auth/src/test/java/org/mifos/mobilewallet/mifospay/auth/ExampleUnitTest.kt b/core/ui/src/test/java/org/mifospay/mobilewallet/mifospay/ui/ExampleUnitTest.kt similarity index 87% rename from feature/auth/src/test/java/org/mifos/mobilewallet/mifospay/auth/ExampleUnitTest.kt rename to core/ui/src/test/java/org/mifospay/mobilewallet/mifospay/ui/ExampleUnitTest.kt index 367125261..14443a05e 100644 --- a/feature/auth/src/test/java/org/mifos/mobilewallet/mifospay/auth/ExampleUnitTest.kt +++ b/core/ui/src/test/java/org/mifospay/mobilewallet/mifospay/ui/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.auth +package org.mifospay.mobilewallet.mifospay.ui import org.junit.Test diff --git a/feature/auth/build.gradle.kts b/feature/auth/build.gradle.kts index bf774d057..c5341dd36 100644 --- a/feature/auth/build.gradle.kts +++ b/feature/auth/build.gradle.kts @@ -4,7 +4,10 @@ plugins { } android { - namespace = "org.mifos.mobilewallet.mifospay.feature.auth" + namespace = "org.mifospay.feature.auth" + buildFeatures { + buildConfig = true + } } apply(from = "${project.rootDir}/config/quality/quality.gradle") diff --git a/feature/auth/src/androidTest/java/org/mifos/mobilewallet/mifospay/feature/auth/ExampleInstrumentedTest.kt b/feature/auth/src/androidTest/java/org/mifospay/mobilewallet/mifospay/feature/auth/ExampleInstrumentedTest.kt similarity index 92% rename from feature/auth/src/androidTest/java/org/mifos/mobilewallet/mifospay/feature/auth/ExampleInstrumentedTest.kt rename to feature/auth/src/androidTest/java/org/mifospay/mobilewallet/mifospay/feature/auth/ExampleInstrumentedTest.kt index 5d183c587..261ab0141 100644 --- a/feature/auth/src/androidTest/java/org/mifos/mobilewallet/mifospay/feature/auth/ExampleInstrumentedTest.kt +++ b/feature/auth/src/androidTest/java/org/mifospay/mobilewallet/mifospay/feature/auth/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.feature.auth +package org.mifospay.mobilewallet.mifospay.feature.auth import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 diff --git a/feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/login/LoginActivity.kt b/feature/auth/src/main/kotlin/org/mifospay/feature/auth/login/LoginActivity.kt similarity index 77% rename from feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/login/LoginActivity.kt rename to feature/auth/src/main/kotlin/org/mifospay/feature/auth/login/LoginActivity.kt index 490553038..1275e707b 100644 --- a/feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/login/LoginActivity.kt +++ b/feature/auth/src/main/kotlin/org/mifospay/feature/auth/login/LoginActivity.kt @@ -1,10 +1,10 @@ -package org.mifos.mobilewallet.mifospay.feature.auth.login +package org.mifospay.feature.auth.login import android.os.Bundle import androidx.activity.compose.setContent import androidx.appcompat.app.AppCompatActivity import dagger.hilt.android.AndroidEntryPoint -import org.mifos.mobilewallet.mifospay.designsystem.theme.MifosTheme +import org.mifospay.core.designsystem.theme.MifosTheme @AndroidEntryPoint class LoginActivity : AppCompatActivity() { diff --git a/feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/login/LoginScreen.kt b/feature/auth/src/main/kotlin/org/mifospay/feature/auth/login/LoginScreen.kt similarity index 90% rename from feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/login/LoginScreen.kt rename to feature/auth/src/main/kotlin/org/mifospay/feature/auth/login/LoginScreen.kt index 0576e11dd..e05b562df 100644 --- a/feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/login/LoginScreen.kt +++ b/feature/auth/src/main/kotlin/org/mifospay/feature/auth/login/LoginScreen.kt @@ -1,7 +1,6 @@ -package org.mifos.mobilewallet.mifospay.feature.auth.login +package org.mifospay.feature.auth.login import android.content.Context -import android.content.Intent import android.widget.Toast import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -44,16 +43,16 @@ import androidx.core.os.bundleOf import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.mifos.mobile.passcode.utils.PassCodeConstants -import org.mifos.mobilewallet.mifospay.designsystem.component.MfOverlayLoadingWheel -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosOutlinedTextField -import org.mifos.mobilewallet.mifospay.designsystem.theme.MifosTheme -import org.mifos.mobilewallet.mifospay.designsystem.theme.grey -import org.mifos.mobilewallet.mifospay.designsystem.theme.styleMedium16sp -import org.mifos.mobilewallet.mifospay.designsystem.theme.styleMedium30sp -import org.mifos.mobilewallet.mifospay.designsystem.theme.styleNormal18sp -import org.mifos.mobilewallet.mifospay.feature.auth.R -import org.mifos.mobilewallet.mifospay.feature.auth.social_signup.SocialSignupMethodContentScreen -import org.mifos.mobilewallet.mifospay.feature.passcode.PassCodeActivity +import org.mifospay.core.designsystem.component.MfOverlayLoadingWheel +import org.mifospay.core.designsystem.component.MifosOutlinedTextField +import org.mifospay.core.designsystem.theme.MifosTheme +import org.mifospay.core.designsystem.theme.grey +import org.mifospay.core.designsystem.theme.styleMedium16sp +import org.mifospay.core.designsystem.theme.styleMedium30sp +import org.mifospay.core.designsystem.theme.styleNormal18sp +import org.mifospay.feature.auth.R +import org.mifospay.feature.auth.social_signup.SocialSignupMethodContentScreen +import org.mifospay.feature.passcode.PassCodeActivity @Composable fun LoginScreen( diff --git a/feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/login/LoginViewModel.kt b/feature/auth/src/main/kotlin/org/mifospay/feature/auth/login/LoginViewModel.kt similarity index 87% rename from feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/login/LoginViewModel.kt rename to feature/auth/src/main/kotlin/org/mifospay/feature/auth/login/LoginViewModel.kt index 12cad8e99..81ad7ced8 100644 --- a/feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/login/LoginViewModel.kt +++ b/feature/auth/src/main/kotlin/org/mifospay/feature/auth/login/LoginViewModel.kt @@ -1,25 +1,22 @@ -package org.mifos.mobilewallet.mifospay.feature.auth.login +package org.mifospay.feature.auth.login import android.util.Log import androidx.lifecycle.ViewModel import com.mifos.mobile.passcode.utils.PasscodePreferencesHelper -import com.mifos.mobilewallet.model.domain.user.User -import com.mifos.mobilewallet.model.entity.UserWithRole +import com.mifospay.core.model.domain.user.User +import com.mifospay.core.model.entity.UserWithRole import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.update -import org.mifos.mobilewallet.core.base.UseCase.UseCaseCallback -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.client.FetchClientData -import org.mifos.mobilewallet.core.domain.usecase.user.AuthenticateUser -import org.mifos.mobilewallet.core.domain.usecase.user.FetchUserDetails -import org.mifos.mobilewallet.mifospay.core.datastore.PreferencesHelper +import org.mifospay.core.data.base.UseCase.UseCaseCallback +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.client.FetchClientData +import org.mifospay.core.data.domain.usecase.user.AuthenticateUser +import org.mifospay.core.data.domain.usecase.user.FetchUserDetails +import org.mifospay.core.datastore.PreferencesHelper import javax.inject.Inject -/** - * Created by naman on 16/6/17. - */ @HiltViewModel class LoginViewModel @Inject constructor( private val mUsecaseHandler: UseCaseHandler, @@ -144,7 +141,7 @@ class LoginViewModel @Inject constructor( /** * TODO remove name, clientId and mobileNo from pref and use from saved Client */ - private fun saveClientDetails(client: com.mifos.mobilewallet.model.domain.client.Client?) { + private fun saveClientDetails(client: com.mifospay.core.model.domain.client.Client?) { preferencesHelper.saveFullName(client?.name) preferencesHelper.clientId = client?.clientId!! preferencesHelper.saveMobile(client.mobileNo) diff --git a/feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/mobile_verify/MobileVerificationActivity.kt b/feature/auth/src/main/kotlin/org/mifospay/feature/auth/mobile_verify/MobileVerificationActivity.kt similarity index 87% rename from feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/mobile_verify/MobileVerificationActivity.kt rename to feature/auth/src/main/kotlin/org/mifospay/feature/auth/mobile_verify/MobileVerificationActivity.kt index be13e8cb2..2fbc56cad 100644 --- a/feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/mobile_verify/MobileVerificationActivity.kt +++ b/feature/auth/src/main/kotlin/org/mifospay/feature/auth/mobile_verify/MobileVerificationActivity.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.feature.auth.mobile_verify +package org.mifospay.feature.auth.mobile_verify import android.content.Intent import android.os.Bundle @@ -6,9 +6,9 @@ import androidx.activity.compose.setContent import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity import dagger.hilt.android.AndroidEntryPoint -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.designsystem.theme.MifosTheme -import org.mifos.mobilewallet.mifospay.feature.auth.signup.SignupActivity +import org.mifospay.common.Constants +import org.mifospay.core.designsystem.theme.MifosTheme +import org.mifospay.feature.auth.signup.SignupActivity @AndroidEntryPoint class MobileVerificationActivity : AppCompatActivity() { diff --git a/feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/mobile_verify/MobileVerificationScreen.kt b/feature/auth/src/main/kotlin/org/mifospay/feature/auth/mobile_verify/MobileVerificationScreen.kt similarity index 95% rename from feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/mobile_verify/MobileVerificationScreen.kt rename to feature/auth/src/main/kotlin/org/mifospay/feature/auth/mobile_verify/MobileVerificationScreen.kt index 8ff839685..7f9da809d 100644 --- a/feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/mobile_verify/MobileVerificationScreen.kt +++ b/feature/auth/src/main/kotlin/org/mifospay/feature/auth/mobile_verify/MobileVerificationScreen.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.feature.auth.mobile_verify +package org.mifospay.feature.auth.mobile_verify import android.widget.Toast import androidx.compose.foundation.background @@ -35,12 +35,12 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.togitech.ccp.component.TogiCountryCodePicker -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosLoadingWheel -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosOutlinedTextField -import org.mifos.mobilewallet.mifospay.designsystem.theme.MifosTheme -import org.mifos.mobilewallet.mifospay.designsystem.theme.styleMedium16sp -import org.mifos.mobilewallet.mifospay.feature.auth.R +import org.mifospay.common.Constants +import org.mifospay.core.designsystem.component.MifosLoadingWheel +import org.mifospay.core.designsystem.component.MifosOutlinedTextField +import org.mifospay.core.designsystem.theme.MifosTheme +import org.mifospay.core.designsystem.theme.styleMedium16sp +import org.mifospay.feature.auth.R @Composable diff --git a/feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/mobile_verify/MobileVerificationViewModel.kt b/feature/auth/src/main/kotlin/org/mifospay/feature/auth/mobile_verify/MobileVerificationViewModel.kt similarity index 90% rename from feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/mobile_verify/MobileVerificationViewModel.kt rename to feature/auth/src/main/kotlin/org/mifospay/feature/auth/mobile_verify/MobileVerificationViewModel.kt index 9b2ab0dc6..1191e5e41 100644 --- a/feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/mobile_verify/MobileVerificationViewModel.kt +++ b/feature/auth/src/main/kotlin/org/mifospay/feature/auth/mobile_verify/MobileVerificationViewModel.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.feature.auth.mobile_verify +package org.mifospay.feature.auth.mobile_verify import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -11,9 +11,9 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.client.SearchClient +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.client.SearchClient import javax.inject.Inject @HiltViewModel diff --git a/feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/signup/SignupActivity.kt b/feature/auth/src/main/kotlin/org/mifospay/feature/auth/signup/SignupActivity.kt similarity index 86% rename from feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/signup/SignupActivity.kt rename to feature/auth/src/main/kotlin/org/mifospay/feature/auth/signup/SignupActivity.kt index 91d6ce56f..a4c387fc0 100644 --- a/feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/signup/SignupActivity.kt +++ b/feature/auth/src/main/kotlin/org/mifospay/feature/auth/signup/SignupActivity.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.feature.auth.signup +package org.mifospay.feature.auth.signup import android.content.Intent import android.os.Bundle @@ -9,10 +9,10 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.os.bundleOf import com.mifos.mobile.passcode.utils.PassCodeConstants import dagger.hilt.android.AndroidEntryPoint -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.designsystem.theme.MifosTheme -import org.mifos.mobilewallet.mifospay.feature.auth.login.LoginActivity -import org.mifos.mobilewallet.mifospay.feature.passcode.PassCodeActivity +import org.mifospay.common.Constants +import org.mifospay.feature.auth.login.LoginActivity +import org.mifospay.feature.passcode.PassCodeActivity +import org.mifospay.core.designsystem.theme.MifosTheme @AndroidEntryPoint class SignupActivity : AppCompatActivity() { diff --git a/feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/signup/SignupScreen.kt b/feature/auth/src/main/kotlin/org/mifospay/feature/auth/signup/SignupScreen.kt similarity index 95% rename from feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/signup/SignupScreen.kt rename to feature/auth/src/main/kotlin/org/mifospay/feature/auth/signup/SignupScreen.kt index 968417fed..6fd58e951 100644 --- a/feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/signup/SignupScreen.kt +++ b/feature/auth/src/main/kotlin/org/mifospay/feature/auth/signup/SignupScreen.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.feature.auth.signup +package org.mifospay.feature.auth.signup import android.widget.Toast import androidx.compose.foundation.background @@ -37,16 +37,16 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.mifos.mobilewallet.model.State -import com.mifos.mobilewallet.model.signup.PasswordStrength -import com.mifos.mobilewallet.model.signup.SignupData -import org.mifos.mobilewallet.core.util.Constants.MIFOS_MERCHANT_SAVINGS_PRODUCT_ID -import org.mifos.mobilewallet.mifospay.designsystem.component.MfOutlinedTextField -import org.mifos.mobilewallet.mifospay.designsystem.component.MfOverlayLoadingWheel -import org.mifos.mobilewallet.mifospay.designsystem.component.MfPasswordTextField -import org.mifos.mobilewallet.mifospay.designsystem.theme.styleMedium16sp -import org.mifos.mobilewallet.mifospay.feature.auth.R -import org.mifos.mobilewallet.mifospay.feature.auth.utils.ValidateUtil.isValidEmail +import com.mifospay.core.model.State +import com.mifospay.core.model.signup.PasswordStrength +import com.mifospay.core.model.signup.SignupData +import org.mifospay.core.data.util.Constants.MIFOS_MERCHANT_SAVINGS_PRODUCT_ID +import org.mifospay.core.designsystem.component.MfOutlinedTextField +import org.mifospay.core.designsystem.component.MfOverlayLoadingWheel +import org.mifospay.core.designsystem.component.MfPasswordTextField +import org.mifospay.core.designsystem.theme.styleMedium16sp +import org.mifospay.feature.auth.R +import org.mifospay.feature.auth.utils.ValidateUtil.isValidEmail import java.util.Locale diff --git a/feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/signup/SignupViewModel.kt b/feature/auth/src/main/kotlin/org/mifospay/feature/auth/signup/SignupViewModel.kt similarity index 86% rename from feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/signup/SignupViewModel.kt rename to feature/auth/src/main/kotlin/org/mifospay/feature/auth/signup/SignupViewModel.kt index 8f70410fc..fa4ff7433 100644 --- a/feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/signup/SignupViewModel.kt +++ b/feature/auth/src/main/kotlin/org/mifospay/feature/auth/signup/SignupViewModel.kt @@ -1,36 +1,36 @@ -package org.mifos.mobilewallet.mifospay.feature.auth.signup +package org.mifospay.feature.auth.signup import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.mifos.mobilewallet.model.State -import com.mifos.mobilewallet.model.domain.user.NewUser -import com.mifos.mobilewallet.model.domain.user.UpdateUserEntityClients -import com.mifos.mobilewallet.model.domain.user.User -import com.mifos.mobilewallet.model.entity.UserWithRole -import com.mifos.mobilewallet.model.signup.SignupData +import com.mifospay.core.model.State +import com.mifospay.core.model.domain.user.NewUser +import com.mifospay.core.model.domain.user.UpdateUserEntityClients +import com.mifospay.core.model.domain.user.User +import com.mifospay.core.model.entity.UserWithRole +import com.mifospay.core.model.signup.SignupData import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.stateIn -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.client.CreateClient -import org.mifos.mobilewallet.core.domain.usecase.client.FetchClientData -import org.mifos.mobilewallet.core.domain.usecase.client.SearchClient -import org.mifos.mobilewallet.core.domain.usecase.user.AuthenticateUser -import org.mifos.mobilewallet.core.domain.usecase.user.CreateUser -import org.mifos.mobilewallet.core.domain.usecase.user.DeleteUser -import org.mifos.mobilewallet.core.domain.usecase.user.FetchUserDetails -import org.mifos.mobilewallet.core.domain.usecase.user.UpdateUser -import org.mifos.mobilewallet.core.repository.local.LocalAssetRepository -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.common.DebugUtil -import org.mifos.mobilewallet.mifospay.core.datastore.PreferencesHelper +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.client.CreateClient +import org.mifospay.core.data.domain.usecase.client.FetchClientData +import org.mifospay.core.data.domain.usecase.client.SearchClient +import org.mifospay.core.data.domain.usecase.user.AuthenticateUser +import org.mifospay.core.data.domain.usecase.user.CreateUser +import org.mifospay.core.data.domain.usecase.user.DeleteUser +import org.mifospay.core.data.domain.usecase.user.FetchUserDetails +import org.mifospay.core.data.domain.usecase.user.UpdateUser +import org.mifospay.core.data.repository.local.LocalAssetRepository +import org.mifospay.common.Constants +import org.mifospay.common.DebugUtil +import org.mifospay.core.datastore.PreferencesHelper import javax.inject.Inject @@ -133,7 +133,7 @@ class SignupViewModel @Inject constructor( } private fun createClient(userId: Int, showToastMessage: (String) -> Unit) { - val newClient = com.mifos.mobilewallet.model.domain.client.NewClient( + val newClient = com.mifospay.core.model.domain.client.NewClient( signupData.businessName, signupData.userName, signupData.addressLine1, signupData.addressLine2, signupData.city, signupData.pinCode, signupData.stateId, signupData.countryId, signupData.mobileNumber, signupData.mifosSavingsProductId @@ -244,7 +244,7 @@ class SignupViewModel @Inject constructor( preferencesHelper.saveEmail(userWithRole.email) } - private fun saveClientDetails(client: com.mifos.mobilewallet.model.domain.client.Client) { + private fun saveClientDetails(client: com.mifospay.core.model.domain.client.Client) { preferencesHelper.saveFullName(client.name) preferencesHelper.clientId = client.clientId preferencesHelper.saveMobile(client.mobileNo) diff --git a/feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/social_signup/SocialSignupMethodScreen.kt b/feature/auth/src/main/kotlin/org/mifospay/feature/auth/social_signup/SocialSignupMethodScreen.kt similarity index 94% rename from feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/social_signup/SocialSignupMethodScreen.kt rename to feature/auth/src/main/kotlin/org/mifospay/feature/auth/social_signup/SocialSignupMethodScreen.kt index b27fb07bb..753d05765 100644 --- a/feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/social_signup/SocialSignupMethodScreen.kt +++ b/feature/auth/src/main/kotlin/org/mifospay/feature/auth/social_signup/SocialSignupMethodScreen.kt @@ -1,6 +1,5 @@ -package org.mifos.mobilewallet.mifospay.feature.auth.social_signup +package org.mifospay.feature.auth.social_signup -import android.app.Activity import android.content.Context import android.content.Intent import android.util.Log @@ -46,19 +45,16 @@ import androidx.credentials.CustomCredential import androidx.credentials.GetCredentialRequest import androidx.credentials.GetCredentialResponse import androidx.credentials.exceptions.GetCredentialException -import com.google.android.gms.auth.api.signin.GoogleSignIn -import com.google.android.gms.auth.api.signin.GoogleSignInAccount -import com.google.android.gms.auth.api.signin.GoogleSignInOptions import com.google.android.libraries.identity.googleid.GetGoogleIdOption import com.google.android.libraries.identity.googleid.GoogleIdTokenCredential import com.google.android.libraries.identity.googleid.GoogleIdTokenParsingException import kotlinx.coroutines.launch -import org.mifos.mobilewallet.core.util.Constants.MIFOS_CONSUMER_SAVINGS_PRODUCT_ID -import org.mifos.mobilewallet.core.util.Constants.MIFOS_MERCHANT_SAVINGS_PRODUCT_ID -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosBottomSheet -import org.mifos.mobilewallet.mifospay.feature.auth.R -import org.mifos.mobilewallet.mifospay.feature.auth.mobile_verify.MobileVerificationActivity +import org.mifospay.common.Constants +import org.mifospay.core.data.util.Constants.MIFOS_CONSUMER_SAVINGS_PRODUCT_ID +import org.mifospay.core.data.util.Constants.MIFOS_MERCHANT_SAVINGS_PRODUCT_ID +import org.mifospay.core.designsystem.component.MifosBottomSheet +import org.mifospay.feature.auth.R +import org.mifospay.feature.auth.mobile_verify.MobileVerificationActivity const val TAG = "Social Login" diff --git a/feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/utils/ValidateUtil.kt b/feature/auth/src/main/kotlin/org/mifospay/feature/auth/utils/ValidateUtil.kt similarity index 72% rename from feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/utils/ValidateUtil.kt rename to feature/auth/src/main/kotlin/org/mifospay/feature/auth/utils/ValidateUtil.kt index 16f428b0a..f0b9748ba 100644 --- a/feature/auth/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/auth/utils/ValidateUtil.kt +++ b/feature/auth/src/main/kotlin/org/mifospay/feature/auth/utils/ValidateUtil.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.feature.auth.utils +package org.mifospay.feature.auth.utils import android.util.Patterns diff --git a/core/common/src/test/java/org/mifos/mobilewallet/mifospay/common/ExampleUnitTest.kt b/feature/auth/src/test/java/org/mifospay/mobilewallet/mifospay/auth/ExampleUnitTest.kt similarity index 86% rename from core/common/src/test/java/org/mifos/mobilewallet/mifospay/common/ExampleUnitTest.kt rename to feature/auth/src/test/java/org/mifospay/mobilewallet/mifospay/auth/ExampleUnitTest.kt index cc7e94d38..ef6307ea8 100644 --- a/core/common/src/test/java/org/mifos/mobilewallet/mifospay/common/ExampleUnitTest.kt +++ b/feature/auth/src/test/java/org/mifospay/mobilewallet/mifospay/auth/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.common +package org.mifospay.mobilewallet.mifospay.auth import org.junit.Test diff --git a/feature/passcode/src/androidTest/java/org/mifos/mobilewallet/mifospay/feature/passcode/ExampleInstrumentedTest.kt b/feature/passcode/src/androidTest/java/org/mifos/mobilewallet/mifospay/feature/passcode/ExampleInstrumentedTest.kt deleted file mode 100644 index a3cdb8f45..000000000 --- a/feature/passcode/src/androidTest/java/org/mifos/mobilewallet/mifospay/feature/passcode/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,27 +0,0 @@ -package org.mifos.mobilewallet.mifospay.feature.passcode - -import androidx.test.platform.app.InstrumentationRegistry -import androidx.test.ext.junit.runners.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals( - "org.mifos.mobilewallet.mifospay.feature.passcode.test", - appContext.packageName - ) - } -} \ No newline at end of file diff --git a/feature/passcode/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/passcode/PassCodeActivity.kt b/feature/passcode/src/main/kotlin/org/mifospay/feature/passcode/PassCodeActivity.kt similarity index 90% rename from feature/passcode/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/passcode/PassCodeActivity.kt rename to feature/passcode/src/main/kotlin/org/mifospay/feature/passcode/PassCodeActivity.kt index 54364a74b..8d6044ce2 100644 --- a/feature/passcode/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/passcode/PassCodeActivity.kt +++ b/feature/passcode/src/main/kotlin/org/mifospay/feature/passcode/PassCodeActivity.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.feature.passcode +package org.mifospay.feature.passcode import android.content.Context import android.content.Intent @@ -14,7 +14,8 @@ import com.mifos.mobile.passcode.utils.EncryptionUtil import com.mifos.mobile.passcode.utils.PassCodeConstants import com.mifos.mobile.passcode.utils.PasscodePreferencesHelper import dagger.hilt.android.AndroidEntryPoint -import org.mifos.mobilewallet.mifospay.common.Constants +import org.mifos.mobilewallet.mifospay.feature.passcode.R +import org.mifospay.common.Constants @AndroidEntryPoint class PassCodeActivity : MifosPassCodeActivity() { @@ -28,9 +29,9 @@ class PassCodeActivity : MifosPassCodeActivity() { companion object { // We gonna remove it after implementing the Compose Passcode screen and compose navigation - const val MAIN_ACTIVITY = "org.mifos.mobilewallet.mifospay.MainActivity" - const val LOGIN_ACTIVITY = "org.mifos.mobilewallet.mifospay.feature.auth.login.LoginActivity" - const val RECEIPT_ACTIVITY = "org.mifos.mobilewallet.mifospay.receipt.ui.ReceiptActivity" + const val MAIN_ACTIVITY = "org.mifospay.MainActivity" + const val LOGIN_ACTIVITY = "org.mifospay.feature.auth.login.LoginActivity" + const val RECEIPT_ACTIVITY = "org.mifospay.receipt.ui.ReceiptActivity" fun startPassCodeActivity(context: Context, bundle: Bundle) { context.startActivity(Intent(context, PassCodeActivity::class.java).apply { diff --git a/feature/passcode/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/passcode/PassCodeViewModel.kt b/feature/passcode/src/main/kotlin/org/mifospay/feature/passcode/PassCodeViewModel.kt similarity index 86% rename from feature/passcode/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/passcode/PassCodeViewModel.kt rename to feature/passcode/src/main/kotlin/org/mifospay/feature/passcode/PassCodeViewModel.kt index 3eb106b1a..b127f7f49 100644 --- a/feature/passcode/src/main/kotlin/org/mifos/mobilewallet/mifospay/feature/passcode/PassCodeViewModel.kt +++ b/feature/passcode/src/main/kotlin/org/mifospay/feature/passcode/PassCodeViewModel.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.feature.passcode +package org.mifospay.feature.passcode import androidx.lifecycle.ViewModel import com.mifos.mobile.passcode.utils.PasscodePreferencesHelper diff --git a/feature/passcode/src/test/java/org/mifos/mobilewallet/mifospay/feature/passcode/ExampleUnitTest.kt b/feature/passcode/src/test/java/org/mifos/mobilewallet/mifospay/feature/passcode/ExampleUnitTest.kt deleted file mode 100644 index 5faf6be2f..000000000 --- a/feature/passcode/src/test/java/org/mifos/mobilewallet/mifospay/feature/passcode/ExampleUnitTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package org.mifos.mobilewallet.mifospay.feature.passcode - -import org.junit.Test - -import org.junit.Assert.* - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} \ No newline at end of file diff --git a/feature/passcode/src/test/java/org/mifospay/mobilewallet/mifospay/feature/passcode/ExampleUnitTest.kt b/feature/passcode/src/test/java/org/mifospay/mobilewallet/mifospay/feature/passcode/ExampleUnitTest.kt new file mode 100644 index 000000000..2214e65f7 --- /dev/null +++ b/feature/passcode/src/test/java/org/mifospay/mobilewallet/mifospay/feature/passcode/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package org.mifospay.mobilewallet.mifospay.feature.passcode + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/mifospay/build.gradle.kts b/mifospay/build.gradle.kts index 9adf5a694..52e58611a 100644 --- a/mifospay/build.gradle.kts +++ b/mifospay/build.gradle.kts @@ -1,9 +1,9 @@ -import org.mifos.mobilewallet.mifospay.MifosBuildType +import org.mifospay.MifosBuildType plugins { alias(libs.plugins.mifospay.android.application) alias(libs.plugins.mifospay.android.application.compose) - // alias(libs.plugins.mifospay.android.application.flavors) + alias(libs.plugins.mifospay.android.application.flavors) alias(libs.plugins.mifospay.android.hilt) alias(libs.plugins.mifospay.android.application.firebase) id("com.google.android.gms.oss-licenses-plugin") @@ -13,9 +13,9 @@ plugins { apply(from = "../config/quality/quality.gradle") android { - namespace = "org.mifos.mobilewallet.mifospay" + namespace = "org.mifospay" defaultConfig { - applicationId = "org.mifos.mobilewallet.mifospay" + applicationId = "org.mifospay" versionCode = 1 versionName = "1.0" vectorDrawables.useSupportLibrary = true @@ -23,7 +23,7 @@ android { } buildTypes { debug { - // applicationIdSuffix = MifosBuildType.DEBUG.applicationIdSuffix + // applicationIdSuffix = MifosBuildType.DEBUG.applicationIdSuffix } release { isMinifyEnabled = true diff --git a/mifospay/google-services.json b/mifospay/google-services.json deleted file mode 100644 index 877c94f79..000000000 --- a/mifospay/google-services.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "project_info": { - "project_number": "650844498895", - "firebase_url": "https://mifos-mobile-wallet.firebaseio.com", - "project_id": "mifos-mobile-wallet", - "storage_bucket": "mifos-mobile-wallet.appspot.com" - }, - "client": [ - { - "client_info": { - "mobilesdk_app_id": "1:650844498895:android:9be7e436ed39fe15", - "android_client_info": { - "package_name": "org.mifos.mobilewallet.mifospay" - } - }, - "oauth_client": [ - { - "client_id": "650844498895-eq3lvn274d8el5auf8q02n184om82eu5.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "org.mifos.mobilewallet.mifospay", - "certificate_hash": "d9707290755498cb2de356116ba81da43c6e56a0" - } - }, - { - "client_id": "650844498895-0pj67mmhg52u1boog7tatmsab1uohl74.apps.googleusercontent.com", - "client_type": 3 - }, - { - "client_id": "650844498895-0pj67mmhg52u1boog7tatmsab1uohl74.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyD-EJsFmZHKNS0ww2iX823-PBNaHR-XHRE" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "appinvite_service": { - "status": 2, - "other_platform_oauth_client": [ - { - "client_id": "650844498895-0pj67mmhg52u1boog7tatmsab1uohl74.apps.googleusercontent.com", - "client_type": 3 - } - ] - }, - "ads_service": { - "status": 2 - } - } - } - ], - "configuration_version": "1" -} \ No newline at end of file diff --git a/mifospay/src/androidTest/java/org/mifos/mobilewallet/mifospay/ExampleInstrumentedTest.kt b/mifospay/src/androidTest/java/org/mifospay/ExampleInstrumentedTest.kt similarity index 82% rename from mifospay/src/androidTest/java/org/mifos/mobilewallet/mifospay/ExampleInstrumentedTest.kt rename to mifospay/src/androidTest/java/org/mifospay/ExampleInstrumentedTest.kt index 34411b8e2..fde9fa532 100644 --- a/mifospay/src/androidTest/java/org/mifos/mobilewallet/mifospay/ExampleInstrumentedTest.kt +++ b/mifospay/src/androidTest/java/org/mifospay/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay +package org.mifospay import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry @@ -18,6 +18,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().context - Assert.assertEquals("org.mifos.mobilewallet.mifospay", appContext.packageName) + Assert.assertEquals("org.mifospay", appContext.packageName) } } diff --git a/mifospay/src/demo/google-services.json b/mifospay/src/demo/google-services.json new file mode 100644 index 000000000..f3fc70ea1 --- /dev/null +++ b/mifospay/src/demo/google-services.json @@ -0,0 +1,39 @@ +{ + "project_info": { + "project_number": "728434912738", + "project_id": "mifos-mobile-apps", + "storage_bucket": "mifos-mobile-apps.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:728434912738:android:48ccd9153349f31e1a1dbb", + "android_client_info": { + "package_name": "org.mifospay.demo" + } + }, + "oauth_client": [ + { + "client_id": "728434912738-4sc51o624viccn8oi14f2mi77tljrdns.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyCUz3P8uUExMFcPHa1Ga3DBKhjK5zxNn70" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "728434912738-4sc51o624viccn8oi14f2mi77tljrdns.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + } + ], + "configuration_version": "1" +} diff --git a/mifospay/src/main/AndroidManifest.xml b/mifospay/src/main/AndroidManifest.xml index db773726c..3cbb42b24 100644 --- a/mifospay/src/main/AndroidManifest.xml +++ b/mifospay/src/main/AndroidManifest.xml @@ -71,7 +71,7 @@ { diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/presenter/AccountViewModel.kt b/mifospay/src/main/java/org/mifospay/bank/presenter/AccountViewModel.kt similarity index 96% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/presenter/AccountViewModel.kt rename to mifospay/src/main/java/org/mifospay/bank/presenter/AccountViewModel.kt index 0c4835211..b11add9d5 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/presenter/AccountViewModel.kt +++ b/mifospay/src/main/java/org/mifospay/bank/presenter/AccountViewModel.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.mifospay.bank.presenter +package org.mifospay.bank.presenter import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.mifos.mobilewallet.model.domain.BankAccountDetails +import com.mifospay.core.model.domain.BankAccountDetails import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableStateFlow diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/presenter/BankAccountDetailPresenter.kt b/mifospay/src/main/java/org/mifospay/bank/presenter/BankAccountDetailPresenter.kt similarity index 62% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/presenter/BankAccountDetailPresenter.kt rename to mifospay/src/main/java/org/mifospay/bank/presenter/BankAccountDetailPresenter.kt index 67588248c..f9390f46e 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/presenter/BankAccountDetailPresenter.kt +++ b/mifospay/src/main/java/org/mifospay/bank/presenter/BankAccountDetailPresenter.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.mifospay.bank.presenter +package org.mifospay.bank.presenter -import org.mifos.mobilewallet.mifospay.bank.BankContract -import org.mifos.mobilewallet.mifospay.bank.BankContract.BankAccountDetailView -import org.mifos.mobilewallet.mifospay.base.BaseView +import org.mifospay.bank.BankContract +import org.mifospay.bank.BankContract.BankAccountDetailView +import org.mifospay.base.BaseView import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/presenter/BankAccountsPresenter.kt b/mifospay/src/main/java/org/mifospay/bank/presenter/BankAccountsPresenter.kt similarity index 84% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/presenter/BankAccountsPresenter.kt rename to mifospay/src/main/java/org/mifospay/bank/presenter/BankAccountsPresenter.kt index 022422643..ecd737ae6 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/presenter/BankAccountsPresenter.kt +++ b/mifospay/src/main/java/org/mifospay/bank/presenter/BankAccountsPresenter.kt @@ -1,11 +1,11 @@ -package org.mifos.mobilewallet.mifospay.bank.presenter +package org.mifospay.bank.presenter -import com.mifos.mobilewallet.model.domain.BankAccountDetails -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.mifospay.bank.BankContract -import org.mifos.mobilewallet.mifospay.bank.BankContract.BankAccountsView -import org.mifos.mobilewallet.mifospay.base.BaseView -import org.mifos.mobilewallet.mifospay.data.local.LocalRepository +import com.mifospay.core.model.domain.BankAccountDetails +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.bank.BankContract +import org.mifospay.bank.BankContract.BankAccountsView +import org.mifospay.base.BaseView +import org.mifospay.data.local.LocalRepository import java.util.Random import javax.inject.Inject diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/presenter/DebitCardPresenter.kt b/mifospay/src/main/java/org/mifospay/bank/presenter/DebitCardPresenter.kt similarity index 69% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/presenter/DebitCardPresenter.kt rename to mifospay/src/main/java/org/mifospay/bank/presenter/DebitCardPresenter.kt index 4408013e5..90a1777dc 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/presenter/DebitCardPresenter.kt +++ b/mifospay/src/main/java/org/mifospay/bank/presenter/DebitCardPresenter.kt @@ -1,10 +1,10 @@ -package org.mifos.mobilewallet.mifospay.bank.presenter +package org.mifospay.bank.presenter -import org.mifos.mobilewallet.mifospay.MifosPayApp -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.bank.BankContract -import org.mifos.mobilewallet.mifospay.bank.BankContract.DebitCardView -import org.mifos.mobilewallet.mifospay.base.BaseView +import org.mifospay.MifosPayApp +import org.mifospay.R +import org.mifospay.bank.BankContract +import org.mifospay.bank.BankContract.DebitCardView +import org.mifospay.base.BaseView import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/presenter/LinkBankAccountPresenter.kt b/mifospay/src/main/java/org/mifospay/bank/presenter/LinkBankAccountPresenter.kt similarity index 72% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/presenter/LinkBankAccountPresenter.kt rename to mifospay/src/main/java/org/mifospay/bank/presenter/LinkBankAccountPresenter.kt index d5a8d8bbc..bdfdf1332 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/presenter/LinkBankAccountPresenter.kt +++ b/mifospay/src/main/java/org/mifospay/bank/presenter/LinkBankAccountPresenter.kt @@ -1,9 +1,9 @@ -package org.mifos.mobilewallet.mifospay.bank.presenter +package org.mifospay.bank.presenter -import com.mifos.mobilewallet.model.domain.BankAccountDetails -import org.mifos.mobilewallet.mifospay.bank.BankContract -import org.mifos.mobilewallet.mifospay.bank.BankContract.LinkBankAccountView -import org.mifos.mobilewallet.mifospay.base.BaseView +import com.mifospay.core.model.domain.BankAccountDetails +import org.mifospay.bank.BankContract +import org.mifospay.bank.BankContract.LinkBankAccountView +import org.mifospay.base.BaseView import java.util.Random import javax.inject.Inject diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/presenter/OtpPresenter.kt b/mifospay/src/main/java/org/mifospay/bank/presenter/OtpPresenter.kt similarity index 53% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/presenter/OtpPresenter.kt rename to mifospay/src/main/java/org/mifospay/bank/presenter/OtpPresenter.kt index bd4efa54b..036fddf4a 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/presenter/OtpPresenter.kt +++ b/mifospay/src/main/java/org/mifospay/bank/presenter/OtpPresenter.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.bank.presenter +package org.mifospay.bank.presenter /** * Created by ankur on 13/July/2018 diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/presenter/SetupUpiPinPresenter.kt b/mifospay/src/main/java/org/mifospay/bank/presenter/SetupUpiPinPresenter.kt similarity index 74% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/presenter/SetupUpiPinPresenter.kt rename to mifospay/src/main/java/org/mifospay/bank/presenter/SetupUpiPinPresenter.kt index 1b0bcb33f..f9f7c9ace 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/presenter/SetupUpiPinPresenter.kt +++ b/mifospay/src/main/java/org/mifospay/bank/presenter/SetupUpiPinPresenter.kt @@ -1,9 +1,9 @@ -package org.mifos.mobilewallet.mifospay.bank.presenter +package org.mifospay.bank.presenter -import com.mifos.mobilewallet.model.domain.BankAccountDetails -import org.mifos.mobilewallet.mifospay.bank.BankContract -import org.mifos.mobilewallet.mifospay.bank.BankContract.SetupUpiPinView -import org.mifos.mobilewallet.mifospay.base.BaseView +import com.mifospay.core.model.domain.BankAccountDetails +import org.mifospay.bank.BankContract +import org.mifospay.bank.BankContract.SetupUpiPinView +import org.mifospay.base.BaseView import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/presenter/UpiPinPresenter.kt b/mifospay/src/main/java/org/mifospay/bank/presenter/UpiPinPresenter.kt similarity index 56% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/presenter/UpiPinPresenter.kt rename to mifospay/src/main/java/org/mifospay/bank/presenter/UpiPinPresenter.kt index 4498b10e7..172129ae5 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/presenter/UpiPinPresenter.kt +++ b/mifospay/src/main/java/org/mifospay/bank/presenter/UpiPinPresenter.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.mifospay.bank.presenter +package org.mifospay.bank.presenter -import org.mifos.mobilewallet.mifospay.bank.BankContract -import org.mifos.mobilewallet.mifospay.bank.BankContract.UpiPinView -import org.mifos.mobilewallet.mifospay.base.BaseView +import org.mifospay.bank.BankContract +import org.mifospay.bank.BankContract.UpiPinView +import org.mifospay.base.BaseView import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/ui/AccountsFragment.kt b/mifospay/src/main/java/org/mifospay/bank/ui/AccountsFragment.kt similarity index 90% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/ui/AccountsFragment.kt rename to mifospay/src/main/java/org/mifospay/bank/ui/AccountsFragment.kt index 5a61b98c9..80d5ab633 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/ui/AccountsFragment.kt +++ b/mifospay/src/main/java/org/mifospay/bank/ui/AccountsFragment.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.bank.ui +package org.mifospay.bank.ui import android.app.Activity import android.content.Intent @@ -15,17 +15,17 @@ import butterknife.BindView import butterknife.ButterKnife import butterknife.OnClick import dagger.hilt.android.AndroidEntryPoint -import com.mifos.mobilewallet.model.domain.BankAccountDetails -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.bank.BankContract -import org.mifos.mobilewallet.mifospay.bank.BankContract.BankAccountsView -import org.mifos.mobilewallet.mifospay.bank.adapters.BankAccountsAdapter -import org.mifos.mobilewallet.mifospay.bank.link_bank.LinkBankAccountActivity -import org.mifos.mobilewallet.mifospay.bank.presenter.BankAccountsPresenter -import org.mifos.mobilewallet.mifospay.base.BaseFragment -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.utils.DebugUtil -import org.mifos.mobilewallet.mifospay.utils.RecyclerItemClickListener +import com.mifospay.core.model.domain.BankAccountDetails +import org.mifospay.R +import org.mifospay.bank.BankContract +import org.mifospay.bank.BankContract.BankAccountsView +import org.mifospay.bank.adapters.BankAccountsAdapter +import org.mifospay.bank.link_bank.LinkBankAccountActivity +import org.mifospay.bank.presenter.BankAccountsPresenter +import org.mifospay.base.BaseFragment +import org.mifospay.common.Constants +import org.mifospay.utils.DebugUtil +import org.mifospay.utils.RecyclerItemClickListener import javax.inject.Inject @AndroidEntryPoint diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/ui/AccountsItem.kt b/mifospay/src/main/java/org/mifospay/bank/ui/AccountsItem.kt similarity index 87% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/ui/AccountsItem.kt rename to mifospay/src/main/java/org/mifospay/bank/ui/AccountsItem.kt index ac60b7149..b25f07acf 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/ui/AccountsItem.kt +++ b/mifospay/src/main/java/org/mifospay/bank/ui/AccountsItem.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.bank.ui +package org.mifospay.bank.ui import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -16,11 +16,11 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.mifos.mobilewallet.model.domain.BankAccountDetails -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosCard -import org.mifos.mobilewallet.mifospay.designsystem.theme.mifosText -import org.mifos.mobilewallet.mifospay.designsystem.theme.styleMedium16sp +import com.mifospay.core.model.domain.BankAccountDetails +import org.mifospay.R +import org.mifospay.core.designsystem.component.MifosCard +import org.mifospay.core.designsystem.theme.mifosText +import org.mifospay.core.designsystem.theme.styleMedium16sp @Composable fun AccountsItem( diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/ui/AccountsScreen.kt b/mifospay/src/main/java/org/mifospay/bank/ui/AccountsScreen.kt similarity index 91% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/ui/AccountsScreen.kt rename to mifospay/src/main/java/org/mifospay/bank/ui/AccountsScreen.kt index e7f0b1ff7..98f499789 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/ui/AccountsScreen.kt +++ b/mifospay/src/main/java/org/mifospay/bank/ui/AccountsScreen.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.bank.ui +package org.mifospay.bank.ui import android.content.Intent import androidx.compose.foundation.background @@ -26,14 +26,14 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.mifos.mobilewallet.model.domain.BankAccountDetails -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.bank.presenter.AccountViewModel -import org.mifos.mobilewallet.mifospay.bank.presenter.AccountsUiState -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.designsystem.component.MfLoadingWheel -import org.mifos.mobilewallet.mifospay.ui.EmptyContentScreen -import org.mifos.mobilewallet.mifospay.ui.utility.AddCardChip +import com.mifospay.core.model.domain.BankAccountDetails +import org.mifospay.R +import org.mifospay.bank.presenter.AccountViewModel +import org.mifospay.bank.presenter.AccountsUiState +import org.mifospay.common.Constants +import org.mifospay.core.designsystem.component.MfLoadingWheel +import org.mifospay.core.ui.EmptyContentScreen +import org.mifospay.core.ui.utility.AddCardChip @Composable fun AccountsScreen( diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/ui/BankAccountDetailActivity.kt b/mifospay/src/main/java/org/mifospay/bank/ui/BankAccountDetailActivity.kt similarity index 87% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/ui/BankAccountDetailActivity.kt rename to mifospay/src/main/java/org/mifospay/bank/ui/BankAccountDetailActivity.kt index d48ae3b30..4592d9d4d 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/ui/BankAccountDetailActivity.kt +++ b/mifospay/src/main/java/org/mifospay/bank/ui/BankAccountDetailActivity.kt @@ -1,14 +1,14 @@ -package org.mifos.mobilewallet.mifospay.bank.ui +package org.mifospay.bank.ui import android.content.Intent import android.os.Bundle import androidx.activity.compose.setContent -import com.mifos.mobilewallet.model.domain.BankAccountDetails +import com.mifospay.core.model.domain.BankAccountDetails import dagger.hilt.android.AndroidEntryPoint -import org.mifos.mobilewallet.mifospay.base.BaseActivity -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.theme.MifosTheme -import org.mifos.mobilewallet.mifospay.utils.Toaster +import org.mifospay.base.BaseActivity +import org.mifospay.common.Constants +import org.mifospay.theme.MifosTheme +import org.mifospay.utils.Toaster @AndroidEntryPoint class BankAccountDetailActivity : BaseActivity() { diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/ui/BankAccountDetailScreen.kt b/mifospay/src/main/java/org/mifospay/bank/ui/BankAccountDetailScreen.kt similarity index 94% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/ui/BankAccountDetailScreen.kt rename to mifospay/src/main/java/org/mifospay/bank/ui/BankAccountDetailScreen.kt index 09d7c0913..d756355a4 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/ui/BankAccountDetailScreen.kt +++ b/mifospay/src/main/java/org/mifospay/bank/ui/BankAccountDetailScreen.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.bank.ui +package org.mifospay.bank.ui import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.border @@ -24,11 +24,11 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.mifos.mobilewallet.model.domain.BankAccountDetails -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosTopBar -import org.mifos.mobilewallet.mifospay.designsystem.theme.mifosText -import org.mifos.mobilewallet.mifospay.designsystem.theme.styleMedium16sp +import com.mifospay.core.model.domain.BankAccountDetails +import org.mifospay.R +import org.mifospay.core.designsystem.component.MifosTopBar +import org.mifospay.core.designsystem.theme.mifosText +import org.mifospay.core.designsystem.theme.styleMedium16sp @Composable fun BankAccountDetailScreen( diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/ui/SetupUpiPinActivity.kt b/mifospay/src/main/java/org/mifospay/bank/ui/SetupUpiPinActivity.kt similarity index 84% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/ui/SetupUpiPinActivity.kt rename to mifospay/src/main/java/org/mifospay/bank/ui/SetupUpiPinActivity.kt index d40108a81..b29b3a5a8 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/ui/SetupUpiPinActivity.kt +++ b/mifospay/src/main/java/org/mifospay/bank/ui/SetupUpiPinActivity.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.bank.ui +package org.mifospay.bank.ui import android.content.Intent import android.os.Bundle @@ -10,18 +10,18 @@ import androidx.cardview.widget.CardView import butterknife.BindView import butterknife.ButterKnife import dagger.hilt.android.AndroidEntryPoint -import com.mifos.mobilewallet.model.domain.BankAccountDetails -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.bank.BankContract -import org.mifos.mobilewallet.mifospay.bank.BankContract.SetupUpiPinView -import org.mifos.mobilewallet.mifospay.bank.fragment.DebitCardFragment -import org.mifos.mobilewallet.mifospay.bank.fragment.OtpFragment -import org.mifos.mobilewallet.mifospay.bank.fragment.UpiPinFragment -import org.mifos.mobilewallet.mifospay.bank.presenter.SetupUpiPinPresenter -import org.mifos.mobilewallet.mifospay.base.BaseActivity -import org.mifos.mobilewallet.mifospay.utils.AnimationUtil -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.utils.Toaster +import com.mifospay.core.model.domain.BankAccountDetails +import org.mifospay.R +import org.mifospay.bank.BankContract +import org.mifospay.bank.BankContract.SetupUpiPinView +import org.mifospay.bank.fragment.DebitCardFragment +import org.mifospay.bank.fragment.OtpFragment +import org.mifospay.bank.fragment.UpiPinFragment +import org.mifospay.bank.presenter.SetupUpiPinPresenter +import org.mifospay.base.BaseActivity +import org.mifospay.utils.AnimationUtil +import org.mifospay.common.Constants +import org.mifospay.utils.Toaster import javax.inject.Inject @AndroidEntryPoint diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/base/BaseActivity.kt b/mifospay/src/main/java/org/mifospay/base/BaseActivity.kt similarity index 96% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/base/BaseActivity.kt rename to mifospay/src/main/java/org/mifospay/base/BaseActivity.kt index 4568dea80..257a066d2 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/base/BaseActivity.kt +++ b/mifospay/src/main/java/org/mifospay/base/BaseActivity.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.base +package org.mifospay.base import android.app.ProgressDialog import android.content.pm.ActivityInfo @@ -8,8 +8,8 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import com.mifos.mobile.passcode.BasePassCodeActivity -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.feature.passcode.PassCodeActivity +import org.mifospay.R +import org.mifospay.feature.passcode.PassCodeActivity /** * Created by naman on 16/6/17. diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/base/BaseActivityCallback.kt b/mifospay/src/main/java/org/mifospay/base/BaseActivityCallback.kt similarity index 92% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/base/BaseActivityCallback.kt rename to mifospay/src/main/java/org/mifospay/base/BaseActivityCallback.kt index 2f6897f29..46d548384 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/base/BaseActivityCallback.kt +++ b/mifospay/src/main/java/org/mifospay/base/BaseActivityCallback.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.base +package org.mifospay.base import androidx.swiperefreshlayout.widget.SwipeRefreshLayout diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/base/BaseFragment.kt b/mifospay/src/main/java/org/mifospay/base/BaseFragment.kt similarity index 98% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/base/BaseFragment.kt rename to mifospay/src/main/java/org/mifospay/base/BaseFragment.kt index b205c8ca4..6b0e7d18d 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/base/BaseFragment.kt +++ b/mifospay/src/main/java/org/mifospay/base/BaseFragment.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.base +package org.mifospay.base import android.app.Activity import android.content.Context diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/base/BasePresenter.kt b/mifospay/src/main/java/org/mifospay/base/BasePresenter.kt similarity index 61% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/base/BasePresenter.kt rename to mifospay/src/main/java/org/mifospay/base/BasePresenter.kt index a5b32146f..5700bca49 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/base/BasePresenter.kt +++ b/mifospay/src/main/java/org/mifospay/base/BasePresenter.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.base +package org.mifospay.base interface BasePresenter { fun attachView(baseView: BaseView<*>?) diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/base/BaseView.kt b/mifospay/src/main/java/org/mifospay/base/BaseView.kt similarity index 63% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/base/BaseView.kt rename to mifospay/src/main/java/org/mifospay/base/BaseView.kt index 5e144c12e..42955454a 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/base/BaseView.kt +++ b/mifospay/src/main/java/org/mifospay/base/BaseView.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.base +package org.mifospay.base interface BaseView { fun setPresenter(presenter: T) diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/SearchContract.kt b/mifospay/src/main/java/org/mifospay/common/SearchContract.kt similarity index 64% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/SearchContract.kt rename to mifospay/src/main/java/org/mifospay/common/SearchContract.kt index 470cc20ad..45a0db446 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/SearchContract.kt +++ b/mifospay/src/main/java/org/mifospay/common/SearchContract.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.mifospay.common +package org.mifospay.common -import com.mifos.mobilewallet.model.domain.SearchResult -import org.mifos.mobilewallet.mifospay.base.BasePresenter -import org.mifos.mobilewallet.mifospay.base.BaseView +import com.mifospay.core.model.domain.SearchResult +import org.mifospay.base.BasePresenter +import org.mifospay.base.BaseView /** * Created by naman on 21/8/17. diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/TransferContract.kt b/mifospay/src/main/java/org/mifospay/common/TransferContract.kt similarity index 77% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/TransferContract.kt rename to mifospay/src/main/java/org/mifospay/common/TransferContract.kt index 114434974..b1cc2a90f 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/TransferContract.kt +++ b/mifospay/src/main/java/org/mifospay/common/TransferContract.kt @@ -1,7 +1,7 @@ -package org.mifos.mobilewallet.mifospay.common +package org.mifospay.common -import org.mifos.mobilewallet.mifospay.base.BasePresenter -import org.mifos.mobilewallet.mifospay.base.BaseView +import org.mifospay.base.BasePresenter +import org.mifospay.base.BaseView /** * Created by naman on 30/8/17. diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/presenter/MakeTransferPresenter.kt b/mifospay/src/main/java/org/mifospay/common/presenter/MakeTransferPresenter.kt similarity index 82% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/presenter/MakeTransferPresenter.kt rename to mifospay/src/main/java/org/mifospay/common/presenter/MakeTransferPresenter.kt index af3764860..53962da58 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/presenter/MakeTransferPresenter.kt +++ b/mifospay/src/main/java/org/mifospay/common/presenter/MakeTransferPresenter.kt @@ -1,11 +1,11 @@ -package org.mifos.mobilewallet.mifospay.common.presenter +package org.mifospay.common.presenter -import org.mifos.mobilewallet.core.base.UseCase.UseCaseCallback -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.account.TransferFunds -import org.mifos.mobilewallet.core.domain.usecase.client.SearchClient -import org.mifos.mobilewallet.mifospay.base.BaseView -import org.mifos.mobilewallet.mifospay.common.TransferContract +import org.mifospay.core.data.base.UseCase.UseCaseCallback +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.account.TransferFunds +import org.mifospay.core.data.domain.usecase.client.SearchClient +import org.mifospay.base.BaseView +import org.mifospay.common.TransferContract import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/presenter/SearchPresenter.kt b/mifospay/src/main/java/org/mifospay/common/presenter/SearchPresenter.kt similarity index 72% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/presenter/SearchPresenter.kt rename to mifospay/src/main/java/org/mifospay/common/presenter/SearchPresenter.kt index d1fbb79b9..693aaa392 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/presenter/SearchPresenter.kt +++ b/mifospay/src/main/java/org/mifospay/common/presenter/SearchPresenter.kt @@ -1,10 +1,10 @@ -package org.mifos.mobilewallet.mifospay.common.presenter +package org.mifospay.common.presenter -import org.mifos.mobilewallet.core.base.UseCase.UseCaseCallback -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.client.SearchClient -import org.mifos.mobilewallet.mifospay.base.BaseView -import org.mifos.mobilewallet.mifospay.common.SearchContract +import org.mifospay.core.data.base.UseCase.UseCaseCallback +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.client.SearchClient +import org.mifospay.base.BaseView +import org.mifospay.common.SearchContract import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/ui/MakeTransferFragment.kt b/mifospay/src/main/java/org/mifospay/common/ui/MakeTransferFragment.kt similarity index 92% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/ui/MakeTransferFragment.kt rename to mifospay/src/main/java/org/mifospay/common/ui/MakeTransferFragment.kt index 5082d7846..ebd8198a9 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/ui/MakeTransferFragment.kt +++ b/mifospay/src/main/java/org/mifospay/common/ui/MakeTransferFragment.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.common.ui +package org.mifospay.common.ui import android.app.Activity import android.app.Dialog @@ -17,13 +17,13 @@ import android.widget.TextView import butterknife.BindView import butterknife.ButterKnife import dagger.hilt.android.AndroidEntryPoint -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.common.TransferContract -import org.mifos.mobilewallet.mifospay.common.presenter.MakeTransferPresenter -import org.mifos.mobilewallet.mifospay.data.local.LocalRepository -import org.mifos.mobilewallet.mifospay.payments.ui.SendFragment -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.utils.Toaster +import org.mifospay.R +import org.mifospay.common.TransferContract +import org.mifospay.common.presenter.MakeTransferPresenter +import org.mifospay.data.local.LocalRepository +import org.mifospay.payments.ui.SendFragment +import org.mifospay.common.Constants +import org.mifospay.utils.Toaster import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/ui/SearchActivity.kt b/mifospay/src/main/java/org/mifospay/common/ui/SearchActivity.kt similarity index 80% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/ui/SearchActivity.kt rename to mifospay/src/main/java/org/mifospay/common/ui/SearchActivity.kt index 0fc5bafcb..255603c01 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/ui/SearchActivity.kt +++ b/mifospay/src/main/java/org/mifospay/common/ui/SearchActivity.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.common.ui +package org.mifospay.common.ui import android.os.Bundle import androidx.recyclerview.widget.DividerItemDecoration @@ -9,15 +9,14 @@ import butterknife.BindView import butterknife.ButterKnife import butterknife.OnTextChanged import dagger.hilt.android.AndroidEntryPoint -import com.mifos.mobilewallet.model.domain.SearchResult -import org.mifos.mobilewallet.mifospay.MifosPayApp -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.base.BaseActivity -import org.mifos.mobilewallet.mifospay.common.SearchContract -import org.mifos.mobilewallet.mifospay.common.presenter.SearchPresenter -import org.mifos.mobilewallet.mifospay.common.ui.adapter.SearchAdapter -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.utils.Toaster +import com.mifospay.core.model.domain.SearchResult +import org.mifospay.MifosPayApp +import org.mifospay.R +import org.mifospay.base.BaseActivity +import org.mifospay.common.SearchContract +import org.mifospay.common.presenter.SearchPresenter +import org.mifospay.common.ui.adapter.SearchAdapter +import org.mifospay.utils.Toaster import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/ui/adapter/SearchAdapter.kt b/mifospay/src/main/java/org/mifospay/common/ui/adapter/SearchAdapter.kt similarity index 91% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/ui/adapter/SearchAdapter.kt rename to mifospay/src/main/java/org/mifospay/common/ui/adapter/SearchAdapter.kt index a955c7731..6983d79fd 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/ui/adapter/SearchAdapter.kt +++ b/mifospay/src/main/java/org/mifospay/common/ui/adapter/SearchAdapter.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.common.ui.adapter +package org.mifospay.common.ui.adapter import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater @@ -7,8 +7,8 @@ import android.view.ViewGroup import android.widget.TextView import butterknife.BindView import butterknife.ButterKnife -import com.mifos.mobilewallet.model.domain.SearchResult -import org.mifos.mobilewallet.mifospay.R +import com.mifospay.core.model.domain.SearchResult +import org.mifospay.R import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/data/firebase/api/services/MifosPayMessagingService.kt b/mifospay/src/main/java/org/mifospay/data/firebase/api/services/MifosPayMessagingService.kt similarity index 97% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/data/firebase/api/services/MifosPayMessagingService.kt rename to mifospay/src/main/java/org/mifospay/data/firebase/api/services/MifosPayMessagingService.kt index 6c7e885c8..9a51ebbdf 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/data/firebase/api/services/MifosPayMessagingService.kt +++ b/mifospay/src/main/java/org/mifospay/data/firebase/api/services/MifosPayMessagingService.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mifos.mobilewallet.mifospay.data.firebase.api.services +package org.mifospay.data.firebase.api.services import android.app.NotificationChannel import android.app.NotificationManager @@ -28,9 +28,9 @@ import com.google.firebase.messaging.FirebaseMessagingService import com.google.firebase.messaging.RemoteMessage import org.json.JSONException import org.json.JSONObject -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.notification.ui.NotificationActivity -import org.mifos.mobilewallet.mifospay.utils.NotificationUtils +import org.mifospay.R +import org.mifospay.notification.ui.NotificationActivity +import org.mifospay.utils.NotificationUtils /** * Created by ankur on 20/June/2018 diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/data/local/LocalRepository.kt b/mifospay/src/main/java/org/mifospay/data/local/LocalRepository.kt similarity index 79% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/data/local/LocalRepository.kt rename to mifospay/src/main/java/org/mifospay/data/local/LocalRepository.kt index 5e757e40c..4c2dba4da 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/data/local/LocalRepository.kt +++ b/mifospay/src/main/java/org/mifospay/data/local/LocalRepository.kt @@ -1,7 +1,7 @@ -package org.mifos.mobilewallet.mifospay.data.local +package org.mifospay.data.local -import org.mifos.mobilewallet.mifospay.core.datastore.PreferencesHelper -import com.mifos.mobilewallet.model.domain.client.Client +import org.mifospay.core.datastore.PreferencesHelper +import com.mifospay.core.model.domain.client.Client import javax.inject.Inject import javax.inject.Singleton diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/di/ApplicationModule.kt b/mifospay/src/main/java/org/mifospay/di/ApplicationModule.kt similarity index 80% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/di/ApplicationModule.kt rename to mifospay/src/main/java/org/mifospay/di/ApplicationModule.kt index 6c045aa6f..61e4d9e05 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/di/ApplicationModule.kt +++ b/mifospay/src/main/java/org/mifospay/di/ApplicationModule.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.di +package org.mifospay.di import android.content.Context import com.mifos.mobile.passcode.utils.PasscodePreferencesHelper @@ -7,8 +7,8 @@ import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent -import org.mifos.mobilewallet.mifospay.data.local.LocalRepository -import org.mifos.mobilewallet.mifospay.core.datastore.PreferencesHelper +import org.mifospay.data.local.LocalRepository +import org.mifospay.core.datastore.PreferencesHelper import javax.inject.Singleton @Module diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/di/JankStatsModule.kt b/mifospay/src/main/java/org/mifospay/di/JankStatsModule.kt similarity index 95% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/di/JankStatsModule.kt rename to mifospay/src/main/java/org/mifospay/di/JankStatsModule.kt index 53f8915e5..9863c93d8 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/di/JankStatsModule.kt +++ b/mifospay/src/main/java/org/mifospay/di/JankStatsModule.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.di +package org.mifospay.di import android.app.Activity import android.util.Log diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/domain/model/Bank.kt b/mifospay/src/main/java/org/mifospay/domain/model/Bank.kt similarity index 73% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/domain/model/Bank.kt rename to mifospay/src/main/java/org/mifospay/domain/model/Bank.kt index 8b0270937..df3067db5 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/domain/model/Bank.kt +++ b/mifospay/src/main/java/org/mifospay/domain/model/Bank.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.domain.model +package org.mifospay.domain.model class Bank( diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/editprofile/EditProfileContract.kt b/mifospay/src/main/java/org/mifospay/editprofile/EditProfileContract.kt similarity index 88% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/editprofile/EditProfileContract.kt rename to mifospay/src/main/java/org/mifospay/editprofile/EditProfileContract.kt index 91c7c799b..f52f94dba 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/editprofile/EditProfileContract.kt +++ b/mifospay/src/main/java/org/mifospay/editprofile/EditProfileContract.kt @@ -1,7 +1,7 @@ -package org.mifos.mobilewallet.mifospay.editprofile +package org.mifospay.editprofile -import org.mifos.mobilewallet.mifospay.base.BasePresenter -import org.mifos.mobilewallet.mifospay.base.BaseView +import org.mifospay.base.BasePresenter +import org.mifospay.base.BaseView /** * Created by ankur on 27/June/2018 diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/editprofile/presenter/EditProfilePresenter.kt b/mifospay/src/main/java/org/mifospay/editprofile/presenter/EditProfilePresenter.kt similarity index 85% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/editprofile/presenter/EditProfilePresenter.kt rename to mifospay/src/main/java/org/mifospay/editprofile/presenter/EditProfilePresenter.kt index ec0d7eddc..5577d2b90 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/editprofile/presenter/EditProfilePresenter.kt +++ b/mifospay/src/main/java/org/mifospay/editprofile/presenter/EditProfilePresenter.kt @@ -1,16 +1,16 @@ -package org.mifos.mobilewallet.mifospay.editprofile.presenter - -import org.mifos.mobilewallet.core.base.UseCase.UseCaseCallback -import com.mifos.mobilewallet.model.domain.user.UpdateUserEntityEmail -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.client.UpdateClient -import org.mifos.mobilewallet.core.domain.usecase.user.AuthenticateUser -import org.mifos.mobilewallet.core.domain.usecase.user.UpdateUser -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.base.BaseView -import org.mifos.mobilewallet.mifospay.core.datastore.PreferencesHelper -import org.mifos.mobilewallet.mifospay.editprofile.EditProfileContract -import org.mifos.mobilewallet.mifospay.editprofile.EditProfileContract.EditProfileView +package org.mifospay.editprofile.presenter + +import org.mifospay.core.data.base.UseCase.UseCaseCallback +import com.mifospay.core.model.domain.user.UpdateUserEntityEmail +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.client.UpdateClient +import org.mifospay.core.data.domain.usecase.user.AuthenticateUser +import org.mifospay.core.data.domain.usecase.user.UpdateUser +import org.mifospay.R +import org.mifospay.base.BaseView +import org.mifospay.core.datastore.PreferencesHelper +import org.mifospay.editprofile.EditProfileContract +import org.mifospay.editprofile.EditProfileContract.EditProfileView import javax.inject.Inject /** @@ -110,7 +110,7 @@ class EditProfilePresenter @Inject constructor( mEditProfileView!!.startProgressBar() mUseCaseHandler.execute(updateClientUseCase, UpdateClient.RequestValues( - com.mifos.mobilewallet.model.domain.client.UpdateClientEntityMobile( + com.mifospay.core.model.domain.client.UpdateClientEntityMobile( fullNumber!! ), mPreferencesHelper.clientId.toInt().toLong() diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/editprofile/presenter/EditProfileViewModel.kt b/mifospay/src/main/java/org/mifospay/editprofile/presenter/EditProfileViewModel.kt similarity index 86% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/editprofile/presenter/EditProfileViewModel.kt rename to mifospay/src/main/java/org/mifospay/editprofile/presenter/EditProfileViewModel.kt index 0dbda33e4..6617345be 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/editprofile/presenter/EditProfileViewModel.kt +++ b/mifospay/src/main/java/org/mifospay/editprofile/presenter/EditProfileViewModel.kt @@ -1,16 +1,16 @@ -package org.mifos.mobilewallet.mifospay.editprofile.presenter +package org.mifospay.editprofile.presenter import android.graphics.Bitmap import androidx.lifecycle.ViewModel -import com.mifos.mobilewallet.model.domain.user.UpdateUserEntityEmail +import com.mifospay.core.model.domain.user.UpdateUserEntityEmail import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.client.UpdateClient -import org.mifos.mobilewallet.core.domain.usecase.user.UpdateUser -import org.mifos.mobilewallet.mifospay.core.datastore.PreferencesHelper +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.client.UpdateClient +import org.mifospay.core.data.domain.usecase.user.UpdateUser +import org.mifospay.core.datastore.PreferencesHelper import javax.inject.Inject @HiltViewModel @@ -66,7 +66,7 @@ class EditProfileViewModel @Inject constructor( _editProfileUiState.value = EditProfileUiState.Loading mUseCaseHandler.execute(updateClientUseCase, UpdateClient.RequestValues( - com.mifos.mobilewallet.model.domain.client.UpdateClientEntityMobile( + com.mifospay.core.model.domain.client.UpdateClientEntityMobile( fullNumber!! ), mPreferencesHelper.clientId.toInt().toLong() diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/editprofile/ui/EditProfileActivity.kt b/mifospay/src/main/java/org/mifospay/editprofile/ui/EditProfileActivity.kt similarity index 76% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/editprofile/ui/EditProfileActivity.kt rename to mifospay/src/main/java/org/mifospay/editprofile/ui/EditProfileActivity.kt index 643e6d6c4..612a5b851 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/editprofile/ui/EditProfileActivity.kt +++ b/mifospay/src/main/java/org/mifospay/editprofile/ui/EditProfileActivity.kt @@ -1,10 +1,10 @@ -package org.mifos.mobilewallet.mifospay.editprofile.ui +package org.mifospay.editprofile.ui import android.os.Bundle import androidx.activity.compose.setContent import dagger.hilt.android.AndroidEntryPoint -import org.mifos.mobilewallet.mifospay.base.BaseActivity -import org.mifos.mobilewallet.mifospay.theme.MifosTheme +import org.mifospay.base.BaseActivity +import org.mifospay.theme.MifosTheme @AndroidEntryPoint class EditProfileActivity : BaseActivity() { diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/editprofile/ui/EditProfileScreen.kt b/mifospay/src/main/java/org/mifospay/editprofile/ui/EditProfileScreen.kt similarity index 94% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/editprofile/ui/EditProfileScreen.kt rename to mifospay/src/main/java/org/mifospay/editprofile/ui/EditProfileScreen.kt index 0169c0b3d..cbbeeaea6 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/editprofile/ui/EditProfileScreen.kt +++ b/mifospay/src/main/java/org/mifospay/editprofile/ui/EditProfileScreen.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.editprofile.ui +package org.mifospay.editprofile.ui import android.Manifest import android.content.Context @@ -57,17 +57,17 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.togitech.ccp.component.TogiCountryCodePicker import kotlinx.coroutines.launch -import org.mifos.mobilewallet.mifospay.BuildConfig -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.designsystem.component.MfLoadingWheel -import org.mifos.mobilewallet.mifospay.designsystem.component.MfOutlinedTextField -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosBottomSheet -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosTopBar -import org.mifos.mobilewallet.mifospay.designsystem.theme.historyItemTextStyle -import org.mifos.mobilewallet.mifospay.designsystem.theme.styleMedium16sp -import org.mifos.mobilewallet.mifospay.editprofile.presenter.EditProfileUiState -import org.mifos.mobilewallet.mifospay.editprofile.presenter.EditProfileViewModel -import org.mifos.mobilewallet.mifospay.ui.EmptyContentScreen +import org.mifospay.BuildConfig +import org.mifospay.R +import org.mifospay.core.designsystem.component.MfLoadingWheel +import org.mifospay.core.designsystem.component.MfOutlinedTextField +import org.mifospay.core.designsystem.component.MifosBottomSheet +import org.mifospay.core.designsystem.component.MifosTopBar +import org.mifospay.core.designsystem.theme.historyItemTextStyle +import org.mifospay.core.designsystem.theme.styleMedium16sp +import org.mifospay.core.ui.EmptyContentScreen +import org.mifospay.editprofile.presenter.EditProfileUiState +import org.mifospay.editprofile.presenter.EditProfileViewModel import java.io.File import java.text.SimpleDateFormat import java.util.Date diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/editprofile/ui/EditProfileScreenImage.kt b/mifospay/src/main/java/org/mifospay/editprofile/ui/EditProfileScreenImage.kt similarity index 96% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/editprofile/ui/EditProfileScreenImage.kt rename to mifospay/src/main/java/org/mifospay/editprofile/ui/EditProfileScreenImage.kt index 7ea99be53..fc12ea42b 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/editprofile/ui/EditProfileScreenImage.kt +++ b/mifospay/src/main/java/org/mifospay/editprofile/ui/EditProfileScreenImage.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.editprofile.ui +package org.mifospay.editprofile.ui import android.net.Uri import androidx.compose.foundation.border @@ -20,7 +20,7 @@ import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import coil.compose.AsyncImage -import org.mifos.mobilewallet.mifospay.R +import org.mifospay.R @Composable fun EditProfileScreenImage(imageUri: Uri?, onCameraIconClick: () -> Unit) { diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/faq/FAQContract.kt b/mifospay/src/main/java/org/mifospay/faq/FAQContract.kt similarity index 76% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/faq/FAQContract.kt rename to mifospay/src/main/java/org/mifospay/faq/FAQContract.kt index 6b9cfe26a..4caf9f0bd 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/faq/FAQContract.kt +++ b/mifospay/src/main/java/org/mifospay/faq/FAQContract.kt @@ -1,7 +1,7 @@ -package org.mifos.mobilewallet.mifospay.faq +package org.mifospay.faq -import org.mifos.mobilewallet.mifospay.base.BasePresenter -import org.mifos.mobilewallet.mifospay.base.BaseView +import org.mifospay.base.BasePresenter +import org.mifospay.base.BaseView /** * This class is a Contract Class working as Interface for UI and diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/faq/FAQListAdapter.kt b/mifospay/src/main/java/org/mifospay/faq/FAQListAdapter.kt similarity index 97% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/faq/FAQListAdapter.kt rename to mifospay/src/main/java/org/mifospay/faq/FAQListAdapter.kt index c615dec76..080781293 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/faq/FAQListAdapter.kt +++ b/mifospay/src/main/java/org/mifospay/faq/FAQListAdapter.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.faq +package org.mifospay.faq import android.content.Context import android.graphics.Typeface @@ -7,7 +7,7 @@ import android.view.View import android.view.ViewGroup import android.widget.BaseExpandableListAdapter import android.widget.TextView -import org.mifos.mobilewallet.mifospay.R +import org.mifospay.R /** * This class is the Adapter class for FAQ Section. diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/faq/presenter/FAQPresenter.kt b/mifospay/src/main/java/org/mifospay/faq/presenter/FAQPresenter.kt similarity index 59% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/faq/presenter/FAQPresenter.kt rename to mifospay/src/main/java/org/mifospay/faq/presenter/FAQPresenter.kt index 793fbaeec..70f494d20 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/faq/presenter/FAQPresenter.kt +++ b/mifospay/src/main/java/org/mifospay/faq/presenter/FAQPresenter.kt @@ -1,10 +1,10 @@ -package org.mifos.mobilewallet.mifospay.faq.presenter +package org.mifospay.faq.presenter -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.mifospay.base.BaseView -import org.mifos.mobilewallet.mifospay.data.local.LocalRepository -import org.mifos.mobilewallet.mifospay.faq.FAQContract -import org.mifos.mobilewallet.mifospay.faq.FAQContract.FAQView +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.base.BaseView +import org.mifospay.data.local.LocalRepository +import org.mifospay.faq.FAQContract +import org.mifospay.faq.FAQContract.FAQView import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/faq/presenter/FAQViewModel.kt b/mifospay/src/main/java/org/mifospay/faq/presenter/FAQViewModel.kt similarity index 76% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/faq/presenter/FAQViewModel.kt rename to mifospay/src/main/java/org/mifospay/faq/presenter/FAQViewModel.kt index 5175a70a9..bddaf78f5 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/faq/presenter/FAQViewModel.kt +++ b/mifospay/src/main/java/org/mifospay/faq/presenter/FAQViewModel.kt @@ -1,9 +1,9 @@ -package org.mifos.mobilewallet.mifospay.faq.presenter +package org.mifospay.faq.presenter import androidx.lifecycle.ViewModel import dagger.hilt.android.lifecycle.HiltViewModel -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.faq.ui.FAQ +import org.mifospay.R +import org.mifospay.faq.ui.FAQ import javax.inject.Inject @HiltViewModel diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/faq/ui/FAQ.kt b/mifospay/src/main/java/org/mifospay/faq/ui/FAQ.kt similarity index 60% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/faq/ui/FAQ.kt rename to mifospay/src/main/java/org/mifospay/faq/ui/FAQ.kt index ca899ed27..d954a3d78 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/faq/ui/FAQ.kt +++ b/mifospay/src/main/java/org/mifospay/faq/ui/FAQ.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.faq.ui +package org.mifospay.faq.ui data class FAQ( var question: Int, diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/faq/ui/FAQActivity.kt b/mifospay/src/main/java/org/mifospay/faq/ui/FAQActivity.kt similarity index 78% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/faq/ui/FAQActivity.kt rename to mifospay/src/main/java/org/mifospay/faq/ui/FAQActivity.kt index fada73b90..9598bc276 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/faq/ui/FAQActivity.kt +++ b/mifospay/src/main/java/org/mifospay/faq/ui/FAQActivity.kt @@ -1,10 +1,10 @@ -package org.mifos.mobilewallet.mifospay.faq.ui +package org.mifospay.faq.ui import android.os.Bundle import androidx.activity.compose.setContent import dagger.hilt.android.AndroidEntryPoint -import org.mifos.mobilewallet.mifospay.base.BaseActivity -import org.mifos.mobilewallet.mifospay.theme.MifosTheme +import org.mifospay.base.BaseActivity +import org.mifospay.theme.MifosTheme /** * This class is the UI component of the Architecture. diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/faq/ui/FaqScreen.kt b/mifospay/src/main/java/org/mifospay/faq/ui/FaqScreen.kt similarity index 85% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/faq/ui/FaqScreen.kt rename to mifospay/src/main/java/org/mifospay/faq/ui/FaqScreen.kt index 7731c5134..f75abb772 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/faq/ui/FaqScreen.kt +++ b/mifospay/src/main/java/org/mifospay/faq/ui/FaqScreen.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.faq.ui +package org.mifospay.faq.ui import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize @@ -10,10 +10,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.hilt.navigation.compose.hiltViewModel -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.ui.FaqItemScreen -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosTopBar -import org.mifos.mobilewallet.mifospay.faq.presenter.FAQViewModel +import org.mifospay.R +import org.mifospay.core.designsystem.component.MifosTopBar +import org.mifospay.core.ui.FaqItemScreen +import org.mifospay.faq.presenter.FAQViewModel @Composable fun FaqScreen( diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/HistoryContract.kt b/mifospay/src/main/java/org/mifospay/history/HistoryContract.kt similarity index 84% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/HistoryContract.kt rename to mifospay/src/main/java/org/mifospay/history/HistoryContract.kt index 6979dce5e..58c79cb6a 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/HistoryContract.kt +++ b/mifospay/src/main/java/org/mifospay/history/HistoryContract.kt @@ -1,10 +1,10 @@ -package org.mifos.mobilewallet.mifospay.history +package org.mifospay.history -import com.mifos.mobilewallet.model.entity.accounts.savings.TransferDetail -import com.mifos.mobilewallet.model.domain.Transaction -import com.mifos.mobilewallet.model.domain.TransactionType -import org.mifos.mobilewallet.mifospay.base.BasePresenter -import org.mifos.mobilewallet.mifospay.base.BaseView +import com.mifospay.core.model.entity.accounts.savings.TransferDetail +import com.mifospay.core.model.domain.Transaction +import com.mifospay.core.model.domain.TransactionType +import org.mifospay.base.BasePresenter +import org.mifospay.base.BaseView /** * Created by naman on 17/8/17. diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/TransactionsHistory.kt b/mifospay/src/main/java/org/mifospay/history/TransactionsHistory.kt similarity index 67% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/TransactionsHistory.kt rename to mifospay/src/main/java/org/mifospay/history/TransactionsHistory.kt index 0ee1cae37..efe55b643 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/TransactionsHistory.kt +++ b/mifospay/src/main/java/org/mifospay/history/TransactionsHistory.kt @@ -1,13 +1,13 @@ -package org.mifos.mobilewallet.mifospay.history +package org.mifospay.history -import org.mifos.mobilewallet.core.base.TaskLooper -import org.mifos.mobilewallet.core.base.UseCase.UseCaseCallback -import org.mifos.mobilewallet.core.base.UseCaseFactory -import com.mifos.mobilewallet.model.domain.Transaction -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.account.FetchAccount -import org.mifos.mobilewallet.core.domain.usecase.account.FetchAccountTransactions -import org.mifos.mobilewallet.mifospay.history.HistoryContract.TransactionsHistoryAsync +import org.mifospay.core.data.base.TaskLooper +import org.mifospay.core.data.base.UseCase.UseCaseCallback +import org.mifospay.core.data.base.UseCaseFactory +import com.mifospay.core.model.domain.Transaction +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.account.FetchAccount +import org.mifospay.core.data.domain.usecase.account.FetchAccountTransactions +import org.mifospay.history.HistoryContract.TransactionsHistoryAsync import javax.inject.Inject class TransactionsHistory @Inject constructor( diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/presenter/HistoryPresenter.kt b/mifospay/src/main/java/org/mifospay/history/presenter/HistoryPresenter.kt similarity index 78% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/presenter/HistoryPresenter.kt rename to mifospay/src/main/java/org/mifospay/history/presenter/HistoryPresenter.kt index a034d39b6..20efb5131 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/presenter/HistoryPresenter.kt +++ b/mifospay/src/main/java/org/mifospay/history/presenter/HistoryPresenter.kt @@ -1,21 +1,21 @@ -package org.mifos.mobilewallet.mifospay.history.presenter +package org.mifospay.history.presenter -import org.mifos.mobilewallet.core.base.TaskLooper -import org.mifos.mobilewallet.core.base.UseCase.UseCaseCallback -import org.mifos.mobilewallet.core.base.UseCaseFactory -import com.mifos.mobilewallet.model.domain.Account -import com.mifos.mobilewallet.model.domain.Transaction -import com.mifos.mobilewallet.model.domain.TransactionType -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.account.FetchAccount -import org.mifos.mobilewallet.core.domain.usecase.account.FetchAccountTransactions -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.base.BaseView -import org.mifos.mobilewallet.mifospay.data.local.LocalRepository -import org.mifos.mobilewallet.mifospay.history.HistoryContract.HistoryView -import org.mifos.mobilewallet.mifospay.history.HistoryContract.TransactionsHistoryAsync -import org.mifos.mobilewallet.mifospay.history.HistoryContract.TransactionsHistoryPresenter -import org.mifos.mobilewallet.mifospay.history.TransactionsHistory +import org.mifospay.core.data.base.TaskLooper +import org.mifospay.core.data.base.UseCase.UseCaseCallback +import org.mifospay.core.data.base.UseCaseFactory +import com.mifospay.core.model.domain.Account +import com.mifospay.core.model.domain.Transaction +import com.mifospay.core.model.domain.TransactionType +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.account.FetchAccount +import org.mifospay.core.data.domain.usecase.account.FetchAccountTransactions +import org.mifospay.R +import org.mifospay.base.BaseView +import org.mifospay.data.local.LocalRepository +import org.mifospay.history.HistoryContract.HistoryView +import org.mifospay.history.HistoryContract.TransactionsHistoryAsync +import org.mifospay.history.HistoryContract.TransactionsHistoryPresenter +import org.mifospay.history.TransactionsHistory import java.util.Locale import javax.inject.Inject diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/presenter/HistoryViewModel.kt b/mifospay/src/main/java/org/mifospay/history/presenter/HistoryViewModel.kt similarity index 84% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/presenter/HistoryViewModel.kt rename to mifospay/src/main/java/org/mifospay/history/presenter/HistoryViewModel.kt index d9d72ef85..d93b0851d 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/presenter/HistoryViewModel.kt +++ b/mifospay/src/main/java/org/mifospay/history/presenter/HistoryViewModel.kt @@ -1,15 +1,15 @@ -package org.mifos.mobilewallet.mifospay.history.presenter +package org.mifospay.history.presenter import androidx.lifecycle.ViewModel -import com.mifos.mobilewallet.model.domain.Transaction +import com.mifospay.core.model.domain.Transaction import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.account.FetchAccount -import org.mifos.mobilewallet.core.domain.usecase.account.FetchAccountTransactions -import org.mifos.mobilewallet.mifospay.data.local.LocalRepository +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.account.FetchAccount +import org.mifospay.core.data.domain.usecase.account.FetchAccountTransactions +import org.mifospay.data.local.LocalRepository import javax.inject.Inject @HiltViewModel diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/presenter/SpecificTransactionsPresenter.kt b/mifospay/src/main/java/org/mifospay/history/presenter/SpecificTransactionsPresenter.kt similarity index 77% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/presenter/SpecificTransactionsPresenter.kt rename to mifospay/src/main/java/org/mifospay/history/presenter/SpecificTransactionsPresenter.kt index 55f988b13..04f63064d 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/presenter/SpecificTransactionsPresenter.kt +++ b/mifospay/src/main/java/org/mifospay/history/presenter/SpecificTransactionsPresenter.kt @@ -1,17 +1,17 @@ -package org.mifos.mobilewallet.mifospay.history.presenter +package org.mifospay.history.presenter -import org.mifos.mobilewallet.core.base.TaskLooper -import org.mifos.mobilewallet.core.base.TaskLooper.TaskData -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.base.UseCaseFactory -import com.mifos.mobilewallet.model.domain.Transaction -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.account.FetchAccountTransfer -import org.mifos.mobilewallet.core.util.Constants -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.base.BaseView -import org.mifos.mobilewallet.mifospay.history.HistoryContract -import org.mifos.mobilewallet.mifospay.history.HistoryContract.SpecificTransactionsView +import org.mifospay.core.data.base.TaskLooper +import org.mifospay.core.data.base.TaskLooper.TaskData +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.base.UseCaseFactory +import com.mifospay.core.model.domain.Transaction +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.account.FetchAccountTransfer +import org.mifospay.R +import org.mifospay.base.BaseView +import org.mifospay.core.data.util.Constants +import org.mifospay.history.HistoryContract +import org.mifospay.history.HistoryContract.SpecificTransactionsView import javax.inject.Inject /** @@ -47,7 +47,7 @@ class SpecificTransactionsPresenter @Inject constructor( as UseCase, values = FetchAccountTransfer.RequestValues(transferId!!), taskData = TaskData( - org.mifos.mobilewallet.mifospay.common.Constants.TRANSFER_DETAILS, i + org.mifospay.common.Constants.TRANSFER_DETAILS, i ) ) } @@ -57,7 +57,7 @@ class SpecificTransactionsPresenter @Inject constructor( taskData: TaskData, response: R ) { when (taskData.taskName) { - org.mifos.mobilewallet.mifospay.common.Constants.TRANSFER_DETAILS -> { + org.mifospay.common.Constants.TRANSFER_DETAILS -> { val responseValue = response as FetchAccountTransfer.ResponseValue val index = taskData.taskId transactions[index]?.transferDetail = responseValue.transferDetail diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/presenter/TransactionDetailPresenter.kt b/mifospay/src/main/java/org/mifospay/history/presenter/TransactionDetailPresenter.kt similarity index 73% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/presenter/TransactionDetailPresenter.kt rename to mifospay/src/main/java/org/mifospay/history/presenter/TransactionDetailPresenter.kt index a1509f40b..1b431135b 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/presenter/TransactionDetailPresenter.kt +++ b/mifospay/src/main/java/org/mifospay/history/presenter/TransactionDetailPresenter.kt @@ -1,12 +1,12 @@ -package org.mifos.mobilewallet.mifospay.history.presenter +package org.mifospay.history.presenter -import org.mifos.mobilewallet.core.base.UseCase.UseCaseCallback -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.account.FetchAccountTransfer -import org.mifos.mobilewallet.mifospay.base.BaseView -import org.mifos.mobilewallet.mifospay.history.HistoryContract -import org.mifos.mobilewallet.mifospay.history.HistoryContract.TransactionDetailView -import org.mifos.mobilewallet.mifospay.common.Constants +import org.mifospay.core.data.base.UseCase.UseCaseCallback +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.account.FetchAccountTransfer +import org.mifospay.base.BaseView +import org.mifospay.history.HistoryContract +import org.mifospay.history.HistoryContract.TransactionDetailView +import org.mifospay.common.Constants import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/ui/HistoryFragment.kt b/mifospay/src/main/java/org/mifospay/history/ui/HistoryFragment.kt similarity index 91% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/ui/HistoryFragment.kt rename to mifospay/src/main/java/org/mifospay/history/ui/HistoryFragment.kt index ce0dd546e..685cb1831 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/ui/HistoryFragment.kt +++ b/mifospay/src/main/java/org/mifospay/history/ui/HistoryFragment.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.history.ui +package org.mifospay.history.ui import android.os.Bundle import android.view.LayoutInflater @@ -16,16 +16,16 @@ import butterknife.ButterKnife import butterknife.OnClick import com.google.android.material.chip.Chip import dagger.hilt.android.AndroidEntryPoint -import com.mifos.mobilewallet.model.domain.Transaction -import com.mifos.mobilewallet.model.domain.TransactionType -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.base.BaseFragment -import org.mifos.mobilewallet.mifospay.history.HistoryContract.HistoryView -import org.mifos.mobilewallet.mifospay.history.HistoryContract.TransactionsHistoryPresenter -import org.mifos.mobilewallet.mifospay.history.presenter.HistoryPresenter -import org.mifos.mobilewallet.mifospay.history.ui.adapter.HistoryAdapter -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.utils.RecyclerItemClickListener +import com.mifospay.core.model.domain.Transaction +import com.mifospay.core.model.domain.TransactionType +import org.mifospay.R +import org.mifospay.base.BaseFragment +import org.mifospay.history.HistoryContract.HistoryView +import org.mifospay.history.HistoryContract.TransactionsHistoryPresenter +import org.mifospay.history.presenter.HistoryPresenter +import org.mifospay.history.ui.adapter.HistoryAdapter +import org.mifospay.common.Constants +import org.mifospay.utils.RecyclerItemClickListener import javax.inject.Inject @AndroidEntryPoint diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/ui/HistoryScreen.kt b/mifospay/src/main/java/org/mifospay/history/ui/HistoryScreen.kt similarity index 88% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/ui/HistoryScreen.kt rename to mifospay/src/main/java/org/mifospay/history/ui/HistoryScreen.kt index 5b29c81de..0fbb4be0a 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/ui/HistoryScreen.kt +++ b/mifospay/src/main/java/org/mifospay/history/ui/HistoryScreen.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.history.ui +package org.mifospay.history.ui import android.widget.Toast import androidx.compose.foundation.layout.Arrangement @@ -30,18 +30,18 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.mifos.mobilewallet.model.domain.Currency -import com.mifos.mobilewallet.model.domain.Transaction -import com.mifos.mobilewallet.model.domain.TransactionType -import com.mifos.mobilewallet.model.entity.accounts.savings.TransferDetail -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosLoadingWheel -import org.mifos.mobilewallet.mifospay.designsystem.theme.chipSelectedColor -import org.mifos.mobilewallet.mifospay.designsystem.theme.lightGrey -import org.mifos.mobilewallet.mifospay.history.presenter.HistoryUiState -import org.mifos.mobilewallet.mifospay.history.presenter.HistoryViewModel -import org.mifos.mobilewallet.mifospay.ui.EmptyContentScreen -import org.mifos.mobilewallet.mifospay.ui.TransactionItemScreen +import com.mifospay.core.model.domain.Currency +import com.mifospay.core.model.domain.Transaction +import com.mifospay.core.model.domain.TransactionType +import com.mifospay.core.model.entity.accounts.savings.TransferDetail +import org.mifospay.R +import org.mifospay.core.designsystem.component.MifosLoadingWheel +import org.mifospay.core.designsystem.theme.chipSelectedColor +import org.mifospay.core.designsystem.theme.lightGrey +import org.mifospay.core.ui.EmptyContentScreen +import org.mifospay.core.ui.TransactionItemScreen +import org.mifospay.history.presenter.HistoryUiState +import org.mifospay.history.presenter.HistoryViewModel @Composable fun HistoryScreen( diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/ui/SpecificTransactionsActivity.kt b/mifospay/src/main/java/org/mifospay/history/ui/SpecificTransactionsActivity.kt similarity index 86% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/ui/SpecificTransactionsActivity.kt rename to mifospay/src/main/java/org/mifospay/history/ui/SpecificTransactionsActivity.kt index c26321630..e541712ff 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/ui/SpecificTransactionsActivity.kt +++ b/mifospay/src/main/java/org/mifospay/history/ui/SpecificTransactionsActivity.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.history.ui +package org.mifospay.history.ui import android.content.Intent import android.net.Uri @@ -13,16 +13,16 @@ import androidx.recyclerview.widget.RecyclerView import butterknife.BindView import butterknife.ButterKnife import dagger.hilt.android.AndroidEntryPoint -import com.mifos.mobilewallet.model.domain.Transaction -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.base.BaseActivity -import org.mifos.mobilewallet.mifospay.history.HistoryContract -import org.mifos.mobilewallet.mifospay.history.HistoryContract.SpecificTransactionsView -import org.mifos.mobilewallet.mifospay.history.presenter.SpecificTransactionsPresenter -import org.mifos.mobilewallet.mifospay.history.ui.adapter.SpecificTransactionsAdapter -import org.mifos.mobilewallet.mifospay.receipt.ui.ReceiptActivity -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.utils.RecyclerItemClickListener +import com.mifospay.core.model.domain.Transaction +import org.mifospay.R +import org.mifospay.base.BaseActivity +import org.mifospay.history.HistoryContract +import org.mifospay.history.HistoryContract.SpecificTransactionsView +import org.mifospay.history.presenter.SpecificTransactionsPresenter +import org.mifospay.history.ui.adapter.SpecificTransactionsAdapter +import org.mifospay.receipt.ui.ReceiptActivity +import org.mifospay.common.Constants +import org.mifospay.utils.RecyclerItemClickListener import javax.inject.Inject @AndroidEntryPoint diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/ui/TransactionDetailDialog.kt b/mifospay/src/main/java/org/mifospay/history/ui/TransactionDetailDialog.kt similarity index 90% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/ui/TransactionDetailDialog.kt rename to mifospay/src/main/java/org/mifospay/history/ui/TransactionDetailDialog.kt index 8b88f4ce1..1d3202e4b 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/ui/TransactionDetailDialog.kt +++ b/mifospay/src/main/java/org/mifospay/history/ui/TransactionDetailDialog.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.history.ui +package org.mifospay.history.ui import android.app.Dialog import android.content.Intent @@ -19,17 +19,17 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.bottomsheet.BottomSheetDialogFragment import dagger.hilt.android.AndroidEntryPoint -import com.mifos.mobilewallet.model.entity.accounts.savings.TransferDetail -import com.mifos.mobilewallet.model.domain.Transaction -import com.mifos.mobilewallet.model.domain.TransactionType -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.history.HistoryContract -import org.mifos.mobilewallet.mifospay.history.HistoryContract.TransactionDetailView -import org.mifos.mobilewallet.mifospay.history.presenter.TransactionDetailPresenter -import org.mifos.mobilewallet.mifospay.receipt.ui.ReceiptActivity -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.utils.Toaster -import org.mifos.mobilewallet.mifospay.common.Utils.getFormattedAccountBalance +import com.mifospay.core.model.entity.accounts.savings.TransferDetail +import com.mifospay.core.model.domain.Transaction +import com.mifospay.core.model.domain.TransactionType +import org.mifospay.R +import org.mifospay.history.HistoryContract +import org.mifospay.history.HistoryContract.TransactionDetailView +import org.mifospay.history.presenter.TransactionDetailPresenter +import org.mifospay.receipt.ui.ReceiptActivity +import org.mifospay.common.Constants +import org.mifospay.utils.Toaster +import org.mifospay.common.Utils.getFormattedAccountBalance import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/ui/adapter/HistoryAdapter.kt b/mifospay/src/main/java/org/mifospay/history/ui/adapter/HistoryAdapter.kt similarity index 90% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/ui/adapter/HistoryAdapter.kt rename to mifospay/src/main/java/org/mifospay/history/ui/adapter/HistoryAdapter.kt index 4e2d73154..fd42cf182 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/ui/adapter/HistoryAdapter.kt +++ b/mifospay/src/main/java/org/mifospay/history/ui/adapter/HistoryAdapter.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.history.ui.adapter +package org.mifospay.history.ui.adapter import android.content.Context import android.view.LayoutInflater @@ -9,11 +9,11 @@ import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import butterknife.BindView import butterknife.ButterKnife -import com.mifos.mobilewallet.model.domain.Transaction -import com.mifos.mobilewallet.model.domain.TransactionType -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.common.Utils.getFormattedAccountBalance +import com.mifospay.core.model.domain.Transaction +import com.mifospay.core.model.domain.TransactionType +import org.mifospay.R +import org.mifospay.common.Constants +import org.mifospay.common.Utils.getFormattedAccountBalance import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/ui/adapter/SpecificTransactionsAdapter.kt b/mifospay/src/main/java/org/mifospay/history/ui/adapter/SpecificTransactionsAdapter.kt similarity index 92% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/ui/adapter/SpecificTransactionsAdapter.kt rename to mifospay/src/main/java/org/mifospay/history/ui/adapter/SpecificTransactionsAdapter.kt index 15c9eac00..7fb300d3a 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/history/ui/adapter/SpecificTransactionsAdapter.kt +++ b/mifospay/src/main/java/org/mifospay/history/ui/adapter/SpecificTransactionsAdapter.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.history.ui.adapter +package org.mifospay.history.ui.adapter import android.content.Context import android.graphics.Color @@ -12,11 +12,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import butterknife.BindView import butterknife.ButterKnife -import com.mifos.mobilewallet.model.domain.Transaction -import com.mifos.mobilewallet.model.domain.TransactionType -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.common.Utils.getFormattedAccountBalance +import com.mifospay.core.model.domain.Transaction +import com.mifospay.core.model.domain.TransactionType +import org.mifospay.R +import org.mifospay.common.Constants +import org.mifospay.common.Utils.getFormattedAccountBalance import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/BaseHomeContract.kt b/mifospay/src/main/java/org/mifospay/home/BaseHomeContract.kt similarity index 88% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/BaseHomeContract.kt rename to mifospay/src/main/java/org/mifospay/home/BaseHomeContract.kt index 75e00b033..b8e28c86f 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/BaseHomeContract.kt +++ b/mifospay/src/main/java/org/mifospay/home/BaseHomeContract.kt @@ -1,10 +1,10 @@ -package org.mifos.mobilewallet.mifospay.home +package org.mifospay.home import okhttp3.ResponseBody -import com.mifos.mobilewallet.model.domain.Account -import com.mifos.mobilewallet.model.domain.Transaction -import org.mifos.mobilewallet.mifospay.base.BasePresenter -import org.mifos.mobilewallet.mifospay.base.BaseView +import com.mifospay.core.model.domain.Account +import com.mifospay.core.model.domain.Transaction +import org.mifospay.base.BasePresenter +import org.mifospay.base.BaseView /** * Created by naman on 17/6/17. @@ -65,7 +65,7 @@ interface BaseHomeContract { } interface ProfileView : BaseView { - fun showProfile(client: com.mifos.mobilewallet.model.domain.client.Client?) + fun showProfile(client: com.mifospay.core.model.domain.client.Client?) fun showEmail(email: String?) fun showVpa(vpa: String?) fun showMobile(mobile: String?) diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/HomeViewModel.kt b/mifospay/src/main/java/org/mifospay/home/HomeViewModel.kt similarity index 79% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/HomeViewModel.kt rename to mifospay/src/main/java/org/mifospay/home/HomeViewModel.kt index 4f282788c..36a71507e 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/HomeViewModel.kt +++ b/mifospay/src/main/java/org/mifospay/home/HomeViewModel.kt @@ -1,20 +1,20 @@ -package org.mifos.mobilewallet.mifospay.home +package org.mifospay.home import androidx.lifecycle.ViewModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.update -import org.mifos.mobilewallet.core.base.UseCase.UseCaseCallback -import com.mifos.mobilewallet.model.domain.Account -import com.mifos.mobilewallet.model.domain.Transaction +import org.mifospay.core.data.base.UseCase.UseCaseCallback +import com.mifospay.core.model.domain.Account +import com.mifospay.core.model.domain.Transaction import kotlinx.coroutines.flow.asStateFlow -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.account.FetchAccount -import org.mifos.mobilewallet.mifospay.data.local.LocalRepository -import org.mifos.mobilewallet.mifospay.core.datastore.PreferencesHelper -import org.mifos.mobilewallet.mifospay.history.HistoryContract.TransactionsHistoryAsync -import org.mifos.mobilewallet.mifospay.history.TransactionsHistory +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.account.FetchAccount +import org.mifospay.data.local.LocalRepository +import org.mifospay.core.datastore.PreferencesHelper +import org.mifospay.history.HistoryContract.TransactionsHistoryAsync +import org.mifospay.history.TransactionsHistory import javax.inject.Inject @HiltViewModel diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/MainPresenter.kt b/mifospay/src/main/java/org/mifospay/home/MainPresenter.kt similarity index 70% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/MainPresenter.kt rename to mifospay/src/main/java/org/mifospay/home/MainPresenter.kt index 46ce8b7b5..b8d6abafa 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/MainPresenter.kt +++ b/mifospay/src/main/java/org/mifospay/home/MainPresenter.kt @@ -1,12 +1,12 @@ -package org.mifos.mobilewallet.mifospay.home +package org.mifospay.home -import org.mifos.mobilewallet.core.base.UseCase.UseCaseCallback -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.client.FetchClientData -import org.mifos.mobilewallet.mifospay.base.BaseView -import org.mifos.mobilewallet.mifospay.data.local.LocalRepository -import org.mifos.mobilewallet.mifospay.home.BaseHomeContract.BaseHomePresenter -import org.mifos.mobilewallet.mifospay.home.BaseHomeContract.BaseHomeView +import org.mifospay.core.data.base.UseCase.UseCaseCallback +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.client.FetchClientData +import org.mifospay.base.BaseView +import org.mifospay.data.local.LocalRepository +import org.mifospay.home.BaseHomeContract.BaseHomePresenter +import org.mifospay.home.BaseHomeContract.BaseHomeView import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/ProfileViewModel.kt b/mifospay/src/main/java/org/mifospay/home/ProfileViewModel.kt similarity index 86% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/ProfileViewModel.kt rename to mifospay/src/main/java/org/mifospay/home/ProfileViewModel.kt index 74552120e..df0f3c695 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/ProfileViewModel.kt +++ b/mifospay/src/main/java/org/mifospay/home/ProfileViewModel.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.home +package org.mifospay.home import android.graphics.Bitmap import android.graphics.BitmapFactory @@ -9,12 +9,12 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.launch import okhttp3.ResponseBody -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.client.FetchClientImage -import org.mifos.mobilewallet.mifospay.core.datastore.PreferencesHelper -import org.mifos.mobilewallet.mifospay.common.DebugUtil -import org.mifos.mobilewallet.mifospay.data.local.LocalRepository +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.client.FetchClientImage +import org.mifospay.core.datastore.PreferencesHelper +import org.mifospay.common.DebugUtil +import org.mifospay.data.local.LocalRepository import javax.inject.Inject @HiltViewModel diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/navigation/FinanceNavigation.kt b/mifospay/src/main/java/org/mifospay/home/navigation/FinanceNavigation.kt similarity index 80% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/navigation/FinanceNavigation.kt rename to mifospay/src/main/java/org/mifospay/home/navigation/FinanceNavigation.kt index ca5b2c050..ff3028ac0 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/navigation/FinanceNavigation.kt +++ b/mifospay/src/main/java/org/mifospay/home/navigation/FinanceNavigation.kt @@ -1,10 +1,10 @@ -package org.mifos.mobilewallet.mifospay.home.navigation +package org.mifospay.home.navigation import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.compose.composable -import org.mifos.mobilewallet.mifospay.home.screens.FinanceRoute +import org.mifospay.home.screens.FinanceRoute const val FINANCE_ROUTE = "finance_route" diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/navigation/HomeNavigation.kt b/mifospay/src/main/java/org/mifospay/home/navigation/HomeNavigation.kt similarity index 81% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/navigation/HomeNavigation.kt rename to mifospay/src/main/java/org/mifospay/home/navigation/HomeNavigation.kt index aaba4859c..415b752ba 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/navigation/HomeNavigation.kt +++ b/mifospay/src/main/java/org/mifospay/home/navigation/HomeNavigation.kt @@ -1,10 +1,10 @@ -package org.mifos.mobilewallet.mifospay.home.navigation +package org.mifospay.home.navigation import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.compose.composable -import org.mifos.mobilewallet.mifospay.home.screens.HomeRoute +import org.mifospay.home.screens.HomeRoute const val HOME_ROUTE = "home_route" diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/navigation/PaymentNavigation.kt b/mifospay/src/main/java/org/mifospay/home/navigation/PaymentNavigation.kt similarity index 81% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/navigation/PaymentNavigation.kt rename to mifospay/src/main/java/org/mifospay/home/navigation/PaymentNavigation.kt index 8f8a37b22..fee4314cd 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/navigation/PaymentNavigation.kt +++ b/mifospay/src/main/java/org/mifospay/home/navigation/PaymentNavigation.kt @@ -1,10 +1,10 @@ -package org.mifos.mobilewallet.mifospay.home.navigation +package org.mifospay.home.navigation import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.compose.composable -import org.mifos.mobilewallet.mifospay.home.screens.PaymentsRoute +import org.mifospay.home.screens.PaymentsRoute const val PAYMENTS_ROUTE = "payments_route" diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/navigation/ProfileNavigation.kt b/mifospay/src/main/java/org/mifospay/home/navigation/ProfileNavigation.kt similarity index 82% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/navigation/ProfileNavigation.kt rename to mifospay/src/main/java/org/mifospay/home/navigation/ProfileNavigation.kt index daf45c307..d41dc8654 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/navigation/ProfileNavigation.kt +++ b/mifospay/src/main/java/org/mifospay/home/navigation/ProfileNavigation.kt @@ -1,10 +1,10 @@ -package org.mifos.mobilewallet.mifospay.home.navigation +package org.mifospay.home.navigation import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.compose.composable -import org.mifos.mobilewallet.mifospay.home.screens.ProfileRoute +import org.mifospay.home.screens.ProfileRoute const val PROFILE_ROUTE = "profile_route" diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/screens/FinanceScreen.kt b/mifospay/src/main/java/org/mifospay/home/screens/FinanceScreen.kt similarity index 77% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/screens/FinanceScreen.kt rename to mifospay/src/main/java/org/mifospay/home/screens/FinanceScreen.kt index d62d63886..e9e03b6be 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/screens/FinanceScreen.kt +++ b/mifospay/src/main/java/org/mifospay/home/screens/FinanceScreen.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.home.screens +package org.mifospay.home.screens import android.content.Intent import androidx.compose.foundation.ExperimentalFoundationApi @@ -9,13 +9,13 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.tooling.preview.Preview -import org.mifos.mobilewallet.mifospay.bank.ui.AccountsScreen -import org.mifos.mobilewallet.mifospay.bank.link_bank.LinkBankAccountActivity -import org.mifos.mobilewallet.mifospay.kyc.ui.KYCDescriptionScreen -import org.mifos.mobilewallet.mifospay.merchants.ui.MerchantScreen -import org.mifos.mobilewallet.mifospay.savedcards.ui.CardsScreen -import org.mifos.mobilewallet.mifospay.ui.MifosScrollableTabRow -import org.mifos.mobilewallet.mifospay.ui.utility.TabContent +import org.mifospay.bank.ui.AccountsScreen +import org.mifospay.bank.link_bank.LinkBankAccountActivity +import org.mifospay.core.ui.MifosScrollableTabRow +import org.mifospay.core.ui.utility.TabContent +import org.mifospay.kyc.ui.KYCDescriptionScreen +import org.mifospay.merchants.ui.MerchantScreen +import org.mifospay.savedcards.ui.CardsScreen @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/screens/HomeScreen.kt b/mifospay/src/main/java/org/mifospay/home/screens/HomeScreen.kt similarity index 90% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/screens/HomeScreen.kt rename to mifospay/src/main/java/org/mifospay/home/screens/HomeScreen.kt index 2fcc931bb..3155f669b 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/screens/HomeScreen.kt +++ b/mifospay/src/main/java/org/mifospay/home/screens/HomeScreen.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.home.screens +package org.mifospay.home.screens import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.Image @@ -36,20 +36,20 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.mifos.mobilewallet.model.domain.Account -import com.mifos.mobilewallet.model.domain.Currency -import com.mifos.mobilewallet.model.domain.Transaction -import com.mifos.mobilewallet.model.domain.TransactionType -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.common.Utils -import org.mifos.mobilewallet.mifospay.designsystem.component.MfLoadingWheel -import org.mifos.mobilewallet.mifospay.home.HomeUiState -import org.mifos.mobilewallet.mifospay.home.HomeViewModel -import org.mifos.mobilewallet.mifospay.theme.border -import org.mifos.mobilewallet.mifospay.theme.lightGrey -import org.mifos.mobilewallet.mifospay.theme.styleMedium16sp -import org.mifos.mobilewallet.mifospay.ui.ErrorScreenContent -import org.mifos.mobilewallet.mifospay.ui.TransactionItemScreen +import com.mifospay.core.model.domain.Account +import com.mifospay.core.model.domain.Currency +import com.mifospay.core.model.domain.Transaction +import com.mifospay.core.model.domain.TransactionType +import org.mifospay.R +import org.mifospay.common.Utils +import org.mifospay.core.designsystem.component.MfLoadingWheel +import org.mifospay.core.ui.ErrorScreenContent +import org.mifospay.core.ui.TransactionItemScreen +import org.mifospay.home.HomeUiState +import org.mifospay.home.HomeViewModel +import org.mifospay.theme.border +import org.mifospay.theme.lightGrey +import org.mifospay.theme.styleMedium16sp @Composable fun HomeRoute( diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/screens/PaymentsScreen.kt b/mifospay/src/main/java/org/mifospay/home/screens/PaymentsScreen.kt similarity index 75% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/screens/PaymentsScreen.kt rename to mifospay/src/main/java/org/mifospay/home/screens/PaymentsScreen.kt index 1c2bea5ee..c92ea8e3d 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/screens/PaymentsScreen.kt +++ b/mifospay/src/main/java/org/mifospay/home/screens/PaymentsScreen.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.home.screens +package org.mifospay.home.screens import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.layout.Column @@ -10,15 +10,14 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import org.mifos.mobilewallet.mifospay.history.ui.HistoryScreen -import org.mifos.mobilewallet.mifospay.invoice.ui.InvoiceScreen -import org.mifos.mobilewallet.mifospay.payments.TransferViewModel -import org.mifos.mobilewallet.mifospay.payments.ui.RequestScreen -import org.mifos.mobilewallet.mifospay.payments.send.SendMoneyScreen -import org.mifos.mobilewallet.mifospay.payments.send.SendScreenRoute -import org.mifos.mobilewallet.mifospay.standinginstruction.ui.StandingInstructionsScreen -import org.mifos.mobilewallet.mifospay.ui.MifosScrollableTabRow -import org.mifos.mobilewallet.mifospay.ui.utility.TabContent +import org.mifospay.core.ui.MifosScrollableTabRow +import org.mifospay.core.ui.utility.TabContent +import org.mifospay.history.ui.HistoryScreen +import org.mifospay.invoice.ui.InvoiceScreen +import org.mifospay.payments.TransferViewModel +import org.mifospay.payments.send.SendScreenRoute +import org.mifospay.payments.ui.RequestScreen +import org.mifospay.standinginstruction.ui.StandingInstructionsScreen @Composable fun PaymentsRoute( diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/screens/ProfileItemCard.kt b/mifospay/src/main/java/org/mifospay/home/screens/ProfileItemCard.kt similarity index 96% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/screens/ProfileItemCard.kt rename to mifospay/src/main/java/org/mifospay/home/screens/ProfileItemCard.kt index dc6b8f57d..c23dacaea 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/screens/ProfileItemCard.kt +++ b/mifospay/src/main/java/org/mifospay/home/screens/ProfileItemCard.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.home.screens +package org.mifospay.home.screens import androidx.compose.foundation.border import androidx.compose.foundation.clickable @@ -22,7 +22,7 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import org.mifos.mobilewallet.mifospay.R +import org.mifospay.R @OptIn(ExperimentalLayoutApi::class) @Composable diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/screens/ProfileScreen.kt b/mifospay/src/main/java/org/mifospay/home/screens/ProfileScreen.kt similarity index 95% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/screens/ProfileScreen.kt rename to mifospay/src/main/java/org/mifospay/home/screens/ProfileScreen.kt index 6268d6a0d..36136c62c 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/home/screens/ProfileScreen.kt +++ b/mifospay/src/main/java/org/mifospay/home/screens/ProfileScreen.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.home.screens +package org.mifospay.home.screens import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -31,10 +31,10 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.home.ProfileUiState -import org.mifos.mobilewallet.mifospay.home.ProfileViewModel -import org.mifos.mobilewallet.mifospay.ui.ProfileImage +import org.mifospay.R +import org.mifospay.core.ui.ProfileImage +import org.mifospay.home.ProfileUiState +import org.mifospay.home.ProfileViewModel @Composable fun ProfileRoute( diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/invoice/InvoiceContract.kt b/mifospay/src/main/java/org/mifospay/invoice/InvoiceContract.kt similarity index 80% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/invoice/InvoiceContract.kt rename to mifospay/src/main/java/org/mifospay/invoice/InvoiceContract.kt index eba609bb1..fb897049f 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/invoice/InvoiceContract.kt +++ b/mifospay/src/main/java/org/mifospay/invoice/InvoiceContract.kt @@ -1,9 +1,9 @@ -package org.mifos.mobilewallet.mifospay.invoice +package org.mifospay.invoice import android.net.Uri -import com.mifos.mobilewallet.model.entity.Invoice -import org.mifos.mobilewallet.mifospay.base.BasePresenter -import org.mifos.mobilewallet.mifospay.base.BaseView +import com.mifospay.core.model.entity.Invoice +import org.mifospay.base.BasePresenter +import org.mifospay.base.BaseView /** * Created by ankur on 07/June/2018 diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/invoice/presenter/InvoicePresenter.kt b/mifospay/src/main/java/org/mifospay/invoice/presenter/InvoicePresenter.kt similarity index 70% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/invoice/presenter/InvoicePresenter.kt rename to mifospay/src/main/java/org/mifospay/invoice/presenter/InvoicePresenter.kt index 87dab859b..2e8f9417f 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/invoice/presenter/InvoicePresenter.kt +++ b/mifospay/src/main/java/org/mifospay/invoice/presenter/InvoicePresenter.kt @@ -1,13 +1,13 @@ -package org.mifos.mobilewallet.mifospay.invoice.presenter +package org.mifospay.invoice.presenter import android.net.Uri -import org.mifos.mobilewallet.core.base.UseCase.UseCaseCallback -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.invoice.FetchInvoice -import org.mifos.mobilewallet.mifospay.base.BaseView -import org.mifos.mobilewallet.mifospay.core.datastore.PreferencesHelper -import org.mifos.mobilewallet.mifospay.invoice.InvoiceContract -import org.mifos.mobilewallet.mifospay.invoice.InvoiceContract.InvoiceView +import org.mifospay.core.data.base.UseCase.UseCaseCallback +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.invoice.FetchInvoice +import org.mifospay.base.BaseView +import org.mifospay.core.datastore.PreferencesHelper +import org.mifospay.invoice.InvoiceContract +import org.mifospay.invoice.InvoiceContract.InvoiceView import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/invoice/presenter/InvoicesPresenter.kt b/mifospay/src/main/java/org/mifospay/invoice/presenter/InvoicesPresenter.kt similarity index 71% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/invoice/presenter/InvoicesPresenter.kt rename to mifospay/src/main/java/org/mifospay/invoice/presenter/InvoicesPresenter.kt index dcbd759d4..d6ec23ed9 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/invoice/presenter/InvoicesPresenter.kt +++ b/mifospay/src/main/java/org/mifospay/invoice/presenter/InvoicesPresenter.kt @@ -1,15 +1,15 @@ -package org.mifos.mobilewallet.mifospay.invoice.presenter +package org.mifospay.invoice.presenter import android.net.Uri -import org.mifos.mobilewallet.core.base.UseCase.UseCaseCallback -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.invoice.FetchInvoices -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.base.BaseView -import org.mifos.mobilewallet.mifospay.core.datastore.PreferencesHelper -import org.mifos.mobilewallet.mifospay.invoice.InvoiceContract -import org.mifos.mobilewallet.mifospay.invoice.InvoiceContract.InvoicesView -import org.mifos.mobilewallet.mifospay.common.Constants +import org.mifospay.core.data.base.UseCase.UseCaseCallback +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.invoice.FetchInvoices +import org.mifospay.R +import org.mifospay.base.BaseView +import org.mifospay.core.datastore.PreferencesHelper +import org.mifospay.invoice.InvoiceContract +import org.mifospay.invoice.InvoiceContract.InvoicesView +import org.mifospay.common.Constants import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/invoice/presenter/InvoicesViewModel.kt b/mifospay/src/main/java/org/mifospay/invoice/presenter/InvoicesViewModel.kt similarity index 81% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/invoice/presenter/InvoicesViewModel.kt rename to mifospay/src/main/java/org/mifospay/invoice/presenter/InvoicesViewModel.kt index 769fb109d..d0d9eb4e3 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/invoice/presenter/InvoicesViewModel.kt +++ b/mifospay/src/main/java/org/mifospay/invoice/presenter/InvoicesViewModel.kt @@ -1,16 +1,16 @@ -package org.mifos.mobilewallet.mifospay.invoice.presenter +package org.mifospay.invoice.presenter import android.net.Uri import androidx.lifecycle.ViewModel -import com.mifos.mobilewallet.model.entity.Invoice +import com.mifospay.core.model.entity.Invoice import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.invoice.FetchInvoices -import org.mifos.mobilewallet.mifospay.common.Constants.INVOICE_DOMAIN -import org.mifos.mobilewallet.mifospay.core.datastore.PreferencesHelper +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.invoice.FetchInvoices +import org.mifospay.common.Constants.INVOICE_DOMAIN +import org.mifospay.core.datastore.PreferencesHelper import javax.inject.Inject @HiltViewModel diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/invoice/ui/InvoiceActivity.kt b/mifospay/src/main/java/org/mifospay/invoice/ui/InvoiceActivity.kt similarity index 88% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/invoice/ui/InvoiceActivity.kt rename to mifospay/src/main/java/org/mifospay/invoice/ui/InvoiceActivity.kt index 7dc82b7eb..0328e3362 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/invoice/ui/InvoiceActivity.kt +++ b/mifospay/src/main/java/org/mifospay/invoice/ui/InvoiceActivity.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.invoice.ui +package org.mifospay.invoice.ui import android.content.ClipData import android.content.ClipboardManager @@ -11,16 +11,16 @@ import android.widget.TextView import butterknife.BindView import butterknife.ButterKnife import dagger.hilt.android.AndroidEntryPoint -import com.mifos.mobilewallet.model.entity.Invoice -import com.mifos.mobilewallet.model.utils.DateHelper -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.base.BaseActivity -import org.mifos.mobilewallet.mifospay.invoice.InvoiceContract -import org.mifos.mobilewallet.mifospay.invoice.InvoiceContract.InvoiceView -import org.mifos.mobilewallet.mifospay.invoice.presenter.InvoicePresenter -import org.mifos.mobilewallet.mifospay.receipt.ui.ReceiptActivity -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.utils.Toaster +import com.mifospay.core.model.entity.Invoice +import com.mifospay.core.model.utils.DateHelper +import org.mifospay.R +import org.mifospay.base.BaseActivity +import org.mifospay.invoice.InvoiceContract +import org.mifospay.invoice.InvoiceContract.InvoiceView +import org.mifospay.invoice.presenter.InvoicePresenter +import org.mifospay.receipt.ui.ReceiptActivity +import org.mifospay.common.Constants +import org.mifospay.utils.Toaster import javax.inject.Inject @AndroidEntryPoint diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/invoice/ui/InvoiceItem.kt b/mifospay/src/main/java/org/mifospay/invoice/ui/InvoiceItem.kt similarity index 96% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/invoice/ui/InvoiceItem.kt rename to mifospay/src/main/java/org/mifospay/invoice/ui/InvoiceItem.kt index 82bde5249..68a997569 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/invoice/ui/InvoiceItem.kt +++ b/mifospay/src/main/java/org/mifospay/invoice/ui/InvoiceItem.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.invoice.ui +package org.mifospay.invoice.ui import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -21,8 +21,8 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.designsystem.theme.grey +import org.mifospay.R +import org.mifospay.core.designsystem.theme.grey @Composable fun InvoiceItem( diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/invoice/ui/InvoiceScreen.kt b/mifospay/src/main/java/org/mifospay/invoice/ui/InvoiceScreen.kt similarity index 91% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/invoice/ui/InvoiceScreen.kt rename to mifospay/src/main/java/org/mifospay/invoice/ui/InvoiceScreen.kt index c1b45bac3..391341a04 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/invoice/ui/InvoiceScreen.kt +++ b/mifospay/src/main/java/org/mifospay/invoice/ui/InvoiceScreen.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.invoice.ui +package org.mifospay.invoice.ui import android.content.Intent import android.net.Uri @@ -18,12 +18,12 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.mifos.mobilewallet.model.entity.Invoice -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosLoadingWheel -import org.mifos.mobilewallet.mifospay.invoice.presenter.InvoiceUiState -import org.mifos.mobilewallet.mifospay.invoice.presenter.InvoicesViewModel -import org.mifos.mobilewallet.mifospay.ui.EmptyContentScreen +import com.mifospay.core.model.entity.Invoice +import org.mifospay.R +import org.mifospay.core.designsystem.component.MifosLoadingWheel +import org.mifospay.core.ui.EmptyContentScreen +import org.mifospay.invoice.presenter.InvoiceUiState +import org.mifospay.invoice.presenter.InvoicesViewModel @Composable fun InvoiceScreen( diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/invoice/ui/InvoicesFragment.kt b/mifospay/src/main/java/org/mifospay/invoice/ui/InvoicesFragment.kt similarity index 89% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/invoice/ui/InvoicesFragment.kt rename to mifospay/src/main/java/org/mifospay/invoice/ui/InvoicesFragment.kt index fd1ab724a..817cf8f58 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/invoice/ui/InvoicesFragment.kt +++ b/mifospay/src/main/java/org/mifospay/invoice/ui/InvoicesFragment.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.invoice.ui +package org.mifospay.invoice.ui import android.content.Intent import android.os.Bundle @@ -14,16 +14,16 @@ import androidx.recyclerview.widget.RecyclerView import butterknife.BindView import butterknife.ButterKnife import dagger.hilt.android.AndroidEntryPoint -import com.mifos.mobilewallet.model.entity.Invoice -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.base.BaseFragment -import org.mifos.mobilewallet.mifospay.invoice.InvoiceContract -import org.mifos.mobilewallet.mifospay.invoice.InvoiceContract.InvoicesView -import org.mifos.mobilewallet.mifospay.invoice.presenter.InvoicesPresenter -import org.mifos.mobilewallet.mifospay.invoice.ui.adapter.InvoicesAdapter -import org.mifos.mobilewallet.mifospay.utils.DebugUtil -import org.mifos.mobilewallet.mifospay.utils.RecyclerItemClickListener -import org.mifos.mobilewallet.mifospay.utils.Toaster +import com.mifospay.core.model.entity.Invoice +import org.mifospay.R +import org.mifospay.base.BaseFragment +import org.mifospay.invoice.InvoiceContract +import org.mifospay.invoice.InvoiceContract.InvoicesView +import org.mifospay.invoice.presenter.InvoicesPresenter +import org.mifospay.invoice.ui.adapter.InvoicesAdapter +import org.mifospay.utils.DebugUtil +import org.mifospay.utils.RecyclerItemClickListener +import org.mifospay.utils.Toaster import javax.inject.Inject @AndroidEntryPoint diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/invoice/ui/adapter/InvoicesAdapter.kt b/mifospay/src/main/java/org/mifospay/invoice/ui/adapter/InvoicesAdapter.kt similarity index 91% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/invoice/ui/adapter/InvoicesAdapter.kt rename to mifospay/src/main/java/org/mifospay/invoice/ui/adapter/InvoicesAdapter.kt index 6b3975d15..884887d12 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/invoice/ui/adapter/InvoicesAdapter.kt +++ b/mifospay/src/main/java/org/mifospay/invoice/ui/adapter/InvoicesAdapter.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.invoice.ui.adapter +package org.mifospay.invoice.ui.adapter import android.content.Context import android.view.LayoutInflater @@ -9,10 +9,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import butterknife.BindView import butterknife.ButterKnife -import com.mifos.mobilewallet.model.entity.Invoice -import com.mifos.mobilewallet.model.utils.DateHelper -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.common.Constants +import com.mifospay.core.model.entity.Invoice +import com.mifospay.core.model.utils.DateHelper +import org.mifospay.R +import org.mifospay.common.Constants import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/KYCContract.kt b/mifospay/src/main/java/org/mifospay/kyc/KYCContract.kt similarity index 87% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/KYCContract.kt rename to mifospay/src/main/java/org/mifospay/kyc/KYCContract.kt index 6da1bfe30..0b07f93f7 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/KYCContract.kt +++ b/mifospay/src/main/java/org/mifospay/kyc/KYCContract.kt @@ -1,10 +1,10 @@ -package org.mifos.mobilewallet.mifospay.kyc +package org.mifospay.kyc import android.content.Context import android.content.Intent -import com.mifos.mobilewallet.model.entity.kyc.KYCLevel1Details -import org.mifos.mobilewallet.mifospay.base.BasePresenter -import org.mifos.mobilewallet.mifospay.base.BaseView +import com.mifospay.core.model.entity.kyc.KYCLevel1Details +import org.mifospay.base.BasePresenter +import org.mifospay.base.BaseView /** * Created by ankur on 16/May/2018 diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/presenter/KYCDescriptionPresenter.kt b/mifospay/src/main/java/org/mifospay/kyc/presenter/KYCDescriptionPresenter.kt similarity index 78% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/presenter/KYCDescriptionPresenter.kt rename to mifospay/src/main/java/org/mifospay/kyc/presenter/KYCDescriptionPresenter.kt index d041a1aca..e1068ff95 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/presenter/KYCDescriptionPresenter.kt +++ b/mifospay/src/main/java/org/mifospay/kyc/presenter/KYCDescriptionPresenter.kt @@ -1,13 +1,13 @@ -package org.mifos.mobilewallet.mifospay.kyc.presenter +package org.mifospay.kyc.presenter -import org.mifos.mobilewallet.core.base.UseCase.UseCaseCallback -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.kyc.FetchKYCLevel1Details -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.base.BaseView -import org.mifos.mobilewallet.mifospay.data.local.LocalRepository -import org.mifos.mobilewallet.mifospay.kyc.KYCContract -import org.mifos.mobilewallet.mifospay.kyc.KYCContract.KYCDescriptionView +import org.mifospay.core.data.base.UseCase.UseCaseCallback +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.kyc.FetchKYCLevel1Details +import org.mifospay.R +import org.mifospay.base.BaseView +import org.mifospay.data.local.LocalRepository +import org.mifospay.kyc.KYCContract +import org.mifospay.kyc.KYCContract.KYCDescriptionView import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/presenter/KYCDescriptionViewModel.kt b/mifospay/src/main/java/org/mifospay/kyc/presenter/KYCDescriptionViewModel.kt similarity index 81% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/presenter/KYCDescriptionViewModel.kt rename to mifospay/src/main/java/org/mifospay/kyc/presenter/KYCDescriptionViewModel.kt index 967898138..0eb8813b3 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/presenter/KYCDescriptionViewModel.kt +++ b/mifospay/src/main/java/org/mifospay/kyc/presenter/KYCDescriptionViewModel.kt @@ -1,16 +1,14 @@ -package org.mifos.mobilewallet.mifospay.kyc.presenter +package org.mifospay.kyc.presenter import androidx.lifecycle.ViewModel -import com.mifos.mobilewallet.model.entity.kyc.KYCLevel1Details +import com.mifospay.core.model.entity.kyc.KYCLevel1Details import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.kyc.FetchKYCLevel1Details -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.data.local.LocalRepository -import org.mifos.mobilewallet.mifospay.kyc.KYCContract +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.kyc.FetchKYCLevel1Details +import org.mifospay.data.local.LocalRepository import javax.inject.Inject @HiltViewModel diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/presenter/KYCLevel1Presenter.kt b/mifospay/src/main/java/org/mifospay/kyc/presenter/KYCLevel1Presenter.kt similarity index 75% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/presenter/KYCLevel1Presenter.kt rename to mifospay/src/main/java/org/mifospay/kyc/presenter/KYCLevel1Presenter.kt index c1df97b5d..10bfbb684 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/presenter/KYCLevel1Presenter.kt +++ b/mifospay/src/main/java/org/mifospay/kyc/presenter/KYCLevel1Presenter.kt @@ -1,14 +1,14 @@ -package org.mifos.mobilewallet.mifospay.kyc.presenter +package org.mifospay.kyc.presenter -import org.mifos.mobilewallet.core.base.UseCase.UseCaseCallback -import com.mifos.mobilewallet.model.entity.kyc.KYCLevel1Details -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.kyc.UploadKYCLevel1Details -import org.mifos.mobilewallet.mifospay.base.BaseView -import org.mifos.mobilewallet.mifospay.data.local.LocalRepository -import org.mifos.mobilewallet.mifospay.kyc.KYCContract -import org.mifos.mobilewallet.mifospay.kyc.KYCContract.KYCLevel1View -import org.mifos.mobilewallet.mifospay.common.Constants +import org.mifospay.core.data.base.UseCase.UseCaseCallback +import com.mifospay.core.model.entity.kyc.KYCLevel1Details +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.kyc.UploadKYCLevel1Details +import org.mifospay.base.BaseView +import org.mifospay.data.local.LocalRepository +import org.mifospay.kyc.KYCContract +import org.mifospay.kyc.KYCContract.KYCLevel1View +import org.mifospay.common.Constants import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/presenter/KYCLevel1ViewModel.kt b/mifospay/src/main/java/org/mifospay/kyc/presenter/KYCLevel1ViewModel.kt similarity index 84% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/presenter/KYCLevel1ViewModel.kt rename to mifospay/src/main/java/org/mifospay/kyc/presenter/KYCLevel1ViewModel.kt index d8b870ee4..27a985aba 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/presenter/KYCLevel1ViewModel.kt +++ b/mifospay/src/main/java/org/mifospay/kyc/presenter/KYCLevel1ViewModel.kt @@ -1,14 +1,14 @@ -package org.mifos.mobilewallet.mifospay.kyc.presenter +package org.mifospay.kyc.presenter import androidx.lifecycle.ViewModel -import com.mifos.mobilewallet.model.entity.kyc.KYCLevel1Details +import com.mifospay.core.model.entity.kyc.KYCLevel1Details import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.kyc.UploadKYCLevel1Details -import org.mifos.mobilewallet.mifospay.data.local.LocalRepository +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.kyc.UploadKYCLevel1Details +import org.mifospay.data.local.LocalRepository import javax.inject.Inject @HiltViewModel diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/presenter/KYCLevel2Presenter.kt b/mifospay/src/main/java/org/mifospay/kyc/presenter/KYCLevel2Presenter.kt similarity index 84% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/presenter/KYCLevel2Presenter.kt rename to mifospay/src/main/java/org/mifospay/kyc/presenter/KYCLevel2Presenter.kt index 318fd9e62..716f68c0a 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/presenter/KYCLevel2Presenter.kt +++ b/mifospay/src/main/java/org/mifospay/kyc/presenter/KYCLevel2Presenter.kt @@ -1,24 +1,24 @@ -package org.mifos.mobilewallet.mifospay.kyc.presenter +package org.mifospay.kyc.presenter import android.app.Activity import android.content.Context import android.content.Intent import android.os.Build import okhttp3.MultipartBody -import org.mifos.mobilewallet.core.base.UseCase.UseCaseCallback -import org.mifos.mobilewallet.core.domain.usecase.kyc.UploadKYCDocs -import org.mifos.mobilewallet.mifospay.MifosPayApp -import org.mifos.mobilewallet.mifospay.base.BaseView -import org.mifos.mobilewallet.mifospay.core.datastore.PreferencesHelper -import org.mifos.mobilewallet.mifospay.kyc.KYCContract -import org.mifos.mobilewallet.mifospay.kyc.KYCContract.KYCLevel2View -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.utils.FileUtils +import org.mifospay.core.data.base.UseCase.UseCaseCallback +import org.mifospay.core.data.domain.usecase.kyc.UploadKYCDocs +import org.mifospay.MifosPayApp +import org.mifospay.base.BaseView +import org.mifospay.core.datastore.PreferencesHelper +import org.mifospay.kyc.KYCContract +import org.mifospay.kyc.KYCContract.KYCLevel2View +import org.mifospay.common.Constants +import org.mifospay.utils.FileUtils import java.io.File import javax.inject.Inject import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.RequestBody.Companion.asRequestBody -import org.mifos.mobilewallet.core.base.UseCaseHandler +import org.mifospay.core.data.base.UseCaseHandler /** * Created by ankur on 17/May/2018 @@ -69,7 +69,7 @@ class KYCLevel2Presenter @Inject constructor( if (file != null) { uploadKYCDocsUseCase.walletRequestValues = identityType?.let { UploadKYCDocs.RequestValues( - org.mifos.mobilewallet.core.util.Constants.ENTITY_TYPE_CLIENTS, + org.mifospay.core.data.util.Constants.ENTITY_TYPE_CLIENTS, preferencesHelper.clientId, file!!.name, it, getRequestFileBody(file!!) ) diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/presenter/KYCLevel2ViewModel.kt b/mifospay/src/main/java/org/mifospay/kyc/presenter/KYCLevel2ViewModel.kt similarity index 83% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/presenter/KYCLevel2ViewModel.kt rename to mifospay/src/main/java/org/mifospay/kyc/presenter/KYCLevel2ViewModel.kt index f47c391c6..6fec9ed31 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/presenter/KYCLevel2ViewModel.kt +++ b/mifospay/src/main/java/org/mifospay/kyc/presenter/KYCLevel2ViewModel.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.kyc.presenter +package org.mifospay.kyc.presenter import android.net.Uri import androidx.lifecycle.ViewModel @@ -8,11 +8,11 @@ import kotlinx.coroutines.flow.StateFlow import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.MultipartBody import okhttp3.RequestBody.Companion.asRequestBody -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.kyc.UploadKYCDocs -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.core.datastore.PreferencesHelper +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.kyc.UploadKYCDocs +import org.mifospay.common.Constants +import org.mifospay.core.datastore.PreferencesHelper import java.io.File import javax.inject.Inject @@ -32,7 +32,7 @@ class KYCLevel2ViewModel @Inject constructor( if (file != null) { uploadKYCDocsUseCase.walletRequestValues = identityType.let { UploadKYCDocs.RequestValues( - org.mifos.mobilewallet.core.util.Constants.ENTITY_TYPE_CLIENTS, + org.mifospay.core.data.util.Constants.ENTITY_TYPE_CLIENTS, preferencesHelper.clientId, file.name, it, getRequestFileBody(file) ) diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/presenter/KYCLevel3Presenter.kt b/mifospay/src/main/java/org/mifospay/kyc/presenter/KYCLevel3Presenter.kt similarity index 56% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/presenter/KYCLevel3Presenter.kt rename to mifospay/src/main/java/org/mifospay/kyc/presenter/KYCLevel3Presenter.kt index 463415042..9db7747fc 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/presenter/KYCLevel3Presenter.kt +++ b/mifospay/src/main/java/org/mifospay/kyc/presenter/KYCLevel3Presenter.kt @@ -1,10 +1,10 @@ -package org.mifos.mobilewallet.mifospay.kyc.presenter +package org.mifospay.kyc.presenter -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.mifospay.base.BaseView -import org.mifos.mobilewallet.mifospay.data.local.LocalRepository -import org.mifos.mobilewallet.mifospay.kyc.KYCContract -import org.mifos.mobilewallet.mifospay.kyc.KYCContract.KYCLevel3View +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.base.BaseView +import org.mifospay.data.local.LocalRepository +import org.mifospay.kyc.KYCContract +import org.mifospay.kyc.KYCContract.KYCLevel3View import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/presenter/KYCLevel3ViewModel.kt b/mifospay/src/main/java/org/mifospay/kyc/presenter/KYCLevel3ViewModel.kt similarity index 81% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/presenter/KYCLevel3ViewModel.kt rename to mifospay/src/main/java/org/mifospay/kyc/presenter/KYCLevel3ViewModel.kt index 63c1ab190..f21d0269f 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/presenter/KYCLevel3ViewModel.kt +++ b/mifospay/src/main/java/org/mifospay/kyc/presenter/KYCLevel3ViewModel.kt @@ -1,11 +1,11 @@ -package org.mifos.mobilewallet.mifospay.kyc.presenter +package org.mifospay.kyc.presenter import androidx.lifecycle.ViewModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.mifospay.data.local.LocalRepository +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.data.local.LocalRepository import javax.inject.Inject @HiltViewModel diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/ui/KYCDescriptionFragment.kt b/mifospay/src/main/java/org/mifospay/kyc/ui/KYCDescriptionFragment.kt similarity index 89% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/ui/KYCDescriptionFragment.kt rename to mifospay/src/main/java/org/mifospay/kyc/ui/KYCDescriptionFragment.kt index 048ca8bd0..3d0911dc9 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/ui/KYCDescriptionFragment.kt +++ b/mifospay/src/main/java/org/mifospay/kyc/ui/KYCDescriptionFragment.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.kyc.ui +package org.mifospay.kyc.ui import android.os.Bundle import android.view.LayoutInflater @@ -9,10 +9,10 @@ import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.ViewCompositionStrategy import androidx.fragment.app.viewModels import dagger.hilt.android.AndroidEntryPoint -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.base.BaseFragment -import org.mifos.mobilewallet.mifospay.kyc.presenter.KYCDescriptionViewModel -import org.mifos.mobilewallet.mifospay.theme.MifosTheme +import org.mifospay.R +import org.mifospay.base.BaseFragment +import org.mifospay.kyc.presenter.KYCDescriptionViewModel +import org.mifospay.theme.MifosTheme /** * Created by ankur on 17/May/2018 diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/ui/KYCDescriptionScreen.kt b/mifospay/src/main/java/org/mifospay/kyc/ui/KYCDescriptionScreen.kt similarity index 95% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/ui/KYCDescriptionScreen.kt rename to mifospay/src/main/java/org/mifospay/kyc/ui/KYCDescriptionScreen.kt index bbf92d9fd..9f61701d3 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/ui/KYCDescriptionScreen.kt +++ b/mifospay/src/main/java/org/mifospay/kyc/ui/KYCDescriptionScreen.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.kyc.ui +package org.mifospay.kyc.ui import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -39,11 +39,11 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.hilt.navigation.compose.hiltViewModel -import com.mifos.mobilewallet.model.entity.kyc.KYCLevel1Details -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosOverlayLoadingWheel -import org.mifos.mobilewallet.mifospay.kyc.presenter.KYCDescriptionUiState -import org.mifos.mobilewallet.mifospay.kyc.presenter.KYCDescriptionViewModel +import com.mifospay.core.model.entity.kyc.KYCLevel1Details +import org.mifospay.R +import org.mifospay.core.designsystem.component.MifosOverlayLoadingWheel +import org.mifospay.kyc.presenter.KYCDescriptionUiState +import org.mifospay.kyc.presenter.KYCDescriptionViewModel @Composable fun KYCDescriptionScreen( diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/ui/KYCLevel1Fragment.kt b/mifospay/src/main/java/org/mifospay/kyc/ui/KYCLevel1Fragment.kt similarity index 88% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/ui/KYCLevel1Fragment.kt rename to mifospay/src/main/java/org/mifospay/kyc/ui/KYCLevel1Fragment.kt index 026444f8a..dda93bab4 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/ui/KYCLevel1Fragment.kt +++ b/mifospay/src/main/java/org/mifospay/kyc/ui/KYCLevel1Fragment.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.kyc.ui +package org.mifospay.kyc.ui import android.os.Bundle import android.view.LayoutInflater @@ -7,8 +7,8 @@ import android.view.ViewGroup import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.ViewCompositionStrategy import dagger.hilt.android.AndroidEntryPoint -import org.mifos.mobilewallet.mifospay.base.BaseFragment -import org.mifos.mobilewallet.mifospay.theme.MifosTheme +import org.mifospay.base.BaseFragment +import org.mifospay.theme.MifosTheme /** * Created by ankur on 17/May/2018 diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/ui/KYCLevel1Screen.kt b/mifospay/src/main/java/org/mifospay/kyc/ui/KYCLevel1Screen.kt similarity index 95% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/ui/KYCLevel1Screen.kt rename to mifospay/src/main/java/org/mifospay/kyc/ui/KYCLevel1Screen.kt index 6f37ba402..a6094d499 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/ui/KYCLevel1Screen.kt +++ b/mifospay/src/main/java/org/mifospay/kyc/ui/KYCLevel1Screen.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.kyc.ui +package org.mifospay.kyc.ui import android.widget.Toast import androidx.compose.foundation.border @@ -38,12 +38,12 @@ import com.maxkeppeler.sheets.calendar.models.CalendarConfig import com.maxkeppeler.sheets.calendar.models.CalendarSelection import com.maxkeppeler.sheets.calendar.models.CalendarStyle import com.togitech.ccp.component.TogiCountryCodePicker -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.designsystem.component.MfOverlayLoadingWheel -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosOutlinedTextField -import org.mifos.mobilewallet.mifospay.kyc.presenter.KYCLevel1UiState -import org.mifos.mobilewallet.mifospay.kyc.presenter.KYCLevel1ViewModel -import org.mifos.mobilewallet.mifospay.theme.MifosTheme +import org.mifospay.R +import org.mifospay.core.designsystem.component.MfOverlayLoadingWheel +import org.mifospay.core.designsystem.component.MifosOutlinedTextField +import org.mifospay.kyc.presenter.KYCLevel1UiState +import org.mifospay.kyc.presenter.KYCLevel1ViewModel +import org.mifospay.theme.MifosTheme import java.time.format.DateTimeFormatter diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/ui/KYCLevel2Fragment.kt b/mifospay/src/main/java/org/mifospay/kyc/ui/KYCLevel2Fragment.kt similarity index 88% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/ui/KYCLevel2Fragment.kt rename to mifospay/src/main/java/org/mifospay/kyc/ui/KYCLevel2Fragment.kt index 0f4731c0f..3443e9b2f 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/ui/KYCLevel2Fragment.kt +++ b/mifospay/src/main/java/org/mifospay/kyc/ui/KYCLevel2Fragment.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.kyc.ui +package org.mifospay.kyc.ui import android.os.Bundle import android.view.LayoutInflater @@ -7,8 +7,8 @@ import android.view.ViewGroup import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.ViewCompositionStrategy import dagger.hilt.android.AndroidEntryPoint -import org.mifos.mobilewallet.mifospay.base.BaseFragment -import org.mifos.mobilewallet.mifospay.theme.MifosTheme +import org.mifospay.base.BaseFragment +import org.mifospay.theme.MifosTheme /** * Created by ankur on 17/May/2018 diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/ui/KYCLevel2Screen.kt b/mifospay/src/main/java/org/mifospay/kyc/ui/KYCLevel2Screen.kt similarity index 96% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/ui/KYCLevel2Screen.kt rename to mifospay/src/main/java/org/mifospay/kyc/ui/KYCLevel2Screen.kt index 5e70d83e4..225f7a002 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/ui/KYCLevel2Screen.kt +++ b/mifospay/src/main/java/org/mifospay/kyc/ui/KYCLevel2Screen.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.kyc.ui +package org.mifospay.kyc.ui import android.Manifest import android.app.Activity @@ -50,12 +50,12 @@ import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleEventObserver import androidx.lifecycle.compose.collectAsStateWithLifecycle import kotlinx.coroutines.launch -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.designsystem.component.MfOverlayLoadingWheel -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosOutlinedTextField -import org.mifos.mobilewallet.mifospay.kyc.presenter.KYCLevel2UiState -import org.mifos.mobilewallet.mifospay.kyc.presenter.KYCLevel2ViewModel -import org.mifos.mobilewallet.mifospay.theme.MifosTheme +import org.mifospay.R +import org.mifospay.core.designsystem.component.MfOverlayLoadingWheel +import org.mifospay.core.designsystem.component.MifosOutlinedTextField +import org.mifospay.kyc.presenter.KYCLevel2UiState +import org.mifospay.kyc.presenter.KYCLevel2ViewModel +import org.mifospay.theme.MifosTheme @Composable diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/ui/KYCLevel3Fragment.kt b/mifospay/src/main/java/org/mifospay/kyc/ui/KYCLevel3Fragment.kt similarity index 86% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/ui/KYCLevel3Fragment.kt rename to mifospay/src/main/java/org/mifospay/kyc/ui/KYCLevel3Fragment.kt index db5e8fa03..b70afd50d 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/ui/KYCLevel3Fragment.kt +++ b/mifospay/src/main/java/org/mifospay/kyc/ui/KYCLevel3Fragment.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.kyc.ui +package org.mifospay.kyc.ui import android.os.Bundle import android.view.LayoutInflater @@ -7,8 +7,8 @@ import android.view.ViewGroup import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.ViewCompositionStrategy import dagger.hilt.android.AndroidEntryPoint -import org.mifos.mobilewallet.mifospay.base.BaseFragment -import org.mifos.mobilewallet.mifospay.theme.MifosTheme +import org.mifospay.base.BaseFragment +import org.mifospay.theme.MifosTheme /** * Created by ankur on 17/May/2018 diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/ui/KYCLevel3Screen.kt b/mifospay/src/main/java/org/mifospay/kyc/ui/KYCLevel3Screen.kt similarity index 84% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/ui/KYCLevel3Screen.kt rename to mifospay/src/main/java/org/mifospay/kyc/ui/KYCLevel3Screen.kt index b293d4ea6..06d54069a 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/kyc/ui/KYCLevel3Screen.kt +++ b/mifospay/src/main/java/org/mifospay/kyc/ui/KYCLevel3Screen.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.kyc.ui +package org.mifospay.kyc.ui import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -19,12 +19,12 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.designsystem.component.MfOverlayLoadingWheel -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosOutlinedTextField -import org.mifos.mobilewallet.mifospay.kyc.presenter.KYCLevel3UiState -import org.mifos.mobilewallet.mifospay.kyc.presenter.KYCLevel3ViewModel -import org.mifos.mobilewallet.mifospay.theme.MifosTheme +import org.mifospay.R +import org.mifospay.core.designsystem.component.MfOverlayLoadingWheel +import org.mifospay.core.designsystem.component.MifosOutlinedTextField +import org.mifospay.kyc.presenter.KYCLevel3UiState +import org.mifospay.kyc.presenter.KYCLevel3ViewModel +import org.mifospay.theme.MifosTheme @Composable fun KYCLevel3Screen( diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/merchants/MerchantsContract.kt b/mifospay/src/main/java/org/mifospay/merchants/MerchantsContract.kt similarity index 64% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/merchants/MerchantsContract.kt rename to mifospay/src/main/java/org/mifospay/merchants/MerchantsContract.kt index bf1b3037b..b9bd0205c 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/merchants/MerchantsContract.kt +++ b/mifospay/src/main/java/org/mifospay/merchants/MerchantsContract.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.mifospay.merchants +package org.mifospay.merchants -import com.mifos.mobilewallet.model.entity.accounts.savings.SavingsWithAssociations -import org.mifos.mobilewallet.mifospay.base.BasePresenter -import org.mifos.mobilewallet.mifospay.base.BaseView +import com.mifospay.core.model.entity.accounts.savings.SavingsWithAssociations +import org.mifospay.base.BasePresenter +import org.mifospay.base.BaseView interface MerchantsContract { interface MerchantsPresenter : BasePresenter { diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/merchants/adapter/MerchantsAdapter.kt b/mifospay/src/main/java/org/mifospay/merchants/adapter/MerchantsAdapter.kt similarity index 93% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/merchants/adapter/MerchantsAdapter.kt rename to mifospay/src/main/java/org/mifospay/merchants/adapter/MerchantsAdapter.kt index 7fdb6f593..422df924e 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/merchants/adapter/MerchantsAdapter.kt +++ b/mifospay/src/main/java/org/mifospay/merchants/adapter/MerchantsAdapter.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.merchants.adapter +package org.mifospay.merchants.adapter import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater @@ -10,9 +10,9 @@ import android.widget.ImageView import android.widget.TextView import butterknife.BindView import butterknife.ButterKnife -import com.mifos.mobilewallet.model.entity.accounts.savings.SavingsWithAssociations -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.utils.TextDrawable +import com.mifospay.core.model.entity.accounts.savings.SavingsWithAssociations +import org.mifospay.R +import org.mifospay.utils.TextDrawable import java.util.* import javax.inject.Inject diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/merchants/presenter/MerchantTransferPresenter.kt b/mifospay/src/main/java/org/mifospay/merchants/presenter/MerchantTransferPresenter.kt similarity index 80% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/merchants/presenter/MerchantTransferPresenter.kt rename to mifospay/src/main/java/org/mifospay/merchants/presenter/MerchantTransferPresenter.kt index 08ca8a9fb..5abb9112b 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/merchants/presenter/MerchantTransferPresenter.kt +++ b/mifospay/src/main/java/org/mifospay/merchants/presenter/MerchantTransferPresenter.kt @@ -1,24 +1,24 @@ -package org.mifos.mobilewallet.mifospay.merchants.presenter +package org.mifospay.merchants.presenter -import org.mifos.mobilewallet.core.base.TaskLooper -import org.mifos.mobilewallet.core.base.TaskLooper.TaskData -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.base.UseCase.UseCaseCallback -import org.mifos.mobilewallet.core.base.UseCaseFactory -import com.mifos.mobilewallet.model.domain.Transaction -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.account.FetchAccount -import org.mifos.mobilewallet.core.domain.usecase.account.FetchAccountTransfer -import org.mifos.mobilewallet.core.util.Constants.FETCH_ACCOUNT_TRANSFER_USECASE -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.base.BaseView -import org.mifos.mobilewallet.mifospay.data.local.LocalRepository -import org.mifos.mobilewallet.mifospay.core.datastore.PreferencesHelper -import org.mifos.mobilewallet.mifospay.history.HistoryContract.TransactionsHistoryAsync -import org.mifos.mobilewallet.mifospay.history.TransactionsHistory -import org.mifos.mobilewallet.mifospay.home.BaseHomeContract -import org.mifos.mobilewallet.mifospay.home.BaseHomeContract.MerchantTransferView -import org.mifos.mobilewallet.mifospay.common.Constants +import org.mifospay.core.data.base.TaskLooper +import org.mifospay.core.data.base.TaskLooper.TaskData +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.base.UseCase.UseCaseCallback +import org.mifospay.core.data.base.UseCaseFactory +import com.mifospay.core.model.domain.Transaction +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.account.FetchAccount +import org.mifospay.core.data.domain.usecase.account.FetchAccountTransfer +import org.mifospay.core.data.util.Constants.FETCH_ACCOUNT_TRANSFER_USECASE +import org.mifospay.R +import org.mifospay.base.BaseView +import org.mifospay.data.local.LocalRepository +import org.mifospay.core.datastore.PreferencesHelper +import org.mifospay.history.HistoryContract.TransactionsHistoryAsync +import org.mifospay.history.TransactionsHistory +import org.mifospay.home.BaseHomeContract +import org.mifospay.home.BaseHomeContract.MerchantTransferView +import org.mifospay.common.Constants import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/merchants/presenter/MerchantViewModel.kt b/mifospay/src/main/java/org/mifospay/merchants/presenter/MerchantViewModel.kt similarity index 89% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/merchants/presenter/MerchantViewModel.kt rename to mifospay/src/main/java/org/mifospay/merchants/presenter/MerchantViewModel.kt index ffd05e7fd..6a551c701 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/merchants/presenter/MerchantViewModel.kt +++ b/mifospay/src/main/java/org/mifospay/merchants/presenter/MerchantViewModel.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.mifospay.merchants.presenter +package org.mifospay.merchants.presenter import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.mifos.mobilewallet.model.entity.accounts.savings.SavingsWithAssociations +import com.mifospay.core.model.entity.accounts.savings.SavingsWithAssociations import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted @@ -11,13 +11,13 @@ import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.flow.update -import org.mifos.mobilewallet.core.base.TaskLooper -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.base.UseCaseFactory -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.account.FetchMerchants -import org.mifos.mobilewallet.core.domain.usecase.client.FetchClientDetails -import org.mifos.mobilewallet.core.util.Constants +import org.mifospay.core.data.base.TaskLooper +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.base.UseCaseFactory +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.account.FetchMerchants +import org.mifospay.core.data.domain.usecase.client.FetchClientDetails +import org.mifospay.core.data.util.Constants import javax.inject.Inject @HiltViewModel diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/merchants/presenter/MerchantsPresenter.kt b/mifospay/src/main/java/org/mifospay/merchants/presenter/MerchantsPresenter.kt similarity index 77% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/merchants/presenter/MerchantsPresenter.kt rename to mifospay/src/main/java/org/mifospay/merchants/presenter/MerchantsPresenter.kt index 7126171eb..7615ad026 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/merchants/presenter/MerchantsPresenter.kt +++ b/mifospay/src/main/java/org/mifospay/merchants/presenter/MerchantsPresenter.kt @@ -1,19 +1,19 @@ -package org.mifos.mobilewallet.mifospay.merchants.presenter +package org.mifospay.merchants.presenter -import org.mifos.mobilewallet.core.base.TaskLooper -import org.mifos.mobilewallet.core.base.TaskLooper.TaskData -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.base.UseCase.UseCaseCallback -import org.mifos.mobilewallet.core.base.UseCaseFactory -import com.mifos.mobilewallet.model.entity.accounts.savings.SavingsWithAssociations -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.account.FetchMerchants -import org.mifos.mobilewallet.core.domain.usecase.client.FetchClientDetails -import org.mifos.mobilewallet.core.util.Constants -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.base.BaseView -import org.mifos.mobilewallet.mifospay.merchants.MerchantsContract -import org.mifos.mobilewallet.mifospay.merchants.MerchantsContract.MerchantsView +import org.mifospay.core.data.base.TaskLooper +import org.mifospay.core.data.base.TaskLooper.TaskData +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.base.UseCase.UseCaseCallback +import org.mifospay.core.data.base.UseCaseFactory +import com.mifospay.core.model.entity.accounts.savings.SavingsWithAssociations +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.account.FetchMerchants +import org.mifospay.core.data.domain.usecase.client.FetchClientDetails +import org.mifospay.R +import org.mifospay.base.BaseView +import org.mifospay.core.data.util.Constants +import org.mifospay.merchants.MerchantsContract +import org.mifospay.merchants.MerchantsContract.MerchantsView import javax.inject.Inject class MerchantsPresenter @Inject constructor( diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/merchants/ui/MerchantScreen.kt b/mifospay/src/main/java/org/mifospay/merchants/ui/MerchantScreen.kt similarity index 93% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/merchants/ui/MerchantScreen.kt rename to mifospay/src/main/java/org/mifospay/merchants/ui/MerchantScreen.kt index a71f35862..bf8c08a9a 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/merchants/ui/MerchantScreen.kt +++ b/mifospay/src/main/java/org/mifospay/merchants/ui/MerchantScreen.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.merchants.ui +package org.mifospay.merchants.ui import android.content.Intent import androidx.compose.foundation.layout.Box @@ -29,14 +29,14 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.mifos.mobilewallet.model.entity.accounts.savings.SavingsWithAssociations -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.designsystem.component.MfLoadingWheel -import org.mifos.mobilewallet.mifospay.merchants.presenter.MerchantUiState -import org.mifos.mobilewallet.mifospay.merchants.presenter.MerchantViewModel -import org.mifos.mobilewallet.mifospay.theme.MifosTheme -import org.mifos.mobilewallet.mifospay.ui.EmptyContentScreen +import com.mifospay.core.model.entity.accounts.savings.SavingsWithAssociations +import org.mifospay.R +import org.mifospay.common.Constants +import org.mifospay.core.ui.EmptyContentScreen +import org.mifospay.core.designsystem.component.MfLoadingWheel +import org.mifospay.merchants.presenter.MerchantUiState +import org.mifospay.merchants.presenter.MerchantViewModel +import org.mifospay.theme.MifosTheme @Composable fun MerchantScreen( diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/merchants/ui/MerchantTransferActivity.kt b/mifospay/src/main/java/org/mifospay/merchants/ui/MerchantTransferActivity.kt similarity index 89% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/merchants/ui/MerchantTransferActivity.kt rename to mifospay/src/main/java/org/mifospay/merchants/ui/MerchantTransferActivity.kt index 75596c886..4501b91b8 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/merchants/ui/MerchantTransferActivity.kt +++ b/mifospay/src/main/java/org/mifospay/merchants/ui/MerchantTransferActivity.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.merchants.ui +package org.mifospay.merchants.ui import android.os.Bundle import com.google.android.material.bottomsheet.BottomSheetBehavior @@ -14,18 +14,18 @@ import butterknife.BindView import butterknife.ButterKnife import butterknife.OnClick import dagger.hilt.android.AndroidEntryPoint -import com.mifos.mobilewallet.model.domain.Transaction -import org.mifos.mobilewallet.mifospay.MifosPayApp -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.base.BaseActivity -import org.mifos.mobilewallet.mifospay.common.ui.MakeTransferFragment -import org.mifos.mobilewallet.mifospay.history.ui.adapter.SpecificTransactionsAdapter -import org.mifos.mobilewallet.mifospay.home.BaseHomeContract -import org.mifos.mobilewallet.mifospay.home.BaseHomeContract.MerchantTransferView -import org.mifos.mobilewallet.mifospay.merchants.presenter.MerchantTransferPresenter -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.utils.TextDrawable -import org.mifos.mobilewallet.mifospay.utils.Toaster +import com.mifospay.core.model.domain.Transaction +import org.mifospay.MifosPayApp +import org.mifospay.R +import org.mifospay.base.BaseActivity +import org.mifospay.common.ui.MakeTransferFragment +import org.mifospay.history.ui.adapter.SpecificTransactionsAdapter +import org.mifospay.home.BaseHomeContract +import org.mifospay.home.BaseHomeContract.MerchantTransferView +import org.mifospay.merchants.presenter.MerchantTransferPresenter +import org.mifospay.common.Constants +import org.mifospay.utils.TextDrawable +import org.mifospay.utils.Toaster import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/merchants/ui/MerchantsFragment.kt b/mifospay/src/main/java/org/mifospay/merchants/ui/MerchantsFragment.kt similarity index 93% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/merchants/ui/MerchantsFragment.kt rename to mifospay/src/main/java/org/mifospay/merchants/ui/MerchantsFragment.kt index 82428f746..95a205c89 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/merchants/ui/MerchantsFragment.kt +++ b/mifospay/src/main/java/org/mifospay/merchants/ui/MerchantsFragment.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.merchants.ui +package org.mifospay.merchants.ui import android.content.ClipData import android.content.ClipboardManager @@ -21,14 +21,14 @@ import butterknife.BindView import butterknife.ButterKnife import butterknife.OnTextChanged import dagger.hilt.android.AndroidEntryPoint -import com.mifos.mobilewallet.model.entity.accounts.savings.SavingsWithAssociations -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.base.BaseFragment -import org.mifos.mobilewallet.mifospay.merchants.MerchantsContract -import org.mifos.mobilewallet.mifospay.merchants.adapter.MerchantsAdapter -import org.mifos.mobilewallet.mifospay.merchants.presenter.MerchantsPresenter -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.utils.RecyclerItemClickListener +import com.mifospay.core.model.entity.accounts.savings.SavingsWithAssociations +import org.mifospay.R +import org.mifospay.base.BaseFragment +import org.mifospay.merchants.MerchantsContract +import org.mifospay.merchants.adapter.MerchantsAdapter +import org.mifospay.merchants.presenter.MerchantsPresenter +import org.mifospay.common.Constants +import org.mifospay.utils.RecyclerItemClickListener import java.util.* import javax.inject.Inject diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/merchants/ui/MerchantsItem.kt b/mifospay/src/main/java/org/mifospay/merchants/ui/MerchantsItem.kt similarity index 85% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/merchants/ui/MerchantsItem.kt rename to mifospay/src/main/java/org/mifospay/merchants/ui/MerchantsItem.kt index 14c2ae4db..876b97a55 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/merchants/ui/MerchantsItem.kt +++ b/mifospay/src/main/java/org/mifospay/merchants/ui/MerchantsItem.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.merchants.ui +package org.mifospay.merchants.ui import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -16,11 +16,11 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.mifos.mobilewallet.model.entity.accounts.savings.SavingsWithAssociations -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosCard -import org.mifos.mobilewallet.mifospay.designsystem.theme.mifosText -import org.mifos.mobilewallet.mifospay.designsystem.theme.styleMedium16sp +import com.mifospay.core.model.entity.accounts.savings.SavingsWithAssociations +import org.mifospay.R +import org.mifospay.core.designsystem.component.MifosCard +import org.mifospay.core.designsystem.theme.mifosText +import org.mifospay.core.designsystem.theme.styleMedium16sp @Composable fun MerchantsItem( diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/navigation/MifosNavHost.kt b/mifospay/src/main/java/org/mifospay/navigation/MifosNavHost.kt similarity index 68% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/navigation/MifosNavHost.kt rename to mifospay/src/main/java/org/mifospay/navigation/MifosNavHost.kt index 160769781..4f5095976 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/navigation/MifosNavHost.kt +++ b/mifospay/src/main/java/org/mifospay/navigation/MifosNavHost.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.navigation +package org.mifospay.navigation import android.content.Context import android.content.Intent @@ -6,21 +6,21 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.navigation.compose.NavHost -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.editprofile.ui.EditProfileActivity -import org.mifos.mobilewallet.mifospay.home.navigation.HOME_ROUTE -import org.mifos.mobilewallet.mifospay.home.navigation.financeScreen -import org.mifos.mobilewallet.mifospay.home.navigation.homeScreen -import org.mifos.mobilewallet.mifospay.home.navigation.paymentsScreen -import org.mifos.mobilewallet.mifospay.home.navigation.profileScreen -import org.mifos.mobilewallet.mifospay.payments.send.navigation.navigateToSendMoneyScreen -import org.mifos.mobilewallet.mifospay.payments.send.navigation.sendMoneyScreen -import org.mifos.mobilewallet.mifospay.payments.ui.SendActivity -import org.mifos.mobilewallet.mifospay.qr.ui.ShowQrActivity -import org.mifos.mobilewallet.mifospay.savedcards.ui.AddCardDialog -import org.mifos.mobilewallet.mifospay.settings.ui.SettingsActivity -import org.mifos.mobilewallet.mifospay.standinginstruction.ui.NewSIActivity -import org.mifos.mobilewallet.mifospay.ui.MifosAppState +import org.mifospay.common.Constants +import org.mifospay.editprofile.ui.EditProfileActivity +import org.mifospay.home.navigation.HOME_ROUTE +import org.mifospay.home.navigation.financeScreen +import org.mifospay.home.navigation.homeScreen +import org.mifospay.home.navigation.paymentsScreen +import org.mifospay.home.navigation.profileScreen +import org.mifospay.payments.send.navigation.navigateToSendMoneyScreen +import org.mifospay.payments.send.navigation.sendMoneyScreen +import org.mifospay.payments.ui.SendActivity +import org.mifospay.qr.ui.ShowQrActivity +import org.mifospay.savedcards.ui.AddCardDialog +import org.mifospay.settings.ui.SettingsActivity +import org.mifospay.standinginstruction.ui.NewSIActivity +import org.mifospay.ui.MifosAppState /** * Top-level navigation graph. Navigation is organized as explained at diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/navigation/TopLevelDestination.kt b/mifospay/src/main/java/org/mifospay/navigation/TopLevelDestination.kt similarity index 88% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/navigation/TopLevelDestination.kt rename to mifospay/src/main/java/org/mifospay/navigation/TopLevelDestination.kt index 06171814d..f9177e265 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/navigation/TopLevelDestination.kt +++ b/mifospay/src/main/java/org/mifospay/navigation/TopLevelDestination.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.mifospay.navigation +package org.mifospay.navigation import androidx.compose.ui.graphics.vector.ImageVector -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.designsystem.icon.MifosIcons +import org.mifospay.R +import org.mifospay.core.designsystem.icon.MifosIcons /** * Type for the top level destinations in the application. Each of these destinations diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/notification/NotificationContract.kt b/mifospay/src/main/java/org/mifospay/notification/NotificationContract.kt similarity index 63% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/notification/NotificationContract.kt rename to mifospay/src/main/java/org/mifospay/notification/NotificationContract.kt index 6d2a992f8..191dcc550 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/notification/NotificationContract.kt +++ b/mifospay/src/main/java/org/mifospay/notification/NotificationContract.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.mifospay.notification +package org.mifospay.notification -import com.mifos.mobilewallet.model.domain.NotificationPayload -import org.mifos.mobilewallet.mifospay.base.BasePresenter -import org.mifos.mobilewallet.mifospay.base.BaseView +import com.mifospay.core.model.domain.NotificationPayload +import org.mifospay.base.BasePresenter +import org.mifospay.base.BaseView /** * Created by ankur on 24/July/2018 diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/notification/presenter/NotificationPresenter.kt b/mifospay/src/main/java/org/mifospay/notification/presenter/NotificationPresenter.kt similarity index 69% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/notification/presenter/NotificationPresenter.kt rename to mifospay/src/main/java/org/mifospay/notification/presenter/NotificationPresenter.kt index bb3faa18c..4b2c25a5b 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/notification/presenter/NotificationPresenter.kt +++ b/mifospay/src/main/java/org/mifospay/notification/presenter/NotificationPresenter.kt @@ -1,12 +1,12 @@ -package org.mifos.mobilewallet.mifospay.notification.presenter +package org.mifospay.notification.presenter -import org.mifos.mobilewallet.core.base.UseCase.UseCaseCallback -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.notification.FetchNotifications -import org.mifos.mobilewallet.mifospay.base.BaseView -import org.mifos.mobilewallet.mifospay.data.local.LocalRepository -import org.mifos.mobilewallet.mifospay.notification.NotificationContract -import org.mifos.mobilewallet.mifospay.notification.NotificationContract.NotificationView +import org.mifospay.core.data.base.UseCase.UseCaseCallback +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.notification.FetchNotifications +import org.mifospay.base.BaseView +import org.mifospay.data.local.LocalRepository +import org.mifospay.notification.NotificationContract +import org.mifospay.notification.NotificationContract.NotificationView import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/notification/ui/NotificationActivity.kt b/mifospay/src/main/java/org/mifospay/notification/ui/NotificationActivity.kt similarity index 83% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/notification/ui/NotificationActivity.kt rename to mifospay/src/main/java/org/mifospay/notification/ui/NotificationActivity.kt index 728b36313..336b47411 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/notification/ui/NotificationActivity.kt +++ b/mifospay/src/main/java/org/mifospay/notification/ui/NotificationActivity.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.notification.ui +package org.mifospay.notification.ui import android.os.Bundle import android.view.View @@ -9,15 +9,15 @@ import androidx.recyclerview.widget.RecyclerView import butterknife.BindView import butterknife.ButterKnife import dagger.hilt.android.AndroidEntryPoint -import com.mifos.mobilewallet.model.domain.NotificationPayload -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.base.BaseActivity -import org.mifos.mobilewallet.mifospay.notification.NotificationContract -import org.mifos.mobilewallet.mifospay.notification.NotificationContract.NotificationView -import org.mifos.mobilewallet.mifospay.notification.presenter.NotificationPresenter -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.utils.DebugUtil -import org.mifos.mobilewallet.mifospay.utils.Toaster +import com.mifospay.core.model.domain.NotificationPayload +import org.mifospay.R +import org.mifospay.base.BaseActivity +import org.mifospay.notification.NotificationContract +import org.mifospay.notification.NotificationContract.NotificationView +import org.mifospay.notification.presenter.NotificationPresenter +import org.mifospay.common.Constants +import org.mifospay.utils.DebugUtil +import org.mifospay.utils.Toaster import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/notification/ui/NotificationAdapter.kt b/mifospay/src/main/java/org/mifospay/notification/ui/NotificationAdapter.kt similarity index 92% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/notification/ui/NotificationAdapter.kt rename to mifospay/src/main/java/org/mifospay/notification/ui/NotificationAdapter.kt index 4b8eb67e4..880d62cdc 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/notification/ui/NotificationAdapter.kt +++ b/mifospay/src/main/java/org/mifospay/notification/ui/NotificationAdapter.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.notification.ui +package org.mifospay.notification.ui import android.view.LayoutInflater import android.view.View @@ -7,8 +7,8 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import butterknife.BindView import butterknife.ButterKnife -import com.mifos.mobilewallet.model.domain.NotificationPayload -import org.mifos.mobilewallet.mifospay.R +import com.mifospay.core.model.domain.NotificationPayload +import org.mifospay.R import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/password/EditPasswordContract.kt b/mifospay/src/main/java/org/mifospay/password/EditPasswordContract.kt similarity index 82% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/password/EditPasswordContract.kt rename to mifospay/src/main/java/org/mifospay/password/EditPasswordContract.kt index 90cb6b232..6078d1ddb 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/password/EditPasswordContract.kt +++ b/mifospay/src/main/java/org/mifospay/password/EditPasswordContract.kt @@ -1,7 +1,7 @@ -package org.mifos.mobilewallet.mifospay.password +package org.mifospay.password -import org.mifos.mobilewallet.mifospay.base.BasePresenter -import org.mifos.mobilewallet.mifospay.base.BaseView +import org.mifospay.base.BasePresenter +import org.mifospay.base.BaseView /** * Created by ankur on 27/June/2018 diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/password/presenter/EditPasswordPresenter.kt b/mifospay/src/main/java/org/mifospay/password/presenter/EditPasswordPresenter.kt similarity index 85% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/password/presenter/EditPasswordPresenter.kt rename to mifospay/src/main/java/org/mifospay/password/presenter/EditPasswordPresenter.kt index 07287af07..3d376bd2f 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/password/presenter/EditPasswordPresenter.kt +++ b/mifospay/src/main/java/org/mifospay/password/presenter/EditPasswordPresenter.kt @@ -1,15 +1,15 @@ -package org.mifos.mobilewallet.mifospay.password.presenter +package org.mifospay.password.presenter -import org.mifos.mobilewallet.core.base.UseCase.UseCaseCallback -import com.mifos.mobilewallet.model.domain.user.UpdateUserEntityPassword -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.user.AuthenticateUser -import org.mifos.mobilewallet.core.domain.usecase.user.UpdateUser -import org.mifos.mobilewallet.mifospay.base.BaseView -import org.mifos.mobilewallet.mifospay.core.datastore.PreferencesHelper -import org.mifos.mobilewallet.mifospay.password.EditPasswordContract -import org.mifos.mobilewallet.mifospay.password.EditPasswordContract.EditPasswordView -import org.mifos.mobilewallet.mifospay.common.Constants +import org.mifospay.core.data.base.UseCase.UseCaseCallback +import com.mifospay.core.model.domain.user.UpdateUserEntityPassword +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.user.AuthenticateUser +import org.mifospay.core.data.domain.usecase.user.UpdateUser +import org.mifospay.base.BaseView +import org.mifospay.core.datastore.PreferencesHelper +import org.mifospay.password.EditPasswordContract +import org.mifospay.password.EditPasswordContract.EditPasswordView +import org.mifospay.common.Constants import javax.inject.Inject class EditPasswordPresenter @Inject constructor( diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/password/ui/EditPasswordActivity.kt b/mifospay/src/main/java/org/mifospay/password/ui/EditPasswordActivity.kt similarity index 84% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/password/ui/EditPasswordActivity.kt rename to mifospay/src/main/java/org/mifospay/password/ui/EditPasswordActivity.kt index e5864add0..441b8c3f1 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/password/ui/EditPasswordActivity.kt +++ b/mifospay/src/main/java/org/mifospay/password/ui/EditPasswordActivity.kt @@ -1,18 +1,18 @@ -package org.mifos.mobilewallet.mifospay.password.ui +package org.mifospay.password.ui import android.os.Bundle import android.view.View import butterknife.OnFocusChange import butterknife.OnTextChanged import dagger.hilt.android.AndroidEntryPoint -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.base.BaseActivity -import org.mifos.mobilewallet.mifospay.databinding.ActivityEditPasswordBinding -import org.mifos.mobilewallet.mifospay.password.EditPasswordContract -import org.mifos.mobilewallet.mifospay.password.EditPasswordContract.EditPasswordView -import org.mifos.mobilewallet.mifospay.password.presenter.EditPasswordPresenter -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.utils.Toaster +import org.mifospay.R +import org.mifospay.base.BaseActivity +import org.mifospay.databinding.ActivityEditPasswordBinding +import org.mifospay.password.EditPasswordContract +import org.mifospay.password.EditPasswordContract.EditPasswordView +import org.mifospay.password.presenter.EditPasswordPresenter +import org.mifospay.common.Constants +import org.mifospay.utils.Toaster import javax.inject.Inject @AndroidEntryPoint diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/payments/TransferViewModel.kt b/mifospay/src/main/java/org/mifospay/payments/TransferViewModel.kt similarity index 83% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/payments/TransferViewModel.kt rename to mifospay/src/main/java/org/mifospay/payments/TransferViewModel.kt index 6ed252ce7..2e5c78e96 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/payments/TransferViewModel.kt +++ b/mifospay/src/main/java/org/mifospay/payments/TransferViewModel.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.payments +package org.mifospay.payments import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope @@ -6,13 +6,13 @@ import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.launch -import org.mifos.mobilewallet.core.base.UseCase.UseCaseCallback -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.account.FetchAccount -import org.mifos.mobilewallet.mifospay.base.BaseView -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.data.local.LocalRepository -import org.mifos.mobilewallet.mifospay.home.BaseHomeContract +import org.mifospay.core.data.base.UseCase.UseCaseCallback +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.account.FetchAccount +import org.mifospay.base.BaseView +import org.mifospay.common.Constants +import org.mifospay.data.local.LocalRepository +import org.mifospay.home.BaseHomeContract import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/payments/send/SendPaymentViewModel.kt b/mifospay/src/main/java/org/mifospay/payments/send/SendPaymentViewModel.kt similarity index 89% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/payments/send/SendPaymentViewModel.kt rename to mifospay/src/main/java/org/mifospay/payments/send/SendPaymentViewModel.kt index f350f387c..6f97463f8 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/payments/send/SendPaymentViewModel.kt +++ b/mifospay/src/main/java/org/mifospay/payments/send/SendPaymentViewModel.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.payments.send +package org.mifospay.payments.send import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope @@ -7,11 +7,11 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.account.FetchAccount -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.data.local.LocalRepository +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.account.FetchAccount +import org.mifospay.R +import org.mifospay.data.local.LocalRepository import javax.inject.Inject @HiltViewModel diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/payments/send/SendScreenRoute.kt b/mifospay/src/main/java/org/mifospay/payments/send/SendScreenRoute.kt similarity index 95% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/payments/send/SendScreenRoute.kt rename to mifospay/src/main/java/org/mifospay/payments/send/SendScreenRoute.kt index d9a62135c..b415e4a00 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/payments/send/SendScreenRoute.kt +++ b/mifospay/src/main/java/org/mifospay/payments/send/SendScreenRoute.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.payments.send +package org.mifospay.payments.send import android.content.Context import android.net.Uri @@ -51,13 +51,13 @@ import com.google.mlkit.vision.codescanner.GmsBarcodeScanning import com.togitech.ccp.component.TogiCountryCodePicker import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.designsystem.component.MfOutlinedTextField -import org.mifos.mobilewallet.mifospay.designsystem.component.MfOverlayLoadingWheel -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosButton -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosNavigationTopAppBar -import org.mifos.mobilewallet.mifospay.designsystem.theme.styleMedium16sp -import org.mifos.mobilewallet.mifospay.designsystem.theme.styleNormal18sp +import org.mifospay.R +import org.mifospay.core.designsystem.component.MfOutlinedTextField +import org.mifospay.core.designsystem.component.MfOverlayLoadingWheel +import org.mifospay.core.designsystem.component.MifosButton +import org.mifospay.core.designsystem.component.MifosNavigationTopAppBar +import org.mifospay.core.designsystem.theme.styleMedium16sp +import org.mifospay.core.designsystem.theme.styleNormal18sp enum class SendMethodType { @@ -321,7 +321,7 @@ fun EnterPhoneScreen( onValueChange = { (code, phone), isValid -> onNumberUpdated(phone, code + phone, isValid) }, - label = { Text(stringResource(id = org.mifos.mobilewallet.mifospay.feature.auth.R.string.feature_auth_phone_number)) }, + label = { Text(stringResource(id = org.mifospay.feature.auth.R.string.feature_auth_phone_number)) }, keyboardActions = KeyboardActions { keyboardController?.hide() } ) } diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/payments/send/navigation/SendNavigation.kt b/mifospay/src/main/java/org/mifospay/payments/send/navigation/SendNavigation.kt similarity index 80% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/payments/send/navigation/SendNavigation.kt rename to mifospay/src/main/java/org/mifospay/payments/send/navigation/SendNavigation.kt index 5d625af1e..838993444 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/payments/send/navigation/SendNavigation.kt +++ b/mifospay/src/main/java/org/mifospay/payments/send/navigation/SendNavigation.kt @@ -1,10 +1,10 @@ -package org.mifos.mobilewallet.mifospay.payments.send.navigation +package org.mifospay.payments.send.navigation import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.compose.composable -import org.mifos.mobilewallet.mifospay.payments.send.SendScreenRoute +import org.mifospay.payments.send.SendScreenRoute const val SEND_MONEY_ROUTE = "send_money_route" diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/payments/ui/PayVpaMobileScreen.kt b/mifospay/src/main/java/org/mifospay/payments/ui/PayVpaMobileScreen.kt similarity index 95% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/payments/ui/PayVpaMobileScreen.kt rename to mifospay/src/main/java/org/mifospay/payments/ui/PayVpaMobileScreen.kt index 5165d3972..4523a47d1 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/payments/ui/PayVpaMobileScreen.kt +++ b/mifospay/src/main/java/org/mifospay/payments/ui/PayVpaMobileScreen.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.payments.ui +package org.mifospay.payments.ui import android.graphics.Bitmap import androidx.compose.foundation.Image @@ -31,9 +31,9 @@ import com.google.zxing.WriterException import com.google.zxing.qrcode.QRCodeWriter import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import org.mifos.mobilewallet.mifospay.theme.green -import org.mifos.mobilewallet.mifospay.theme.grey -import org.mifos.mobilewallet.mifospay.theme.styleMedium16sp +import org.mifospay.core.designsystem.theme.green +import org.mifospay.core.designsystem.theme.grey +import org.mifospay.core.designsystem.theme.styleMedium16sp @Composable fun PayVpsMobileScreen() { diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/payments/ui/RequestFragment.kt b/mifospay/src/main/java/org/mifospay/payments/ui/RequestFragment.kt similarity index 85% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/payments/ui/RequestFragment.kt rename to mifospay/src/main/java/org/mifospay/payments/ui/RequestFragment.kt index fbeb178c9..d28e637ec 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/payments/ui/RequestFragment.kt +++ b/mifospay/src/main/java/org/mifospay/payments/ui/RequestFragment.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.payments.ui +package org.mifospay.payments.ui import android.os.Bundle import android.view.LayoutInflater @@ -7,7 +7,7 @@ import android.view.ViewGroup import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.ViewCompositionStrategy import dagger.hilt.android.AndroidEntryPoint -import org.mifos.mobilewallet.mifospay.base.BaseFragment +import org.mifospay.base.BaseFragment @AndroidEntryPoint diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/payments/ui/RequestScreen.kt b/mifospay/src/main/java/org/mifospay/payments/ui/RequestScreen.kt similarity index 90% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/payments/ui/RequestScreen.kt rename to mifospay/src/main/java/org/mifospay/payments/ui/RequestScreen.kt index dcb36e05e..e48fcc59c 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/payments/ui/RequestScreen.kt +++ b/mifospay/src/main/java/org/mifospay/payments/ui/RequestScreen.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.payments.ui +package org.mifospay.payments.ui import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -20,10 +20,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.designsystem.theme.styleMedium16sp -import org.mifos.mobilewallet.mifospay.designsystem.theme.styleNormal18sp -import org.mifos.mobilewallet.mifospay.payments.TransferViewModel +import org.mifospay.R +import org.mifospay.core.designsystem.theme.styleMedium16sp +import org.mifospay.core.designsystem.theme.styleNormal18sp +import org.mifospay.payments.TransferViewModel @Composable fun RequestScreen( diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/payments/ui/SendActivity.kt b/mifospay/src/main/java/org/mifospay/payments/ui/SendActivity.kt similarity index 76% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/payments/ui/SendActivity.kt rename to mifospay/src/main/java/org/mifospay/payments/ui/SendActivity.kt index 641d70495..1d2bfe3e6 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/payments/ui/SendActivity.kt +++ b/mifospay/src/main/java/org/mifospay/payments/ui/SendActivity.kt @@ -1,12 +1,11 @@ -package org.mifos.mobilewallet.mifospay.payments.ui +package org.mifospay.payments.ui import android.os.Bundle import androidx.fragment.app.add import androidx.fragment.app.commit import dagger.hilt.android.AndroidEntryPoint -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.base.BaseActivity -import org.mifos.mobilewallet.mifospay.common.Constants +import org.mifospay.R +import org.mifospay.base.BaseActivity @AndroidEntryPoint class SendActivity : BaseActivity() { diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/payments/ui/SendFragment.kt b/mifospay/src/main/java/org/mifospay/payments/ui/SendFragment.kt similarity index 95% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/payments/ui/SendFragment.kt rename to mifospay/src/main/java/org/mifospay/payments/ui/SendFragment.kt index cb8b62fb9..86a6f47e4 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/payments/ui/SendFragment.kt +++ b/mifospay/src/main/java/org/mifospay/payments/ui/SendFragment.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.payments.ui +package org.mifospay.payments.ui import android.Manifest import android.app.Activity @@ -26,15 +26,15 @@ import butterknife.OnClick import com.google.android.material.chip.Chip import com.google.android.material.textfield.TextInputLayout import dagger.hilt.android.AndroidEntryPoint -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.base.BaseFragment -import org.mifos.mobilewallet.mifospay.common.ui.MakeTransferFragment.Companion.newInstance -import org.mifos.mobilewallet.mifospay.home.BaseHomeContract -import org.mifos.mobilewallet.mifospay.qr.ui.ReadQrActivity -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.payments.TransferViewModel -import org.mifos.mobilewallet.mifospay.utils.Toaster -import org.mifos.mobilewallet.mifospay.common.Utils.hideSoftKeyboard +import org.mifospay.R +import org.mifospay.base.BaseFragment +import org.mifospay.common.ui.MakeTransferFragment.Companion.newInstance +import org.mifospay.home.BaseHomeContract +import org.mifospay.qr.ui.ReadQrActivity +import org.mifospay.common.Constants +import org.mifospay.payments.TransferViewModel +import org.mifospay.utils.Toaster +import org.mifospay.common.Utils.hideSoftKeyboard /** * Created by naman on 30/8/17. diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/qr/QrContract.kt b/mifospay/src/main/java/org/mifospay/qr/QrContract.kt similarity index 72% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/qr/QrContract.kt rename to mifospay/src/main/java/org/mifospay/qr/QrContract.kt index 8c1462065..fa077cbf4 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/qr/QrContract.kt +++ b/mifospay/src/main/java/org/mifospay/qr/QrContract.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.mifospay.qr +package org.mifospay.qr import android.graphics.Bitmap -import org.mifos.mobilewallet.mifospay.base.BasePresenter -import org.mifos.mobilewallet.mifospay.base.BaseView +import org.mifospay.base.BasePresenter +import org.mifospay.base.BaseView /** * Created by naman on 8/7/17. diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/qr/domain/usecase/GenerateQr.kt b/mifospay/src/main/java/org/mifospay/qr/domain/usecase/GenerateQr.kt similarity index 92% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/qr/domain/usecase/GenerateQr.kt rename to mifospay/src/main/java/org/mifospay/qr/domain/usecase/GenerateQr.kt index 48b1eb032..81c45050f 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/qr/domain/usecase/GenerateQr.kt +++ b/mifospay/src/main/java/org/mifospay/qr/domain/usecase/GenerateQr.kt @@ -1,12 +1,12 @@ -package org.mifos.mobilewallet.mifospay.qr.domain.usecase +package org.mifospay.qr.domain.usecase import android.graphics.Bitmap import com.google.zxing.BarcodeFormat import com.google.zxing.MultiFormatWriter import com.google.zxing.WriterException import com.google.zxing.common.BitMatrix -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.mifospay.common.Constants +import org.mifospay.core.data.base.UseCase +import org.mifospay.common.Constants import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/qr/presenter/ReadQrPresenter.kt b/mifospay/src/main/java/org/mifospay/qr/presenter/ReadQrPresenter.kt similarity index 58% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/qr/presenter/ReadQrPresenter.kt rename to mifospay/src/main/java/org/mifospay/qr/presenter/ReadQrPresenter.kt index f4d9d87f6..1f6228f8a 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/qr/presenter/ReadQrPresenter.kt +++ b/mifospay/src/main/java/org/mifospay/qr/presenter/ReadQrPresenter.kt @@ -1,9 +1,9 @@ -package org.mifos.mobilewallet.mifospay.qr.presenter +package org.mifospay.qr.presenter -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.mifospay.base.BaseView -import org.mifos.mobilewallet.mifospay.qr.QrContract -import org.mifos.mobilewallet.mifospay.qr.QrContract.ReadQrView +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.base.BaseView +import org.mifospay.qr.QrContract +import org.mifospay.qr.QrContract.ReadQrView import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/qr/presenter/ShowQrPresenter.kt b/mifospay/src/main/java/org/mifospay/qr/presenter/ShowQrPresenter.kt similarity index 70% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/qr/presenter/ShowQrPresenter.kt rename to mifospay/src/main/java/org/mifospay/qr/presenter/ShowQrPresenter.kt index f9f5d5d15..aadc1c4e9 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/qr/presenter/ShowQrPresenter.kt +++ b/mifospay/src/main/java/org/mifospay/qr/presenter/ShowQrPresenter.kt @@ -1,11 +1,11 @@ -package org.mifos.mobilewallet.mifospay.qr.presenter +package org.mifospay.qr.presenter -import org.mifos.mobilewallet.core.base.UseCase.UseCaseCallback -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.mifospay.base.BaseView -import org.mifos.mobilewallet.mifospay.qr.QrContract -import org.mifos.mobilewallet.mifospay.qr.QrContract.ShowQrView -import org.mifos.mobilewallet.mifospay.qr.domain.usecase.GenerateQr +import org.mifospay.core.data.base.UseCase.UseCaseCallback +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.base.BaseView +import org.mifospay.qr.QrContract +import org.mifospay.qr.QrContract.ShowQrView +import org.mifospay.qr.domain.usecase.GenerateQr import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/qr/ui/ReadQrActivity.kt b/mifospay/src/main/java/org/mifospay/qr/ui/ReadQrActivity.kt similarity index 92% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/qr/ui/ReadQrActivity.kt rename to mifospay/src/main/java/org/mifospay/qr/ui/ReadQrActivity.kt index 809d0cbdf..2e37ee9a2 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/qr/ui/ReadQrActivity.kt +++ b/mifospay/src/main/java/org/mifospay/qr/ui/ReadQrActivity.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.qr.ui +package org.mifospay.qr.ui import android.content.Intent import android.graphics.Bitmap @@ -21,12 +21,12 @@ import com.journeyapps.barcodescanner.CaptureActivity import dagger.hilt.android.AndroidEntryPoint import me.dm7.barcodescanner.zxing.ZXingScannerView import me.dm7.barcodescanner.zxing.ZXingScannerView.ResultHandler -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.base.BaseActivity -import org.mifos.mobilewallet.mifospay.qr.QrContract -import org.mifos.mobilewallet.mifospay.qr.QrContract.ReadQrView -import org.mifos.mobilewallet.mifospay.qr.presenter.ReadQrPresenter -import org.mifos.mobilewallet.mifospay.common.Constants +import org.mifospay.R +import org.mifospay.base.BaseActivity +import org.mifospay.qr.QrContract +import org.mifospay.qr.QrContract.ReadQrView +import org.mifospay.qr.presenter.ReadQrPresenter +import org.mifospay.common.Constants import java.io.FileNotFoundException import javax.inject.Inject diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/qr/ui/ShowQrActivity.kt b/mifospay/src/main/java/org/mifospay/qr/ui/ShowQrActivity.kt similarity index 93% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/qr/ui/ShowQrActivity.kt rename to mifospay/src/main/java/org/mifospay/qr/ui/ShowQrActivity.kt index b0d97b3c0..c5aca34cb 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/qr/ui/ShowQrActivity.kt +++ b/mifospay/src/main/java/org/mifospay/qr/ui/ShowQrActivity.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.qr.ui +package org.mifospay.qr.ui import android.content.DialogInterface import android.content.Intent @@ -22,12 +22,12 @@ import android.widget.Toast import butterknife.BindView import butterknife.ButterKnife import dagger.hilt.android.AndroidEntryPoint -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.base.BaseActivity -import org.mifos.mobilewallet.mifospay.qr.QrContract -import org.mifos.mobilewallet.mifospay.qr.QrContract.ShowQrView -import org.mifos.mobilewallet.mifospay.qr.presenter.ShowQrPresenter -import org.mifos.mobilewallet.mifospay.common.Constants +import org.mifospay.R +import org.mifospay.base.BaseActivity +import org.mifospay.qr.QrContract +import org.mifospay.qr.QrContract.ShowQrView +import org.mifospay.qr.presenter.ShowQrPresenter +import org.mifospay.common.Constants import java.io.File import java.io.FileOutputStream import java.io.IOException @@ -100,7 +100,7 @@ class ShowQrActivity : BaseActivity(), ShowQrView { stream.close() uri = FileProvider.getUriForFile( this, - "org.mifos.mobilewallet.mifospay.provider", file + "org.mifospay.provider", file ) } catch (e: IOException) { e.printStackTrace() diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/receipt/ReceiptContract.kt b/mifospay/src/main/java/org/mifospay/receipt/ReceiptContract.kt similarity index 68% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/receipt/ReceiptContract.kt rename to mifospay/src/main/java/org/mifospay/receipt/ReceiptContract.kt index 2c8b3755f..15c2fb2a5 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/receipt/ReceiptContract.kt +++ b/mifospay/src/main/java/org/mifospay/receipt/ReceiptContract.kt @@ -1,10 +1,10 @@ -package org.mifos.mobilewallet.mifospay.receipt +package org.mifospay.receipt import okhttp3.ResponseBody -import com.mifos.mobilewallet.model.entity.accounts.savings.TransferDetail -import com.mifos.mobilewallet.model.domain.Transaction -import org.mifos.mobilewallet.mifospay.base.BasePresenter -import org.mifos.mobilewallet.mifospay.base.BaseView +import com.mifospay.core.model.entity.accounts.savings.TransferDetail +import com.mifospay.core.model.domain.Transaction +import org.mifospay.base.BasePresenter +import org.mifospay.base.BaseView /** * Created by ankur on 06/June/2018 diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/receipt/presenter/ReceiptPresenter.kt b/mifospay/src/main/java/org/mifospay/receipt/presenter/ReceiptPresenter.kt similarity index 80% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/receipt/presenter/ReceiptPresenter.kt rename to mifospay/src/main/java/org/mifospay/receipt/presenter/ReceiptPresenter.kt index bd8af4dd4..b58a531b1 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/receipt/presenter/ReceiptPresenter.kt +++ b/mifospay/src/main/java/org/mifospay/receipt/presenter/ReceiptPresenter.kt @@ -1,15 +1,15 @@ -package org.mifos.mobilewallet.mifospay.receipt.presenter +package org.mifospay.receipt.presenter -import org.mifos.mobilewallet.core.base.UseCase.UseCaseCallback -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.account.DownloadTransactionReceipt -import org.mifos.mobilewallet.core.domain.usecase.account.FetchAccountTransaction -import org.mifos.mobilewallet.core.domain.usecase.account.FetchAccountTransfer -import org.mifos.mobilewallet.mifospay.base.BaseView -import org.mifos.mobilewallet.mifospay.core.datastore.PreferencesHelper -import org.mifos.mobilewallet.mifospay.receipt.ReceiptContract -import org.mifos.mobilewallet.mifospay.receipt.ReceiptContract.ReceiptView -import org.mifos.mobilewallet.mifospay.common.Constants +import org.mifospay.core.data.base.UseCase.UseCaseCallback +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.account.DownloadTransactionReceipt +import org.mifospay.core.data.domain.usecase.account.FetchAccountTransaction +import org.mifospay.core.data.domain.usecase.account.FetchAccountTransfer +import org.mifospay.base.BaseView +import org.mifospay.core.datastore.PreferencesHelper +import org.mifospay.receipt.ReceiptContract +import org.mifospay.receipt.ReceiptContract.ReceiptView +import org.mifospay.common.Constants import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/receipt/ui/ReceiptActivity.kt b/mifospay/src/main/java/org/mifospay/receipt/ui/ReceiptActivity.kt similarity index 91% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/receipt/ui/ReceiptActivity.kt rename to mifospay/src/main/java/org/mifospay/receipt/ui/ReceiptActivity.kt index 5242e048c..1d3e49dcf 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/receipt/ui/ReceiptActivity.kt +++ b/mifospay/src/main/java/org/mifospay/receipt/ui/ReceiptActivity.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.receipt.ui +package org.mifospay.receipt.ui import android.Manifest import android.content.ClipData @@ -24,19 +24,19 @@ import butterknife.OnClick import com.mifos.mobile.passcode.utils.PassCodeConstants import dagger.hilt.android.AndroidEntryPoint import okhttp3.ResponseBody -import com.mifos.mobilewallet.model.entity.accounts.savings.TransferDetail -import com.mifos.mobilewallet.model.domain.Transaction -import com.mifos.mobilewallet.model.domain.TransactionType -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.base.BaseActivity -import org.mifos.mobilewallet.mifospay.receipt.ReceiptContract -import org.mifos.mobilewallet.mifospay.receipt.ReceiptContract.ReceiptView -import org.mifos.mobilewallet.mifospay.receipt.presenter.ReceiptPresenter -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.feature.passcode.PassCodeActivity -import org.mifos.mobilewallet.mifospay.utils.FileUtils -import org.mifos.mobilewallet.mifospay.utils.Toaster -import org.mifos.mobilewallet.mifospay.common.Utils.getFormattedAccountBalance +import com.mifospay.core.model.entity.accounts.savings.TransferDetail +import com.mifospay.core.model.domain.Transaction +import com.mifospay.core.model.domain.TransactionType +import org.mifospay.R +import org.mifospay.base.BaseActivity +import org.mifospay.receipt.ReceiptContract +import org.mifospay.receipt.ReceiptContract.ReceiptView +import org.mifospay.receipt.presenter.ReceiptPresenter +import org.mifospay.common.Constants +import org.mifospay.feature.passcode.PassCodeActivity +import org.mifospay.utils.FileUtils +import org.mifospay.utils.Toaster +import org.mifospay.common.Utils.getFormattedAccountBalance import java.io.File import javax.inject.Inject @@ -260,7 +260,7 @@ class ReceiptActivity : BaseActivity(), ReceiptView { private fun openFile(context: Context, file: File) { val data = FileProvider.getUriForFile( context, - "org.mifos.mobilewallet.mifospay.provider", file + "org.mifospay.provider", file ) context.grantUriPermission( context.packageName, diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/savedcards/CardsContract.kt b/mifospay/src/main/java/org/mifospay/savedcards/CardsContract.kt similarity index 80% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/savedcards/CardsContract.kt rename to mifospay/src/main/java/org/mifospay/savedcards/CardsContract.kt index e462e7039..d0aa4efe9 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/savedcards/CardsContract.kt +++ b/mifospay/src/main/java/org/mifospay/savedcards/CardsContract.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.mifospay.savedcards +package org.mifospay.savedcards -import com.mifos.mobilewallet.model.entity.savedcards.Card -import org.mifos.mobilewallet.mifospay.base.BasePresenter -import org.mifos.mobilewallet.mifospay.base.BaseView +import com.mifospay.core.model.entity.savedcards.Card +import org.mifospay.base.BasePresenter +import org.mifospay.base.BaseView /** * This a contract class working as an Interface for UI diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/savedcards/presenter/CardsPresenter.kt b/mifospay/src/main/java/org/mifospay/savedcards/presenter/CardsPresenter.kt similarity index 88% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/savedcards/presenter/CardsPresenter.kt rename to mifospay/src/main/java/org/mifospay/savedcards/presenter/CardsPresenter.kt index 09a9fd8c3..e0ac5c5f3 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/savedcards/presenter/CardsPresenter.kt +++ b/mifospay/src/main/java/org/mifospay/savedcards/presenter/CardsPresenter.kt @@ -1,18 +1,18 @@ -package org.mifos.mobilewallet.mifospay.savedcards.presenter +package org.mifospay.savedcards.presenter -import org.mifos.mobilewallet.core.base.UseCase.UseCaseCallback -import com.mifos.mobilewallet.model.entity.savedcards.Card -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.savedcards.AddCard -import org.mifos.mobilewallet.core.domain.usecase.savedcards.DeleteCard -import org.mifos.mobilewallet.core.domain.usecase.savedcards.EditCard -import org.mifos.mobilewallet.core.domain.usecase.savedcards.FetchSavedCards -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.base.BaseView -import org.mifos.mobilewallet.mifospay.data.local.LocalRepository -import org.mifos.mobilewallet.mifospay.savedcards.CardsContract -import org.mifos.mobilewallet.mifospay.savedcards.CardsContract.CardsView -import org.mifos.mobilewallet.mifospay.common.Constants +import org.mifospay.core.data.base.UseCase.UseCaseCallback +import com.mifospay.core.model.entity.savedcards.Card +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.savedcards.AddCard +import org.mifospay.core.data.domain.usecase.savedcards.DeleteCard +import org.mifospay.core.data.domain.usecase.savedcards.EditCard +import org.mifospay.core.data.domain.usecase.savedcards.FetchSavedCards +import org.mifospay.R +import org.mifospay.base.BaseView +import org.mifospay.data.local.LocalRepository +import org.mifospay.savedcards.CardsContract +import org.mifospay.savedcards.CardsContract.CardsView +import org.mifospay.common.Constants import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/savedcards/presenter/CardsScreenViewModel.kt b/mifospay/src/main/java/org/mifospay/savedcards/presenter/CardsScreenViewModel.kt similarity index 89% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/savedcards/presenter/CardsScreenViewModel.kt rename to mifospay/src/main/java/org/mifospay/savedcards/presenter/CardsScreenViewModel.kt index d3e293cdc..02ad6a075 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/savedcards/presenter/CardsScreenViewModel.kt +++ b/mifospay/src/main/java/org/mifospay/savedcards/presenter/CardsScreenViewModel.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.mifospay.savedcards.presenter +package org.mifospay.savedcards.presenter import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.mifos.mobilewallet.model.entity.savedcards.Card +import com.mifospay.core.model.entity.savedcards.Card import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted @@ -11,15 +11,15 @@ import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.flow.update -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.savedcards.AddCard -import org.mifos.mobilewallet.core.domain.usecase.savedcards.DeleteCard -import org.mifos.mobilewallet.core.domain.usecase.savedcards.EditCard -import org.mifos.mobilewallet.core.domain.usecase.savedcards.FetchSavedCards -import org.mifos.mobilewallet.mifospay.common.CreditCardUtils.validateCreditCardNumber -import org.mifos.mobilewallet.mifospay.data.local.LocalRepository -import org.mifos.mobilewallet.mifospay.common.Constants +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.savedcards.AddCard +import org.mifospay.core.data.domain.usecase.savedcards.DeleteCard +import org.mifospay.core.data.domain.usecase.savedcards.EditCard +import org.mifospay.core.data.domain.usecase.savedcards.FetchSavedCards +import org.mifospay.common.CreditCardUtils.validateCreditCardNumber +import org.mifospay.data.local.LocalRepository +import org.mifospay.common.Constants import javax.inject.Inject @HiltViewModel diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/savedcards/ui/AddCardDialog.kt b/mifospay/src/main/java/org/mifospay/savedcards/ui/AddCardDialog.kt similarity index 94% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/savedcards/ui/AddCardDialog.kt rename to mifospay/src/main/java/org/mifospay/savedcards/ui/AddCardDialog.kt index 9ebcb176c..c1090ce9f 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/savedcards/ui/AddCardDialog.kt +++ b/mifospay/src/main/java/org/mifospay/savedcards/ui/AddCardDialog.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.savedcards.ui +package org.mifospay.savedcards.ui import android.app.Dialog import android.content.DialogInterface @@ -18,11 +18,11 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.google.android.material.textfield.TextInputLayout -import com.mifos.mobilewallet.model.entity.savedcards.Card -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.savedcards.CardsContract -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.utils.Toaster +import com.mifospay.core.model.entity.savedcards.Card +import org.mifospay.R +import org.mifospay.savedcards.CardsContract +import org.mifospay.common.Constants +import org.mifospay.utils.Toaster import java.util.Calendar /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/savedcards/ui/CardsFragment.kt b/mifospay/src/main/java/org/mifospay/savedcards/ui/CardsFragment.kt similarity index 88% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/savedcards/ui/CardsFragment.kt rename to mifospay/src/main/java/org/mifospay/savedcards/ui/CardsFragment.kt index c2033252a..caa3e6e09 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/savedcards/ui/CardsFragment.kt +++ b/mifospay/src/main/java/org/mifospay/savedcards/ui/CardsFragment.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.savedcards.ui +package org.mifospay.savedcards.ui import android.content.Intent @@ -11,9 +11,9 @@ import androidx.compose.material3.Surface import androidx.compose.ui.Modifier import androidx.compose.ui.platform.ViewCompositionStrategy import dagger.hilt.android.AndroidEntryPoint -import org.mifos.mobilewallet.mifospay.base.BaseFragment -import org.mifos.mobilewallet.mifospay.databinding.FragmentCardsBinding -import org.mifos.mobilewallet.mifospay.designsystem.theme.MifosTheme +import org.mifospay.base.BaseFragment +import org.mifospay.databinding.FragmentCardsBinding +import org.mifospay.core.designsystem.theme.MifosTheme /** * This is the UI component of the SavedCards Architecture. diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/savedcards/ui/CardsScreen.kt b/mifospay/src/main/java/org/mifospay/savedcards/ui/CardsScreen.kt similarity index 93% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/savedcards/ui/CardsScreen.kt rename to mifospay/src/main/java/org/mifospay/savedcards/ui/CardsScreen.kt index 4a2aa0e2f..a094319ff 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/savedcards/ui/CardsScreen.kt +++ b/mifospay/src/main/java/org/mifospay/savedcards/ui/CardsScreen.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.savedcards.ui +package org.mifospay.savedcards.ui import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -10,16 +10,12 @@ 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.material.icons.Icons -import androidx.compose.material.icons.filled.Add import androidx.compose.material.icons.filled.Close import androidx.compose.material.icons.filled.Search import androidx.compose.material.icons.rounded.Info -import androidx.compose.material3.AssistChip -import androidx.compose.material3.AssistChipDefaults import androidx.compose.material3.Card import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenuItem @@ -39,19 +35,18 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.mifos.mobilewallet.model.entity.savedcards.Card -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.designsystem.component.MfLoadingWheel -import org.mifos.mobilewallet.mifospay.designsystem.theme.MifosTheme -import org.mifos.mobilewallet.mifospay.savedcards.presenter.CardsScreenViewModel -import org.mifos.mobilewallet.mifospay.savedcards.presenter.CardsUiState -import org.mifos.mobilewallet.mifospay.ui.EmptyContentScreen -import org.mifos.mobilewallet.mifospay.ui.utility.AddCardChip +import com.mifospay.core.model.entity.savedcards.Card +import org.mifospay.R +import org.mifospay.core.designsystem.component.MfLoadingWheel +import org.mifospay.core.designsystem.theme.MifosTheme +import org.mifospay.core.ui.EmptyContentScreen +import org.mifospay.core.ui.utility.AddCardChip +import org.mifospay.savedcards.presenter.CardsScreenViewModel +import org.mifospay.savedcards.presenter.CardsUiState enum class CardMenuAction { EDIT, DELETE, CANCEL diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/settings/SettingsContract.kt b/mifospay/src/main/java/org/mifospay/settings/SettingsContract.kt similarity index 63% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/settings/SettingsContract.kt rename to mifospay/src/main/java/org/mifospay/settings/SettingsContract.kt index 4a2d05310..8d0431d77 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/settings/SettingsContract.kt +++ b/mifospay/src/main/java/org/mifospay/settings/SettingsContract.kt @@ -1,7 +1,7 @@ -package org.mifos.mobilewallet.mifospay.settings +package org.mifospay.settings -import org.mifos.mobilewallet.mifospay.base.BasePresenter -import org.mifos.mobilewallet.mifospay.base.BaseView +import org.mifospay.base.BasePresenter +import org.mifospay.base.BaseView /** * Created by ankur on 09/July/2018 diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/settings/presenter/SettingsPresenter.kt b/mifospay/src/main/java/org/mifospay/settings/presenter/SettingsPresenter.kt similarity index 69% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/settings/presenter/SettingsPresenter.kt rename to mifospay/src/main/java/org/mifospay/settings/presenter/SettingsPresenter.kt index 83d786f36..89395458f 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/settings/presenter/SettingsPresenter.kt +++ b/mifospay/src/main/java/org/mifospay/settings/presenter/SettingsPresenter.kt @@ -1,12 +1,12 @@ -package org.mifos.mobilewallet.mifospay.settings.presenter +package org.mifospay.settings.presenter -import org.mifos.mobilewallet.core.base.UseCase.UseCaseCallback -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.account.BlockUnblockCommand -import org.mifos.mobilewallet.mifospay.base.BaseView -import org.mifos.mobilewallet.mifospay.data.local.LocalRepository -import org.mifos.mobilewallet.mifospay.settings.SettingsContract -import org.mifos.mobilewallet.mifospay.settings.SettingsContract.SettingsView +import org.mifospay.core.data.base.UseCase.UseCaseCallback +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.account.BlockUnblockCommand +import org.mifospay.base.BaseView +import org.mifospay.data.local.LocalRepository +import org.mifospay.settings.SettingsContract +import org.mifospay.settings.SettingsContract.SettingsView import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/settings/presenter/SettingsViewModel.kt b/mifospay/src/main/java/org/mifospay/settings/presenter/SettingsViewModel.kt similarity index 76% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/settings/presenter/SettingsViewModel.kt rename to mifospay/src/main/java/org/mifospay/settings/presenter/SettingsViewModel.kt index 65ef180d0..1d85b8ab0 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/settings/presenter/SettingsViewModel.kt +++ b/mifospay/src/main/java/org/mifospay/settings/presenter/SettingsViewModel.kt @@ -1,11 +1,11 @@ -package org.mifos.mobilewallet.mifospay.settings.presenter +package org.mifospay.settings.presenter import androidx.lifecycle.ViewModel import dagger.hilt.android.lifecycle.HiltViewModel -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.account.BlockUnblockCommand -import org.mifos.mobilewallet.mifospay.data.local.LocalRepository +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.account.BlockUnblockCommand +import org.mifospay.data.local.LocalRepository import javax.inject.Inject @HiltViewModel diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/settings/ui/DialogManager.kt b/mifospay/src/main/java/org/mifospay/settings/ui/DialogManager.kt similarity index 78% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/settings/ui/DialogManager.kt rename to mifospay/src/main/java/org/mifospay/settings/ui/DialogManager.kt index ea764552e..152a9312e 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/settings/ui/DialogManager.kt +++ b/mifospay/src/main/java/org/mifospay/settings/ui/DialogManager.kt @@ -1,12 +1,12 @@ -package org.mifos.mobilewallet.mifospay.settings.ui +package org.mifospay.settings.ui import androidx.compose.runtime.Composable import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosDialogBox -import org.mifos.mobilewallet.mifospay.ui.utility.DialogState -import org.mifos.mobilewallet.mifospay.ui.utility.DialogType +import org.mifospay.R +import org.mifospay.core.designsystem.component.MifosDialogBox +import org.mifospay.core.ui.utility.DialogState +import org.mifospay.core.ui.utility.DialogType @Composable fun DialogManager(dialogState: DialogState, onDismiss: () -> Unit) { diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/settings/ui/SettingsActivity.kt b/mifospay/src/main/java/org/mifospay/settings/ui/SettingsActivity.kt similarity index 80% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/settings/ui/SettingsActivity.kt rename to mifospay/src/main/java/org/mifospay/settings/ui/SettingsActivity.kt index cba8bf03b..d482a4a46 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/settings/ui/SettingsActivity.kt +++ b/mifospay/src/main/java/org/mifospay/settings/ui/SettingsActivity.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.settings.ui +package org.mifospay.settings.ui import android.content.Intent import android.os.Bundle @@ -6,11 +6,11 @@ import androidx.activity.compose.setContent import androidx.core.os.bundleOf import com.mifos.mobile.passcode.utils.PasscodePreferencesHelper import dagger.hilt.android.AndroidEntryPoint -import org.mifos.mobilewallet.mifospay.base.BaseActivity -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.feature.passcode.PassCodeActivity -import org.mifos.mobilewallet.mifospay.password.ui.EditPasswordActivity -import org.mifos.mobilewallet.mifospay.theme.MifosTheme +import org.mifospay.base.BaseActivity +import org.mifospay.common.Constants +import org.mifospay.feature.passcode.PassCodeActivity +import org.mifospay.password.ui.EditPasswordActivity +import org.mifospay.theme.MifosTheme import javax.inject.Inject @AndroidEntryPoint diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/settings/ui/SettingsScreen.kt b/mifospay/src/main/java/org/mifospay/settings/ui/SettingsScreen.kt similarity index 90% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/settings/ui/SettingsScreen.kt rename to mifospay/src/main/java/org/mifospay/settings/ui/SettingsScreen.kt index e62cd122f..c9dd48a78 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/settings/ui/SettingsScreen.kt +++ b/mifospay/src/main/java/org/mifospay/settings/ui/SettingsScreen.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.settings.ui +package org.mifospay.settings.ui import android.content.Intent import androidx.compose.foundation.background @@ -24,15 +24,15 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.hilt.navigation.compose.hiltViewModel -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosCard -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosTopBar -import org.mifos.mobilewallet.mifospay.designsystem.theme.mifosText -import org.mifos.mobilewallet.mifospay.designsystem.theme.styleSettingsButton -import org.mifos.mobilewallet.mifospay.feature.auth.login.LoginActivity -import org.mifos.mobilewallet.mifospay.settings.presenter.SettingsViewModel -import org.mifos.mobilewallet.mifospay.ui.utility.DialogState -import org.mifos.mobilewallet.mifospay.ui.utility.DialogType +import org.mifospay.R +import org.mifospay.core.designsystem.component.MifosCard +import org.mifospay.core.designsystem.component.MifosTopBar +import org.mifospay.core.designsystem.theme.mifosText +import org.mifospay.core.designsystem.theme.styleSettingsButton +import org.mifospay.feature.auth.login.LoginActivity +import org.mifospay.settings.presenter.SettingsViewModel +import org.mifospay.core.ui.utility.DialogState +import org.mifospay.core.ui.utility.DialogType /** * @author pratyush diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/StandingInstructionContract.kt b/mifospay/src/main/java/org/mifospay/standinginstruction/StandingInstructionContract.kt similarity index 86% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/StandingInstructionContract.kt rename to mifospay/src/main/java/org/mifospay/standinginstruction/StandingInstructionContract.kt index d740b8ec1..ea648398c 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/StandingInstructionContract.kt +++ b/mifospay/src/main/java/org/mifospay/standinginstruction/StandingInstructionContract.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.mifospay.standinginstruction +package org.mifospay.standinginstruction -import com.mifos.mobilewallet.model.entity.standinginstruction.StandingInstruction -import org.mifos.mobilewallet.mifospay.base.BasePresenter -import org.mifos.mobilewallet.mifospay.base.BaseView +import com.mifospay.core.model.entity.standinginstruction.StandingInstruction +import org.mifospay.base.BasePresenter +import org.mifospay.base.BaseView interface StandingInstructionContract { diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/adapter/StandingInstructionAdapter.kt b/mifospay/src/main/java/org/mifospay/standinginstruction/adapter/StandingInstructionAdapter.kt similarity index 91% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/adapter/StandingInstructionAdapter.kt rename to mifospay/src/main/java/org/mifospay/standinginstruction/adapter/StandingInstructionAdapter.kt index 9762f95fb..fdf7698f7 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/adapter/StandingInstructionAdapter.kt +++ b/mifospay/src/main/java/org/mifospay/standinginstruction/adapter/StandingInstructionAdapter.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.standinginstruction.adapter +package org.mifospay.standinginstruction.adapter import android.content.Context import androidx.recyclerview.widget.RecyclerView @@ -6,9 +6,9 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.TextView -import com.mifos.mobilewallet.model.entity.standinginstruction.StandingInstruction -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.common.Constants +import com.mifospay.core.model.entity.standinginstruction.StandingInstruction +import org.mifospay.R +import org.mifospay.common.Constants /** * Created by Devansh on 08/06/2020 diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/presenter/NewSIPresenter.kt b/mifospay/src/main/java/org/mifospay/standinginstruction/presenter/NewSIPresenter.kt similarity index 81% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/presenter/NewSIPresenter.kt rename to mifospay/src/main/java/org/mifospay/standinginstruction/presenter/NewSIPresenter.kt index f583efafa..dea6c3ce1 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/presenter/NewSIPresenter.kt +++ b/mifospay/src/main/java/org/mifospay/standinginstruction/presenter/NewSIPresenter.kt @@ -1,13 +1,13 @@ -package org.mifos.mobilewallet.mifospay.standinginstruction.presenter - -import org.mifos.mobilewallet.core.base.UseCase.UseCaseCallback -import com.mifos.mobilewallet.model.domain.SearchResult -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.client.SearchClient -import org.mifos.mobilewallet.core.domain.usecase.standinginstruction.CreateStandingTransaction -import org.mifos.mobilewallet.mifospay.base.BaseView -import org.mifos.mobilewallet.mifospay.core.datastore.PreferencesHelper -import org.mifos.mobilewallet.mifospay.standinginstruction.StandingInstructionContract +package org.mifospay.standinginstruction.presenter + +import org.mifospay.core.data.base.UseCase.UseCaseCallback +import com.mifospay.core.model.domain.SearchResult +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.client.SearchClient +import org.mifospay.core.data.domain.usecase.standinginstruction.CreateStandingTransaction +import org.mifospay.base.BaseView +import org.mifospay.core.datastore.PreferencesHelper +import org.mifospay.standinginstruction.StandingInstructionContract import java.text.SimpleDateFormat import java.util.* import javax.inject.Inject diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/presenter/StandingInstructionDetailsPresenter.kt b/mifospay/src/main/java/org/mifospay/standinginstruction/presenter/StandingInstructionDetailsPresenter.kt similarity index 81% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/presenter/StandingInstructionDetailsPresenter.kt rename to mifospay/src/main/java/org/mifospay/standinginstruction/presenter/StandingInstructionDetailsPresenter.kt index de02dabbc..e7e3a191b 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/presenter/StandingInstructionDetailsPresenter.kt +++ b/mifospay/src/main/java/org/mifospay/standinginstruction/presenter/StandingInstructionDetailsPresenter.kt @@ -1,14 +1,14 @@ -package org.mifos.mobilewallet.mifospay.standinginstruction.presenter - -import org.mifos.mobilewallet.core.base.UseCase -import com.mifos.mobilewallet.model.entity.standinginstruction.StandingInstruction -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.standinginstruction.FetchStandingInstruction -import org.mifos.mobilewallet.core.domain.usecase.standinginstruction.DeleteStandingInstruction -import org.mifos.mobilewallet.core.domain.usecase.standinginstruction.UpdateStandingInstruction -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.base.BaseView -import org.mifos.mobilewallet.mifospay.standinginstruction.StandingInstructionContract +package org.mifospay.standinginstruction.presenter + +import org.mifospay.core.data.base.UseCase +import com.mifospay.core.model.entity.standinginstruction.StandingInstruction +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.standinginstruction.FetchStandingInstruction +import org.mifospay.core.data.domain.usecase.standinginstruction.DeleteStandingInstruction +import org.mifospay.core.data.domain.usecase.standinginstruction.UpdateStandingInstruction +import org.mifospay.R +import org.mifospay.base.BaseView +import org.mifospay.standinginstruction.StandingInstructionContract import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/presenter/StandingInstructionViewModel.kt b/mifospay/src/main/java/org/mifospay/standinginstruction/presenter/StandingInstructionViewModel.kt similarity index 83% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/presenter/StandingInstructionViewModel.kt rename to mifospay/src/main/java/org/mifospay/standinginstruction/presenter/StandingInstructionViewModel.kt index 47e685c60..6b658ce1a 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/presenter/StandingInstructionViewModel.kt +++ b/mifospay/src/main/java/org/mifospay/standinginstruction/presenter/StandingInstructionViewModel.kt @@ -1,14 +1,14 @@ -package org.mifos.mobilewallet.mifospay.standinginstruction.presenter +package org.mifospay.standinginstruction.presenter import androidx.lifecycle.ViewModel -import com.mifos.mobilewallet.model.entity.standinginstruction.StandingInstruction +import com.mifospay.core.model.entity.standinginstruction.StandingInstruction import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow -import org.mifos.mobilewallet.core.base.UseCase -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.standinginstruction.GetAllStandingInstructions -import org.mifos.mobilewallet.mifospay.data.local.LocalRepository +import org.mifospay.core.data.base.UseCase +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.standinginstruction.GetAllStandingInstructions +import org.mifospay.data.local.LocalRepository import javax.inject.Inject @HiltViewModel diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/presenter/StandingInstructionsPresenter.kt b/mifospay/src/main/java/org/mifospay/standinginstruction/presenter/StandingInstructionsPresenter.kt similarity index 76% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/presenter/StandingInstructionsPresenter.kt rename to mifospay/src/main/java/org/mifospay/standinginstruction/presenter/StandingInstructionsPresenter.kt index 483cba57f..0debd36b7 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/presenter/StandingInstructionsPresenter.kt +++ b/mifospay/src/main/java/org/mifospay/standinginstruction/presenter/StandingInstructionsPresenter.kt @@ -1,12 +1,12 @@ -package org.mifos.mobilewallet.mifospay.standinginstruction.presenter - -import org.mifos.mobilewallet.core.base.UseCase.UseCaseCallback -import org.mifos.mobilewallet.core.base.UseCaseHandler -import org.mifos.mobilewallet.core.domain.usecase.standinginstruction.GetAllStandingInstructions -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.base.BaseView -import org.mifos.mobilewallet.mifospay.data.local.LocalRepository -import org.mifos.mobilewallet.mifospay.standinginstruction.StandingInstructionContract +package org.mifospay.standinginstruction.presenter + +import org.mifospay.core.data.base.UseCase.UseCaseCallback +import org.mifospay.core.data.base.UseCaseHandler +import org.mifospay.core.data.domain.usecase.standinginstruction.GetAllStandingInstructions +import org.mifospay.R +import org.mifospay.base.BaseView +import org.mifospay.data.local.LocalRepository +import org.mifospay.standinginstruction.StandingInstructionContract import javax.inject.Inject /** diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/ui/NewSIActivity.kt b/mifospay/src/main/java/org/mifospay/standinginstruction/ui/NewSIActivity.kt similarity index 90% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/ui/NewSIActivity.kt rename to mifospay/src/main/java/org/mifospay/standinginstruction/ui/NewSIActivity.kt index 5c027c614..be53ddf85 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/ui/NewSIActivity.kt +++ b/mifospay/src/main/java/org/mifospay/standinginstruction/ui/NewSIActivity.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.standinginstruction.ui +package org.mifospay.standinginstruction.ui import android.Manifest import android.app.DatePickerDialog @@ -12,17 +12,17 @@ import android.widget.Toast import androidx.databinding.DataBindingUtil import butterknife.ButterKnife import dagger.hilt.android.AndroidEntryPoint -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.base.BaseActivity -import org.mifos.mobilewallet.mifospay.databinding.ActivityNewSiBinding -import org.mifos.mobilewallet.mifospay.qr.ui.ReadQrActivity -import org.mifos.mobilewallet.mifospay.standinginstruction.StandingInstructionContract -import org.mifos.mobilewallet.mifospay.standinginstruction.presenter.NewSIPresenter -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.common.Constants.REQUEST_CAMERA -import org.mifos.mobilewallet.mifospay.common.Constants.SCAN_QR_REQUEST_CODE -import org.mifos.mobilewallet.mifospay.utils.Toaster -import org.mifos.mobilewallet.mifospay.common.Utils +import org.mifospay.R +import org.mifospay.base.BaseActivity +import org.mifospay.databinding.ActivityNewSiBinding +import org.mifospay.qr.ui.ReadQrActivity +import org.mifospay.standinginstruction.StandingInstructionContract +import org.mifospay.standinginstruction.presenter.NewSIPresenter +import org.mifospay.common.Constants +import org.mifospay.common.Constants.REQUEST_CAMERA +import org.mifospay.common.Constants.SCAN_QR_REQUEST_CODE +import org.mifospay.utils.Toaster +import org.mifospay.common.Utils import java.util.* import javax.inject.Inject import kotlin.properties.Delegates diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/ui/SIContent.kt b/mifospay/src/main/java/org/mifospay/standinginstruction/ui/SIContent.kt similarity index 96% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/ui/SIContent.kt rename to mifospay/src/main/java/org/mifospay/standinginstruction/ui/SIContent.kt index 758d8509b..eda7b76ee 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/ui/SIContent.kt +++ b/mifospay/src/main/java/org/mifospay/standinginstruction/ui/SIContent.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.standinginstruction.ui +package org.mifospay.standinginstruction.ui import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/ui/SIDetailsActivity.kt b/mifospay/src/main/java/org/mifospay/standinginstruction/ui/SIDetailsActivity.kt similarity index 95% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/ui/SIDetailsActivity.kt rename to mifospay/src/main/java/org/mifospay/standinginstruction/ui/SIDetailsActivity.kt index 3db593bb9..ee39fa9e6 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/ui/SIDetailsActivity.kt +++ b/mifospay/src/main/java/org/mifospay/standinginstruction/ui/SIDetailsActivity.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.standinginstruction.ui +package org.mifospay.standinginstruction.ui import android.app.DatePickerDialog import android.content.res.Resources @@ -12,15 +12,15 @@ import androidx.databinding.DataBindingUtil import butterknife.ButterKnife import butterknife.OnTextChanged import dagger.hilt.android.AndroidEntryPoint -import com.mifos.mobilewallet.model.entity.standinginstruction.StandingInstruction -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.base.BaseActivity -import org.mifos.mobilewallet.mifospay.databinding.ActivitySiDetailsBinding -import org.mifos.mobilewallet.mifospay.standinginstruction.StandingInstructionContract -import org.mifos.mobilewallet.mifospay.standinginstruction.presenter.StandingInstructionDetailsPresenter -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.utils.DialogBox -import org.mifos.mobilewallet.mifospay.common.Utils +import com.mifospay.core.model.entity.standinginstruction.StandingInstruction +import org.mifospay.R +import org.mifospay.base.BaseActivity +import org.mifospay.databinding.ActivitySiDetailsBinding +import org.mifospay.standinginstruction.StandingInstructionContract +import org.mifospay.standinginstruction.presenter.StandingInstructionDetailsPresenter +import org.mifospay.common.Constants +import org.mifospay.utils.DialogBox +import org.mifospay.common.Utils import java.util.* import javax.inject.Inject diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/ui/SIFragment.kt b/mifospay/src/main/java/org/mifospay/standinginstruction/ui/SIFragment.kt similarity index 85% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/ui/SIFragment.kt rename to mifospay/src/main/java/org/mifospay/standinginstruction/ui/SIFragment.kt index 58ed95763..0eefb584a 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/ui/SIFragment.kt +++ b/mifospay/src/main/java/org/mifospay/standinginstruction/ui/SIFragment.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.standinginstruction.ui +package org.mifospay.standinginstruction.ui import android.app.Activity.RESULT_OK import android.content.Intent @@ -9,16 +9,16 @@ import android.view.View import android.view.ViewGroup import androidx.databinding.DataBindingUtil import dagger.hilt.android.AndroidEntryPoint -import com.mifos.mobilewallet.model.entity.standinginstruction.StandingInstruction -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.base.BaseActivity -import org.mifos.mobilewallet.mifospay.base.BaseFragment -import org.mifos.mobilewallet.mifospay.databinding.FragmentSiBinding -import org.mifos.mobilewallet.mifospay.standinginstruction.StandingInstructionContract -import org.mifos.mobilewallet.mifospay.standinginstruction.adapter.StandingInstructionAdapter -import org.mifos.mobilewallet.mifospay.standinginstruction.presenter.StandingInstructionsPresenter -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.utils.RecyclerItemClickListener +import com.mifospay.core.model.entity.standinginstruction.StandingInstruction +import org.mifospay.R +import org.mifospay.base.BaseActivity +import org.mifospay.base.BaseFragment +import org.mifospay.databinding.FragmentSiBinding +import org.mifospay.standinginstruction.StandingInstructionContract +import org.mifospay.standinginstruction.adapter.StandingInstructionAdapter +import org.mifospay.standinginstruction.presenter.StandingInstructionsPresenter +import org.mifospay.common.Constants +import org.mifospay.utils.RecyclerItemClickListener import javax.inject.Inject @AndroidEntryPoint diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/ui/StandingInstructionScreen.kt b/mifospay/src/main/java/org/mifospay/standinginstruction/ui/StandingInstructionScreen.kt similarity index 90% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/ui/StandingInstructionScreen.kt rename to mifospay/src/main/java/org/mifospay/standinginstruction/ui/StandingInstructionScreen.kt index 2993a2d25..3d1eb5ce9 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/ui/StandingInstructionScreen.kt +++ b/mifospay/src/main/java/org/mifospay/standinginstruction/ui/StandingInstructionScreen.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.standinginstruction.ui +package org.mifospay.standinginstruction.ui import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize @@ -20,11 +20,11 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosLoadingWheel -import org.mifos.mobilewallet.mifospay.standinginstruction.presenter.StandingInstructionViewModel -import org.mifos.mobilewallet.mifospay.standinginstruction.presenter.StandingInstructionsUiState -import org.mifos.mobilewallet.mifospay.ui.EmptyContentScreen +import org.mifospay.R +import org.mifospay.core.designsystem.component.MifosLoadingWheel +import org.mifospay.standinginstruction.presenter.StandingInstructionViewModel +import org.mifospay.standinginstruction.presenter.StandingInstructionsUiState +import org.mifospay.core.ui.EmptyContentScreen @Composable fun StandingInstructionsScreen( diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/theme/Color.kt b/mifospay/src/main/java/org/mifospay/theme/Color.kt similarity index 90% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/theme/Color.kt rename to mifospay/src/main/java/org/mifospay/theme/Color.kt index 1519cbc31..186fb0e73 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/theme/Color.kt +++ b/mifospay/src/main/java/org/mifospay/theme/Color.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.theme +package org.mifospay.theme import androidx.compose.ui.graphics.Color diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/theme/MifosTextStyle.kt b/mifospay/src/main/java/org/mifospay/theme/MifosTextStyle.kt similarity index 65% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/theme/MifosTextStyle.kt rename to mifospay/src/main/java/org/mifospay/theme/MifosTextStyle.kt index b31334048..4bbcc9bf9 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/theme/MifosTextStyle.kt +++ b/mifospay/src/main/java/org/mifospay/theme/MifosTextStyle.kt @@ -1,11 +1,9 @@ -package org.mifos.mobilewallet.mifospay.theme +package org.mifospay.theme import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.sp -import org.mifos.mobilewallet.mifospay.designsystem.theme.primaryDarkBlue val styleMedium16sp = TextStyle( fontSize = 16.sp, diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/theme/Theme.kt b/mifospay/src/main/java/org/mifospay/theme/Theme.kt similarity index 97% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/theme/Theme.kt rename to mifospay/src/main/java/org/mifospay/theme/Theme.kt index 51f918ccb..77c1e08bc 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/theme/Theme.kt +++ b/mifospay/src/main/java/org/mifospay/theme/Theme.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.theme +package org.mifospay.theme import android.app.Activity import android.os.Build diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/theme/Type.kt b/mifospay/src/main/java/org/mifospay/theme/Type.kt similarity index 95% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/theme/Type.kt rename to mifospay/src/main/java/org/mifospay/theme/Type.kt index 77d1600bd..cda507436 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/theme/Type.kt +++ b/mifospay/src/main/java/org/mifospay/theme/Type.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.theme +package org.mifospay.theme import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/ui/MifosApp.kt b/mifospay/src/main/java/org/mifospay/ui/MifosApp.kt similarity index 91% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/ui/MifosApp.kt rename to mifospay/src/main/java/org/mifospay/ui/MifosApp.kt index 676edd660..cc2f73b74 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/ui/MifosApp.kt +++ b/mifospay/src/main/java/org/mifospay/ui/MifosApp.kt @@ -1,6 +1,5 @@ -package org.mifos.mobilewallet.mifospay.ui +package org.mifospay.ui -import android.content.Context import android.content.Intent import androidx.compose.animation.AnimatedVisibility import androidx.compose.foundation.background @@ -53,22 +52,22 @@ import androidx.compose.ui.semantics.testTagsAsResourceId import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavDestination -import org.mifos.mobilewallet.mifospay.R +import org.mifospay.R import androidx.navigation.NavDestination.Companion.hierarchy -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosBackground -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosGradientBackground -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosNavigationBar -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosNavigationBarItem -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosNavigationRail -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosNavigationRailItem -import org.mifos.mobilewallet.mifospay.designsystem.component.MifosTopAppBar -import org.mifos.mobilewallet.mifospay.designsystem.icon.MifosIcons -import org.mifos.mobilewallet.mifospay.designsystem.theme.GradientColors -import org.mifos.mobilewallet.mifospay.designsystem.theme.LocalGradientColors -import org.mifos.mobilewallet.mifospay.faq.ui.FAQActivity -import org.mifos.mobilewallet.mifospay.navigation.MifosNavHost -import org.mifos.mobilewallet.mifospay.navigation.TopLevelDestination -import org.mifos.mobilewallet.mifospay.settings.ui.SettingsActivity +import org.mifospay.core.designsystem.component.MifosBackground +import org.mifospay.core.designsystem.component.MifosGradientBackground +import org.mifospay.core.designsystem.component.MifosNavigationBar +import org.mifospay.core.designsystem.component.MifosNavigationBarItem +import org.mifospay.core.designsystem.component.MifosNavigationRail +import org.mifospay.core.designsystem.component.MifosNavigationRailItem +import org.mifospay.core.designsystem.component.MifosTopAppBar +import org.mifospay.core.designsystem.icon.MifosIcons +import org.mifospay.core.designsystem.theme.GradientColors +import org.mifospay.core.designsystem.theme.LocalGradientColors +import org.mifospay.faq.ui.FAQActivity +import org.mifospay.navigation.MifosNavHost +import org.mifospay.navigation.TopLevelDestination +import org.mifospay.settings.ui.SettingsActivity @OptIn( ExperimentalMaterial3Api::class, diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/ui/MifosAppState.kt b/mifospay/src/main/java/org/mifospay/ui/MifosAppState.kt similarity index 87% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/ui/MifosAppState.kt rename to mifospay/src/main/java/org/mifospay/ui/MifosAppState.kt index 798be9305..b1e0f68ca 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/ui/MifosAppState.kt +++ b/mifospay/src/main/java/org/mifospay/ui/MifosAppState.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.ui +package org.mifospay.ui import androidx.compose.material3.windowsizeclass.WindowSizeClass import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass @@ -19,17 +19,18 @@ import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.stateIn import kotlinx.datetime.TimeZone -import org.mifos.mobilewallet.core.util.NetworkMonitor -import org.mifos.mobilewallet.core.util.TimeZoneMonitor -import org.mifos.mobilewallet.mifospay.home.navigation.FINANCE_ROUTE -import org.mifos.mobilewallet.mifospay.home.navigation.HOME_ROUTE -import org.mifos.mobilewallet.mifospay.home.navigation.PAYMENTS_ROUTE -import org.mifos.mobilewallet.mifospay.home.navigation.PROFILE_ROUTE -import org.mifos.mobilewallet.mifospay.home.navigation.navigateToFinance -import org.mifos.mobilewallet.mifospay.home.navigation.navigateToHome -import org.mifos.mobilewallet.mifospay.home.navigation.navigateToPayments -import org.mifos.mobilewallet.mifospay.home.navigation.navigateToProfile -import org.mifos.mobilewallet.mifospay.navigation.TopLevelDestination +import org.mifospay.core.data.util.NetworkMonitor +import org.mifospay.core.data.util.TimeZoneMonitor +import org.mifospay.core.ui.TrackDisposableJank +import org.mifospay.home.navigation.FINANCE_ROUTE +import org.mifospay.home.navigation.HOME_ROUTE +import org.mifospay.home.navigation.PAYMENTS_ROUTE +import org.mifospay.home.navigation.PROFILE_ROUTE +import org.mifospay.home.navigation.navigateToFinance +import org.mifospay.home.navigation.navigateToHome +import org.mifospay.home.navigation.navigateToPayments +import org.mifospay.home.navigation.navigateToProfile +import org.mifospay.navigation.TopLevelDestination @Composable fun rememberMifosAppState( diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/AnimationUtil.kt b/mifospay/src/main/java/org/mifospay/utils/AnimationUtil.kt similarity index 99% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/AnimationUtil.kt rename to mifospay/src/main/java/org/mifospay/utils/AnimationUtil.kt index dc107af57..c5c574211 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/AnimationUtil.kt +++ b/mifospay/src/main/java/org/mifospay/utils/AnimationUtil.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.utils +package org.mifospay.utils import android.view.View import android.view.animation.AccelerateInterpolator diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/DebugUtil.kt b/mifospay/src/main/java/org/mifospay/utils/DebugUtil.kt similarity index 90% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/DebugUtil.kt rename to mifospay/src/main/java/org/mifospay/utils/DebugUtil.kt index 408e0413f..7a515df86 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/DebugUtil.kt +++ b/mifospay/src/main/java/org/mifospay/utils/DebugUtil.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.utils +package org.mifospay.utils import android.util.Log diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/DialogBox.kt b/mifospay/src/main/java/org/mifospay/utils/DialogBox.kt similarity index 93% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/DialogBox.kt rename to mifospay/src/main/java/org/mifospay/utils/DialogBox.kt index 510994206..e74a385d3 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/DialogBox.kt +++ b/mifospay/src/main/java/org/mifospay/utils/DialogBox.kt @@ -1,9 +1,9 @@ -package org.mifos.mobilewallet.mifospay.utils +package org.mifospay.utils import android.content.Context import android.content.DialogInterface import androidx.appcompat.app.AlertDialog -import org.mifos.mobilewallet.mifospay.R +import org.mifospay.R class DialogBox { var alertDialog: AlertDialog? = null diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/FileUtils.kt b/mifospay/src/main/java/org/mifospay/utils/FileUtils.kt similarity index 98% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/FileUtils.kt rename to mifospay/src/main/java/org/mifospay/utils/FileUtils.kt index f75b0d2be..a4501fbff 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/FileUtils.kt +++ b/mifospay/src/main/java/org/mifospay/utils/FileUtils.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.utils +package org.mifospay.utils import android.content.ContentUris import android.content.Context @@ -11,8 +11,8 @@ import android.provider.MediaStore import android.util.Base64 import android.util.Log import org.json.JSONObject -import org.mifos.mobilewallet.mifospay.common.Constants -import org.mifos.mobilewallet.mifospay.utils.DebugUtil.log +import org.mifospay.common.Constants +import org.mifospay.utils.DebugUtil.log import java.io.BufferedOutputStream import java.io.File import java.io.FileNotFoundException diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/NotificationUtils.kt b/mifospay/src/main/java/org/mifospay/utils/NotificationUtils.kt similarity index 98% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/NotificationUtils.kt rename to mifospay/src/main/java/org/mifospay/utils/NotificationUtils.kt index bf9332b71..99644ae40 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/NotificationUtils.kt +++ b/mifospay/src/main/java/org/mifospay/utils/NotificationUtils.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.utils +package org.mifospay.utils import android.app.ActivityManager import android.app.ActivityManager.RunningAppProcessInfo @@ -17,8 +17,8 @@ import android.text.TextUtils import android.util.Log import android.util.Patterns import androidx.core.app.NotificationCompat -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.common.Constants +import org.mifospay.R +import org.mifospay.common.Constants import java.io.IOException import java.net.HttpURLConnection import java.net.URL diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/PasswordStrength.kt b/mifospay/src/main/java/org/mifospay/utils/PasswordStrength.kt similarity index 95% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/PasswordStrength.kt rename to mifospay/src/main/java/org/mifospay/utils/PasswordStrength.kt index a9a7f1784..1111190cb 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/PasswordStrength.kt +++ b/mifospay/src/main/java/org/mifospay/utils/PasswordStrength.kt @@ -1,8 +1,8 @@ -package org.mifos.mobilewallet.mifospay.utils +package org.mifospay.utils import android.graphics.Color import android.util.Log -import org.mifos.mobilewallet.mifospay.R +import org.mifospay.R class PasswordStrength(password: String) { var strengthStringId = 0 diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/RecyclerItemClickListener.kt b/mifospay/src/main/java/org/mifospay/utils/RecyclerItemClickListener.kt similarity index 98% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/RecyclerItemClickListener.kt rename to mifospay/src/main/java/org/mifospay/utils/RecyclerItemClickListener.kt index 7d0a475f5..310e3217b 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/RecyclerItemClickListener.kt +++ b/mifospay/src/main/java/org/mifospay/utils/RecyclerItemClickListener.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.utils +package org.mifospay.utils import android.content.Context import android.view.GestureDetector diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/TextDrawable.kt b/mifospay/src/main/java/org/mifospay/utils/TextDrawable.kt similarity index 99% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/TextDrawable.kt rename to mifospay/src/main/java/org/mifospay/utils/TextDrawable.kt index 21604cf84..5a9b2f4ac 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/TextDrawable.kt +++ b/mifospay/src/main/java/org/mifospay/utils/TextDrawable.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.utils +package org.mifospay.utils import android.graphics.Canvas import android.graphics.Color diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/Toaster.kt b/mifospay/src/main/java/org/mifospay/utils/Toaster.kt similarity index 87% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/Toaster.kt rename to mifospay/src/main/java/org/mifospay/utils/Toaster.kt index 82defc03b..d495ad72d 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/Toaster.kt +++ b/mifospay/src/main/java/org/mifospay/utils/Toaster.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.utils +package org.mifospay.utils import android.content.Context import android.graphics.Color @@ -6,9 +6,9 @@ import android.view.View import android.widget.TextView import android.widget.Toast import com.google.android.material.snackbar.Snackbar -import org.mifos.mobilewallet.mifospay.MifosPayApp.Companion.context -import org.mifos.mobilewallet.mifospay.R -import org.mifos.mobilewallet.mifospay.common.Constants +import org.mifospay.MifosPayApp.Companion.context +import org.mifospay.R +import org.mifospay.common.Constants /** * Created by ankur on 23/May/2018 diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/ValidateUtil.kt b/mifospay/src/main/java/org/mifospay/utils/ValidateUtil.kt similarity index 77% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/ValidateUtil.kt rename to mifospay/src/main/java/org/mifospay/utils/ValidateUtil.kt index e311f13cc..da2fec814 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/ValidateUtil.kt +++ b/mifospay/src/main/java/org/mifospay/utils/ValidateUtil.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.utils +package org.mifospay.utils import android.util.Patterns diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/WrapContentHeightViewPager.kt b/mifospay/src/main/java/org/mifospay/utils/WrapContentHeightViewPager.kt similarity index 96% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/WrapContentHeightViewPager.kt rename to mifospay/src/main/java/org/mifospay/utils/WrapContentHeightViewPager.kt index b3c4f5b4d..205e437a5 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/utils/WrapContentHeightViewPager.kt +++ b/mifospay/src/main/java/org/mifospay/utils/WrapContentHeightViewPager.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.mifospay.utils +package org.mifospay.utils import android.content.Context import android.util.AttributeSet diff --git a/mifospay/src/main/res/layout/dialog_setup_upi_pin2.xml b/mifospay/src/main/res/layout/dialog_setup_upi_pin2.xml index 525f9d072..2d15c1d70 100644 --- a/mifospay/src/main/res/layout/dialog_setup_upi_pin2.xml +++ b/mifospay/src/main/res/layout/dialog_setup_upi_pin2.xml @@ -5,7 +5,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - diff --git a/core/data/src/test/java/org/mifos/mobilewallet/core/ExampleUnitTest.kt b/mifospay/src/test/java/org/mifospay/ExampleUnitTest.kt similarity index 90% rename from core/data/src/test/java/org/mifos/mobilewallet/core/ExampleUnitTest.kt rename to mifospay/src/test/java/org/mifospay/ExampleUnitTest.kt index 1d822b6aa..63ab9c388 100644 --- a/core/data/src/test/java/org/mifos/mobilewallet/core/ExampleUnitTest.kt +++ b/mifospay/src/test/java/org/mifospay/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package org.mifos.mobilewallet.core +package org.mifospay import org.junit.Assert import org.junit.Test