Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Migrate search fragment to compose UI #2108

Closed
wants to merge 17 commits into from
Closed

Migrate search fragment to compose UI #2108

wants to merge 17 commits into from

Commits on Feb 29, 2024

  1. Refactor: Migrate SearchFragment to Jetpack Compose

    @ashutosh-kumar-kushwaha
    ashutosh-kumar-kushwaha committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    bbc439a View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2024

  1. Merge branch 'master' into search_fragment_to_compose 

    # Conflicts:
#	mifosng-android/build.gradle.kts
#	mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchFragment.kt
#	mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchUiState.kt
#	mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchViewModel.kt
#	mifosng-android/src/test/java/com/mifos/viewmodels/SearchViewModelTest.kt
    @ashutosh-kumar-kushwaha
    ashutosh-kumar-kushwaha committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    fa0ce92 View commit details
    Browse the repository at this point in the history

  2. Fixed the imports

    @ashutosh-kumar-kushwaha
    ashutosh-kumar-kushwaha committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    e9968d1 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. Merge branch 'master' into search_fragment_to_compose 

    # Conflicts:
#	mifosng-android/build.gradle.kts
    @ashutosh-kumar-kushwaha
    ashutosh-kumar-kushwaha committed May 10, 2024
    Configuration menu
    Copy the full SHA
    1719c17 View commit details
    Browse the repository at this point in the history

  2. Resolved Merge conflicts

    @ashutosh-kumar-kushwaha
    ashutosh-kumar-kushwaha committed May 10, 2024
    Configuration menu
    Copy the full SHA
    3934a10 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. Remove Dialog in ProgressBar, Use Mifos Mifos Color Scheme and use co… 

    …llectAsStateWithLifecycle
    @ashutosh-kumar-kushwaha
    ashutosh-kumar-kushwaha committed May 14, 2024
    Configuration menu
    Copy the full SHA
    eed2607 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2024

  1. Fix the TextField moved to below on click issue

    @ashutosh-kumar-kushwaha
    ashutosh-kumar-kushwaha committed May 20, 2024
    Configuration menu
    Copy the full SHA
    083c62f View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. Refactor: Migrate SearchFragment to Jetpack Compose

    @ashutosh-kumar-kushwaha @niyajali
    ashutosh-kumar-kushwaha authored and niyajali committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    71fa7f2 View commit details
    Browse the repository at this point in the history

  2. Fixed the imports

    @ashutosh-kumar-kushwaha @niyajali
    ashutosh-kumar-kushwaha authored and niyajali committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    263e37a View commit details
    Browse the repository at this point in the history

  3. Resolved Merge conflicts

    @ashutosh-kumar-kushwaha @niyajali
    ashutosh-kumar-kushwaha authored and niyajali committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    98e85e5 View commit details
    Browse the repository at this point in the history

  4. Remove Dialog in ProgressBar, Use Mifos Mifos Color Scheme and use co… 

    …llectAsStateWithLifecycle
    @ashutosh-kumar-kushwaha @niyajali
    ashutosh-kumar-kushwaha authored and niyajali committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    6d488f4 View commit details
    Browse the repository at this point in the history

  5. Fix the TextField moved to below on click issue

    @ashutosh-kumar-kushwaha @niyajali
    ashutosh-kumar-kushwaha authored and niyajali committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    1ae12c8 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'ashutosh/search_fragment_to_compose' in… 

    …to MIFOSAC-168-migrate-search-fragment-to-compose

# Conflicts:
#	mifosng-android/build.gradle.kts
#	mifosng-android/src/main/java/com/mifos/mifosxdroid/online/search/SearchViewModel.kt
#	mifosng-android/src/test/java/com/mifos/viewmodels/SearchViewModelTest.kt
    @niyajali
    niyajali committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    2419218 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. refactor - search fragment to compose ui 

    - Moved files to specific package
- Created new search module
- Fixed search screen UX/UI
    @niyajali
    niyajali committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    4a920ce View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. Merge branch 'refs/heads/master' into MIFOSAC-168-migrate-search-frag… 

    …ment-to-compose-ui

# Conflicts:
#	core/data/src/main/java/com/mifos/core/data/di/DataModule.kt
#	core/designsystem/src/main/java/com/mifos/core/designsystem/component/MifosScaffold.kt
#	feature/checker-inbox-task/src/main/java/com/mifos/feature/checker_inbox_task/checker_inbox_tasks/ui/CheckerInboxTasksScreen.kt
#	mifosng-android/build.gradle.kts
#	mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/module/RepositoryModule.kt
#	settings.gradle.kts
    @niyajali
    niyajali committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    66efd3d View commit details
    Browse the repository at this point in the history

  2. - Resolved Merge Conflicts 

    - Added ViewModel Test
    @niyajali
    niyajali committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    887da84 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'refs/heads/master' into MIFOSAC-168-migrate-search-frag… 

    …ment-to-compose-ui
    @niyajali
    niyajali committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    3709fdf View commit details
    Browse the repository at this point in the history