Client Collateral Datas

feature/loan/src/commonMain/kotlin/com/mifos/feature/loan/ClientCollateral/ClientCollateralScreen.kt

@@ -0,0 +1,152 @@
+package com.mifos.feature.loan.ClientCollateral
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+
+import androidx.compose.material3.Button
+import androidx.compose.material3.Card
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+// Koin ViewModel import
+import org.koin.compose.viewmodel.koinViewModel
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun ClientCollateralScreen(
+    viewModel: ClientCollateralViewModel = koinViewModel()
+) {
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+
+    Scaffold(
+        topBar = {
+            TopAppBar(title = {
+                val titleText = when (val state = uiState) {
+                    is ClientCollateralUiState.Success -> "Collateral Data (${state.totalItems} ${if (state.totalItems == 1) "Item" else "Items"})"
+                    is ClientCollateralUiState.Empty -> "Collateral Data (0 Items)"
+                    else -> "Collateral Data"
+                }
+                Text(text = titleText)
+            })
+        }
+    ) { paddingValues ->
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(paddingValues)
+                .padding(horizontal = 16.dp, vertical = 8.dp),
+            contentAlignment = Alignment.TopCenter // Changed to TopCenter for list display
+        ) {
+            when (val state = uiState) {
+                is ClientCollateralUiState.Loading -> {
+                    // Centered loading indicator
+                    Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+                        CircularProgressIndicator()
+                    }
+                }
+                is ClientCollateralUiState.Success -> {
+                    CollateralList(items = state.items)
+                }
+                is ClientCollateralUiState.Empty -> {
+                    // Centered empty state message
+                     Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+                        EmptyCollateralState()
+                    }
+                }
+                is ClientCollateralUiState.Error -> {
+                    // Centered error state message
+                    Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+                        ErrorState(message = state.message, onRetry = { viewModel.loadCollateralItems() })
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun CollateralList(items: List<CollateralDisplayItem>) {
+    LazyColumn(
+        verticalArrangement = Arrangement.spacedBy(8.dp),
+        contentPadding = PaddingValues(top = 8.dp, bottom = 8.dp)
+    ) {
+        items(items, key = { it.id }) { item -> // Use item.id as a key for better performance
+            CollateralListItem(item = item, onActionClick = { /* TODO: Handle action click */ })
+        }
+    }
+}
+
+@Composable
+fun CollateralListItem(item: CollateralDisplayItem, onActionClick: () -> Unit) {
+    Card(
+        modifier = Modifier
+            .fillMaxWidth()
+    ) {
+        Column(modifier = Modifier.padding(16.dp)) {
+            Text("Type/Name: ${item.typeName}", fontWeight = FontWeight.Bold, style = MaterialTheme.typography.titleMedium)
+            Spacer(modifier = Modifier.height(4.dp))
+            Text("Quantity: ${item.quantity}", style = MaterialTheme.typography.bodyMedium)
+            Spacer(modifier = Modifier.height(4.dp))
+            Text("Unit Value: ${item.unitValue}", style = MaterialTheme.typography.bodyMedium)
+            Spacer(modifier = Modifier.height(4.dp))
+            Text("Total Collateral Value: ${item.totalCollateralValue}", style = MaterialTheme.typography.bodyMedium)
+            Box(modifier = Modifier.fillMaxWidth(), contentAlignment = Alignment.CenterEnd) {
+                 IconButton(onClick = onActionClick) {
+
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun EmptyCollateralState() {
+    Card(modifier = Modifier.padding(16.dp)) {
+        Column(
+            modifier = Modifier
+                .padding(32.dp)
+                .fillMaxWidth(),
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.Center
+        ) {
+            Text("No Item Found", style = MaterialTheme.typography.headlineSmall)
+        }
+    }
+}
+
+@Composable
+fun ErrorState(message: String, onRetry: () -> Unit) {
+    Column(
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Center,
+        modifier = Modifier.padding(16.dp)
+    ) {
+        Text("Error: $message", color = MaterialTheme.colorScheme.error, style = MaterialTheme.typography.bodyLarge)
+        Spacer(modifier = Modifier.height(16.dp))
+        Button(onClick = onRetry) {
+            Text("Retry")
+        }
+    }
+}
+

feature/loan/src/commonMain/kotlin/com/mifos/feature/loan/ClientCollateral/ClientCollateralUiState.kt

@@ -0,0 +1,18 @@
+package com.mifos.feature.loan.ClientCollateral
+
+
+
+data class CollateralDisplayItem(
+    val id: Int,
+    val typeName: String,
+    val quantity: Int,
+    val unitValue: Double,
+    val totalCollateralValue: Double
+)
+sealed interface ClientCollateralUiState {
+    data object Loading : ClientCollateralUiState
+    data class Error(val message: String) : ClientCollateralUiState
+    data object Empty : ClientCollateralUiState
+    data class Success(val items: List<CollateralDisplayItem>, val totalItems: Int) : ClientCollateralUiState
+}
+

feature/loan/src/commonMain/kotlin/com/mifos/feature/loan/ClientCollateral/ClientCollateralViewmodel.kt

@@ -0,0 +1,78 @@
+package com.mifos.feature.loan.ClientCollateral
+
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.mifos.core.common.utils.DataState
+import com.mifos.core.data.repository.ClientDetailsRepository
+
+import com.mifos.core.network.model.CollateralItem
+import com.mifos.feature.loan.ClientCollateral.ClientCollateralUiState.*
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+
+class ClientCollateralViewModel(
+    private val savedStateHandle: SavedStateHandle, // Assuming we might need clientId/groupId from nav args
+    private val clientDetailsRepository: ClientDetailsRepository
+) : ViewModel() {
+
+    private val _uiState = MutableStateFlow<ClientCollateralUiState>(ClientCollateralUiState.Loading)
+    val uiState: StateFlow<ClientCollateralUiState> = _uiState.asStateFlow()
+
+
+    private val clientId: Int? = savedStateHandle.get<Int>("clientIdKey")
+
+    init {
+        loadCollateralItems()
+    }
+
+    fun loadCollateralItems() {
+        if (clientId == null) {
+            _uiState.value = ClientCollateralUiState.Error("Client ID not found")
+            return
+        }
+
+        viewModelScope.launch {
+            _uiState.value = ClientCollateralUiState.Loading
+            when (val result = clientDetailsRepository.getCollateralItems()) {
+                is DataState.Success -> {
+                    val networkItems = result.data
+                    if (networkItems.isEmpty()) {
+                        _uiState.value = ClientCollateralUiState.Empty
+                    } else {
+                        val displayItems = networkItems.mapNotNull { transformToDisplayItem(it) }
+                        if (displayItems.isEmpty() && networkItems.isNotEmpty()) {
+                            // This case means all items failed to parse quantity, which is an error
+                             _uiState.value = Error("Error parsing collateral data")
+                        } else {
+                             _uiState.value = Success(displayItems, displayItems.size)
+                        }
+                    }
+                }
+                is DataState.Error -> {
+                    _uiState.value = Error(result.exception.message ?: "Unknown error")
+                }
+
+                DataState.Loading -> TODO()
+            }
+        }
+    }
+
+    private fun transformToDisplayItem(networkItem: CollateralItem): CollateralDisplayItem? {
+        val quantity = networkItem.quality.toIntOrNull()
+        return if (quantity != null) {
+            CollateralDisplayItem(
+                id = networkItem.id,
+                typeName = networkItem.name,
+                quantity = quantity,
+                unitValue = networkItem.basePrice,
+                totalCollateralValue = quantity * networkItem.basePrice
+            )
+        } else {
+
+            null
+        }
+    }
+}

feature/savings/build.gradle.kts

@@ -25,6 +25,7 @@ kotlin{
             implementation(compose.components.uiToolingPreview)
             implementation(compose.ui)
             implementation(libs.kotlinx.serialization.json)
+
         }
     }
 }

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 accompanistPermission = "0.34.0"
 androidDesugarJdkLibs = "2.1.4"
-androidGradlePlugin = "8.7.3"
+androidGradlePlugin = "8.12.2"
 androidTools = "31.8.0"
 androidxActivity = "1.10.0"
 androidxAppCompat = "1.7.0"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Fri Feb 02 11:29:16 IST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists