refactor: refactor client list screen to compose with clean arch, rea…

…lm and paging3
Aditya-gupta99 · Feb 21, 2024 · 78bd2be · 78bd2be
1 parent 56825eb
commit 78bd2be
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 389 deletions.
diff --git a/core/datastore/src/main/java/com/mifos/core/database/DatabaseClientQuery.kt b/core/datastore/src/main/java/com/mifos/core/database/DatabaseClientQuery.kt
@@ -4,6 +4,7 @@ import com.mifos.core.common.utils.Page
 import com.mifos.core.model.ClientDb
 import io.realm.kotlin.Realm
 import io.realm.kotlin.ext.query
+import io.realm.kotlin.query.Sort
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
@@ -15,7 +16,7 @@ import javax.inject.Inject
 class DatabaseClientQuery @Inject constructor(private val realm: Realm) {
 
     fun getClientListFromDb(): Flow<Page<ClientDb>> {
-        return realm.query<ClientDb>().asFlow()
+        return realm.query<ClientDb>().sort("accountNo", sortOrder = Sort.ASCENDING).asFlow()
             .map { Page(totalFilteredRecords = it.list.size, pageItems = it.list) }
     }
 

diff --git a/...client/src/main/java/com/mifos/feature/client/clientList/paging/ClientListPagingSource.kt b/...client/src/main/java/com/mifos/feature/client/clientList/paging/ClientListPagingSource.kt
@@ -79,7 +79,7 @@ class ClientListPagingSource(private val dataManagerClient: DataManagerClient) :
         clientList: List<Client>,
         clientDbList: List<ClientDb>
     ): List<Client> {
-        if (clientDbList.isEmpty()) {
+        if (clientDbList.isNotEmpty()) {
             clientList.forEach { client ->
                 clientDbList.forEach { clientDb ->
                     if (client.id == clientDb._id) {

diff --git a/...client/src/main/java/com/mifos/feature/client/clientList/presentation/ClientListScreen.kt b/...client/src/main/java/com/mifos/feature/client/clientList/presentation/ClientListScreen.kt
@@ -76,7 +76,7 @@ import com.mifos.feature.client.R
 @Composable
 fun ClientListScreen(
     createNewClient: () -> Unit,
-    syncClicked: () -> Unit,
+    syncClicked: (List<Client>) -> Unit,
     onClientSelect: (Client) -> Unit,
 ) {
 
@@ -118,13 +118,16 @@ fun ClientListScreen(
             if (isInSelectionMode.value) {
                 SelectionModeTopAppBar(
                     selectedItems = selectedItems,
-                    syncClicked = { syncClicked() },
+                    syncClicked = { syncClicked(selectedItems.toList()) },
                     resetSelectionMode = resetSelectionMode,
                 )
             }
         },
         floatingActionButton = {
-            FloatingActionButton(onClick = { createNewClient() }) {
+            FloatingActionButton(
+                onClick = { createNewClient() },
+                containerColor = BlueSecondary
+            ) {
                 Icon(
                     imageVector = Icons.Filled.Add,
                     contentDescription = null

diff --git a/mifosng-android/build.gradle.kts b/mifosng-android/build.gradle.kts
@@ -122,6 +122,7 @@ dependencies {
 
     implementation(project(":feature:auth"))
     implementation(project(":feature:client"))
+    implementation(project(":core:data"))
 
     // Multidex dependency
     implementation("androidx.multidex:multidex:2.0.1")