Merge kmp-impl into development by itsPronay · Pull Request #2447 · openMF/mifos-x-field-officer-app

itsPronay · 2025-08-05T20:41:41Z

Fixes - https://mifosforge.jira.com/browse/MIFOSAC-499

Didn't create a Jira ticket, click here to create new.

Please Add Screenshots If there are any UI changes.

Before	After

Please make sure these boxes are checked before submitting your pull request - thanks!

Run the static analysis check ./gradlew check or ci-prepush.sh to make sure you didn't break anything
If you have multiple commits please combine them into one commit by squashing them.

* MIFOSAC-323 KMP setup * fix checks failure * applied spotless * fix issues

* added all the missing KMP dependencies in the version catalog fix checks failure * format code * fix: Build Issue & Updated Dependencies * chore: Updated .gitignore --------- Co-authored-by: Sk Niyaj Ali <niyaj639@gmail.com>

…2283) refactor: moving files from the database module to the model module (openMF#2275)

* MIFOSAC-278 adding entities for the migration. here we have added entities for accounts package * MIFOSAC-278 adding entities for the migration. here we have added entities for center, client, collection sheet,group, navigation package * MIFOSAC-278 due date type converter and database module cache issue solved * MIFOSAC-278 added entities fir the rest of the modules * MIFOSAC-278 migrated model package to the room related package

* database.loan -DBflow to room * remove flow from impl * fix spotless * made suggested changes

* Directory restructure :core:designsystem to KMP * Feat: Configure theme and color * Updated components, theme, utils, colors * Update files after ci-prepush run * Fix issues related to stringResources and R class * Update files after ci-prepush run * Separate utils and utility * Refactor: Remove explicit color, size, and typography definitions * Remove mistakenly added file * Refactor: Update typography, colors

* migrate [core.model] to KMP applied spotless and detekt rename fixed spotless fix removed parcelize * fix spotless

* [database/survey] dbflow to room [database/survey] dbflow to room * removed extra changes * fixed spotless and detekt

* MIFOSAC-391 database.staff dbflow to room * remove suspend * made suggested changes * fix

* [database.group] dbflow to room * fix checks

* MIFOSAC-342 [database.center] dbFlow to room migration

* feat(office): migrated Dbflow to Room * fix: data type and removed Gson * fix: model usage in useCase * refactor: replaced entity instead of model * fix: spotless error * fix checks failure --------- Co-authored-by: Nagarjuna <nagarjunabanda4@gmail.com>

* MIFOSAC-392 [database/charge] dbflow to room * backup * Fix exception * added singleton

* refactor(core): migrate from dbflow to room in core:data and core:database * refactor(core): replace var with val in core:database * refactor(core): replace var with val in core:database and delete some files * refactor(core): update files after ci-prepush * refactor(core:database): remove columninfo annotations from room entities * chore: apply ci-prepush changes * refactor: correct import statements for client room entities * chore: update ci-prepush changes * feat(core:database): Update ClientDao * refactor(core): migrate from dbflow to room in core:data and core:database * refactor(core): replace var with val in core:database * refactor(core): replace var with val in core:database and delete some files * refactor(core): update files after ci-prepush * refactor(core:database): remove columninfo annotations from room entities * chore: apply ci-prepush changes * refactor: correct import statements for client room entities * chore: update ci-prepush changes * feat(core:database): Update ClientDao * refactor(core:database): remove columninfo annotaions from room:entities:templates * refactor(core:database): replace HashMap with emptyMap * refactor(core): restore original files DataManagerClient and ActivatePayload * refactor(core:data): migrate dbflow to room * refactor(core:database): update ClientDao * refactor(core): update ClientDao and other files in :core:data and :core:database * refactor: [database.group] dbflow to room (openMF#2313) * [database.group] dbflow to room * fix checks * refactor: [database.center] dbFlow to room migration (openMF#2307) * MIFOSAC-342 [database.center] dbFlow to room migration * refactor: [database.office] dbflow to room (openMF#2314) * feat(office): migrated Dbflow to Room * fix: data type and removed Gson * fix: model usage in useCase * refactor: replaced entity instead of model * fix: spotless error * fix checks failure --------- Co-authored-by: Nagarjuna <nagarjunabanda4@gmail.com> * refactor: [database/charge] dbflow to room (openMF#2312) * MIFOSAC-392 [database/charge] dbflow to room * backup * Fix exception * added singleton * refactor(core:database): update ClientDaoHelper and ClientAccounts * refactor(core:database): update ClientDaoHelper and ClientTypeConverters * refactor(core:database): update DAO classes and clean up comments * [database/client] dbflow to room * fix * made changes --------- Co-authored-by: Biplab Dutta <biplabdutta27@gmail.com> Co-authored-by: Nagarjuna <nagarjunabanda4@gmail.com>

* backup * fix build issue * move parcelize to model * implemented arjun's suggestion * backup * fix: Fixed Build Issue --------- Co-authored-by: Sk Niyaj Ali <niyaj639@gmail.com>

…Provider (openMF#2335)

* Fixed CMP plugins and dependencies * Update CMPFeatureConventionPlugin.kt

* UI Converted to KMP * updated * updated * added other components * updated * updated * updated * updated * merged

* Replaced hilt with koin in feature module * Added RepositoryModule * migrated Dispatchers use * replaced hilt with koin in core.domain * network and database * removed hilt from repo impl * migrated hilt to koin * backup * backup * added helperModule * network module + database modules left out part * fix checks * app builds fine now * fix app crash + added missing modules * removed commented out code * removed comments * made suggested changes * changed Files to make app run * updated --------- Co-authored-by: revanthkumarJ <jrevanth101@gmail.com>

* changed Files to make app run * updated * updated * updated * updated * updated

* migrate core/common to KMP * common to KMP * fix checks * remove comments * fix checks * added ConnectivityManagerNetworkMonitor

* Initial Commit * updated * updated * updated * updated * Updated * Updated * Updated * Updated * Updated * updated * updated * updated * updated * updated * updated * Updated * Updated * Updated * Updated * Updated

* [core.database] to KMP * dependencyGuardBaseline generated * provided type for mifosdatabase + refactored

* initial setup * updated * Updated * Changed Imports in Services * Updated * Updated * Added ktorHttpClient * Added ktorHttpClient * Updated * Updated * Updated * updated mappers * updated mappers * Updated * Updated * Updated * Updated * Updated * Updated ImageLoader.Utils * changed observable to flow in data * Updated * Updated * Updated * Updated based on suggestions * Updated * Updated * Updated

Co-authored-by: Biplab Dutta <biplabdutt27@gmail.com>

…#2446)

therajanmaurya · 2025-08-05T20:48:54Z

closing in reference with #2448

Nagarjuna0033 · 2025-08-06T15:38:06Z

@itsPronay make sure the workflows are correctly setup

biplab1

LGTM

biplab1 · 2025-08-06T18:06:06Z

@itsPronay The Android build is failing, and it seems to be due to the core/network/src/main/ folder. Could you please take a look?

itsPronay · 2025-08-06T20:15:56Z

@itsPronay The Android build is failing, and it seems to be due to the core/network/src/main/ folder. Could you please take a look?

@biplab1 App is building fine locally, but failing in workflow, couldn't figure out whats the issue exactly yet

biplab1 · 2025-08-07T08:28:18Z

@itsPronay The merge branch seems to contain a folder mentioned earlier (core/network/src/main/) which is not present in the kmp-impl branch. Screenshot attached for reference.

niyajali · 2025-08-07T09:12:52Z

@itsPronay

file:///home/runner/work/android-client/android-client/core/network/src/main/java/com/mifos/core/network/adapter/internal/ResponseCallAdapter.kt:37:39 Type mismatch: inferred type is 'ERROR CLASS: Unresolved name: HttpException', but 'kotlin.Throwable' was expected.

niyajali · 2025-08-07T11:22:45Z

@itsPronay Which platforms currently we're supporting in KMP

itsPronay · 2025-08-07T13:26:41Z

@itsPronay Which platforms currently we're supporting in KMP

@niyajali Currently, Android and Desktop only.
There is a build failure on iOS; we have not yet fixed it. And the web is disabled for now because of paging issue

HekmatullahAmin · 2025-08-08T12:19:04Z

-
-version.txt
-fastlane/report.xml
-firebaseAppDistributionServiceCredentialsFile.json


do not remove some of these mentioned from gitignore for ex: firebaseAppDistributionServiceCredentialsFile.json. have a look at the kmp-project-template what are there if it is there then keep it also here and the rest which u think might not be needed then delete.

HekmatullahAmin · 2025-08-08T12:36:20Z

        with(target) {
            apply(plugin = "com.android.library")
-//            apply(plugin = "org.jetbrains.kotlin.plugin.compose")
+            apply(plugin = "org.jetbrains.kotlin.plugin.compose")


we already have one plugin AndroidApplicationComposeConventionPlugin do u think we need this one?

no we don't need this one, I missed this one during cleanup..

…ore according to kmp-impl

itsPronay and others added 30 commits August 6, 2025 02:28

KMP dependencies setup (openMF#2277)

7add89d

* MIFOSAC-323 KMP setup * fix checks failure * applied spotless * fix issues

Create module dependency graphs (openMF#2281)

8a73109

duplicate: moving files from database module to model module (openMF#…

48319d3

…2283) refactor: moving files from the database module to the model module (openMF#2275)

kmp-impl: Room basic setup (openMF#2284)

53e9e1e

[database-Loan] DBflow to Room migration (openMF#2292)

981a703

* database.loan -DBflow to room * remove flow from impl * fix spotless * made suggested changes

refactor: migrate [core.model] to KMP (openMF#2285)

e16807e

* migrate [core.model] to KMP applied spotless and detekt rename fixed spotless fix removed parcelize * fix spotless

refactor: DBFlow Surveys migration to Room (openMF#2310)

3b2fec8

* [database/survey] dbflow to room [database/survey] dbflow to room * removed extra changes * fixed spotless and detekt

refactor: [database.staff] dbflow to room (openMF#2311)

b586e04

* MIFOSAC-391 database.staff dbflow to room * remove suspend * made suggested changes * fix

refactor: [database.group] dbflow to room (openMF#2313)

561dc74

* [database.group] dbflow to room * fix checks

refactor: [database.center] dbFlow to room migration (openMF#2307)

3701240

* MIFOSAC-342 [database.center] dbFlow to room migration

refactor: [database/charge] dbflow to room (openMF#2312)

b624f38

* MIFOSAC-392 [database/charge] dbflow to room * backup * Fix exception * added singleton

refactor: [database.savings] dbflow to room (openMF#2317)

dd25112

fix: Fixed build failure (openMF#2329)

d206d40

* backup * fix build issue * move parcelize to model * implemented arjun's suggestion * backup * fix: Fixed Build Issue --------- Co-authored-by: Sk Niyaj Ali <niyaj639@gmail.com>

fix: Replace hardcoded package name with context.packageName for File…

99927c7

…Provider (openMF#2335)

fixed CMP plugin naming convention (openMF#2332)

46e6dc0

* Fixed CMP plugins and dependencies * Update CMPFeatureConventionPlugin.kt

feat: Migrate :core:ui to KMP (openMF#2327)

2cee283

* UI Converted to KMP * updated * updated * added other components * updated * updated * updated * updated * merged

fix : changed some Files to make app run (openMF#2345)

81b4b76

* changed Files to make app run * updated * updated * updated * updated * updated

Gson-to-kotlinx.json (openMF#2341)

5404d48

ShareUtils added (openMF#2347)

e6bd32a

feat: Core/common to KMP (openMF#2351)

98f7c76

* migrate core/common to KMP * common to KMP * fix checks * remove comments * fix checks * added ConnectivityManagerNetworkMonitor

feat (core:dataStore) Migrated to KMP (openMF#2352)

9ffd2fb

* Initial Commit * updated * updated * updated * updated * Updated * Updated * Updated * Updated * Updated * updated * updated * updated * updated * updated * updated * Updated * Updated * Updated * Updated * Updated

feat: Migrate [core/database] to KMP (openMF#2354)

5d985a1

* [core.database] to KMP * dependencyGuardBaseline generated * provided type for mifosdatabase + refactored

refactor(core:data): Migrate to KMP (openMF#2364)

42388fd

Co-authored-by: Biplab Dutta <biplabdutt27@gmail.com>

Ktorfit Cleanup: Remove Duplicates and Align DI Configuration (openMF…

0381059

…#2446)

therajanmaurya closed this Aug 5, 2025

itsPronay reopened this Aug 6, 2025

therajanmaurya requested review from HekmatullahAmin, Nagarjuna0033, biplab1 and niyajali August 6, 2025 15:26

Nagarjuna0033 approved these changes Aug 6, 2025

View reviewed changes

itsPronay added 2 commits August 6, 2025 22:06

Update branch name in workflows

ccbc03d

fix checks

8c59e2b

revanthkumarJ approved these changes Aug 6, 2025

View reviewed changes

biplab1 approved these changes Aug 6, 2025

View reviewed changes

fix workflow

2201039

fixed build failure

90860e8

HekmatullahAmin reviewed Aug 8, 2025

View reviewed changes

Removed AndroidApplicationComposeConventionPlugin and modified gitign…

d77ec9f

…ore according to kmp-impl

itsPronay requested a review from HekmatullahAmin August 8, 2025 15:05

HekmatullahAmin approved these changes Aug 8, 2025

View reviewed changes

biplab1 mentioned this pull request Aug 8, 2025

[DMP 2025]: Mifos Pay v4.0 openMF/mifos-pay#1852

Closed

fixed extra padding in clientsList and groupsList

4b1beb0

therajanmaurya approved these changes Aug 11, 2025

View reviewed changes

therajanmaurya merged commit c84297e into openMF:development Aug 11, 2025
2 checks passed

Uh oh!

Conversation

itsPronay commented Aug 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

therajanmaurya commented Aug 5, 2025

Uh oh!

Nagarjuna0033 commented Aug 6, 2025

Uh oh!

biplab1 left a comment

Choose a reason for hiding this comment

Uh oh!

biplab1 commented Aug 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

itsPronay commented Aug 6, 2025

Uh oh!

biplab1 commented Aug 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

niyajali commented Aug 7, 2025

Uh oh!

niyajali commented Aug 7, 2025

Uh oh!

itsPronay commented Aug 7, 2025

Uh oh!

HekmatullahAmin Aug 8, 2025

Choose a reason for hiding this comment

Uh oh!

HekmatullahAmin Aug 8, 2025

Choose a reason for hiding this comment

Uh oh!

itsPronay Aug 8, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

itsPronay commented Aug 5, 2025 •

edited

Loading

biplab1 commented Aug 6, 2025 •

edited

Loading

biplab1 commented Aug 7, 2025 •

edited

Loading