Преглед изворни кода

removed experimental accompanist pager

sirekanian пре 2 година
родитељ
комит
0ff4de8e69

+ 0 - 1
app/build.gradle

@@ -67,7 +67,6 @@ dependencies {
     // compose
     // compose
     implementation "androidx.compose.material:material:$composeLibraryVersion"
     implementation "androidx.compose.material:material:$composeLibraryVersion"
     implementation "androidx.activity:activity-compose:1.7.0"
     implementation "androidx.activity:activity-compose:1.7.0"
-    implementation "com.google.accompanist:accompanist-pager:0.30.1"
 
 
     // room
     // room
     implementation "androidx.room:room-ktx:2.5.1"
     implementation "androidx.room:room-ktx:2.5.1"

+ 2 - 2
app/src/main/java/com/sirekanian/spacetime/MainActivity.kt

@@ -3,17 +3,17 @@ package com.sirekanian.spacetime
 import android.os.Bundle
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.compose.setContent
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
 import androidx.compose.material.Surface
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.Modifier
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowCompat
-import com.google.accompanist.pager.ExperimentalPagerApi
 import com.sirekanian.spacetime.ui.theme.SpacetimeTheme
 import com.sirekanian.spacetime.ui.theme.SpacetimeTheme
 
 
 class MainActivity : ComponentActivity() {
 class MainActivity : ComponentActivity() {
 
 
-    @ExperimentalPagerApi
+    @ExperimentalFoundationApi
     override fun onCreate(savedInstanceState: Bundle?) {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         super.onCreate(savedInstanceState)
         WindowCompat.setDecorFitsSystemWindows(window, false)
         WindowCompat.setDecorFitsSystemWindows(window, false)

+ 2 - 2
app/src/main/java/com/sirekanian/spacetime/MainPresenter.kt

@@ -1,10 +1,10 @@
 package com.sirekanian.spacetime
 package com.sirekanian.spacetime
 
 
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalContext
-import com.google.accompanist.pager.ExperimentalPagerApi
 import com.sirekanian.spacetime.data.Repository
 import com.sirekanian.spacetime.data.Repository
 import com.sirekanian.spacetime.data.api.ThumbnailApi
 import com.sirekanian.spacetime.data.api.ThumbnailApi
 import com.sirekanian.spacetime.ext.app
 import com.sirekanian.spacetime.ext.app
@@ -66,9 +66,9 @@ class MainPresenterImpl(
         }
         }
     }
     }
 
 
+    @ExperimentalFoundationApi
     override fun openPageByIndex(index: Int) {
     override fun openPageByIndex(index: Int) {
         scope.launch {
         scope.launch {
-            @OptIn(ExperimentalPagerApi::class)
             state.pagerState.animateScrollToPage(index)
             state.pagerState.animateScrollToPage(index)
         }
         }
     }
     }

+ 4 - 4
app/src/main/java/com/sirekanian/spacetime/MainScreen.kt

@@ -1,12 +1,12 @@
 package com.sirekanian.spacetime
 package com.sirekanian.spacetime
 
 
 import androidx.activity.compose.BackHandler
 import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Composable
-import com.google.accompanist.pager.ExperimentalPagerApi
-import com.google.accompanist.pager.HorizontalPager
 import com.sirekanian.spacetime.ext.ScreenAnimatedVisibility
 import com.sirekanian.spacetime.ext.ScreenAnimatedVisibility
 import com.sirekanian.spacetime.model.EditablePage
 import com.sirekanian.spacetime.model.EditablePage
 import com.sirekanian.spacetime.model.EditablePage.Autofocus
 import com.sirekanian.spacetime.model.EditablePage.Autofocus
@@ -18,7 +18,7 @@ import com.sirekanian.spacetime.ui.GalleryPageContent
 import com.sirekanian.spacetime.ui.ImagePageContent
 import com.sirekanian.spacetime.ui.ImagePageContent
 
 
 @Composable
 @Composable
-@ExperimentalPagerApi
+@ExperimentalFoundationApi
 fun MainScreen(presenter: MainPresenter) {
 fun MainScreen(presenter: MainPresenter) {
     val state = presenter.state
     val state = presenter.state
     BackHandler(state.pagerState.currentPage > 0) {
     BackHandler(state.pagerState.currentPage > 0) {
@@ -28,7 +28,7 @@ fun MainScreen(presenter: MainPresenter) {
     val insets = WindowInsets.systemBars.asPaddingValues()
     val insets = WindowInsets.systemBars.asPaddingValues()
     HorizontalPager(
     HorizontalPager(
         state = state.pagerState,
         state = state.pagerState,
-        count = pages.size,
+        pageCount = pages.size,
         key = { pages[it].id },
         key = { pages[it].id },
         userScrollEnabled = state.editablePage == null,
         userScrollEnabled = state.editablePage == null,
     ) { index ->
     ) { index ->

+ 6 - 4
app/src/main/java/com/sirekanian/spacetime/MainState.kt

@@ -1,21 +1,23 @@
 package com.sirekanian.spacetime
 package com.sirekanian.spacetime
 
 
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.pager.PagerState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.setValue
-import com.google.accompanist.pager.ExperimentalPagerApi
-import com.google.accompanist.pager.PagerState
 import com.sirekanian.spacetime.ext.currentDate
 import com.sirekanian.spacetime.ext.currentDate
 import com.sirekanian.spacetime.ext.minusDays
 import com.sirekanian.spacetime.ext.minusDays
 import com.sirekanian.spacetime.ext.minusMonths
 import com.sirekanian.spacetime.ext.minusMonths
 import com.sirekanian.spacetime.ext.withDayOfMonth
 import com.sirekanian.spacetime.ext.withDayOfMonth
-import com.sirekanian.spacetime.model.*
+import com.sirekanian.spacetime.model.EditablePage
+import com.sirekanian.spacetime.model.Page
+import com.sirekanian.spacetime.model.Thumbnail
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.LocalDate
 
 
 class MainState {
 class MainState {
 
 
-    @OptIn(ExperimentalPagerApi::class)
+    @ExperimentalFoundationApi
     val pagerState = PagerState()
     val pagerState = PagerState()
     var editablePage by mutableStateOf<EditablePage?>(null)
     var editablePage by mutableStateOf<EditablePage?>(null)
     var pages by mutableStateOf(listOf<Page>())
     var pages by mutableStateOf(listOf<Page>())