add Collections to pager, init collections data layer

stslex · stslex · commit d4a7cf4db435 · 2021-10-04T15:23:33.000+03:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -51,8 +51,10 @@ android {
 
 dependencies {
 
-    implementation "com.google.accompanist:accompanist-pager:0.19.0"
-    implementation "com.google.accompanist:accompanist-appcompat-theme:0.16.0"
+    def accompanistVersion = '0.19.0'
+    implementation "com.google.accompanist:accompanist-pager:$accompanistVersion"
+    implementation "com.google.accompanist:accompanist-placeholder:$accompanistVersion"
+    implementation "com.google.accompanist:accompanist-appcompat-theme:$accompanistVersion"
 
     /*Navigation*/
     implementation "androidx.navigation:navigation-compose:2.4.0-alpha10"
diff --git a/app/src/main/java/st/slex/csplashscreen/MainActivity.kt b/app/src/main/java/st/slex/csplashscreen/MainActivity.kt
@@ -4,31 +4,38 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
+import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.NavHostController
+import androidx.navigation.NavType
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
+import androidx.navigation.navArgument
+import coil.annotation.ExperimentalCoilApi
 import com.google.accompanist.pager.ExperimentalPagerApi
 import dagger.Lazy
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import st.slex.csplashscreen.ui.collection.Collection
 import st.slex.csplashscreen.ui.detail.ImageDetailScreen
 import st.slex.csplashscreen.ui.main.MainScreen
-import st.slex.csplashscreen.ui.main.PhotosViewModel
+import st.slex.csplashscreen.ui.main.MainViewModel
 import st.slex.csplashscreen.ui.theme.CSplashScreenTheme
 import javax.inject.Inject
 
+@ExperimentalCoilApi
+@ExperimentalMaterialApi
+@ExperimentalPagerApi
 @ExperimentalCoroutinesApi
 class MainActivity : ComponentActivity() {
 
     @Inject
     lateinit var viewModelFactory: Lazy<ViewModelProvider.Factory>
 
-    private val photosViewModel: PhotosViewModel by viewModels { viewModelFactory.get() }
+    private val viewModel: MainViewModel by viewModels { viewModelFactory.get() }
 
-    @ExperimentalPagerApi
     override fun onCreate(savedInstanceState: Bundle?) {
         appComponent.inject(this)
         super.onCreate(savedInstanceState)
@@ -38,28 +45,37 @@ class MainActivity : ComponentActivity() {
                 Scaffold {
                     NavigationComponent(
                         navController = navController,
-                        photosViewModel = photosViewModel
+                        viewModel = viewModel
                     )
                 }
             }
         }
     }
 }
 
+@ExperimentalCoilApi
+@ExperimentalMaterialApi
 @ExperimentalPagerApi
 @ExperimentalCoroutinesApi
 @Composable
-fun NavigationComponent(navController: NavHostController, photosViewModel: PhotosViewModel) {
+fun NavigationComponent(navController: NavHostController, viewModel: MainViewModel) {
     NavHost(
         navController = navController,
         startDestination = "main"
     ) {
         composable("main") {
-            MainScreen(navController, photosViewModel)
+            MainScreen(navController, viewModel)
         }
 
         composable("detail") {
             ImageDetailScreen()
         }
+
+        composable(
+            route = "collection/{collectionId}",
+            arguments = listOf(navArgument("collectionId") { type = NavType.StringType })
+        ) {
+            Collection(navController, viewModel, it.arguments?.getString("collectionId").toString())
+        }
     }
 }
diff --git a/app/src/main/java/st/slex/csplashscreen/data/collections/CollectionService.kt b/app/src/main/java/st/slex/csplashscreen/data/collections/CollectionService.kt
@@ -0,0 +1,30 @@
+package st.slex.csplashscreen.data.collections
+
+import retrofit2.Response
+import retrofit2.http.GET
+import retrofit2.http.Path
+import retrofit2.http.Query
+import st.slex.csplashscreen.data.model.remote.collection.RemoteCollectionModel
+import st.slex.csplashscreen.utiles.QUERY_API_KEY
+import st.slex.csplashscreen.utiles.QUERY_PAGE
+import st.slex.csplashscreen.utiles.QUERY_PAGE_SIZE
+
+interface CollectionService {
+    @GET("{q}")
+    suspend fun getCollections(
+        @Path("q") query: String,
+        @Query(QUERY_PAGE) page: Int,
+        @Query(QUERY_PAGE_SIZE) page_size: Int,
+        @Query(QUERY_API_KEY) api_key: String
+    ): Response<List<RemoteCollectionModel>>
+
+    @GET("{q1}/{q2}/{q3}")
+    suspend fun getCollections(
+        @Path("q1") query1: String,
+        @Path("q2") query2: String,
+        @Path("q3") query3: String,
+        @Query(QUERY_PAGE) page: Int,
+        @Query(QUERY_PAGE_SIZE) page_size: Int,
+        @Query(QUERY_API_KEY) api_key: String
+    ): Response<List<RemoteCollectionModel>>
+}
diff --git a/app/src/main/java/st/slex/csplashscreen/data/collections/CollectionsPagingSource.kt b/app/src/main/java/st/slex/csplashscreen/data/collections/CollectionsPagingSource.kt
@@ -0,0 +1,70 @@
+package st.slex.csplashscreen.data.collections
+
+import androidx.paging.PagingSource
+import androidx.paging.PagingState
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import retrofit2.HttpException
+import st.slex.csplashscreen.data.core.toCollectionModel
+import st.slex.csplashscreen.data.model.ui.collection.CollectionModel
+import st.slex.csplashscreen.utiles.API_KEY
+
+class CollectionsPagingSource @AssistedInject constructor(
+    private val service: CollectionService,
+    @Assisted("query") private val query: List<String>
+) : PagingSource<Int, CollectionModel>() {
+
+    override fun getRefreshKey(state: PagingState<Int, CollectionModel>): Int? {
+        val anchorPosition = state.anchorPosition ?: return null
+        val anchorPage = state.closestPageToPosition(anchorPosition) ?: return null
+        return anchorPage.prevKey?.plus(1) ?: anchorPage.nextKey?.minus(1)
+    }
+
+    override suspend fun load(params: LoadParams<Int>): LoadResult<Int, CollectionModel> {
+        if (query.isEmpty()) {
+            return LoadResult.Page(emptyList(), prevKey = null, nextKey = null)
+        }
+        try {
+            val pageNumber = params.key ?: INITIAL_PAGE_NUMBER
+            val pageSize = params.loadSize
+
+            val response = if (query.size > 1) {
+                service.getCollections(
+                    query[0],
+                    query[1],
+                    query[2],
+                    pageNumber,
+                    pageSize,
+                    API_KEY
+                )
+            } else {
+                service.getCollections(query[0], pageNumber, pageSize, API_KEY)
+            }
+
+            return if (response.isSuccessful) {
+                val photos = response.body()!!.map {
+                    it.toCollectionModel()
+                }
+                val nextPageNumber = if (photos.isEmpty()) null else pageNumber + 1
+                val prevPageNumber = if (pageNumber > 1) pageNumber - 1 else null
+                LoadResult.Page(photos, prevPageNumber, nextPageNumber)
+            } else {
+                LoadResult.Error(HttpException(response))
+            }
+        } catch (e: HttpException) {
+            return LoadResult.Error(e)
+        } catch (e: Exception) {
+            return LoadResult.Error(e)
+        }
+    }
+
+    @AssistedFactory
+    interface Factory {
+        fun create(@Assisted("query") query: List<String>): CollectionsPagingSource
+    }
+
+    companion object {
+        const val INITIAL_PAGE_NUMBER = 0
+    }
+}
diff --git a/app/src/main/java/st/slex/csplashscreen/data/collections/CollectionsRepository.kt b/app/src/main/java/st/slex/csplashscreen/data/collections/CollectionsRepository.kt
@@ -0,0 +1,18 @@
+package st.slex.csplashscreen.data.collections
+
+import androidx.paging.PagingSource
+import st.slex.csplashscreen.data.model.ui.collection.CollectionModel
+import javax.inject.Inject
+
+interface CollectionsRepository {
+
+    fun queryAll(query: List<String>): PagingSource<Int, CollectionModel>
+
+    class Base @Inject constructor(
+        private val collectionsPagingSourceFactory: CollectionsPagingSource.Factory
+    ) : CollectionsRepository {
+
+        override fun queryAll(query: List<String>): PagingSource<Int, CollectionModel> =
+            collectionsPagingSourceFactory.create(query)
+    }
+}
diff --git a/app/src/main/java/st/slex/csplashscreen/di/module/NetworkServiceModule.kt b/app/src/main/java/st/slex/csplashscreen/di/module/NetworkServiceModule.kt
@@ -3,6 +3,7 @@ package st.slex.csplashscreen.di.module
 import dagger.Module
 import dagger.Provides
 import retrofit2.Retrofit
+import st.slex.csplashscreen.data.collections.CollectionService
 import st.slex.csplashscreen.data.photos.PhotosService
 
 @Module(includes = [RetrofitModule::class])
@@ -11,4 +12,8 @@ class NetworkServiceModule {
     @Provides
     fun providesPhotosService(retrofit: Retrofit): PhotosService =
         retrofit.create(PhotosService::class.java)
+
+    @Provides
+    fun providesCollectionsService(retrofit: Retrofit): CollectionService =
+        retrofit.create(CollectionService::class.java)
 }
diff --git a/app/src/main/java/st/slex/csplashscreen/di/module/RepositoryModule.kt b/app/src/main/java/st/slex/csplashscreen/di/module/RepositoryModule.kt
@@ -2,11 +2,15 @@ package st.slex.csplashscreen.di.module
 
 import dagger.Binds
 import dagger.Module
+import st.slex.csplashscreen.data.collections.CollectionsRepository
 import st.slex.csplashscreen.data.photos.PhotosRepository
 
 @Module
 interface RepositoryModule {
 
     @Binds
     fun bindsPhotosRepository(repository: PhotosRepository.Base): PhotosRepository
+
+    @Binds
+    fun bindsCollectionsRepository(repository: CollectionsRepository.Base): CollectionsRepository
 }
diff --git a/app/src/main/java/st/slex/csplashscreen/di/module/ViewModelModule.kt b/app/src/main/java/st/slex/csplashscreen/di/module/ViewModelModule.kt
@@ -6,14 +6,14 @@ import dagger.Module
 import dagger.multibindings.IntoMap
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import st.slex.csplashscreen.di.key.ViewModelKey
-import st.slex.csplashscreen.ui.main.PhotosViewModel
+import st.slex.csplashscreen.ui.main.MainViewModel
 
 @ExperimentalCoroutinesApi
 @Module
 interface ViewModelModule {
 
     @IntoMap
     @Binds
-    @ViewModelKey(PhotosViewModel::class)
-    fun bindsPhotosViewModel(viewModel: PhotosViewModel): ViewModel
+    @ViewModelKey(MainViewModel::class)
+    fun bindsPhotosViewModel(viewModel: MainViewModel): ViewModel
 }
diff --git a/app/src/main/java/st/slex/csplashscreen/ui/collection/Collection.kt b/app/src/main/java/st/slex/csplashscreen/ui/collection/Collection.kt
@@ -0,0 +1,13 @@
+package st.slex.csplashscreen.ui.collection
+
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.navigation.NavController
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import st.slex.csplashscreen.ui.main.MainViewModel
+
+@ExperimentalCoroutinesApi
+@Composable
+fun Collection(navController: NavController, viewModel: MainViewModel, collectionId: String) {
+    Text(text = collectionId)
+}
diff --git a/app/src/main/java/st/slex/csplashscreen/ui/main/Collections.kt b/app/src/main/java/st/slex/csplashscreen/ui/main/Collections.kt
@@ -0,0 +1,103 @@
+package st.slex.csplashscreen.ui.main
+
+import android.annotation.SuppressLint
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.Card
+import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.clipToBounds
+import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavController
+import coil.annotation.ExperimentalCoilApi
+import coil.compose.rememberImagePainter
+import coil.transform.RoundedCornersTransformation
+import com.google.accompanist.pager.ExperimentalPagerApi
+import com.google.accompanist.pager.PagerScope
+import com.google.accompanist.pager.calculateCurrentOffsetForPage
+import com.google.android.material.animation.AnimationUtils
+import st.slex.csplashscreen.data.model.ui.collection.CollectionModel
+
+@SuppressLint("RestrictedApi")
+@ExperimentalMaterialApi
+@ExperimentalPagerApi
+@ExperimentalCoilApi
+@Composable
+fun CollectionItem(
+    item: CollectionModel?,
+    navController: NavController,
+    page: Int,
+    scope: PagerScope
+) {
+    Column(
+        modifier = Modifier
+            .padding(16.dp)
+            .graphicsLayer {
+                val pageOffset = scope.calculateCurrentOffsetForPage(page)
+                AnimationUtils
+                    .lerp(
+                        0.85f,
+                        1f,
+                        1f - pageOffset.coerceIn(0f, 1f)
+                    )
+                    .also { scale ->
+                        scaleX = scale
+                        scaleY = scale
+                    }
+                // We animate the alpha, between 50% and 100%
+                alpha = AnimationUtils.lerp(
+                    0.5f,
+                    1f,
+                    1f - pageOffset.coerceIn(0f, 1f)
+                )
+            }
+            .aspectRatio(1f)) {
+        Row(modifier = Modifier.padding(bottom = 8.dp)) {
+            Image(
+                modifier = Modifier
+                    .size(32.dp)
+                    .clip(CircleShape),
+                painter = rememberImagePainter(
+                    data = item?.user?.profile_image?.medium.toString(),
+                    builder = {
+                        allowHardware(false)
+                        crossfade(500)
+                    }
+                ),
+                contentDescription = "User Avatar"
+            )
+            Text(
+                modifier = Modifier
+                    .padding(start = 8.dp),
+                text = item?.user?.username.toString()
+            )
+        }
+
+        Card(
+            modifier = Modifier.shadow(elevation = 8.dp, clip = true),
+            onClick = { navController.navigate("collection/${item?.id}") }
+        ) {
+            Image(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(300.dp)
+                    .clipToBounds(),
+                painter = rememberImagePainter(
+                    data = item?.cover_photo?.urls?.regular.toString(),
+                    builder = {
+                        transformations(RoundedCornersTransformation())
+                        allowHardware(false)
+                        crossfade(500)
+                    }
+                ),
+                contentDescription = "Image",
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/st/slex/csplashscreen/ui/main/MainScreen.kt b/app/src/main/java/st/slex/csplashscreen/ui/main/MainScreen.kt
diff --git a/app/src/main/java/st/slex/csplashscreen/ui/main/MainViewModel.kt b/app/src/main/java/st/slex/csplashscreen/ui/main/MainViewModel.kt
diff --git a/app/src/main/java/st/slex/csplashscreen/ui/main/Photos.kt b/app/src/main/java/st/slex/csplashscreen/ui/main/Photos.kt
diff --git a/app/src/main/java/st/slex/csplashscreen/ui/main/PhotosViewModel.kt b/app/src/main/java/st/slex/csplashscreen/ui/main/PhotosViewModel.kt
diff --git a/app/src/main/java/st/slex/csplashscreen/ui/main/QueryCollectionsUseCase.kt b/app/src/main/java/st/slex/csplashscreen/ui/main/QueryCollectionsUseCase.kt
