Migrate search dashboard to Compose

SIKV · Jun 15, 2024 · 6dd9aaa · 6dd9aaa
1 parent 74e63d4
commit 6dd9aaa
Show file tree

Hide file tree

Showing 14 changed files with 191 additions and 211 deletions.
diff --git a/app/src/main/res/layout/fragment_search_dashboard.xml b/app/src/main/res/layout/fragment_search_dashboard.xml
diff --git a/app/src/main/res/navigation/navigation.xml b/app/src/main/res/navigation/navigation.xml
@@ -10,7 +10,7 @@
 
     <fragment
         android:id="@+id/searchDashboard"
-        android:name="com.github.sikv.photos.ui.fragment.SearchDashboardFragment"
+        android:name="com.github.sikv.photos.search.ui.SearchDashboardFragment"
         android:label="@string/search_dashboard" />
 
     <fragment
@@ -25,7 +25,7 @@
 
     <fragment
         android:id="@+id/search"
-        android:name="com.github.sikv.photos.search.SearchFragment"
+        android:name="com.github.sikv.photos.search.ui.SearchFragment"
         android:label="@string/search">
 
         <argument

diff --git a/feature/recommendations/build.gradle b/feature/recommendations/build.gradle
@@ -10,7 +10,6 @@ android {
 
     buildFeatures {
         compose true
-        viewBinding true
     }
 
     composeOptions {
@@ -26,19 +25,18 @@ dependencies {
     implementation project(":common")
     implementation project(':common-ui')
 
-    implementation libs.androidx.fragment
     implementation libs.androidx.lifecycle.viewmodel
 
     // Used for PullRefresh.
     implementation libs.androidx.compose.material
 
     implementation libs.androidx.compose.material3
-    implementation libs.accompanist.themeadapter.material3
     implementation libs.androidx.lifecycle.viewmodel.compose
 
     implementation libs.inject
     kapt libs.hilt.compiler
     implementation libs.hilt.android
+    implementation libs.androidx.hilt.navigation.compose
 
     implementation libs.coroutines.core
 

diff --git a/.../recommendations/RecommendationsScreen.kt → ...photos/recommendations/Recommendations.kt b/.../recommendations/RecommendationsScreen.kt → ...photos/recommendations/Recommendations.kt
@@ -2,62 +2,79 @@ package com.github.sikv.photos.recommendations
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.GridItemSpan
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.pullrefresh.PullRefreshIndicator
 import androidx.compose.material.pullrefresh.pullRefresh
 import androidx.compose.material.pullrefresh.rememberPullRefreshState
-import androidx.compose.material3.*
+import androidx.compose.material3.Button
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
 import com.github.sikv.photos.common.ui.NetworkImage
 import com.github.sikv.photos.common.ui.rememberViewInteropNestedScrollConnection
 import com.github.sikv.photos.domain.Photo
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
-fun RecommendationsScreen(
-    isRefreshing: Boolean,
-    photos: List<Photo>,
-    onPhotoPressed: (Photo) -> Unit,
-    isNextPageLoading: Boolean,
-    onLoadMore: () -> Unit,
-    onRefresh: () -> Unit,
+fun Recommendations(
     modifier: Modifier = Modifier,
+    viewModel: RecommendationsViewModel = hiltViewModel(),
+    onPhotoClick: (Photo) -> Unit,
 ) {
+    val uiState by viewModel.uiState.collectAsState()
+
     Surface(
         modifier = modifier,
     ) {
-        if (!isRefreshing && !isNextPageLoading && photos.isEmpty()) {
+        if (!uiState.isLoading && !uiState.isNextPageLoading && uiState.photos.isEmpty()) {
             NoRecommendations(
-                onRefreshPressed = onRefresh
+                onRefreshPressed = {
+                    viewModel.loadRecommendations(refresh = true)
+                }
             )
         } else {
             val pullRefreshState = rememberPullRefreshState(
-                refreshing = isRefreshing,
-                onRefresh = onRefresh
+                refreshing = uiState.isLoading,
+                onRefresh = {
+                    viewModel.loadRecommendations(refresh = true)
+                }
             )
             Box(
                 modifier = Modifier
                     .pullRefresh(pullRefreshState)
             ) {
                 Recommendations(
-                    photos = photos,
-                    onPhotoPressed = onPhotoPressed,
-                    isNextPageLoading = isNextPageLoading,
-                    onLoadMore = onLoadMore,
+                    photos = uiState.photos,
+                    onPhotoClick = onPhotoClick,
+                    isNextPageLoading = uiState.isNextPageLoading,
+                    onLoadMore = {
+                        viewModel.loadRecommendations()
+                    },
                 )
                 PullRefreshIndicator(
-                    refreshing = isRefreshing,
+                    refreshing = uiState.isLoading,
                     state =  pullRefreshState,
                     modifier = Modifier
                         .align(Alignment.TopCenter),
@@ -98,7 +115,7 @@ private fun NoRecommendations(
 @Composable
 private fun Recommendations(
     photos: List<Photo>,
-    onPhotoPressed: (Photo) -> Unit,
+    onPhotoClick: (Photo) -> Unit,
     isNextPageLoading: Boolean,
     onLoadMore: () -> Unit,
     cellsCount: Int = 3,
@@ -127,7 +144,7 @@ private fun Recommendations(
                     modifier = Modifier
                         .aspectRatio(1f)
                         .clickable {
-                            onPhotoPressed(photos[index])
+                            onPhotoClick(photos[index])
                         }
                 )
             }

diff --git a/...endations/src/main/java/com/github/sikv/photos/recommendations/RecommendationsFragment.kt b/...endations/src/main/java/com/github/sikv/photos/recommendations/RecommendationsFragment.kt
diff --git a/feature/search/build.gradle b/feature/search/build.gradle
@@ -9,8 +9,13 @@ android {
     namespace 'com.github.sikv.photos.search'
 
     buildFeatures {
+        compose true
         viewBinding true
     }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
+    }
 }
 
 dependencies {
@@ -19,15 +24,22 @@ dependencies {
     implementation project(':config')
     implementation project(':common')
     implementation project(':common-ui')
+    implementation project(':compose-ui')
     implementation project(':navigation')
     implementation project(':photo-list-ui')
+    implementation project(':feature:recommendations')
 
     implementation libs.material
     implementation libs.androidx.fragment
 
+    implementation libs.androidx.compose.material3
+    implementation libs.accompanist.themeadapter.material3
+    implementation libs.androidx.lifecycle.viewmodel.compose
+
     implementation libs.inject
     kapt libs.hilt.compiler
     implementation libs.hilt.android
+    implementation libs.androidx.hilt.navigation.compose
 
     implementation libs.androidx.paging.runtime
 }