Merge pull request #98 from VictorKabata/search

Added search functionality
VictorKabata · Oct 9, 2023 · 169c4e4 · 169c4e4
2 parents 2640eed + 4acf68b
commit 169c4e4
Show file tree

Hide file tree

Showing 11 changed files with 339 additions and 132 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -50,7 +50,7 @@ test = "1.5.0"
 kotlinTest = "1.9.10"
 archTestCore = "2.2.0"
 turbine = "0.12.3"
-composeMultiplatform = "1.5.1"
+composeMultiplatform = "1.5.10-beta02"
 preCompose = "1.5.0-beta01"
 
 [plugins]

diff --git a/shared/src/commonMain/kotlin/com/vickikbt/shared/data/datasources/MoviesRepositoryImpl.kt b/shared/src/commonMain/kotlin/com/vickikbt/shared/data/datasources/MoviesRepositoryImpl.kt
@@ -79,4 +79,20 @@ class MoviesRepositoryImpl constructor(
 
         return cachedResponse
     }*/
+
+    override suspend fun searchMovie(
+        movieName: String,
+        page: Int
+    ): Flow<NetworkResultState<List<Movie>?>> {
+        return flowOf(
+            safeApiCall {
+                val response = httpClient.get(urlString = "search/movie") {
+                    parameter("query", movieName)
+                    parameter("page", page)
+                }.body<MovieResultsDto>()
+
+                response.movies?.map { it.toDomain() }
+            }
+        )
+    }
 }
diff --git a/shared/src/commonMain/kotlin/com/vickikbt/shared/di/CommonModule.kt b/shared/src/commonMain/kotlin/com/vickikbt/shared/di/CommonModule.kt
@@ -11,10 +11,10 @@ import com.vickikbt.shared.domain.repositories.MoviesRepository
 import com.vickikbt.shared.domain.repositories.SettingsRepository
 import com.vickikbt.shared.domain.utils.Constants.BASE_URL
 import com.vickikbt.shared.domain.utils.Constants.URL_PATH
-import com.vickikbt.shared.ui.screens.details.DetailsViewModel
 import com.vickikbt.shared.presentation.ui.screens.home.HomeViewModel
 import com.vickikbt.shared.presentation.ui.screens.main.MainViewModel
 import com.vickikbt.shared.presentation.ui.screens.settings.SettingsViewModel
+import com.vickikbt.shared.ui.screens.details.DetailsViewModel
 import io.github.aakira.napier.DebugAntilog
 import io.github.aakira.napier.Napier
 import io.ktor.client.HttpClient

diff --git a/shared/src/commonMain/kotlin/com/vickikbt/shared/domain/repositories/MoviesRepository.kt b/shared/src/commonMain/kotlin/com/vickikbt/shared/domain/repositories/MoviesRepository.kt
@@ -26,4 +26,10 @@ interface MoviesRepository {
     /** Get movies based on category from cache*/
     /*@Deprecated("Pending caching implementation")
     suspend fun getMovies(category: String): Flow<List<Movie>>*/
+
+    // Search movie from network source
+    suspend fun searchMovie(
+        movieName: String,
+        page: Int = STARTING_PAGE_INDEX
+    ): Flow<NetworkResultState<List<Movie>?>>
 }
diff --git a/shared/src/commonMain/kotlin/com/vickikbt/shared/ui/components/BottomNavBar.kt b/shared/src/commonMain/kotlin/com/vickikbt/shared/ui/components/BottomNavBar.kt
@@ -23,9 +23,7 @@ fun BottomNavBar(
     bottomNavItems: List<NavigationItem>
 ) {
     NavigationBar(
-        modifier = modifier
-            .fillMaxWidth()
-            .alpha(0.95F),
+        modifier = modifier.fillMaxWidth(),
         containerColor = MaterialTheme.colorScheme.surface.copy(alpha = .85f)
     ) {
         bottomNavItems.iterator().forEach { item ->

diff --git a/shared/src/commonMain/kotlin/com/vickikbt/shared/ui/components/MovieCardPortrait.kt b/shared/src/commonMain/kotlin/com/vickikbt/shared/ui/components/MovieCardPortrait.kt
@@ -13,8 +13,8 @@ import com.vickikbt.shared.ui.components.ratingbar.StepSize
 import com.vickikbt.shared.utils.getRating
 
 @Composable
-fun MovieCardPortrait(movie: Movie, onItemClick: (Movie) -> Unit) {
-    Column(verticalArrangement = Arrangement.spacedBy(1.dp)) {
+fun MovieCardPortrait(modifier: Modifier = Modifier, movie: Movie, onItemClick: (Movie) -> Unit) {
+    Column(modifier = modifier, verticalArrangement = Arrangement.spacedBy(1.dp)) {
         MovieCardPortraitCompact(
             movie = movie,
             onItemClick = { onItemClick(movie) }