Merge branch 'kmp-impl' into MIFOSAC-458-client-charge-dialog

Author: niyajali

cmp-android/dependencies/demoDebugRuntimeClasspath.txt

@@ -153,6 +153,7 @@ com.google.accompanist:accompanist-drawablepainter:0.37.3
 com.google.accompanist:accompanist-permissions:0.34.0
 com.google.android.gms:play-services-base:18.5.0
 com.google.android.gms:play-services-basement:18.4.0
+com.google.android.gms:play-services-location:21.3.0
 com.google.android.gms:play-services-maps:18.2.0
 com.google.android.gms:play-services-oss-licenses:17.1.0
 com.google.android.gms:play-services-tasks:18.2.0
@@ -313,6 +314,7 @@ org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2
 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2
+org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.10.2
 org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.10.2
 org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.2
 org.jetbrains.kotlinx:kotlinx-datetime:0.6.2

cmp-android/dependencies/demoReleaseRuntimeClasspath.txt

@@ -149,6 +149,7 @@ com.google.accompanist:accompanist-drawablepainter:0.37.3
 com.google.accompanist:accompanist-permissions:0.34.0
 com.google.android.gms:play-services-base:18.5.0
 com.google.android.gms:play-services-basement:18.4.0
+com.google.android.gms:play-services-location:21.3.0
 com.google.android.gms:play-services-maps:18.2.0
 com.google.android.gms:play-services-oss-licenses:17.1.0
 com.google.android.gms:play-services-tasks:18.2.0
@@ -306,6 +307,7 @@ org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2
 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2
+org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.10.2
 org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.10.2
 org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.2
 org.jetbrains.kotlinx:kotlinx-datetime:0.6.2

cmp-android/dependencies/prodDebugRuntimeClasspath.txt

@@ -153,6 +153,7 @@ com.google.accompanist:accompanist-drawablepainter:0.37.3
 com.google.accompanist:accompanist-permissions:0.34.0
 com.google.android.gms:play-services-base:18.5.0
 com.google.android.gms:play-services-basement:18.4.0
+com.google.android.gms:play-services-location:21.3.0
 com.google.android.gms:play-services-maps:18.2.0
 com.google.android.gms:play-services-oss-licenses:17.1.0
 com.google.android.gms:play-services-tasks:18.2.0
@@ -313,6 +314,7 @@ org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2
 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2
+org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.10.2
 org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.10.2
 org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.2
 org.jetbrains.kotlinx:kotlinx-datetime:0.6.2

cmp-android/dependencies/prodReleaseRuntimeClasspath.txt

@@ -149,6 +149,7 @@ com.google.accompanist:accompanist-drawablepainter:0.37.3
 com.google.accompanist:accompanist-permissions:0.34.0
 com.google.android.gms:play-services-base:18.5.0
 com.google.android.gms:play-services-basement:18.4.0
+com.google.android.gms:play-services-location:21.3.0
 com.google.android.gms:play-services-maps:18.2.0
 com.google.android.gms:play-services-oss-licenses:17.1.0
 com.google.android.gms:play-services-tasks:18.2.0
@@ -306,6 +307,7 @@ org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2
 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2
+org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.10.2
 org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.10.2
 org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.2
 org.jetbrains.kotlinx:kotlinx-datetime:0.6.2

cmp-android/src/main/AndroidManifest.xml

@@ -23,6 +23,8 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="32"
         tools:ignore="ScopedStorage" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <!--
     Firebase automatically adds the AD_ID permission, even though we don't use it. If you use this
     permission you must declare how you're using it to Google Play, otherwise the app will be

core/data/src/commonMain/kotlin/com/mifos/core/data/repository/PinPointClientRepository.kt

@@ -12,7 +12,7 @@ package com.mifos.core.data.repository
 import com.mifos.core.common.utils.DataState
 import com.mifos.core.model.objects.clients.ClientAddressRequest
 import com.mifos.core.model.objects.clients.ClientAddressResponse
-import com.mifos.core.network.GenericResponse
+import com.mifos.core.network.model.PinpointLocationActionResponse
 import kotlinx.coroutines.flow.Flow
 
 /**
@@ -25,16 +25,16 @@ interface PinPointClientRepository {
     suspend fun addClientPinpointLocation(
         clientId: Int,
         address: ClientAddressRequest,
-    ): GenericResponse
+    ): PinpointLocationActionResponse
 
     suspend fun deleteClientAddressPinpointLocation(
         apptableId: Int,
         datatableId: Int,
-    ): GenericResponse
+    ): PinpointLocationActionResponse
 
     suspend fun updateClientPinpointLocation(
         apptableId: Int,
         datatableId: Int,
         address: ClientAddressRequest,
-    ): GenericResponse
+    ): PinpointLocationActionResponse
 }

core/data/src/commonMain/kotlin/com/mifos/core/data/repositoryImp/PinPointClientRepositoryImp.kt

@@ -12,9 +12,10 @@ package com.mifos.core.data.repositoryImp
 import com.mifos.core.common.utils.DataState
 import com.mifos.core.common.utils.asDataStateFlow
 import com.mifos.core.data.repository.PinPointClientRepository
+import com.mifos.core.model.objects.clients.ClientAddressRequest
 import com.mifos.core.model.objects.clients.ClientAddressResponse
-import com.mifos.core.network.GenericResponse
 import com.mifos.core.network.datamanager.DataManagerClient
+import com.mifos.core.network.model.PinpointLocationActionResponse
 import kotlinx.coroutines.flow.Flow
 
 /**
@@ -31,23 +32,23 @@ class PinPointClientRepositoryImp(
 
     override suspend fun addClientPinpointLocation(
         clientId: Int,
-        address: com.mifos.core.model.objects.clients.ClientAddressRequest,
-    ): GenericResponse {
+        address: ClientAddressRequest,
+    ): PinpointLocationActionResponse {
         return dataManagerClient.addClientPinpointLocation(clientId, address)
     }
 
     override suspend fun deleteClientAddressPinpointLocation(
         apptableId: Int,
         datatableId: Int,
-    ): GenericResponse {
+    ): PinpointLocationActionResponse {
         return dataManagerClient.deleteClientAddressPinpointLocation(apptableId, datatableId)
     }
 
     override suspend fun updateClientPinpointLocation(
         apptableId: Int,
         datatableId: Int,
-        address: com.mifos.core.model.objects.clients.ClientAddressRequest,
-    ): GenericResponse {
+        address: ClientAddressRequest,
+    ): PinpointLocationActionResponse {
         return dataManagerClient.updateClientPinpointLocation(apptableId, datatableId, address)
     }
 }

core/designsystem/src/androidMain/kotlin/com/mifos/core/designsystem/component/MifosPermissionBox.android.kt

@@ -25,11 +25,11 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.compose.LocalLifecycleOwner
 
 @Composable
 actual fun PermissionBox(
@@ -169,3 +169,10 @@ actual fun getRequiredPermissionsForExport(): List<String> {
         )
     }
 }
+
+actual fun getRequiredPermissionsForLocation(): List<String> {
+    return listOf(
+        Manifest.permission.ACCESS_FINE_LOCATION,
+        Manifest.permission.ACCESS_COARSE_LOCATION,
+    )
+}

core/designsystem/src/commonMain/kotlin/com/mifos/core/designsystem/component/MifosPermissionBox.kt

@@ -22,3 +22,5 @@ expect fun PermissionBox(
 )
 
 expect fun getRequiredPermissionsForExport(): List<String>
+
+expect fun getRequiredPermissionsForLocation(): List<String>

core/designsystem/src/desktopMain/kotlin/com/mifos/core/designsystem/component/MifosPermissionBox.desktop.kt

@@ -26,3 +26,7 @@ actual fun PermissionBox(
 actual fun getRequiredPermissionsForExport(): List<String> {
     TODO("Not yet implemented")
 }
+
+actual fun getRequiredPermissionsForLocation(): List<String> {
+    TODO("Not yet implemented")
+}