Merge remote-tracking branch 'origin/feature_pull_to_refresh_gallery_…

…screen_issue_866' into feature_pull_to_refresh_gallery_screen_issue_866 # Conflicts: # app/src/main/java/com/google/samples/apps/sunflower/compose/home/HomeScreen.kt
android · Dec 27, 2023 · e915abc · e915abc
2 parents 4fa74d3 + a0dde22
commit e915abc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/src/main/java/com/google/samples/apps/sunflower/compose/gallery/GalleryScreen.kt b/app/src/main/java/com/google/samples/apps/sunflower/compose/gallery/GalleryScreen.kt
@@ -90,8 +90,8 @@ private fun GalleryScreen(
 
         val pullToRefreshState = rememberPullToRefreshState()
 
-        if (pullToRefreshState.isRefreshing){
-                onPullToRefresh()
+        if (pullToRefreshState.isRefreshing) {
+            onPullToRefresh()
         }
 
         val pagingItems: LazyPagingItems<UnsplashPhoto> =

diff --git a/app/src/main/java/com/google/samples/apps/sunflower/compose/home/HomeScreen.kt b/app/src/main/java/com/google/samples/apps/sunflower/compose/home/HomeScreen.kt
@@ -16,7 +16,6 @@
 
 package com.google.samples.apps.sunflower.compose.home
 
-import android.util.Log
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.compose.foundation.ExperimentalFoundationApi
@@ -103,6 +102,7 @@ fun HomePagerScreen(
     pagerState: PagerState,
     pages: Array<SunflowerPage>,
     modifier: Modifier = Modifier,
+    pages: Array<SunflowerPage>
 ) {
     Column(modifier) {
         val coroutineScope = rememberCoroutineScope()