Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 475c18ff authored by Anvesh Renikindi's avatar Anvesh Renikindi Committed by Automerger Merge Worker
Browse files

Merge "Move page count to rememberPagerState" into udc-dev-plus-aosp am: 44609502 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23813399



Change-Id: I5abe9590add47ceeb817c0b5358cfd3750039516
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8412f1cd 44609502

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/SettingsPager.kt

+2 −48
Original line number Diff line number Diff line
@@ -20,20 +20,12 @@ import androidx.compose.foundation.ExperimentalFoundationApi 
import androidx.compose.foundation.layout.Column

import androidx.compose.foundation.layout.padding

import androidx.compose.foundation.pager.HorizontalPager

import androidx.compose.foundation.pager.PagerState

import androidx.compose.foundation.pager.rememberPagerState

import androidx.compose.material3.TabRow

import androidx.compose.runtime.Composable

import androidx.compose.runtime.LaunchedEffect

import androidx.compose.runtime.SideEffect

import androidx.compose.runtime.getValue

import androidx.compose.runtime.mutableStateOf

import androidx.compose.runtime.rememberCoroutineScope

import androidx.compose.runtime.saveable.rememberSaveable

import androidx.compose.runtime.setValue

import androidx.compose.ui.Modifier

import androidx.compose.ui.graphics.Color

import androidx.compose.ui.platform.LocalConfiguration

import com.android.settingslib.spa.framework.theme.SettingsDimension

import kotlin.math.absoluteValue

import kotlinx.coroutines.launch
@@ -49,7 +41,7 @@ fun SettingsPager(titles: List<String>, content: @Composable (page: Int) -> Unit 


    Column {

        val coroutineScope = rememberCoroutineScope()

        val pagerState = rememberPageStateFixed()

        val pagerState = rememberPagerState { titles.size }



        TabRow(

            selectedTabIndex = pagerState.currentPage,
@@ -72,46 +64,8 @@ fun SettingsPager(titles: List<String>, content: @Composable (page: Int) -> Unit 
            }

        }



        HorizontalPager(pageCount = titles.size, state = pagerState) { page ->

        HorizontalPager(state = pagerState) { page ->

            content(page)

        }

    }

}
 


/**

 * Gets the state of [PagerState].

 *

 * This is a work around.

 *

 * TODO: Remove this and replace with rememberPageState() after the Compose Foundation 1.5.0-alpha04

 *       updated in the platform.

 */

@Composable

@OptIn(ExperimentalFoundationApi::class)

private fun rememberPageStateFixed(): PagerState {

    var currentPage by rememberSaveable { mutableStateOf(0) }

    var targetPage by rememberSaveable { mutableStateOf(-1) }

    val pagerState = rememberPagerState()

    val configuration = LocalConfiguration.current

    var lastScreenWidthDp by rememberSaveable { mutableStateOf(-1) }

    val screenWidthDp = configuration.screenWidthDp

    LaunchedEffect(screenWidthDp) {

        // Reset pager state to fix an issue after configuration change.

        // When we declare android:configChanges in the manifest, the pager state is in a weird

        // state after configuration change.

        targetPage = currentPage

        lastScreenWidthDp = screenWidthDp

    }

    LaunchedEffect(targetPage) {

        if (targetPage != -1) {

            pagerState.scrollToPage(targetPage)

            targetPage = -1

        }

    }

    SideEffect {

        if (lastScreenWidthDp == screenWidthDp) {

            currentPage = pagerState.currentPage

        }

    }

    return pagerState

}