feat: Implemented fineract sdk cmp

openMF · Dec 15, 2024 · c535672 · c535672
1 parent af22111
commit c535672
Show file tree

Hide file tree

Showing 16 changed files with 68 additions and 65 deletions.
diff --git a/core/data/src/main/java/com/mifos/core/data/di/DataModule.kt b/core/data/src/main/java/com/mifos/core/data/di/DataModule.kt
@@ -49,18 +49,15 @@ import com.mifos.core.data.repository.SearchRepository
 import com.mifos.core.data.repository.SignatureRepository
 import com.mifos.core.data.repository.SurveyListRepository
 import com.mifos.core.data.repository.SurveySubmitRepository
-import com.mifos.core.data.repositoryImp.ActivateRepositoryImp
 import com.mifos.core.data.repositoryImp.CenterDetailsRepositoryImp
 import com.mifos.core.data.repositoryImp.CenterListRepositoryImp
 import com.mifos.core.data.repositoryImp.ChargeDialogRepositoryImp
 import com.mifos.core.data.repositoryImp.CheckerInboxRepositoryImp
 import com.mifos.core.data.repositoryImp.CheckerInboxTasksRepositoryImp
 import com.mifos.core.data.repositoryImp.ClientChargeRepositoryImp
 import com.mifos.core.data.repositoryImp.ClientIdentifierDialogRepositoryImp
-import com.mifos.core.data.repositoryImp.ClientIdentifiersRepositoryImp
 import com.mifos.core.data.repositoryImp.CreateNewCenterRepositoryImp
 import com.mifos.core.data.repositoryImp.CreateNewGroupRepositoryImp
-import com.mifos.core.data.repositoryImp.DataTableDataRepositoryImp
 import com.mifos.core.data.repositoryImp.DataTableListRepositoryImp
 import com.mifos.core.data.repositoryImp.DataTableRepositoryImp
 import com.mifos.core.data.repositoryImp.DataTableRowDialogRepositoryImp
@@ -89,6 +86,9 @@ import com.mifos.core.data.repositoryImp.SearchRepositoryImp
 import com.mifos.core.data.repositoryImp.SignatureRepositoryImp
 import com.mifos.core.data.repositoryImp.SurveyListRepositoryImp
 import com.mifos.core.data.repositoryImp.SurveySubmitRepositoryImp
+import com.mifos.core.data.repository_imp.ActivateRepositoryImp
+import com.mifos.core.data.repository_imp.ClientIdentifiersRepositoryImp
+import com.mifos.core.data.repository_imp.DataTableDataRepositoryImp
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn

diff --git a/core/data/src/main/java/com/mifos/core/data/pagingSource/CenterListPagingSource.kt b/core/data/src/main/java/com/mifos/core/data/pagingSource/CenterListPagingSource.kt
@@ -1,4 +1,4 @@
-package com.mifos.core.data.paging_source
+package com.mifos.core.data.pagingSource
 
 import androidx.paging.PagingSource
 import androidx.paging.PagingState

diff --git a/core/data/src/main/java/com/mifos/core/data/pagingSource/ClientListPagingSource.kt b/core/data/src/main/java/com/mifos/core/data/pagingSource/ClientListPagingSource.kt
@@ -1,4 +1,4 @@
-package com.mifos.core.data.paging_source
+package com.mifos.core.data.pagingSource
 
 import androidx.paging.PagingSource
 import androidx.paging.PagingState

diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/ActivateCenterUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/ActivateCenterUseCase.kt
@@ -1,4 +1,4 @@
-package com.mifos.core.domain.use_cases
+package com.mifos.core.domain.useCases
 
 import com.mifos.core.common.utils.Resource
 import com.mifos.core.data.repository.ActivateRepository

diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/ActivateClientUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/ActivateClientUseCase.kt
@@ -1,4 +1,4 @@
-package com.mifos.core.domain.use_cases
+package com.mifos.core.domain.useCases
 
 import com.mifos.core.common.utils.Resource
 import com.mifos.core.data.repository.ActivateRepository

diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/DeleteDataTableEntryUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/DeleteDataTableEntryUseCase.kt
@@ -1,4 +1,4 @@
-package com.mifos.core.domain.use_cases
+package com.mifos.core.domain.useCases
 
 import com.mifos.core.common.utils.Resource
 import com.mifos.core.data.repository.DataTableDataRepository

diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/DeleteIdentifierUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/DeleteIdentifierUseCase.kt
@@ -1,4 +1,4 @@
-package com.mifos.core.domain.use_cases
+package com.mifos.core.domain.useCases
 
 import com.mifos.core.common.utils.Resource
 import com.mifos.core.data.repository.ClientIdentifiersRepository

diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientDetailsUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientDetailsUseCase.kt
@@ -1,4 +1,4 @@
-package com.mifos.core.domain.use_cases
+package com.mifos.core.domain.useCases
 
 import com.mifos.core.common.utils.Resource
 import com.mifos.core.data.repository.ClientDetailsRepository

diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientIdentifiersUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientIdentifiersUseCase.kt
@@ -1,4 +1,4 @@
-package com.mifos.core.domain.use_cases
+package com.mifos.core.domain.useCases
 
 import com.mifos.core.common.utils.Resource
 import com.mifos.core.data.repository.ClientIdentifiersRepository

diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupOfficesUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupOfficesUseCase.kt
@@ -1,4 +1,4 @@
-package com.mifos.core.domain.use_cases
+package com.mifos.core.domain.useCases
 
 import com.mifos.core.common.utils.Resource
 import com.mifos.core.data.repository.CreateNewGroupRepository

diff --git a/...enter/src/main/java/com/mifos/feature/center/syncCentersDialog/SyncCentersDialogScreen.kt b/...enter/src/main/java/com/mifos/feature/center/syncCentersDialog/SyncCentersDialogScreen.kt
@@ -40,6 +40,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.mifos.core.designsystem.component.MifosCircularProgress
 import com.mifos.core.objects.group.Center
 import com.mifos.feature.center.R
+import com.mifos.feature.center.sync_centers_dialog.SyncCentersDialogViewModel
 
 @Composable
 internal fun SyncCenterDialogScreen(

diff --git a/...client/src/main/java/com/mifos/feature/client/createNewClient/CreateNewClientViewModel.kt b/...client/src/main/java/com/mifos/feature/client/createNewClient/CreateNewClientViewModel.kt
@@ -5,8 +5,8 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.mifos.core.common.utils.Resource
 import com.mifos.core.data.repository.CreateNewClientRepository
-import com.mifos.core.domain.use_cases.ClientTemplateUseCase
-import com.mifos.core.domain.use_cases.GetOfficeListUseCase
+import com.mifos.core.domain.useCases.ClientTemplateUseCase
+import com.mifos.core.domain.useCases.GetOfficeListUseCase
 import com.mifos.core.domain.use_cases.GetStaffInOfficeForCreateNewClientUseCase
 import com.mifos.core.objects.client.Client
 import com.mifos.core.objects.client.ClientPayload
@@ -39,7 +39,7 @@ class CreateNewClientViewModel @Inject constructor(
     private val repository: CreateNewClientRepository,
     private val clientTemplateUseCase: ClientTemplateUseCase,
     private val getStaffInOffice: GetStaffInOfficeForCreateNewClientUseCase,
-    private val getOfficeListUseCase: GetOfficeListUseCase
+    private val getOfficeListUseCase: GetOfficeListUseCase,
 ) : ViewModel() {
 
     private val _createNewClientUiState =
@@ -109,46 +109,48 @@ class CreateNewClientViewModel @Inject constructor(
         repository.createClient(clientPayload)
             .observeOn(AndroidSchedulers.mainThread())
             .subscribeOn(Schedulers.io())
-            .subscribe(object : Subscriber<Client>() {
-                override fun onCompleted() {
-                }
-
-                override fun onError(e: Throwable) {
-                    try {
-                        if (e is HttpException) {
-                            val errorMessage = e.response()?.errorBody()
-                                ?.string() ?: ""
-                            Log.d("error", errorMessage)
-                            _createNewClientUiState.value =
-                                CreateNewClientUiState.ShowStringError(errorMessage)
+            .subscribe(
+                object : Subscriber<Client>() {
+                    override fun onCompleted() {
+                    }
 
+                    override fun onError(e: Throwable) {
+                        try {
+                            if (e is HttpException) {
+                                val errorMessage = e.response()?.errorBody()
+                                    ?.string() ?: ""
+                                Log.d("error", errorMessage)
+                                _createNewClientUiState.value =
+                                    CreateNewClientUiState.ShowStringError(errorMessage)
+
+                            }
+                        } catch (throwable: Throwable) {
+                            RxJavaPlugins.getInstance().errorHandler.handleError(e)
                         }
-                    } catch (throwable: Throwable) {
-                        RxJavaPlugins.getInstance().errorHandler.handleError(e)
                     }
-                }
 
-                override fun onNext(client: Client?) {
-                    if (client != null) {
-                        if (client.clientId != null) {
-                            _createNewClientUiState.value =
-                                CreateNewClientUiState.ShowClientCreatedSuccessfully(R.string.feature_client_client_created_successfully)
-
-                            _createNewClientUiState.value = client.clientId?.let {
-                                CreateNewClientUiState.SetClientId(
-                                    it
-                                )
-                            }!!
-                        } else {
-                            _createNewClientUiState.value = client.clientId?.let {
-                                CreateNewClientUiState.ShowWaitingForCheckerApproval(
-                                    it
-                                )
-                            }!!
+                    override fun onNext(client: Client?) {
+                        if (client != null) {
+                            if (client.clientId != null) {
+                                _createNewClientUiState.value =
+                                    CreateNewClientUiState.ShowClientCreatedSuccessfully(R.string.feature_client_client_created_successfully)
+
+                                _createNewClientUiState.value = client.clientId?.let {
+                                    CreateNewClientUiState.SetClientId(
+                                        it,
+                                    )
+                                }!!
+                            } else {
+                                _createNewClientUiState.value = client.clientId?.let {
+                                    CreateNewClientUiState.ShowWaitingForCheckerApproval(
+                                        it,
+                                    )
+                                }!!
+                            }
                         }
                     }
-                }
-            })
+                },
+            )
     }
 
     fun uploadImage(id: Int, pngFile: File) {
@@ -164,19 +166,21 @@ class CreateNewClientViewModel @Inject constructor(
         repository.uploadClientImage(id, body)
             .observeOn(AndroidSchedulers.mainThread())
             .subscribeOn(Schedulers.io())
-            .subscribe(object : Subscriber<ResponseBody>() {
-                override fun onCompleted() {
-                }
+            .subscribe(
+                object : Subscriber<ResponseBody>() {
+                    override fun onCompleted() {
+                    }
 
-                override fun onError(e: Throwable) {
-                    _createNewClientUiState.value =
-                        CreateNewClientUiState.ShowError(R.string.feature_client_Image_Upload_Failed)
-                }
+                    override fun onError(e: Throwable) {
+                        _createNewClientUiState.value =
+                            CreateNewClientUiState.ShowError(R.string.feature_client_Image_Upload_Failed)
+                    }
 
-                override fun onNext(t: ResponseBody) {
-                    _createNewClientUiState.value =
-                        CreateNewClientUiState.OnImageUploadSuccess(R.string.feature_client_Image_Upload_Successful)
-                }
-            })
+                    override fun onNext(t: ResponseBody) {
+                        _createNewClientUiState.value =
+                            CreateNewClientUiState.OnImageUploadSuccess(R.string.feature_client_Image_Upload_Successful)
+                    }
+                },
+            )
     }
 }
diff --git a/...ent/src/main/java/com/mifos/feature/client/syncClientDialog/SyncClientsDialogViewModel.kt b/...ent/src/main/java/com/mifos/feature/client/syncClientDialog/SyncClientsDialogViewModel.kt
@@ -1,4 +1,4 @@
-package com.mifos.feature.client.sync_client_dialog
+package com.mifos.feature.client.syncClientDialog
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope

diff --git a/...roups/src/main/java/com/mifos/feature/groups/syncGroupDialog/SyncGroupsDialogViewModel.kt b/...roups/src/main/java/com/mifos/feature/groups/syncGroupDialog/SyncGroupsDialogViewModel.kt
@@ -1,4 +1,4 @@
-package com.mifos.feature.groups.sync_group_dialog
+package com.mifos.feature.groups.syncGroupDialog
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope

diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/core/MifosBaseActivity.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/core/MifosBaseActivity.kt
@@ -18,7 +18,6 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import com.mifos.mifosxdroid.AndroidClientActivity
 import com.mifos.mifosxdroid.R
-import com.mifos.mifosxdroid.passcode.PassCodeActivity
 import com.mifos.utils.Constants
 import com.mifos.utils.LanguageHelper
 import com.mifos.utils.PrefManager

diff --git a/mifosng-android/src/main/res/values/dimens.xml b/mifosng-android/src/main/res/values/dimens.xml
@@ -23,7 +23,6 @@
     <dimen name="datatable_name_heading">18sp</dimen>
     <dimen name="dimension_72_dp">72dp</dimen>
     <dimen name="dimension_32_dp">32dp</dimen>
-    <dimen name="fab_margin">32dp</dimen>
 
     <dimen name="marginItemsInSectionSmall">16dp</dimen>
     <dimen name="marginItemsInSectionMedium">20dp</dimen>