-
Notifications
You must be signed in to change notification settings - Fork 622
feat : Collection sheet migrated to cmp #2396
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
...s/feature/individualCollectionSheet/generateCollectionSheet/GenerateCollectionSheetScreen.kt
Outdated
Show resolved
Hide resolved
...alCollectionSheet/individualCollectionSheetDetails/IndividualCollectionSheetDetailsScreen.kt
Outdated
Show resolved
Hide resolved
...n/kotlin/com/mifos/feature/individualCollectionSheet/navigation/CollectionSheetNavigation.kt
Show resolved
Hide resolved
# Conflicts: # cmp-android/dependencies/demoDebugRuntimeClasspath.txt # cmp-android/dependencies/demoReleaseRuntimeClasspath.txt # cmp-android/dependencies/prodDebugRuntimeClasspath.txt # cmp-android/dependencies/prodReleaseRuntimeClasspath.txt # cmp-navigation/src/commonMain/kotlin/cmp/navigation/di/KoinModules.kt # cmp-navigation/src/commonMain/kotlin/cmp/navigation/navigation/FeatureNavHost.kt
@revanthkumarJ is it done? |
@revanthkumarJ There is a duplicate PR opened by Arjun, and ask team members for approval |
@niyajali the pr opened by arjun is a duplicate one as he is not avaialble and having some git issues he asked me to open a new pr regarding this pr i have implemented the screens which are working in development branch other features are not working in development branch so i just migrated them but unable to check them |
@revanthkumarJ resolve merge conflicts and ask team members for approval |
# Conflicts: # cmp-navigation/src/commonMain/kotlin/cmp/navigation/navigation/FeatureNavHost.kt
1249cb5
to
8bd9fac
Compare
...ividualCollectionSheet/newIndividualCollectionSheet/NewIndividualCollectionSheetViewModel.kt
Outdated
Show resolved
Hide resolved
...ividualCollectionSheet/newIndividualCollectionSheet/NewIndividualCollectionSheetViewModel.kt
Outdated
Show resolved
Hide resolved
...kotlin/com/mifos/feature/individualCollectionSheet/paymentDetails/PaymentDetailsViewModel.kt
Show resolved
Hide resolved
...idualCollectionSheet/savedIndividualCollectionSheet/SavedIndividualCollectionSheetCompose.kt
Outdated
Show resolved
Hide resolved
@revanthkumarJ Other than the ImageLoaderUtils issue, everything else looks good to me. Although the feature isn’t fully functional yet, as we discussed, it can be merged for now. I have requested some changes — once those are done, I will approve. |
@biplab1 done the changes |
@niyajali can you do final review and merge this |
Fixes - Jira-#418