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

Refactor: Migrate SearchFragment to Jetpack Compose #2073

Closed
wants to merge 7 commits into from
Closed

Refactor: Migrate SearchFragment to Jetpack Compose #2073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bbc439a
Refactor: Migrate SearchFragment to Jetpack Compose
ashutosh-kumar-kushwaha Feb 29, 2024
fa0ce92
Merge branch 'master' into search_fragment_to_compose
ashutosh-kumar-kushwaha Mar 18, 2024
e9968d1
Fixed the imports
ashutosh-kumar-kushwaha Mar 18, 2024
1719c17
Merge branch 'master' into search_fragment_to_compose
ashutosh-kumar-kushwaha May 10, 2024
3934a10
Resolved Merge conflicts
ashutosh-kumar-kushwaha May 10, 2024
eed2607
Remove Dialog in ProgressBar, Use Mifos Mifos Color Scheme and use co…
ashutosh-kumar-kushwaha May 14, 2024
083c62f
Fix the TextField moved to below on click issue
ashutosh-kumar-kushwaha May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerSearch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import javax.inject.Singleton
*/
@Singleton
class DataManagerSearch @Inject constructor(private val baseApiManager: BaseApiManager) {
fun searchResources(
suspend fun searchResources(
query: String?, resources: String?,
exactMatch: Boolean?
): Observable<List<SearchedEntity>> {
): List<SearchedEntity> {
return baseApiManager.searchApi.searchResources(query, resources, exactMatch)
}
}
4 changes: 2 additions & 2 deletions core/network/src/main/java/com/mifos/core/network/services/SearchService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import rx.Observable
*/
interface SearchService {
@GET(APIEndPoint.SEARCH)
fun searchResources(
suspend fun searchResources(
@Query("query") clientName: String?,
@Query("resource") resources: String?,
@Query("exactMatch") exactMatch: Boolean?
): Observable<List<SearchedEntity>>
): List<SearchedEntity>
}
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[versions]
accompanistDrawablepainter = "0.35.0-alpha"
accompanistSwiperefresh = "0.25.1"
accompanistPermission = "0.34.0"
adapterRxjava = "2.9.0"
Expand Down Expand Up @@ -118,6 +119,7 @@ truthVersion = '1.1.5'

[libraries]
# AndroidX Libraries
accompanist-drawablepainter = { module = "com.google.accompanist:accompanist-drawablepainter", version.ref = "accompanistDrawablepainter" }
accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanistSwiperefresh" }
accompanist-permission = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanistPermission" }
android-desugarJdkLibs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "androidDesugarJdkLibs" }
Expand Down
5 changes: 5 additions & 0 deletions mifosng-android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ dependencies {
implementation(project(":core:datastore"))
implementation(project(":core:network"))
implementation(project(":core:common"))
implementation(project(":core:designsystem"))

// Multidex dependency
implementation(libs.androidx.multidex)
Expand Down Expand Up @@ -222,6 +223,7 @@ dependencies {
androidTestImplementation(libs.mockito.android)
testImplementation(libs.junit.jupiter)
testImplementation(libs.androidx.core.testing)
testImplementation(libs.kotlinx.coroutines.test)

//Android-Jobs
implementation(libs.android.job)
Expand Down Expand Up @@ -262,4 +264,7 @@ dependencies {
// ViewModel utilities for Compose
implementation(libs.androidx.lifecycle.viewModelCompose)
implementation(libs.androidx.hilt.navigation.compose)
implementation(libs.androidx.lifecycle.runtimeCompose)

implementation(libs.accompanist.drawablepainter)
}
Loading