Merge changes from topic "kt-controller-nonlegacy" into androidx-main
* changes:
Convert SavedStateHandleController to Kotlin
Rename SavedStateHandleController.java to .kt
diff --git a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/cts/app/SearchSpecCtsTest.java b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/cts/app/SearchSpecCtsTest.java
index e25c3a9..6a2a8f8 100644
--- a/appsearch/appsearch/src/androidTest/java/androidx/appsearch/cts/app/SearchSpecCtsTest.java
+++ b/appsearch/appsearch/src/androidTest/java/androidx/appsearch/cts/app/SearchSpecCtsTest.java
@@ -286,6 +286,7 @@
.build();
SearchSpec searchSpec = new SearchSpec.Builder()
+ .setRankingStrategy(SearchSpec.RANKING_STRATEGY_JOIN_AGGREGATE_SCORE)
.setJoinSpec(joinSpec)
.build();
@@ -450,6 +451,17 @@
assertThat(e.getMessage()).isEqualTo("Attempting to rank based on joined documents, but"
+ " no JoinSpec provided");
+
+ e = assertThrows(IllegalStateException.class, () -> new SearchSpec.Builder()
+ .setRankingStrategy(SearchSpec.RANKING_STRATEGY_CREATION_TIMESTAMP)
+ .setJoinSpec(new JoinSpec.Builder("childProp")
+ .setAggregationScoringStrategy(
+ JoinSpec.AGGREGATION_SCORING_SUM_RANKING_SIGNAL)
+ .build())
+ .build());
+ assertThat(e.getMessage()).isEqualTo("Aggregate scoring strategy has been set in the "
+ + "nested JoinSpec, but ranking strategy is not "
+ + "RANKING_STRATEGY_JOIN_AGGREGATE_SCORE");
}
@Test
diff --git a/appsearch/appsearch/src/main/java/androidx/appsearch/app/SearchSpec.java b/appsearch/appsearch/src/main/java/androidx/appsearch/app/SearchSpec.java
index 084653e..1f92e9a 100644
--- a/appsearch/appsearch/src/main/java/androidx/appsearch/app/SearchSpec.java
+++ b/appsearch/appsearch/src/main/java/androidx/appsearch/app/SearchSpec.java
@@ -1237,12 +1237,22 @@
* @throws IllegalStateException if the ranking strategy is
* {@link #RANKING_STRATEGY_JOIN_AGGREGATE_SCORE} and {@link #setJoinSpec} has never been
* called.
+ * @throws IllegalStateException if the aggregation scoring strategy has been set in
+ * {@link JoinSpec#getAggregationScoringStrategy()} but the ranking strategy is not
+ * {@link #RANKING_STRATEGY_JOIN_AGGREGATE_SCORE}.
*
*/
@NonNull
public SearchSpec build() {
Bundle bundle = new Bundle();
if (mJoinSpec != null) {
+ if (mRankingStrategy != RANKING_STRATEGY_JOIN_AGGREGATE_SCORE
+ && mJoinSpec.getAggregationScoringStrategy()
+ != JoinSpec.AGGREGATION_SCORING_OUTER_RESULT_RANKING_SIGNAL) {
+ throw new IllegalStateException("Aggregate scoring strategy has been set in "
+ + "the nested JoinSpec, but ranking strategy is not "
+ + "RANKING_STRATEGY_JOIN_AGGREGATE_SCORE");
+ }
bundle.putBundle(JOIN_SPEC, mJoinSpec.getBundle());
} else if (mRankingStrategy == RANKING_STRATEGY_JOIN_AGGREGATE_SCORE) {
throw new IllegalStateException("Attempting to rank based on joined documents, but "
diff --git a/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/perfetto/PerfettoCaptureSweepTest.kt b/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/perfetto/PerfettoCaptureSweepTest.kt
index bcb337f..6d15a0d 100644
--- a/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/perfetto/PerfettoCaptureSweepTest.kt
+++ b/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/perfetto/PerfettoCaptureSweepTest.kt
@@ -22,7 +22,6 @@
import androidx.benchmark.perfetto.PerfettoHelper
import androidx.benchmark.perfetto.PerfettoHelper.Companion.LOWEST_BUNDLED_VERSION_SUPPORTED
import androidx.benchmark.perfetto.PerfettoHelper.Companion.isAbiSupported
-import androidx.test.filters.FlakyTest
import androidx.test.filters.LargeTest
import androidx.test.filters.SdkSuppress
import androidx.testutils.verifyWithPolling
@@ -38,6 +37,7 @@
import org.junit.runners.Parameterized
import kotlin.test.assertEquals
import kotlin.test.fail
+import org.junit.Ignore
/**
* Trace validation tests for PerfettoCapture
@@ -61,12 +61,12 @@
PerfettoHelper.stopAllPerfettoProcesses()
}
- @FlakyTest(bugId = 258216025)
+ @Ignore("b/258216025")
@SdkSuppress(minSdkVersion = LOWEST_BUNDLED_VERSION_SUPPORTED, maxSdkVersion = 33)
@Test
fun captureAndValidateTrace_bundled() = captureAndValidateTrace(unbundled = false)
- @FlakyTest(bugId = 258216025)
+ @Ignore("b/258216025")
@Test
@SdkSuppress(maxSdkVersion = 33) // b/262909049: Failing on SDK 34
fun captureAndValidateTrace_unbundled() = captureAndValidateTrace(unbundled = true)
diff --git a/buildSrc-tests/src/test/kotlin/androidx/build/LibraryVersionsServiceTest.kt b/buildSrc-tests/src/test/kotlin/androidx/build/LibraryVersionsServiceTest.kt
index 892ef6b..85d9997 100644
--- a/buildSrc-tests/src/test/kotlin/androidx/build/LibraryVersionsServiceTest.kt
+++ b/buildSrc-tests/src/test/kotlin/androidx/build/LibraryVersionsServiceTest.kt
@@ -17,6 +17,8 @@
package androidx.build
import com.google.common.truth.Truth.assertThat
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.create
import org.gradle.testfixtures.ProjectBuilder
import org.junit.Rule
import org.junit.Test
@@ -237,13 +239,160 @@
).isEqualTo(null)
}
+ @Test
+ fun androidxExtension_noAtomicGroup() {
+ runAndroidExtensionTest(
+ projectPath = "myGroup:project1",
+ tomlFile = """
+ [versions]
+ [groups]
+ G1 = { group = "androidx.myGroup" }
+ """.trimIndent(),
+ validateWithKmp = { extension ->
+ extension.mavenVersion = Version("1.0.0")
+ extension.mavenMultiplatformVersion = Version("1.0.0-dev01")
+ assertThat(
+ extension.mavenGroup
+ ).isEqualTo(
+ LibraryGroup("androidx.myGroup", atomicGroupVersion = null)
+ )
+ assertThat(
+ extension.project.version
+ ).isEqualTo(Version("1.0.0-dev01"))
+ extension.validateMavenVersion()
+ },
+ validateWithoutKmp = { extension ->
+ extension.mavenVersion = Version("1.0.0")
+ extension.mavenMultiplatformVersion = Version("1.0.0-dev01")
+ assertThat(
+ extension.mavenGroup
+ ).isEqualTo(
+ LibraryGroup("androidx.myGroup", atomicGroupVersion = null)
+ )
+ assertThat(
+ extension.project.version
+ ).isEqualTo(Version("1.0.0"))
+ extension.validateMavenVersion()
+ }
+ )
+ }
+
+ @Test
+ fun androidxExtension_noAtomicGroup_setKmpVersionFirst() {
+ runAndroidExtensionTest(
+ projectPath = "myGroup:project1",
+ tomlFile = """
+ [versions]
+ [groups]
+ G1 = { group = "androidx.myGroup" }
+ """.trimIndent(),
+ validateWithKmp = { extension ->
+ extension.mavenMultiplatformVersion = Version("1.0.0-dev01")
+ extension.mavenVersion = Version("1.0.0")
+ assertThat(
+ extension.mavenGroup
+ ).isEqualTo(
+ LibraryGroup("androidx.myGroup", atomicGroupVersion = null)
+ )
+ assertThat(
+ extension.project.version
+ ).isEqualTo(Version("1.0.0-dev01"))
+ extension.validateMavenVersion()
+ },
+ validateWithoutKmp = { extension ->
+ extension.mavenMultiplatformVersion = Version("1.0.0-dev01")
+ extension.mavenVersion = Version("1.0.0")
+ assertThat(
+ extension.mavenGroup
+ ).isEqualTo(
+ LibraryGroup("androidx.myGroup", atomicGroupVersion = null)
+ )
+ assertThat(
+ extension.project.version
+ ).isEqualTo(Version("1.0.0"))
+ extension.validateMavenVersion()
+ }
+ )
+ }
+
+ @Test
+ fun androidxExtension_withAtomicGroup() {
+ runAndroidExtensionTest(
+ projectPath = "myGroup:project1",
+ tomlFile = """
+ [versions]
+ V1 = "1.0.0"
+ V1_KMP = "1.0.0-dev01"
+ [groups]
+ G1 = { group = "androidx.myGroup", atomicGroupVersion = "versions.V1", multiplatformGroupVersion = "versions.V1_KMP" }
+ """.trimIndent(),
+ validateWithKmp = { extension ->
+ assertThat(
+ extension.mavenGroup
+ ).isEqualTo(
+ LibraryGroup("androidx.myGroup", atomicGroupVersion = Version("1.0.0-dev01"))
+ )
+ assertThat(
+ extension.project.version
+ ).isEqualTo(Version("1.0.0-dev01"))
+ extension.validateMavenVersion()
+ },
+ validateWithoutKmp = { extension ->
+ assertThat(
+ extension.mavenGroup
+ ).isEqualTo(
+ LibraryGroup("androidx.myGroup", atomicGroupVersion = Version("1.0.0"))
+ )
+ assertThat(
+ extension.project.version
+ ).isEqualTo(Version("1.0.0"))
+ extension.validateMavenVersion()
+ }
+ )
+ }
+
+ private fun runAndroidExtensionTest(
+ projectPath: String,
+ tomlFile: String,
+ validateWithoutKmp: (AndroidXExtension) -> Unit,
+ validateWithKmp: (AndroidXExtension) -> Unit
+ ) {
+ listOf(false, true).forEach { useKmpVersions ->
+ val rootProjectDir = tempDir.newFolder()
+ val rootProject = ProjectBuilder.builder().withProjectDir(
+ rootProjectDir
+ ).build()
+ val subject = ProjectBuilder.builder()
+ .withParent(rootProject)
+ .withName(projectPath)
+ .build()
+ // create the service before extensions are created so that they'll use the test service
+ // we've created.
+ createLibraryVersionsService(
+ tomlFile = tomlFile,
+ project = rootProject,
+ useMultiplatformGroupVersions = useKmpVersions
+ )
+ // needed for AndroidXExtension initialization
+ rootProject.setSupportRootFolder(rootProjectDir)
+ // create androidx extensions
+ val extension = subject.extensions
+ .create<AndroidXExtension>(AndroidXImplPlugin.EXTENSION_NAME)
+ if (useKmpVersions) {
+ validateWithKmp(extension)
+ } else {
+ validateWithoutKmp(extension)
+ }
+ }
+ }
+
private fun createLibraryVersionsService(
tomlFile: String,
composeCustomVersion: String? = null,
composeCustomGroup: String? = null,
- useMultiplatformGroupVersions: Boolean = false
+ useMultiplatformGroupVersions: Boolean = false,
+ project: Project = ProjectBuilder.builder().withProjectDir(tempDir.newFolder()).build()
): LibraryVersionsService {
- val project = ProjectBuilder.builder().withProjectDir(tempDir.newFolder()).build()
val serviceProvider = project.gradle.sharedServices.registerIfAbsent(
"libraryVersionsService", LibraryVersionsService::class.java
) { spec ->
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXExtension.kt b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXExtension.kt
index be0f9f3..bf6e0b1 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXExtension.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXExtension.kt
@@ -18,7 +18,6 @@
import androidx.build.checkapi.shouldConfigureApiTasks
import androidx.build.transform.configureAarAsJarForConfiguration
-import com.android.build.gradle.internal.crash.afterEvaluate
import groovy.lang.Closure
import org.gradle.api.GradleException
import org.gradle.api.Project
@@ -42,6 +41,8 @@
val listProjectsService: Provider<ListProjectsService>
+ private val versionService: LibraryVersionsService
+
init {
val toml = lazyReadFile("libraryversions.toml")
@@ -52,21 +53,18 @@
// `./gradlew :compose:compiler:compiler:publishToMavenLocal -Pandroidx.versionExtraCheckEnabled=false`
val composeCustomVersion = project.providers.environmentVariable("COMPOSE_CUSTOM_VERSION")
val composeCustomGroup = project.providers.environmentVariable("COMPOSE_CUSTOM_GROUP")
- val useMultiplatformVersions = project.provider {
- Multiplatform.isKotlinNativeEnabled(project)
- }
-
// service that can compute group/version for a project
- val versionServiceProvider = project.gradle.sharedServices.registerIfAbsent(
+ versionService = project.gradle.sharedServices.registerIfAbsent(
"libraryVersionsService",
LibraryVersionsService::class.java
) { spec ->
spec.parameters.tomlFile = toml
spec.parameters.composeCustomVersion = composeCustomVersion
spec.parameters.composeCustomGroup = composeCustomGroup
- spec.parameters.useMultiplatformGroupVersions = useMultiplatformVersions
- }
- val versionService = versionServiceProvider.get()
+ spec.parameters.useMultiplatformGroupVersions = project.provider {
+ Multiplatform.isKotlinNativeEnabled(project)
+ }
+ }.get()
AllLibraryGroups = versionService.libraryGroups.values.toList()
LibraryVersions = versionService.libraryVersions
libraryGroupsByGroupId = versionService.libraryGroupsByGroupId
@@ -87,11 +85,37 @@
var name: Property<String?> = project.objects.property(String::class.java)
fun setName(newName: String) { name.set(newName) }
+
+ /**
+ * Maven version of the library.
+ *
+ * Note that, setting this is an error if the library group sets an atomic version.
+ * If the build is a multiplatform build, this value will be overridden by
+ * the [mavenMultiplatformVersion] property when it is provided.
+ *
+ * @see mavenMultiplatformVersion
+ */
var mavenVersion: Version? = null
set(value) {
field = value
chooseProjectVersion()
}
+ get() = if (versionService.useMultiplatformGroupVersions) {
+ mavenMultiplatformVersion ?: field
+ } else {
+ field
+ }
+
+ /**
+ * If set, this will override the [mavenVersion] property in multiplatform builds.
+ *
+ * @see mavenVersion
+ */
+ var mavenMultiplatformVersion: Version? = null
+ set(value) {
+ field = value
+ chooseProjectVersion()
+ }
fun getAllProjectPathsInSameGroup(): List<String> {
val allProjectPaths = listProjectsService.get().allPossibleProjectPaths
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/LibraryVersionsService.kt b/buildSrc/private/src/main/kotlin/androidx/build/LibraryVersionsService.kt
index 2885e3b..94bff7f 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/LibraryVersionsService.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/LibraryVersionsService.kt
@@ -39,6 +39,9 @@
Toml.parse(parameters.tomlFile.get())
}
+ val useMultiplatformGroupVersions
+ get() = parameters.useMultiplatformGroupVersions.get()
+
private fun getTable(key: String): TomlTable {
return parsedTomlFile.getTable(key)
?: throw GradleException("Library versions toml file is missing [$key] table")
diff --git a/busytown/androidx_multiplatform_mac.sh b/busytown/androidx_multiplatform_mac.sh
index d7f9541..128e691 100755
--- a/busytown/androidx_multiplatform_mac.sh
+++ b/busytown/androidx_multiplatform_mac.sh
@@ -15,7 +15,7 @@
# Setup simulators
impl/androidx-native-mac-simulator-setup.sh
-impl/build.sh buildOnServer allTests :docs-kmp:zipCombinedKmpDocs --no-configuration-cache -Pandroidx.displayTestOutput=false
+impl/build.sh buildOnServer :docs-kmp:zipCombinedKmpDocs --no-configuration-cache -Pandroidx.displayTestOutput=false
# run a separate createArchive task to prepare a repository
# folder in DIST.
diff --git a/camera/camera-camera2-pipe-integration/src/androidTest/java/androidx/camera/camera2/pipe/integration/CameraControlAdapterDeviceTest.kt b/camera/camera-camera2-pipe-integration/src/androidTest/java/androidx/camera/camera2/pipe/integration/CameraControlAdapterDeviceTest.kt
index e2e53b7..02bb86f 100644
--- a/camera/camera-camera2-pipe-integration/src/androidTest/java/androidx/camera/camera2/pipe/integration/CameraControlAdapterDeviceTest.kt
+++ b/camera/camera-camera2-pipe-integration/src/androidTest/java/androidx/camera/camera2/pipe/integration/CameraControlAdapterDeviceTest.kt
@@ -70,6 +70,7 @@
import org.junit.Assume
import org.junit.Assume.assumeThat
import org.junit.Before
+import org.junit.Ignore
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
@@ -158,6 +159,7 @@
// TODO: test all public API of the CameraControl to ensure the RequestOptions still exist
// after adding/removing the UseCase.
+ @Ignore("b/265316774")
@Test
fun removeUseCase_requestOptionsShouldSetToCamera(): Unit = runBlocking {
// Arrange.
diff --git a/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/CameraXInitTest.kt b/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/CameraXInitTest.kt
index 0d4c7e8..d8b0f40 100644
--- a/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/CameraXInitTest.kt
+++ b/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/CameraXInitTest.kt
@@ -23,6 +23,7 @@
import androidx.camera.core.CameraSelector
import androidx.camera.core.CameraXConfig
import androidx.camera.lifecycle.ProcessCameraProvider
+import androidx.camera.testing.LabTestRule
import androidx.concurrent.futures.await
import androidx.test.core.app.ApplicationProvider
import androidx.test.filters.LargeTest
@@ -58,6 +59,9 @@
val permissionRule: GrantPermissionRule =
GrantPermissionRule.grant(android.Manifest.permission.CAMERA)
+ @get:Rule
+ val labTest: LabTestRule = LabTestRule()
+
private val context = ApplicationProvider.getApplicationContext<Context>()
private val packageManager = context.packageManager
private lateinit var cameraProvider: ProcessCameraProvider
@@ -88,6 +92,9 @@
}
}
+ // Only test on lab devices because emulator may not have correctly set the matching camera
+ // features and camera list.
+ @LabTestRule.LabTestOnly
@Test
fun initOnDevice_hasCamera() {
ProcessCameraProvider.configureInstance(cameraXConfig)
diff --git a/camera/integration-tests/extensionstestapp/src/androidTest/java/androidx/camera/integration/extensions/OpenCloseCaptureSessionStressTest.kt b/camera/integration-tests/extensionstestapp/src/androidTest/java/androidx/camera/integration/extensions/OpenCloseCaptureSessionStressTest.kt
index 0edd0a0..925d785 100644
--- a/camera/integration-tests/extensionstestapp/src/androidTest/java/androidx/camera/integration/extensions/OpenCloseCaptureSessionStressTest.kt
+++ b/camera/integration-tests/extensionstestapp/src/androidTest/java/androidx/camera/integration/extensions/OpenCloseCaptureSessionStressTest.kt
@@ -17,27 +17,17 @@
package androidx.camera.integration.extensions
import android.content.Context
+import android.hardware.camera2.CameraCaptureSession
+import android.hardware.camera2.CameraDevice
+import android.view.Surface
import androidx.camera.camera2.Camera2Config
-import androidx.camera.camera2.impl.Camera2ImplConfig
-import androidx.camera.camera2.impl.CameraEventCallback
-import androidx.camera.camera2.impl.CameraEventCallbacks
-import androidx.camera.camera2.interop.Camera2CameraInfo
+import androidx.camera.camera2.interop.Camera2Interop
import androidx.camera.core.Camera
-import androidx.camera.core.CameraFilter
-import androidx.camera.core.CameraInfo
import androidx.camera.core.CameraSelector
import androidx.camera.core.ImageAnalysis
import androidx.camera.core.ImageCapture
import androidx.camera.core.Preview
import androidx.camera.core.UseCase
-import androidx.camera.core.impl.CameraConfig
-import androidx.camera.core.impl.CaptureConfig
-import androidx.camera.core.impl.Config
-import androidx.camera.core.impl.ExtendedCameraConfigProviderStore
-import androidx.camera.core.impl.Identifier
-import androidx.camera.core.impl.MutableOptionsBundle
-import androidx.camera.core.impl.OptionsBundle
-import androidx.camera.core.impl.UseCaseConfigFactory
import androidx.camera.extensions.ExtensionMode
import androidx.camera.extensions.ExtensionsManager
import androidx.camera.integration.extensions.util.CameraXExtensionsTestUtil
@@ -88,7 +78,7 @@
private lateinit var imageAnalysis: ImageAnalysis
private var isImageAnalysisSupported = false
private lateinit var lifecycleOwner: FakeLifecycleOwner
- private val cameraEventMonitor = CameraEventMonitor()
+ private val cameraSessionMonitor = CameraSessionMonitor()
@Before
fun setUp(): Unit = runBlocking {
@@ -114,7 +104,9 @@
cameraProvider.bindToLifecycle(lifecycleOwner, extensionCameraSelector)
}
- preview = Preview.Builder().build()
+ val previewBuilder = Preview.Builder()
+ injectCameraSessionMonitor(previewBuilder, cameraSessionMonitor)
+ preview = previewBuilder.build()
withContext(Dispatchers.Main) {
preview.setSurfaceProvider(SurfaceTextureProvider.createSurfaceTextureProvider())
}
@@ -125,6 +117,51 @@
camera.isUseCasesCombinationSupported(preview, imageCapture, imageAnalysis)
}
+ private fun injectCameraSessionMonitor(
+ previewBuilder: Preview.Builder,
+ cameraMonitor: CameraSessionMonitor
+ ) {
+ Camera2Interop.Extender(previewBuilder)
+ .setSessionStateCallback(object : CameraCaptureSession.StateCallback() {
+ override fun onConfigured(session: CameraCaptureSession) {
+ cameraMonitor.onOpenedSession()
+ }
+
+ override fun onClosed(session: CameraCaptureSession) {
+ cameraMonitor.onClosedSession()
+ }
+
+ override fun onConfigureFailed(session: CameraCaptureSession) {
+ }
+
+ override fun onReady(session: CameraCaptureSession) {
+ }
+
+ override fun onActive(session: CameraCaptureSession) {
+ }
+
+ override fun onCaptureQueueEmpty(session: CameraCaptureSession) {
+ }
+
+ override fun onSurfacePrepared(session: CameraCaptureSession, surface: Surface) {
+ }
+ })
+ .setDeviceStateCallback(object : CameraDevice.StateCallback() {
+ override fun onOpened(device: CameraDevice) {
+ }
+ // Some device doesn't invoke CameraCaptureSession onClosed callback thus
+ // we need to invoke when camera is closed.
+ override fun onClosed(device: CameraDevice) {
+ cameraMonitor.onClosedSession()
+ }
+
+ override fun onDisconnected(device: CameraDevice) {
+ }
+
+ override fun onError(device: CameraDevice, error: Int) {
+ }
+ })
+ }
@After
fun cleanUp(): Unit = runBlocking {
if (::cameraProvider.isInitialized) {
@@ -157,7 +194,7 @@
/**
* Repeatedly binds use cases, unbind all to check whether the capture session can be opened
- * and closed successfully by monitoring the CameraEvent callbacks.
+ * and closed successfully by monitoring the camera session state.
*/
private fun bindUseCase_unbindAll_toCheckCameraEvent_repeatedly(
vararg useCases: UseCase,
@@ -165,36 +202,27 @@
): Unit = runBlocking {
for (i in 1..repeatCount) {
// Arrange: resets the camera event monitor
- cameraEventMonitor.reset()
+ cameraSessionMonitor.reset()
withContext(Dispatchers.Main) {
- // Arrange: retrieves the camera selector which allows to monitor camera event
- // callbacks
- val extensionEnabledCameraEventMonitorCameraSelector =
- getExtensionsCameraEventMonitorCameraSelector(
- extensionsManager,
- config.extensionMode,
- baseCameraSelector
- )
-
// Act: binds use cases
cameraProvider.bindToLifecycle(
lifecycleOwner,
- extensionEnabledCameraEventMonitorCameraSelector,
+ extensionCameraSelector,
*useCases
)
}
- // Assert: checks the CameraEvent#onEnableSession callback function is called
- cameraEventMonitor.awaitSessionEnabledAndAssert()
+ // Assert: checks the camera session is opened.
+ cameraSessionMonitor.awaitSessionOpenedAndAssert()
// Act: unbinds all use cases
withContext(Dispatchers.Main) {
cameraProvider.unbindAll()
}
- // Assert: checks the CameraEvent#onSessionDisabled callback function is called
- cameraEventMonitor.awaitSessionDisabledAndAssert()
+ // Assert: checks the camera session is closed.
+ cameraSessionMonitor.awaitSessionClosedAndAssert()
}
}
@@ -231,186 +259,18 @@
}
/**
- * Gets the camera selector which allows to monitor the camera event callbacks
+ * An implementation of CameraEventCallback to monitor whether the camera is closed or opened.
*/
- private fun getExtensionsCameraEventMonitorCameraSelector(
- extensionsManager: ExtensionsManager,
- extensionMode: Int,
- baseCameraSelector: CameraSelector
- ): CameraSelector {
- // Injects the ExtensionsCameraEventMonitorUseCaseConfigFactory which allows to monitor and
- // verify the camera event callbacks
- injectExtensionsCameraEventMonitorUseCaseConfigFactory(
- extensionsManager,
- extensionMode,
- baseCameraSelector
- )
-
- val builder = CameraSelector.Builder.fromSelector(baseCameraSelector)
- // Add an ExtensionCameraEventMonitorCameraFilter which includes the CameraFilter to check
- // whether the camera is supported for the extension mode or not and also includes the
- // identifier to find the extended camera config provider from
- // ExtendedCameraConfigProviderStore
- builder.addCameraFilter(
- ExtensionsCameraEventMonitorCameraFilter(
- extensionsManager,
- extensionMode
- )
- )
- return builder.build()
- }
-
- /**
- * Injects the ExtensionsCameraEventMonitorUseCaseConfigFactory which allows to monitor and
- * verify the camera event callbacks
- */
- private fun injectExtensionsCameraEventMonitorUseCaseConfigFactory(
- extensionsManager: ExtensionsManager,
- extensionMode: Int,
- baseCameraSelector: CameraSelector
- ): Unit = runBlocking {
- val defaultConfigProviderId =
- Identifier.create(getExtendedCameraConfigProviderId(extensionMode))
- val cameraEventConfigProviderId =
- Identifier.create(getCameraEventMonitorCameraConfigProviderId(extensionMode))
-
- // Calls the ExtensionsManager#getExtensionEnabledCameraSelector() function to add the
- // default extended camera config provider to ExtendedCameraConfigProviderStore
- extensionsManager.getExtensionEnabledCameraSelector(baseCameraSelector, extensionMode)
-
- // Injects the new camera config provider which will keep the original extensions needed
- // configs and also add additional CameraEventMonitor to monitor the camera event callbacks.
- ExtendedCameraConfigProviderStore.addConfig(cameraEventConfigProviderId) {
- cameraInfo: CameraInfo, context: Context ->
- // Retrieves the default extended camera config provider and
- // ExtensionsUseCaseConfigFactory
- val defaultCameraConfigProvider =
- ExtendedCameraConfigProviderStore.getConfigProvider(defaultConfigProviderId)
- val defaultCameraConfig = defaultCameraConfigProvider.getConfig(cameraInfo, context)!!
- val defaultExtensionsUseCaseConfigFactory =
- defaultCameraConfig.retrieveOption(CameraConfig.OPTION_USECASE_CONFIG_FACTORY, null)
-
- // Creates a new ExtensionsCameraEventMonitorUseCaseConfigFactory on top of the default
- // ExtensionsCameraEventMonitorUseCaseConfigFactory to monitor the capture session
- // callbacks
- val extensionsCameraEventMonitorUseCaseConfigFactory =
- ExtensionsCameraEventMonitorUseCaseConfigFactory(
- defaultExtensionsUseCaseConfigFactory,
- cameraEventMonitor
- )
-
- // Creates the config from the original config and replaces its use case config factory
- // with the ExtensionsCameraEventMonitorUseCaseConfigFactory
- val mutableOptionsBundle = MutableOptionsBundle.from(defaultCameraConfig)
- mutableOptionsBundle.insertOption(
- CameraConfig.OPTION_USECASE_CONFIG_FACTORY,
- extensionsCameraEventMonitorUseCaseConfigFactory
- )
-
- // Returns a CameraConfig implemented with the updated config
- object : CameraConfig {
- val config = OptionsBundle.from(mutableOptionsBundle)
-
- override fun getConfig(): Config {
- return config
- }
-
- override fun getCompatibilityId(): Identifier {
- return config.retrieveOption(CameraConfig.OPTION_COMPATIBILITY_ID)!!
- }
- }
- }
- }
-
- /**
- * A ExtensionsCameraEventMonitorCameraFilter which includes the CameraFilter to check whether
- * the camera is supported for the extension mode or not and also includes the identifier to
- * find the extended camera config provider from ExtendedCameraConfigProviderStore.
- */
- private class ExtensionsCameraEventMonitorCameraFilter constructor(
- private val extensionManager: ExtensionsManager,
- @ExtensionMode.Mode private val mode: Int
- ) : CameraFilter {
- override fun getIdentifier(): Identifier {
- return Identifier.create(getCameraEventMonitorCameraConfigProviderId(mode))
- }
-
- override fun filter(cameraInfos: MutableList<CameraInfo>): MutableList<CameraInfo> =
- cameraInfos.mapNotNull { cameraInfo ->
- val cameraId = Camera2CameraInfo.from(cameraInfo).cameraId
- val cameraIdCameraSelector = CameraSelectorUtil.createCameraSelectorById(cameraId)
- if (extensionManager.isExtensionAvailable(cameraIdCameraSelector, mode)) {
- cameraInfo
- } else {
- null
- }
- }.toMutableList()
- }
-
- /**
- * A UseCaseConfigFactory implemented on top of the default ExtensionsUseCaseConfigFactory to
- * monitor the camera event callbacks
- */
- private class ExtensionsCameraEventMonitorUseCaseConfigFactory constructor(
- private val useCaseConfigFactory: UseCaseConfigFactory?,
- private val cameraEventMonitor: CameraEventMonitor
- ) :
- UseCaseConfigFactory {
- override fun getConfig(
- captureType: UseCaseConfigFactory.CaptureType,
- captureMode: Int
- ): Config {
- // Retrieves the config from the default ExtensionsUseCaseConfigFactory
- val mutableOptionsBundle = useCaseConfigFactory?.getConfig(
- captureType, captureMode
- )?.let {
- MutableOptionsBundle.from(it)
- } ?: MutableOptionsBundle.create()
-
- // Adds the CameraEventMonitor to the original CameraEventCallbacks of ImageCapture to
- // monitor the camera event callbacks
- if (captureType.equals(UseCaseConfigFactory.CaptureType.IMAGE_CAPTURE)) {
- var cameraEventCallbacks = mutableOptionsBundle.retrieveOption(
- Camera2ImplConfig.CAMERA_EVENT_CALLBACK_OPTION,
- null
- )
-
- if (cameraEventCallbacks != null) {
- cameraEventCallbacks.addAll(
- mutableListOf<CameraEventCallback>(
- cameraEventMonitor
- )
- )
- } else {
- cameraEventCallbacks = CameraEventCallbacks(cameraEventMonitor)
- }
-
- mutableOptionsBundle.insertOption(
- Camera2ImplConfig.CAMERA_EVENT_CALLBACK_OPTION,
- cameraEventCallbacks
- )
- }
-
- return OptionsBundle.from(mutableOptionsBundle)
- }
- }
-
- /**
- * An implementation of CameraEventCallback to monitor whether the camera event callbacks are
- * called properly or not.
- */
- private class CameraEventMonitor : CameraEventCallback() {
+ private class CameraSessionMonitor {
private var sessionEnabledLatch = CountDownLatch(1)
private var sessionDisabledLatch = CountDownLatch(1)
- override fun onEnableSession(): CaptureConfig? {
+ fun onOpenedSession() {
sessionEnabledLatch.countDown()
- return super.onEnableSession()
}
- override fun onDisableSession(): CaptureConfig? {
+ fun onClosedSession() {
sessionDisabledLatch.countDown()
- return super.onDisableSession()
}
fun reset() {
@@ -418,11 +278,11 @@
sessionDisabledLatch = CountDownLatch(1)
}
- fun awaitSessionEnabledAndAssert() {
+ fun awaitSessionOpenedAndAssert() {
assertThat(sessionEnabledLatch.await(3000, TimeUnit.MILLISECONDS)).isTrue()
}
- fun awaitSessionDisabledAndAssert() {
+ fun awaitSessionClosedAndAssert() {
assertThat(sessionDisabledLatch.await(3000, TimeUnit.MILLISECONDS)).isTrue()
}
}
diff --git a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/VersionChecker.kt b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/VersionChecker.kt
index 67f33e3..43a41cf 100644
--- a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/VersionChecker.kt
+++ b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/VersionChecker.kt
@@ -116,7 +116,7 @@
* The maven version string of this compiler. This string should be updated before/after every
* release.
*/
- const val compilerVersion: String = "1.4.0-alpha05"
+ const val compilerVersion: String = "1.4.0"
private val minimumRuntimeVersion: String
get() = runtimeVersionToMavenVersionTable[minimumRuntimeVersionInt] ?: "unknown"
}
diff --git a/compose/foundation/foundation-newtext/src/androidAndroidTest/kotlin/androidx/compose/foundation/newtext/text/modifiers/MultiParagraphLayoutCacheTest.kt b/compose/foundation/foundation-newtext/src/androidAndroidTest/kotlin/androidx/compose/foundation/newtext/text/modifiers/MultiParagraphLayoutCacheTest.kt
index f7cdf7b..471b37e 100644
--- a/compose/foundation/foundation-newtext/src/androidAndroidTest/kotlin/androidx/compose/foundation/newtext/text/modifiers/MultiParagraphLayoutCacheTest.kt
+++ b/compose/foundation/foundation-newtext/src/androidAndroidTest/kotlin/androidx/compose/foundation/newtext/text/modifiers/MultiParagraphLayoutCacheTest.kt
@@ -52,13 +52,12 @@
val spanStyle = SpanStyle(fontSize = fontSize, fontFamily = fontFamily)
val annotatedString = AnnotatedString(text, spanStyle)
val textDelegate = MultiParagraphLayoutCache(
- StaticTextLayoutDrawParams(
- text = annotatedString,
- style = TextStyle.Default,
- fontFamilyResolver = fontFamilyResolver,
- ),
- density = this
- )
+ text = annotatedString,
+ style = TextStyle.Default,
+ fontFamilyResolver = fontFamilyResolver,
+ ).also {
+ it.density = this
+ }
textDelegate.layoutWithConstraints(Constraints.fixed(0, 0), LayoutDirection.Ltr)
@@ -75,13 +74,12 @@
val spanStyle = SpanStyle(fontSize = fontSize, fontFamily = fontFamily)
val annotatedString = AnnotatedString(text, spanStyle)
val textDelegate = MultiParagraphLayoutCache(
- StaticTextLayoutDrawParams(
- text = annotatedString,
- style = TextStyle.Default,
- fontFamilyResolver = fontFamilyResolver,
- ),
- density = this
- )
+ text = annotatedString,
+ style = TextStyle.Default,
+ fontFamilyResolver = fontFamilyResolver,
+ ).also {
+ it.density = this
+ }
textDelegate.layoutWithConstraints(Constraints.fixed(0, 0), LayoutDirection.Ltr)
@@ -93,13 +91,12 @@
@Test
fun TextLayoutInput_reLayout_withDifferentHeight() {
val textDelegate = MultiParagraphLayoutCache(
- StaticTextLayoutDrawParams(
- text = AnnotatedString(text = "Hello World!"),
- style = TextStyle.Default,
- fontFamilyResolver = fontFamilyResolver,
- ),
- density = density
- )
+ text = AnnotatedString("Hello World"),
+ style = TextStyle.Default,
+ fontFamilyResolver = fontFamilyResolver,
+ ).also {
+ it.density = density
+ }
val width = 200
val heightFirstLayout = 100
val heightSecondLayout = 200
@@ -121,13 +118,12 @@
@Test
fun TextLayoutResult_reLayout_withDifferentHeight() {
val textDelegate = MultiParagraphLayoutCache(
- StaticTextLayoutDrawParams(
- text = AnnotatedString(text = "Hello World!"),
- style = TextStyle.Default,
- fontFamilyResolver = fontFamilyResolver,
- ),
- density = density
- )
+ text = AnnotatedString("Hello World"),
+ style = TextStyle.Default,
+ fontFamilyResolver = fontFamilyResolver,
+ ).also {
+ it.density = density
+ }
val width = 200
val heightFirstLayout = 100
val heightSecondLayout = 200
@@ -151,16 +147,14 @@
val fontSize = 20f
val text = AnnotatedString(text = "Hello World! Hello World! Hello World! Hello World!")
val textDelegate = MultiParagraphLayoutCache(
- StaticTextLayoutDrawParams(
- text = text,
- style = TextStyle(fontSize = fontSize.sp),
- fontFamilyResolver = fontFamilyResolver,
- softWrap = false,
- overflow = TextOverflow.Ellipsis,
- ),
-
- density = density
- )
+ text = text,
+ style = TextStyle(fontSize = fontSize.sp),
+ fontFamilyResolver = fontFamilyResolver,
+ softWrap = false,
+ overflow = TextOverflow.Ellipsis,
+ ).also {
+ it.density = density
+ }
textDelegate.layoutWithConstraints(Constraints.fixed(0, 0), LayoutDirection.Ltr)
// Makes width smaller than needed.
@@ -177,15 +171,15 @@
fun TextLayoutResult_layoutWithLimitedHeight_withEllipsis() {
val fontSize = 20f
val text = AnnotatedString(text = "Hello World! Hello World! Hello World! Hello World!")
+
val textDelegate = MultiParagraphLayoutCache(
- StaticTextLayoutDrawParams(
- text = text,
- style = TextStyle(fontSize = fontSize.sp),
- fontFamilyResolver = fontFamilyResolver,
- overflow = TextOverflow.Ellipsis,
- ),
- density = density
- )
+ text = text,
+ style = TextStyle(fontSize = fontSize.sp),
+ fontFamilyResolver = fontFamilyResolver,
+ overflow = TextOverflow.Ellipsis,
+ ).also {
+ it.density = density
+ }
textDelegate.layoutWithConstraints(Constraints.fixed(0, 0), LayoutDirection.Ltr)
val constraints = Constraints(
maxWidth = textDelegate.maxIntrinsicWidth / 4,
@@ -202,15 +196,16 @@
fun TextLayoutResult_sameWidth_inRtlAndLtr_withLetterSpacing() {
val fontSize = 20f
val text = AnnotatedString(text = "Hello World")
+
val textDelegate = MultiParagraphLayoutCache(
- StaticTextLayoutDrawParams(
- text = text,
- style = TextStyle(fontSize = fontSize.sp, letterSpacing = 0.5.sp),
- fontFamilyResolver = fontFamilyResolver,
- overflow = TextOverflow.Ellipsis,
- ),
- density = density
- )
+ text = text,
+ style = TextStyle(fontSize = fontSize.sp, letterSpacing = 0.5.sp),
+ fontFamilyResolver = fontFamilyResolver,
+ overflow = TextOverflow.Ellipsis,
+ ).also {
+ it.density = density
+ }
+
textDelegate.layoutWithConstraints(Constraints(), LayoutDirection.Ltr)
val layoutResultLtr = textDelegate.layout
textDelegate.layoutWithConstraints(Constraints(), LayoutDirection.Rtl)
diff --git a/compose/foundation/foundation-newtext/src/androidAndroidTest/kotlin/androidx/compose/foundation/newtext/text/modifiers/MultiParagraphLayoutCacheWidthWithLetterSpacingTest.kt b/compose/foundation/foundation-newtext/src/androidAndroidTest/kotlin/androidx/compose/foundation/newtext/text/modifiers/MultiParagraphLayoutCacheWidthWithLetterSpacingTest.kt
index e858dd4..a2195df 100644
--- a/compose/foundation/foundation-newtext/src/androidAndroidTest/kotlin/androidx/compose/foundation/newtext/text/modifiers/MultiParagraphLayoutCacheWidthWithLetterSpacingTest.kt
+++ b/compose/foundation/foundation-newtext/src/androidAndroidTest/kotlin/androidx/compose/foundation/newtext/text/modifiers/MultiParagraphLayoutCacheWidthWithLetterSpacingTest.kt
@@ -73,18 +73,17 @@
private fun assertLineCount(style: TextStyle) {
val textDelegate = MultiParagraphLayoutCache(
- StaticTextLayoutDrawParams(
- text = AnnotatedString(text = "This is a callout message"),
- style = style.copy(
- fontFamily = fontFamily,
- fontSize = fontSize
- ),
- fontFamilyResolver = fontFamilyResolver,
- softWrap = true,
- overflow = TextOverflow.Clip
+ text = AnnotatedString(text = "This is a callout message"),
+ style = style.copy(
+ fontFamily = fontFamily,
+ fontSize = fontSize
),
- density = density,
- )
+ fontFamilyResolver = fontFamilyResolver,
+ softWrap = true,
+ overflow = TextOverflow.Clip
+ ).also {
+ it.density = density
+ }
textDelegate.layoutWithConstraints(Constraints(), LayoutDirection.Ltr)
val layoutResult = textDelegate.layout
assertThat(layoutResult.lineCount).isEqualTo(1)
diff --git a/compose/foundation/foundation-newtext/src/androidAndroidTest/kotlin/androidx/compose/foundation/newtext/text/modifiers/TextLayoutResultIntegrationTest.kt b/compose/foundation/foundation-newtext/src/androidAndroidTest/kotlin/androidx/compose/foundation/newtext/text/modifiers/TextLayoutResultIntegrationTest.kt
index d0822aa..4b8b7c1 100644
--- a/compose/foundation/foundation-newtext/src/androidAndroidTest/kotlin/androidx/compose/foundation/newtext/text/modifiers/TextLayoutResultIntegrationTest.kt
+++ b/compose/foundation/foundation-newtext/src/androidAndroidTest/kotlin/androidx/compose/foundation/newtext/text/modifiers/TextLayoutResultIntegrationTest.kt
@@ -56,13 +56,12 @@
val spanStyle = SpanStyle(fontSize = fontSize, fontFamily = fontFamily)
val annotatedString = AnnotatedString(text, spanStyle)
val textDelegate = MultiParagraphLayoutCache(
- StaticTextLayoutDrawParams(
- text = annotatedString,
- style = TextStyle.Default,
- fontFamilyResolver = fontFamilyResolver
- ),
- density = this,
- )
+ text = annotatedString,
+ style = TextStyle.Default,
+ fontFamilyResolver = fontFamilyResolver
+ ).also {
+ it.density = this
+ }
textDelegate.layoutWithConstraints(Constraints(0, 200), layoutDirection)
val layoutResult = textDelegate.layout
@@ -80,13 +79,12 @@
val spanStyle = SpanStyle(fontSize = 20.sp, fontFamily = fontFamily)
val annotatedString = AnnotatedString(text, spanStyle)
val textDelegate = MultiParagraphLayoutCache(
- StaticTextLayoutDrawParams(
- text = annotatedString,
- style = TextStyle.Default,
- fontFamilyResolver = fontFamilyResolver
- ),
- density = density,
- )
+ text = annotatedString,
+ style = TextStyle.Default,
+ fontFamilyResolver = fontFamilyResolver
+ ).also {
+ it.density = density
+ }
textDelegate.layoutWithConstraints(Constraints(maxWidth = width), layoutDirection)
val layoutResult = textDelegate.layout
@@ -102,13 +100,12 @@
val text = "hello"
val annotatedString = AnnotatedString(text, spanStyle)
val textDelegate = MultiParagraphLayoutCache(
- StaticTextLayoutDrawParams(
- text = annotatedString,
- style = TextStyle.Default,
- fontFamilyResolver = fontFamilyResolver
- ),
- density = this,
- )
+ text = annotatedString,
+ style = TextStyle.Default,
+ fontFamilyResolver = fontFamilyResolver
+ ).also {
+ it.density = this
+ }
textDelegate.layoutWithConstraints(Constraints(), layoutDirection)
val layoutResult = textDelegate.layout
@@ -120,13 +117,12 @@
@Test
fun layout_build_layoutResult() {
val textDelegate = MultiParagraphLayoutCache(
- StaticTextLayoutDrawParams(
- text = AnnotatedString("Hello"),
- style = TextStyle.Default,
- fontFamilyResolver = fontFamilyResolver
- ),
- density = density,
- )
+ text = AnnotatedString("hello"),
+ style = TextStyle.Default,
+ fontFamilyResolver = fontFamilyResolver
+ ).also {
+ it.density = density
+ }
textDelegate.layoutWithConstraints(Constraints(0, 20), layoutDirection)
val layoutResult = textDelegate.layout
@@ -147,13 +143,12 @@
)
val textDelegate = MultiParagraphLayoutCache(
- StaticTextLayoutDrawParams(
- text = annotatedString,
- style = TextStyle.Default,
- fontFamilyResolver = fontFamilyResolver
- ),
- density = density,
- )
+ text = annotatedString,
+ style = TextStyle.Default,
+ fontFamilyResolver = fontFamilyResolver
+ ).also {
+ it.density = density
+ }
textDelegate.layoutWithConstraints(Constraints(), layoutDirection)
val layoutResult = textDelegate.layout
@@ -175,13 +170,12 @@
)
val textDelegate = MultiParagraphLayoutCache(
- StaticTextLayoutDrawParams(
- text = annotatedString,
- style = TextStyle.Default,
- fontFamilyResolver = fontFamilyResolver
- ),
- density = this,
- )
+ text = annotatedString,
+ style = TextStyle.Default,
+ fontFamilyResolver = fontFamilyResolver
+ ).also {
+ it.density = this
+ }
textDelegate.layoutWithConstraints(Constraints(), layoutDirection)
val layoutResult = textDelegate.layout
@@ -199,13 +193,12 @@
val spanStyle = SpanStyle(fontSize = 20.sp, fontFamily = fontFamily)
val annotatedString = AnnotatedString(text, spanStyle)
val textDelegate = MultiParagraphLayoutCache(
- StaticTextLayoutDrawParams(
- text = annotatedString,
- style = TextStyle.Default,
- fontFamilyResolver = fontFamilyResolver
- ),
- density = density,
- )
+ text = annotatedString,
+ style = TextStyle.Default,
+ fontFamilyResolver = fontFamilyResolver
+ ).also {
+ it.density = density
+ }
textDelegate.layoutWithConstraints(Constraints(), layoutDirection)
val layoutResult = textDelegate.layout
@@ -224,14 +217,13 @@
val maxLines = 3
val textDelegate = MultiParagraphLayoutCache(
- StaticTextLayoutDrawParams(
- text = annotatedString,
- style = TextStyle.Default,
- fontFamilyResolver = fontFamilyResolver,
- maxLines = maxLines
- ),
- density = density,
- )
+ text = annotatedString,
+ style = TextStyle.Default,
+ fontFamilyResolver = fontFamilyResolver,
+ maxLines = maxLines
+ ).also {
+ it.density = density
+ }
textDelegate.layoutWithConstraints(Constraints.fixed(0, 0), LayoutDirection.Ltr)
// Tries to make 5 lines of text, which exceeds the given maxLines(3).
@@ -253,14 +245,13 @@
val maxLines = 10
val textDelegate = MultiParagraphLayoutCache(
- StaticTextLayoutDrawParams(
- text = annotatedString,
- style = TextStyle.Default,
- fontFamilyResolver = fontFamilyResolver,
- maxLines = maxLines
- ),
- density = density,
- )
+ text = annotatedString,
+ style = TextStyle.Default,
+ fontFamilyResolver = fontFamilyResolver,
+ maxLines = maxLines
+ ).also {
+ it.density = density
+ }
textDelegate.layoutWithConstraints(Constraints.fixed(0, 0), LayoutDirection.Ltr)
// Tries to make 5 lines of text, which doesn't exceed the given maxLines(10).
@@ -281,13 +272,12 @@
val annotatedString = AnnotatedString(text, spanStyle)
val textDelegate = MultiParagraphLayoutCache(
- StaticTextLayoutDrawParams(
- text = annotatedString,
- style = TextStyle.Default,
- fontFamilyResolver = fontFamilyResolver,
- ),
- density = density,
- )
+ text = annotatedString,
+ style = TextStyle.Default,
+ fontFamilyResolver = fontFamilyResolver,
+ ).also {
+ it.density = density
+ }
textDelegate.layoutWithConstraints(
Constraints(),
@@ -314,13 +304,12 @@
val annotatedString = AnnotatedString(text, spanStyle)
val textDelegate = MultiParagraphLayoutCache(
- StaticTextLayoutDrawParams(
- text = annotatedString,
- style = TextStyle.Default,
- fontFamilyResolver = fontFamilyResolver
- ),
- density = density,
- )
+ text = annotatedString,
+ style = TextStyle.Default,
+ fontFamilyResolver = fontFamilyResolver,
+ ).also {
+ it.density = density
+ }
textDelegate.layoutWithConstraints(
Constraints(),
diff --git a/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/TextUsingModifier.kt b/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/TextUsingModifier.kt
index eca9c82..819e0e1 100644
--- a/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/TextUsingModifier.kt
+++ b/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/TextUsingModifier.kt
@@ -18,10 +18,10 @@
import androidx.compose.foundation.newtext.text.copypasta.selection.LocalSelectionRegistrar
import androidx.compose.foundation.newtext.text.copypasta.selection.LocalTextSelectionColors
-import androidx.compose.foundation.newtext.text.modifiers.SelectableStaticTextModifier
-import androidx.compose.foundation.newtext.text.modifiers.StaticTextSelectionModifierController
-import androidx.compose.foundation.newtext.text.modifiers.StaticTextLayoutDrawParams
-import androidx.compose.foundation.newtext.text.modifiers.StaticTextModifier
+import androidx.compose.foundation.newtext.text.modifiers.SelectableTextAnnotatedStringElement
+import androidx.compose.foundation.newtext.text.modifiers.TextAnnotatedStringElement
+import androidx.compose.foundation.newtext.text.modifiers.SelectionController
+import androidx.compose.foundation.newtext.text.modifiers.validateMinMaxLines
import androidx.compose.foundation.text.InlineTextContent
import androidx.compose.runtime.Composable
import androidx.compose.runtime.mutableStateOf
@@ -35,9 +35,7 @@
import androidx.compose.ui.layout.MeasureResult
import androidx.compose.ui.layout.MeasureScope
import androidx.compose.ui.layout.Placeable
-import androidx.compose.ui.node.ModifierNodeElement
import androidx.compose.ui.platform.LocalFontFamilyResolver
-import androidx.compose.ui.platform.debugInspectorInfo
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.ExperimentalTextApi
import androidx.compose.ui.text.Placeholder
@@ -66,12 +64,12 @@
maxLines: Int = Int.MAX_VALUE,
minLines: Int = 1,
) {
-
+ validateMinMaxLines(minLines, maxLines)
val selectionRegistrar = LocalSelectionRegistrar.current
val selectionController = if (selectionRegistrar != null) {
val backgroundSelectionColor = LocalTextSelectionColors.current.backgroundColor
remember(selectionRegistrar, backgroundSelectionColor) {
- StaticTextSelectionModifierController(
+ SelectionController(
selectionRegistrar,
backgroundSelectionColor
)
@@ -113,11 +111,12 @@
minLines: Int = 1,
inlineContent: Map<String, InlineTextContent>? = null,
) {
+ validateMinMaxLines(minLines, maxLines)
val selectionRegistrar = LocalSelectionRegistrar.current
val selectionController = if (selectionRegistrar != null) {
val backgroundSelectionColor = LocalTextSelectionColors.current.backgroundColor
remember(selectionRegistrar, backgroundSelectionColor) {
- StaticTextSelectionModifierController(
+ SelectionController(
selectionRegistrar,
backgroundSelectionColor
)
@@ -225,46 +224,37 @@
fontFamilyResolver: FontFamily.Resolver,
placeholders: List<AnnotatedString.Range<Placeholder>>?,
onPlaceholderLayout: ((List<Rect?>) -> Unit)?,
- selectionController: StaticTextSelectionModifierController?
+ selectionController: SelectionController?
): Modifier {
- val params = StaticTextLayoutDrawParams(
- text,
- style,
- fontFamilyResolver,
- onTextLayout,
- overflow,
- softWrap,
- maxLines,
- minLines,
- placeholders,
- onPlaceholderLayout,
- selectionController
- )
if (selectionController == null) {
- val staticTextModifier = object : ModifierNodeElement<StaticTextModifier>(
- params,
- false,
- debugInspectorInfo {}
- ) {
- override fun create(): StaticTextModifier = StaticTextModifier(params)
- override fun update(node: StaticTextModifier): StaticTextModifier =
- node.also { it.params = params }
- }
+ val staticTextModifier = TextAnnotatedStringElement(
+ text,
+ style,
+ fontFamilyResolver,
+ onTextLayout,
+ overflow,
+ softWrap,
+ maxLines,
+ minLines,
+ placeholders,
+ onPlaceholderLayout,
+ null
+ )
return this then Modifier /* selection position */ then staticTextModifier
} else {
- val selectableTextModifier =
- object : ModifierNodeElement<SelectableStaticTextModifier>(
- params,
- false,
- debugInspectorInfo {}
- ) {
- override fun create(): SelectableStaticTextModifier =
- SelectableStaticTextModifier(params)
-
- override fun update(
- node: SelectableStaticTextModifier
- ): SelectableStaticTextModifier = node.also { it.params = params }
- }
+ val selectableTextModifier = SelectableTextAnnotatedStringElement(
+ text,
+ style,
+ fontFamilyResolver,
+ onTextLayout,
+ overflow,
+ softWrap,
+ maxLines,
+ minLines,
+ placeholders,
+ onPlaceholderLayout,
+ selectionController
+ )
return this then selectionController.modifier then selectableTextModifier
}
}
diff --git a/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/MinMaxLinesCoercer.kt b/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/MinMaxLinesCoercer.kt
index 8d114fc..c616ac9 100644
--- a/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/MinMaxLinesCoercer.kt
+++ b/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/MinMaxLinesCoercer.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2023 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/MultiParagraphLayoutCache.kt b/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/MultiParagraphLayoutCache.kt
index f44de77..fa494d1 100644
--- a/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/MultiParagraphLayoutCache.kt
+++ b/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/MultiParagraphLayoutCache.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2023 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,12 +16,16 @@
package androidx.compose.foundation.newtext.text.modifiers
+import androidx.compose.foundation.newtext.text.DefaultMinLines
import androidx.compose.foundation.newtext.text.ceilToIntPx
-import androidx.compose.ui.text.ExperimentalTextApi
+import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.MultiParagraph
import androidx.compose.ui.text.MultiParagraphIntrinsics
+import androidx.compose.ui.text.Placeholder
import androidx.compose.ui.text.TextLayoutInput
import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.resolveDefaults
import androidx.compose.ui.text.style.LineBreak
import androidx.compose.ui.text.style.TextOverflow
@@ -32,18 +36,38 @@
import androidx.compose.ui.unit.constrain
internal class MultiParagraphLayoutCache(
- private val params: StaticTextLayoutDrawParams,
- private val density: Density
+ private var text: AnnotatedString,
+ private var style: TextStyle,
+ private var fontFamilyResolver: FontFamily.Resolver,
+ private var overflow: TextOverflow = TextOverflow.Clip,
+ private var softWrap: Boolean = true,
+ private var maxLines: Int = Int.MAX_VALUE,
+ private var minLines: Int = DefaultMinLines,
+ private var placeholders: List<AnnotatedString.Range<Placeholder>>? = null,
) {
private var minMaxLinesCoercer: MinMaxLinesCoercer? = null
+ internal var density: Density? = null
+ set(value) {
+ val localField = field
+ if (value == null || localField == null) {
+ field = value
+ return
+ }
+
+ if (localField.density != value.density || localField.fontScale != value.fontScale) {
+ field = value
+ // none of our results are correct if density changed
+ markDirty()
+ }
+ }
/*@VisibleForTesting*/
// NOTE(text-perf-review): it seems like TextDelegate essentially guarantees that we use
// MultiParagraph. Can we have a fast-path that uses just Paragraph in simpler cases (ie,
// String)?
- internal var paragraphIntrinsics: MultiParagraphIntrinsics? = null
+ private var paragraphIntrinsics: MultiParagraphIntrinsics? = null
- internal var intrinsicsLayoutDirection: LayoutDirection? = null
+ private var intrinsicsLayoutDirection: LayoutDirection? = null
private var layoutCache: TextLayoutResult? = null
private var cachedIntrinsicHeight: Pair<Int, Int>? = null
@@ -75,6 +99,120 @@
get() = layoutCache
/**
+ * Update layout constraints for this text
+ *
+ * @return true if constraints caused a text layout invalidation
+ */
+ fun layoutWithConstraints(
+ constraints: Constraints,
+ layoutDirection: LayoutDirection
+ ): Boolean {
+ if (!layoutCache.newLayoutWillBeDifferent(constraints, layoutDirection)) {
+ return false
+ }
+ val finalConstraints = if (maxLines != Int.MAX_VALUE || minLines > 1) {
+ val localMinMax = MinMaxLinesCoercer.from(
+ minMaxLinesCoercer,
+ layoutDirection,
+ style,
+ density!!,
+ fontFamilyResolver
+ ).also {
+ minMaxLinesCoercer = it
+ }
+ localMinMax.coerceMaxMinLines(
+ inConstraints = constraints,
+ minLines = minLines,
+ maxLines = maxLines
+ )
+ } else {
+ constraints
+ }
+ val multiParagraph = layoutText(finalConstraints, layoutDirection)
+
+ val size = finalConstraints.constrain(
+ IntSize(
+ multiParagraph.width.ceilToIntPx(),
+ multiParagraph.height.ceilToIntPx()
+ )
+ )
+
+ layoutCache = TextLayoutResult(
+ TextLayoutInput(
+ text,
+ style,
+ placeholders.orEmpty(),
+ maxLines,
+ softWrap,
+ overflow,
+ density!!,
+ layoutDirection,
+ fontFamilyResolver,
+ finalConstraints
+ ),
+ multiParagraph,
+ size
+ )
+ return true
+ }
+
+ fun intrinsicHeightAt(width: Int, layoutDirection: LayoutDirection): Int {
+ cachedIntrinsicHeight?.let { (prevWidth, prevHeight) ->
+ if (width == prevWidth) return prevHeight
+ }
+ val result = layoutText(
+ Constraints(0, width, 0, Constraints.Infinity),
+ layoutDirection
+ ).height.ceilToIntPx()
+
+ cachedIntrinsicHeight = width to result
+ return result
+ }
+
+ fun update(
+ text: AnnotatedString,
+ style: TextStyle,
+ fontFamilyResolver: FontFamily.Resolver,
+ overflow: TextOverflow,
+ softWrap: Boolean,
+ maxLines: Int,
+ minLines: Int,
+ placeholders: List<AnnotatedString.Range<Placeholder>>?
+ ) {
+ this.text = text
+ this.style = style
+ this.fontFamilyResolver = fontFamilyResolver
+ this.overflow = overflow
+ this.softWrap = softWrap
+ this.maxLines = maxLines
+ this.minLines = minLines
+ this.placeholders = placeholders
+ markDirty()
+ }
+
+ private fun setLayoutDirection(layoutDirection: LayoutDirection) {
+ val localIntrinsics = paragraphIntrinsics
+ val intrinsics = if (
+ localIntrinsics == null ||
+ layoutDirection != intrinsicsLayoutDirection ||
+ localIntrinsics.hasStaleResolvedFonts
+ ) {
+ intrinsicsLayoutDirection = layoutDirection
+ MultiParagraphIntrinsics(
+ annotatedString = text,
+ style = resolveDefaults(style, layoutDirection),
+ density = density!!,
+ fontFamilyResolver = fontFamilyResolver,
+ placeholders = placeholders.orEmpty()
+ )
+ } else {
+ localIntrinsics
+ }
+
+ paragraphIntrinsics = intrinsics
+ }
+
+ /**
* Computes the visual position of the glyphs for painting the text.
*
* The text will layout with a width that's as close to its max intrinsic width as possible
@@ -87,7 +225,7 @@
setLayoutDirection(layoutDirection)
val minWidth = constraints.minWidth
- val widthMatters = params.softWrap || params.overflow == TextOverflow.Ellipsis
+ val widthMatters = softWrap || overflow == TextOverflow.Ellipsis
val maxWidth = if (widthMatters && constraints.hasBoundedWidth) {
constraints.maxWidth
} else {
@@ -108,8 +246,8 @@
// AA…
// Here we assume there won't be any '\n' character when softWrap is false. And make
// maxLines 1 to implement the similar behavior.
- val overwriteMaxLines = !params.softWrap && params.overflow == TextOverflow.Ellipsis
- val finalMaxLines = if (overwriteMaxLines) 1 else params.maxLines.coerceAtLeast(1)
+ val overwriteMaxLines = !softWrap && overflow == TextOverflow.Ellipsis
+ val finalMaxLines = if (overwriteMaxLines) 1 else maxLines.coerceAtLeast(1)
// if minWidth == maxWidth the width is fixed.
// therefore we can pass that value to our paragraph and use it
@@ -131,92 +269,11 @@
constraints = Constraints(maxWidth = width, maxHeight = constraints.maxHeight),
// This is a fallback behavior for ellipsis. Native
maxLines = finalMaxLines,
- ellipsis = params.overflow == TextOverflow.Ellipsis
+ ellipsis = overflow == TextOverflow.Ellipsis
)
}
- private fun setLayoutDirection(layoutDirection: LayoutDirection) {
- val localIntrinsics = paragraphIntrinsics
- val intrinsics = if (
- localIntrinsics == null ||
- layoutDirection != intrinsicsLayoutDirection ||
- localIntrinsics.hasStaleResolvedFonts
- ) {
- intrinsicsLayoutDirection = layoutDirection
- MultiParagraphIntrinsics(
- annotatedString = params.text,
- style = resolveDefaults(params.style, layoutDirection),
- density = density,
- fontFamilyResolver = params.fontFamilyResolver,
- placeholders = params.placeholders.orEmpty()
- )
- } else {
- localIntrinsics
- }
-
- paragraphIntrinsics = intrinsics
- }
-
- /**
- * Update layout constraints for this text
- *
- * @return true if constraints caused a text layout invalidation
- */
- fun layoutWithConstraints(
- constraints: Constraints,
- layoutDirection: LayoutDirection
- ): Boolean {
- if (!layoutCache.newConstraintsProduceNewLayout(constraints, layoutDirection)) {
- return false
- }
- val finalConstraints = if (params.maxLines != Int.MAX_VALUE || params.minLines > 1) {
- val localMinMax = MinMaxLinesCoercer.from(
- minMaxLinesCoercer,
- layoutDirection,
- params.style,
- density,
- params.fontFamilyResolver
- ).also {
- minMaxLinesCoercer = it
- }
- localMinMax.coerceMaxMinLines(
- inConstraints = constraints,
- minLines = params.minLines,
- maxLines = params.maxLines
- )
- } else {
- constraints
- }
- val multiParagraph = layoutText(finalConstraints, layoutDirection)
-
- val size = finalConstraints.constrain(
- IntSize(
- multiParagraph.width.ceilToIntPx(),
- multiParagraph.height.ceilToIntPx()
- )
- )
-
- layoutCache = TextLayoutResult(
- TextLayoutInput(
- params.text,
- params.style,
- params.placeholders.orEmpty(),
- params.maxLines,
- params.softWrap,
- params.overflow,
- density,
- layoutDirection,
- params.fontFamilyResolver,
- finalConstraints
- ),
- multiParagraph,
- size
- )
- return true
- }
-
- @OptIn(ExperimentalTextApi::class)
- private fun TextLayoutResult?.newConstraintsProduceNewLayout(
+ private fun TextLayoutResult?.newLayoutWillBeDifferent(
constraints: Constraints,
layoutDirection: LayoutDirection
): Boolean {
@@ -234,17 +291,17 @@
// only be clever if we can predict line break behavior exactly, which is only possible with
// simple geometry math for the greedy layout case
- if (params.style.lineBreak != LineBreak.Simple) {
+ if (style.lineBreak != LineBreak.Simple) {
return true
}
// see if width would produce the same wraps (greedy wraps only)
- val canWrap = params.softWrap && params.maxLines > 1
+ val canWrap = softWrap && maxLines > 1
if (canWrap && size.width != multiParagraph.maxIntrinsicWidth.ceilToIntPx()) {
// some soft wrapping happened, check to see if we're between the previous measure and
// the next wrap
- val prevActualMaxWidth = params.paraMaxWidthFor(layoutInput.constraints)
- val newMaxWidth = params.paraMaxWidthFor(constraints)
+ val prevActualMaxWidth = maxWidth(layoutInput.constraints)
+ val newMaxWidth = maxWidth(constraints)
if (newMaxWidth > prevActualMaxWidth) {
// we've grown the potential layout area, and may break longer lines
return true
@@ -273,7 +330,7 @@
return false
}
- private fun StaticTextLayoutDrawParams.paraMaxWidthFor(constraints: Constraints): Int {
+ private fun maxWidth(constraints: Constraints): Int {
val minWidth = constraints.minWidth
val widthMatters = softWrap || overflow == TextOverflow.Ellipsis
val maxWidth = if (widthMatters && constraints.hasBoundedWidth) {
@@ -288,20 +345,8 @@
}
}
- fun intrinsicHeightAt(width: Int, layoutDirection: LayoutDirection): Int {
- cachedIntrinsicHeight?.let { (prevWidth, prevHeight) ->
- if (width == prevWidth) return prevHeight
- }
- val result = layoutText(
- Constraints(0, width, 0, Constraints.Infinity),
- layoutDirection
- ).height.ceilToIntPx()
-
- cachedIntrinsicHeight = width to result
- return result
- }
-
- fun diff(value: StaticTextLayoutDrawParams): StaticTextLayoutDrawParamsDiff {
- return params.diff(value)
+ private fun markDirty() {
+ paragraphIntrinsics = null
+ layoutCache = null
}
}
\ No newline at end of file
diff --git a/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/SelectableStaticTextModifier.kt b/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/SelectableStaticTextModifier.kt
deleted file mode 100644
index 957dfb8..0000000
--- a/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/SelectableStaticTextModifier.kt
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.compose.foundation.newtext.text.modifiers
-
-import androidx.compose.ui.ExperimentalComposeUiApi
-import androidx.compose.ui.graphics.drawscope.ContentDrawScope
-import androidx.compose.ui.layout.IntrinsicMeasurable
-import androidx.compose.ui.layout.IntrinsicMeasureScope
-import androidx.compose.ui.layout.LayoutCoordinates
-import androidx.compose.ui.layout.Measurable
-import androidx.compose.ui.layout.MeasureResult
-import androidx.compose.ui.layout.MeasureScope
-import androidx.compose.ui.node.DelegatingNode
-import androidx.compose.ui.node.DrawModifierNode
-import androidx.compose.ui.node.GlobalPositionAwareModifierNode
-import androidx.compose.ui.node.LayoutModifierNode
-import androidx.compose.ui.node.SemanticsModifierNode
-import androidx.compose.ui.node.invalidateMeasurements
-import androidx.compose.ui.semantics.SemanticsConfiguration
-import androidx.compose.ui.unit.Constraints
-
-@OptIn(ExperimentalComposeUiApi::class)
-internal class SelectableStaticTextModifier(
- params: StaticTextLayoutDrawParams
-) : DelegatingNode(), LayoutModifierNode, DrawModifierNode, GlobalPositionAwareModifierNode,
- SemanticsModifierNode {
-
- private val delegate = delegated { StaticTextModifier(params) }
-
- init {
- requireNotNull(params.selectionController) {
- "Do not use SelectionCapableStaticTextModifier unless selectionController != null"
- }
- }
-
- var params: StaticTextLayoutDrawParams = params
- set(value) {
- field = value
- delegate.params = value
-
- // selection means we always have to invalidate on set to redo position
- invalidateMeasurements()
- }
-
- override fun onGloballyPositioned(coordinates: LayoutCoordinates) {
- params.selectionController?.updateGlobalPosition(coordinates)
- }
-
- override fun ContentDrawScope.draw() = delegate.drawNonExtension(this)
-
- override fun MeasureScope.measure(
- measurable: Measurable,
- constraints: Constraints
- ): MeasureResult = delegate.measureNonExtension(this, measurable, constraints)
-
- override val semanticsConfiguration: SemanticsConfiguration
- get() = delegate.semanticsConfiguration
-
- override fun IntrinsicMeasureScope.minIntrinsicWidth(
- measurable: IntrinsicMeasurable,
- height: Int
- ): Int = delegate.minIntrinsicWidthNonExtension(this, measurable, height)
-
- override fun IntrinsicMeasureScope.minIntrinsicHeight(
- measurable: IntrinsicMeasurable,
- width: Int
- ): Int = delegate.minIntrinsicHeightNonExtension(this, measurable, width)
-
- override fun IntrinsicMeasureScope.maxIntrinsicWidth(
- measurable: IntrinsicMeasurable,
- height: Int
- ): Int = delegate.maxIntrinsicWidthNonExtension(this, measurable, height)
-
- override fun IntrinsicMeasureScope.maxIntrinsicHeight(
- measurable: IntrinsicMeasurable,
- width: Int
- ): Int = delegate.maxIntrinsicHeightNonExtension(this, measurable, width)
-}
\ No newline at end of file
diff --git a/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/SelectableTextAnnotatedStringElement.kt b/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/SelectableTextAnnotatedStringElement.kt
new file mode 100644
index 0000000..1514df6
--- /dev/null
+++ b/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/SelectableTextAnnotatedStringElement.kt
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.foundation.newtext.text.modifiers
+
+import androidx.compose.foundation.newtext.text.DefaultMinLines
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.geometry.Rect
+import androidx.compose.ui.node.ModifierNodeElement
+import androidx.compose.ui.platform.debugInspectorInfo
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.Placeholder
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.style.TextOverflow
+
+@ExperimentalComposeUiApi
+internal class SelectableTextAnnotatedStringElement(
+ private val text: AnnotatedString,
+ private val style: TextStyle,
+ private val fontFamilyResolver: FontFamily.Resolver,
+ private val onTextLayout: ((TextLayoutResult) -> Unit)? = null,
+ private val overflow: TextOverflow = TextOverflow.Clip,
+ private val softWrap: Boolean = true,
+ private val maxLines: Int = Int.MAX_VALUE,
+ private val minLines: Int = DefaultMinLines,
+ private val placeholders: List<AnnotatedString.Range<Placeholder>>? = null,
+ private val onPlaceholderLayout: ((List<Rect?>) -> Unit)? = null,
+ private val selectionController: SelectionController? = null
+) : ModifierNodeElement<SelectableTextAnnotatedStringNode>(inspectorInfo = debugInspectorInfo { }) {
+ override fun create(): SelectableTextAnnotatedStringNode = SelectableTextAnnotatedStringNode(
+ text,
+ style,
+ fontFamilyResolver,
+ onTextLayout,
+ overflow,
+ softWrap,
+ maxLines,
+ minLines,
+ placeholders,
+ onPlaceholderLayout,
+ selectionController
+ )
+
+ override fun update(
+ node: SelectableTextAnnotatedStringNode
+ ): SelectableTextAnnotatedStringNode {
+ node.update(
+ text = text,
+ style = style,
+ placeholders = placeholders,
+ minLines = minLines,
+ maxLines = maxLines,
+ softWrap = softWrap,
+ fontFamilyResolver = fontFamilyResolver,
+ overflow = overflow,
+ >
+ >
+ selectionController = selectionController
+ )
+ return node
+ }
+
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+
+ if (other !is SelectableTextAnnotatedStringElement) return false
+
+ // these three are most likely to actually change
+ if (text != other.text) return false
+ if (style != other.style) return false
+ if (placeholders != other.placeholders) return false
+
+ // these are equally unlikely to change
+ if (fontFamilyResolver != other.fontFamilyResolver) return false
+ if (onTextLayout != other.onTextLayout) return false
+ if (overflow != other.overflow) return false
+ if (softWrap != other.softWrap) return false
+ if (maxLines != other.maxLines) return false
+ if (minLines != other.minLines) return false
+
+ // these never change, but check anyway for correctness
+ if (onPlaceholderLayout != other.onPlaceholderLayout) return false
+ if (selectionController != other.selectionController) return false
+
+ return true
+ }
+
+ override fun hashCode(): Int {
+ var result = super.hashCode()
+ result = 31 * result + text.hashCode()
+ result = 31 * result + style.hashCode()
+ result = 31 * result + fontFamilyResolver.hashCode()
+ result = 31 * result + (onTextLayout?.hashCode() ?: 0)
+ result = 31 * result + overflow.hashCode()
+ result = 31 * result + softWrap.hashCode()
+ result = 31 * result + maxLines
+ result = 31 * result + minLines
+ result = 31 * result + (placeholders?.hashCode() ?: 0)
+ result = 31 * result + (onPlaceholderLayout?.hashCode() ?: 0)
+ result = 31 * result + (selectionController?.hashCode() ?: 0)
+ return result
+ }
+}
\ No newline at end of file
diff --git a/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/SelectableTextAnnotatedStringNode.kt b/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/SelectableTextAnnotatedStringNode.kt
new file mode 100644
index 0000000..c369c40
--- /dev/null
+++ b/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/SelectableTextAnnotatedStringNode.kt
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.foundation.newtext.text.modifiers
+
+import androidx.compose.foundation.newtext.text.DefaultMinLines
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.geometry.Rect
+import androidx.compose.ui.graphics.drawscope.ContentDrawScope
+import androidx.compose.ui.layout.IntrinsicMeasurable
+import androidx.compose.ui.layout.IntrinsicMeasureScope
+import androidx.compose.ui.layout.LayoutCoordinates
+import androidx.compose.ui.layout.Measurable
+import androidx.compose.ui.layout.MeasureResult
+import androidx.compose.ui.layout.MeasureScope
+import androidx.compose.ui.node.DelegatingNode
+import androidx.compose.ui.node.DrawModifierNode
+import androidx.compose.ui.node.GlobalPositionAwareModifierNode
+import androidx.compose.ui.node.LayoutModifierNode
+import androidx.compose.ui.node.SemanticsModifierNode
+import androidx.compose.ui.node.invalidateMeasurements
+import androidx.compose.ui.semantics.SemanticsConfiguration
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.Placeholder
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Constraints
+
+@OptIn(ExperimentalComposeUiApi::class)
+internal class SelectableTextAnnotatedStringNode(
+ text: AnnotatedString,
+ style: TextStyle,
+ fontFamilyResolver: FontFamily.Resolver,
+ onTextLayout: ((TextLayoutResult) -> Unit)? = null,
+ overflow: TextOverflow = TextOverflow.Clip,
+ softWrap: Boolean = true,
+ maxLines: Int = Int.MAX_VALUE,
+ minLines: Int = DefaultMinLines,
+ placeholders: List<AnnotatedString.Range<Placeholder>>? = null,
+ onPlaceholderLayout: ((List<Rect?>) -> Unit)? = null,
+ private val selectionController: SelectionController? = null
+) : DelegatingNode(), LayoutModifierNode, DrawModifierNode, GlobalPositionAwareModifierNode,
+ SemanticsModifierNode {
+
+ private val delegate = delegated {
+ TextAnnotatedStringNode(
+ text = text,
+ style = style,
+ fontFamilyResolver = fontFamilyResolver,
+ >
+ overflow = overflow,
+ softWrap = softWrap,
+ maxLines = maxLines,
+ minLines = minLines,
+ placeholders = placeholders,
+ >
+ selectionController = selectionController
+ )
+ }
+
+ init {
+ requireNotNull(selectionController) {
+ "Do not use SelectionCapableStaticTextModifier unless selectionController != null"
+ }
+ }
+
+ override fun onGloballyPositioned(coordinates: LayoutCoordinates) {
+ selectionController?.updateGlobalPosition(coordinates)
+ }
+
+ override fun ContentDrawScope.draw() = delegate.drawNonExtension(this)
+
+ override fun MeasureScope.measure(
+ measurable: Measurable,
+ constraints: Constraints
+ ): MeasureResult = delegate.measureNonExtension(this, measurable, constraints)
+
+ override val semanticsConfiguration: SemanticsConfiguration
+ get() = delegate.semanticsConfiguration
+
+ override fun IntrinsicMeasureScope.minIntrinsicWidth(
+ measurable: IntrinsicMeasurable,
+ height: Int
+ ): Int = delegate.minIntrinsicWidthNonExtension(this, measurable, height)
+
+ override fun IntrinsicMeasureScope.minIntrinsicHeight(
+ measurable: IntrinsicMeasurable,
+ width: Int
+ ): Int = delegate.minIntrinsicHeightNonExtension(this, measurable, width)
+
+ override fun IntrinsicMeasureScope.maxIntrinsicWidth(
+ measurable: IntrinsicMeasurable,
+ height: Int
+ ): Int = delegate.maxIntrinsicWidthNonExtension(this, measurable, height)
+
+ override fun IntrinsicMeasureScope.maxIntrinsicHeight(
+ measurable: IntrinsicMeasurable,
+ width: Int
+ ): Int = delegate.maxIntrinsicHeightNonExtension(this, measurable, width)
+
+ fun update(
+ text: AnnotatedString,
+ style: TextStyle,
+ placeholders: List<AnnotatedString.Range<Placeholder>>?,
+ minLines: Int,
+ maxLines: Int,
+ softWrap: Boolean,
+ fontFamilyResolver: FontFamily.Resolver,
+ overflow: TextOverflow,
+ onTextLayout: ((TextLayoutResult) -> Unit)?,
+ onPlaceholderLayout: ((List<Rect?>) -> Unit)?,
+ selectionController: SelectionController?
+ ) {
+ delegate.doInvalidations(
+ textChanged = delegate.updateText(
+ text = text
+ ),
+ layoutChanged = delegate.updateLayoutRelatedArgs(
+ style = style,
+ placeholders = placeholders,
+ minLines = minLines,
+ maxLines = maxLines,
+ softWrap = softWrap,
+ fontFamilyResolver = fontFamilyResolver,
+ overflow = overflow
+ ),
+ callbacksChanged = delegate.updateCallbacks(
+ >
+ >
+ selectionController = selectionController
+ )
+ )
+ // we always relayout when we're selectable
+ invalidateMeasurements()
+ }
+}
\ No newline at end of file
diff --git a/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/StaticTextSelectionModifierController.kt b/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/SelectionController.kt
similarity index 98%
rename from compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/StaticTextSelectionModifierController.kt
rename to compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/SelectionController.kt
index 02a2ced8..ed21488 100644
--- a/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/StaticTextSelectionModifierController.kt
+++ b/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/SelectionController.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2023 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -47,9 +47,9 @@
// This is _basically_ a Modifier.Node but moved into remember because we need to do pointerInput
// TODO: Refactor when Modifier.pointerInput is available for delegation
-internal class StaticTextSelectionModifierController(
- val selectionRegistrar: SelectionRegistrar,
- val backgroundSelectionColor: Color
+internal class SelectionController(
+ private val selectionRegistrar: SelectionRegistrar,
+ private val backgroundSelectionColor: Color
) : RememberObserver {
private var selectable: Selectable? = null
private val selectableId = selectionRegistrar.nextSelectableId()
diff --git a/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/StaticTextLayoutDrawParams.kt b/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/StaticTextLayoutDrawParams.kt
deleted file mode 100644
index 5315354..0000000
--- a/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/StaticTextLayoutDrawParams.kt
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.compose.foundation.newtext.text.modifiers
-
-import androidx.compose.foundation.newtext.text.DefaultMinLines
-import androidx.compose.ui.geometry.Rect
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.Placeholder
-import androidx.compose.ui.text.TextLayoutResult
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.style.TextOverflow
-import kotlin.experimental.and
-import kotlin.experimental.or
-
-// TODO(seanmcq): break this into (text, style) and (rest...) objects to avoid high-invalidation cost
-// TODO(seanmcq): Explore this holding non-AnnotatedString (future perf opt)
-internal data class StaticTextLayoutDrawParams constructor(
- val text: AnnotatedString,
- val style: TextStyle,
- val fontFamilyResolver: FontFamily.Resolver,
- val onTextLayout: ((TextLayoutResult) -> Unit)? = null,
- val overflow: TextOverflow = TextOverflow.Clip,
- val softWrap: Boolean = true,
- val maxLines: Int = Int.MAX_VALUE,
- val minLines: Int = DefaultMinLines,
- val placeholders: List<AnnotatedString.Range<Placeholder>>? = null,
- val onPlaceholderLayout: ((List<Rect?>) -> Unit)? = null,
- val selectionController: StaticTextSelectionModifierController? = null
-) {
- init {
- validateMinMaxLines(minLines, maxLines)
- }
-}
-
-internal fun StaticTextLayoutDrawParams.diff(
- other: StaticTextLayoutDrawParams
-): StaticTextLayoutDrawParamsDiff {
- return packCompares(
- text = text != other.text,
- style = style != other.style,
- placeholders = placeholders != other.placeholders,
- layoutParams = !(minLines == other.minLines && maxLines == other.maxLines &&
- softWrap == other.softWrap &&
- fontFamilyResolver == other.fontFamilyResolver &&
- overflow == other.overflow),
- != other.onTextLayout,
- != other.onPlaceholderLayout,
- selectionController = selectionController != other.selectionController
- )
-}
-
-@JvmInline
-internal value class StaticTextLayoutDrawParamsDiff(internal val value: Short)
-
-internal const val TextFlag: Short = 0b0000000000000001
-private const val StyleFlag: Short = 0b0000000000000010
-private const val PlaceholderFlag: Short = 0b0000000000000100
-private const val LayoutFlag: Short = 0b0000000000001000
-private const val CallbackFlag: Short = 0b0000000000010000
-private const val SelectionFlag: Short = 0b0000000000100000
-
-private val AllLayoutAffectingFlags =
- TextFlag or StyleFlag or PlaceholderFlag or LayoutFlag
-
-private val AllCallbackFlags =
- CallbackFlag or SelectionFlag
-
-internal val StaticTextLayoutDrawParamsDiff.anyDiffs
- get() = value != 0.toShort()
-
-internal val StaticTextLayoutDrawParamsDiff.hasLayoutDiffs: Boolean
- get() = (value and AllLayoutAffectingFlags).toInt() != 0
-
-internal val StaticTextLayoutDrawParamsDiff.hasSemanticsDiffs: Boolean
- get() = (value and TextFlag).toInt() != 0
-
-internal val StaticTextLayoutDrawParamsDiff.hasCallbackDiffs: Boolean
- get() = (value and AllCallbackFlags).toInt() != 0
-
-private fun packCompares(
- text: Boolean,
- style: Boolean,
- placeholders: Boolean,
- layoutParams: Boolean,
- onTextLayout: Boolean,
- onPlaceholderLayout: Boolean,
- selectionController: Boolean
-): StaticTextLayoutDrawParamsDiff {
- return StaticTextLayoutDrawParamsDiff(
- text.adds(TextFlag) or
- style.adds(StyleFlag) or
- placeholders.adds(PlaceholderFlag) or
- layoutParams.adds(LayoutFlag) or
- (onTextLayout || onPlaceholderLayout).adds(CallbackFlag) or
- selectionController.adds(SelectionFlag)
- )
-}
-
-private fun Boolean.adds(result: Short): Short {
- return if (this) result else 0
-}
diff --git a/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/StaticTextModifier.kt b/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/StaticTextModifier.kt
deleted file mode 100644
index 9ce4c4e..0000000
--- a/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/StaticTextModifier.kt
+++ /dev/null
@@ -1,255 +0,0 @@
-package androidx.compose.foundation.newtext.text.modifiers
-
-import androidx.compose.ui.ExperimentalComposeUiApi
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.drawscope.ContentDrawScope
-import androidx.compose.ui.graphics.drawscope.drawIntoCanvas
-import androidx.compose.ui.layout.AlignmentLine
-import androidx.compose.ui.layout.FirstBaseline
-import androidx.compose.ui.layout.IntrinsicMeasurable
-import androidx.compose.ui.layout.IntrinsicMeasureScope
-import androidx.compose.ui.layout.LastBaseline
-import androidx.compose.ui.layout.Measurable
-import androidx.compose.ui.layout.MeasureResult
-import androidx.compose.ui.layout.MeasureScope
-import androidx.compose.ui.node.DrawModifierNode
-import androidx.compose.ui.node.LayoutModifierNode
-import androidx.compose.ui.node.SemanticsModifierNode
-import androidx.compose.ui.node.invalidateDraw
-import androidx.compose.ui.node.invalidateLayer
-import androidx.compose.ui.node.invalidateMeasurements
-import androidx.compose.ui.node.invalidateSemantics
-import androidx.compose.ui.semantics.SemanticsConfiguration
-import androidx.compose.ui.semantics.getTextLayoutResult
-import androidx.compose.ui.semantics.text
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.TextLayoutResult
-import androidx.compose.ui.text.TextPainter
-import androidx.compose.ui.unit.Constraints
-import androidx.compose.ui.unit.Density
-import kotlin.math.roundToInt
-
-/**
- * Modifier that does Layout and Draw for [StaticTextLayoutDrawParams]
- */
-@OptIn(ExperimentalComposeUiApi::class)
-internal class StaticTextModifier(
- params: StaticTextLayoutDrawParams
-) : Modifier.Node(), LayoutModifierNode, DrawModifierNode, SemanticsModifierNode {
- private var baselineCache: Map<AlignmentLine, Int>? = null
- private var layoutCache: MultiParagraphLayoutCache? = null
- private var textDelegateDirty = true
-
- internal var params: StaticTextLayoutDrawParams = params
- set(value) {
- validate(value)
- field = value
- layoutCache?.let { cache ->
- val diff = cache.diff(value)
- if (diff.hasSemanticsDiffs) {
- _semanticsConfiguration = null
- invalidateSemantics()
- }
- if (diff.hasLayoutDiffs || diff.hasCallbackDiffs) {
- textDelegateDirty = true
- invalidateMeasurements()
- }
- if (diff.anyDiffs) {
- // if anything changed we redraw
- invalidateDraw()
- }
- return
- }
-
- // if no layout has happened, 🎶 just invalidate everything 🎶
- // we don't expect to hit this often, but if we do don't keep anything around from
- // the previous params and restart all passes ⚽
- _semanticsConfiguration = null
- textDelegateDirty = true
- invalidateSemantics()
- invalidateMeasurements()
- invalidateDraw()
- }
-
- private var _semanticsConfiguration: SemanticsConfiguration? = null
-
- private var semanticsTextLayoutResult: ((MutableList<TextLayoutResult>) -> Boolean)? = null
-
- private fun generateSemantics(text: AnnotatedString): SemanticsConfiguration {
- var localSemanticsTextLayoutResult = semanticsTextLayoutResult
- if (localSemanticsTextLayoutResult == null) {
- localSemanticsTextLayoutResult = { textLayoutResult ->
- val layout = layoutCache?.layoutOrNull?.also {
- textLayoutResult.add(it)
- }
- layout != null
- }
- semanticsTextLayoutResult = localSemanticsTextLayoutResult
- }
- return SemanticsConfiguration().also {
- it.isMergingSemanticsOfDescendants = false
- it.isClearingSemantics = false
- it.text = text
- it.getTextLayoutResult(action = localSemanticsTextLayoutResult)
- }
- }
-
- override val semanticsConfiguration: SemanticsConfiguration
- get() {
- var localSemantics = _semanticsConfiguration
- if (localSemantics == null) {
- localSemantics = generateSemantics(params.text)
- _semanticsConfiguration = localSemantics
- }
- return localSemantics
- }
-
- private fun validate(params: StaticTextLayoutDrawParams) {
- validateMinMaxLines(params.minLines, params.maxLines)
- }
-
- private fun getOrUpdateTextDelegateInLayout(
- density: Density
- ): MultiParagraphLayoutCache {
- val localLayoutCache = layoutCache
- return if (!textDelegateDirty && localLayoutCache != null) {
- localLayoutCache
- } else {
- val textDelegate = MultiParagraphLayoutCache(params, density)
- this.layoutCache = textDelegate
- textDelegateDirty = false
- textDelegate
- }
- }
-
- fun measureNonExtension(
- measureScope: MeasureScope,
- measurable: Measurable,
- constraints: Constraints
- ): MeasureResult {
- return measureScope.measure(measurable, constraints)
- }
-
- override fun MeasureScope.measure(
- measurable: Measurable,
- constraints: Constraints
- ): MeasureResult {
- val td = getOrUpdateTextDelegateInLayout(this)
-
- val didChangeLayout = td.layoutWithConstraints(constraints, layoutDirection)
- val textLayoutResult = td.layout
-
- // ensure measure restarts when hasStaleResolvedFonts by reading in measure
- textLayoutResult.multiParagraph.intrinsics.hasStaleResolvedFonts
-
- if (didChangeLayout) {
- invalidateLayer()
- params.onTextLayout?.invoke(textLayoutResult)
- params.selectionController?.updateTextLayout(textLayoutResult)
- baselineCache = mapOf(
- FirstBaseline to textLayoutResult.firstBaseline.roundToInt(),
- LastBaseline to textLayoutResult.lastBaseline.roundToInt()
- )
- }
-
- // first share the placeholders
- params.onPlaceholderLayout?.invoke(textLayoutResult.placeholderRects)
-
- // then allow children to measure _inside_ our final box, with the above placeholders
- val placeable = measurable.measure(
- Constraints.fixed(
- textLayoutResult.size.width,
- textLayoutResult.size.height
- )
- )
-
- return layout(
- textLayoutResult.size.width,
- textLayoutResult.size.height,
- baselineCache!!
- ) {
- // this is basically a graphicsLayer
- placeable.place(0, 0)
- }
- }
-
- fun minIntrinsicWidthNonExtension(
- intrinsicMeasureScope: IntrinsicMeasureScope,
- measurable: IntrinsicMeasurable,
- height: Int
- ): Int {
- return intrinsicMeasureScope.minIntrinsicWidth(measurable, height)
- }
-
- override fun IntrinsicMeasureScope.minIntrinsicWidth(
- measurable: IntrinsicMeasurable,
- height: Int
- ): Int {
- val td = getOrUpdateTextDelegateInLayout(this)
- return td.minIntrinsicWidth
- }
-
- fun minIntrinsicHeightNonExtension(
- intrinsicMeasureScope: IntrinsicMeasureScope,
- measurable: IntrinsicMeasurable,
- width: Int
- ): Int {
- return intrinsicMeasureScope.minIntrinsicHeight(measurable, width)
- }
-
- override fun IntrinsicMeasureScope.minIntrinsicHeight(
- measurable: IntrinsicMeasurable,
- width: Int
- ): Int {
- return getOrUpdateTextDelegateInLayout(this)
- .intrinsicHeightAt(width, layoutDirection)
- }
-
- fun maxIntrinsicWidthNonExtension(
- intrinsicMeasureScope: IntrinsicMeasureScope,
- measurable: IntrinsicMeasurable,
- height: Int
- ): Int {
- return intrinsicMeasureScope.maxIntrinsicWidth(measurable, height)
- }
-
- override fun IntrinsicMeasureScope.maxIntrinsicWidth(
- measurable: IntrinsicMeasurable,
- height: Int
- ): Int {
- val td = getOrUpdateTextDelegateInLayout(this)
- return td.maxIntrinsicWidth
- }
-
- fun maxIntrinsicHeightNonExtension(
- intrinsicMeasureScope: IntrinsicMeasureScope,
- measurable: IntrinsicMeasurable,
- width: Int
- ): Int {
- return intrinsicMeasureScope.maxIntrinsicHeight(measurable, width)
- }
-
- override fun IntrinsicMeasureScope.maxIntrinsicHeight(
- measurable: IntrinsicMeasurable,
- width: Int
- ): Int {
- return getOrUpdateTextDelegateInLayout(this)
- .intrinsicHeightAt(width, layoutDirection)
- }
-
- fun drawNonExtension(
- contentDrawScope: ContentDrawScope
- ) {
- return contentDrawScope.draw()
- }
-
- override fun ContentDrawScope.draw() {
- params.selectionController?.draw(this)
- drawIntoCanvas { canvas ->
- TextPainter.paint(canvas, requireNotNull(layoutCache?.layout))
- }
- if (!params.placeholders.isNullOrEmpty()) {
- drawContent()
- }
- }
-}
\ No newline at end of file
diff --git a/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/TextAnnotatedStringElement.kt b/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/TextAnnotatedStringElement.kt
new file mode 100644
index 0000000..1204125
--- /dev/null
+++ b/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/TextAnnotatedStringElement.kt
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.foundation.newtext.text.modifiers
+
+import androidx.compose.foundation.newtext.text.DefaultMinLines
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.geometry.Rect
+import androidx.compose.ui.node.ModifierNodeElement
+import androidx.compose.ui.platform.debugInspectorInfo
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.Placeholder
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.style.TextOverflow
+
+@ExperimentalComposeUiApi
+internal class TextAnnotatedStringElement(
+ private val text: AnnotatedString,
+ private val style: TextStyle,
+ private val fontFamilyResolver: FontFamily.Resolver,
+ private val onTextLayout: ((TextLayoutResult) -> Unit)? = null,
+ private val overflow: TextOverflow = TextOverflow.Clip,
+ private val softWrap: Boolean = true,
+ private val maxLines: Int = Int.MAX_VALUE,
+ private val minLines: Int = DefaultMinLines,
+ private val placeholders: List<AnnotatedString.Range<Placeholder>>? = null,
+ private val onPlaceholderLayout: ((List<Rect?>) -> Unit)? = null,
+ private val selectionController: SelectionController? = null
+) : ModifierNodeElement<TextAnnotatedStringNode>(inspectorInfo = debugInspectorInfo { }) {
+ override fun create(): TextAnnotatedStringNode = TextAnnotatedStringNode(
+ text,
+ style,
+ fontFamilyResolver,
+ onTextLayout,
+ overflow,
+ softWrap,
+ maxLines,
+ minLines,
+ placeholders,
+ onPlaceholderLayout,
+ selectionController
+ )
+
+ override fun update(node: TextAnnotatedStringNode): TextAnnotatedStringNode {
+ node.doInvalidations(
+ textChanged = node.updateText(
+ text = text
+ ),
+ layoutChanged = node.updateLayoutRelatedArgs(
+ style = style,
+ placeholders = placeholders,
+ minLines = minLines,
+ maxLines = maxLines,
+ softWrap = softWrap,
+ fontFamilyResolver = fontFamilyResolver,
+ overflow = overflow
+ ),
+ callbacksChanged = node.updateCallbacks(
+ >
+ >
+ selectionController = selectionController
+ )
+ )
+ return node
+ }
+
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+
+ if (other !is TextAnnotatedStringElement) return false
+
+ // these three are most likely to actually change
+ if (text != other.text) return false
+ if (style != other.style) return false
+ if (placeholders != other.placeholders) return false
+
+ // these are equally unlikely to change
+ if (fontFamilyResolver != other.fontFamilyResolver) return false
+ if (onTextLayout != other.onTextLayout) return false
+ if (overflow != other.overflow) return false
+ if (softWrap != other.softWrap) return false
+ if (maxLines != other.maxLines) return false
+ if (minLines != other.minLines) return false
+
+ // these never change, but check anyway for correctness
+ if (onPlaceholderLayout != other.onPlaceholderLayout) return false
+ if (selectionController != other.selectionController) return false
+
+ return true
+ }
+
+ override fun hashCode(): Int {
+ var result = super.hashCode()
+ result = 31 * result + text.hashCode()
+ result = 31 * result + style.hashCode()
+ result = 31 * result + fontFamilyResolver.hashCode()
+ result = 31 * result + (onTextLayout?.hashCode() ?: 0)
+ result = 31 * result + overflow.hashCode()
+ result = 31 * result + softWrap.hashCode()
+ result = 31 * result + maxLines
+ result = 31 * result + minLines
+ result = 31 * result + (placeholders?.hashCode() ?: 0)
+ result = 31 * result + (onPlaceholderLayout?.hashCode() ?: 0)
+ result = 31 * result + (selectionController?.hashCode() ?: 0)
+ return result
+ }
+}
\ No newline at end of file
diff --git a/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/TextAnnotatedStringNode.kt b/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/TextAnnotatedStringNode.kt
new file mode 100644
index 0000000..164c4fb
--- /dev/null
+++ b/compose/foundation/foundation-newtext/src/commonMain/kotlin/androidx/compose/foundation/newtext/text/modifiers/TextAnnotatedStringNode.kt
@@ -0,0 +1,344 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.foundation.newtext.text.modifiers
+
+import androidx.compose.foundation.newtext.text.DefaultMinLines
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Rect
+import androidx.compose.ui.graphics.drawscope.ContentDrawScope
+import androidx.compose.ui.graphics.drawscope.drawIntoCanvas
+import androidx.compose.ui.layout.AlignmentLine
+import androidx.compose.ui.layout.FirstBaseline
+import androidx.compose.ui.layout.IntrinsicMeasurable
+import androidx.compose.ui.layout.IntrinsicMeasureScope
+import androidx.compose.ui.layout.LastBaseline
+import androidx.compose.ui.layout.Measurable
+import androidx.compose.ui.layout.MeasureResult
+import androidx.compose.ui.layout.MeasureScope
+import androidx.compose.ui.node.DrawModifierNode
+import androidx.compose.ui.node.LayoutModifierNode
+import androidx.compose.ui.node.SemanticsModifierNode
+import androidx.compose.ui.node.invalidateDraw
+import androidx.compose.ui.node.invalidateLayer
+import androidx.compose.ui.node.invalidateMeasurements
+import androidx.compose.ui.node.invalidateSemantics
+import androidx.compose.ui.semantics.SemanticsConfiguration
+import androidx.compose.ui.semantics.getTextLayoutResult
+import androidx.compose.ui.semantics.text
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.Placeholder
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextPainter
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Constraints
+import androidx.compose.ui.unit.Density
+import kotlin.math.roundToInt
+
+@OptIn(ExperimentalComposeUiApi::class)
+internal class TextAnnotatedStringNode(
+ private var text: AnnotatedString,
+ private var style: TextStyle,
+ private var fontFamilyResolver: FontFamily.Resolver,
+ private var onTextLayout: ((TextLayoutResult) -> Unit)? = null,
+ private var overflow: TextOverflow = TextOverflow.Clip,
+ private var softWrap: Boolean = true,
+ private var maxLines: Int = Int.MAX_VALUE,
+ private var minLines: Int = DefaultMinLines,
+ private var placeholders: List<AnnotatedString.Range<Placeholder>>? = null,
+ private var onPlaceholderLayout: ((List<Rect?>) -> Unit)? = null,
+ private var selectionController: SelectionController? = null
+) : Modifier.Node(), LayoutModifierNode, DrawModifierNode, SemanticsModifierNode {
+ private var baselineCache: Map<AlignmentLine, Int>? = null
+
+ private var _layoutCache: MultiParagraphLayoutCache? = null
+ private val layoutCache: MultiParagraphLayoutCache
+ get() {
+ if (_layoutCache == null) {
+ _layoutCache = MultiParagraphLayoutCache(
+ text,
+ style,
+ fontFamilyResolver,
+ overflow,
+ softWrap,
+ maxLines,
+ minLines,
+ placeholders
+ )
+ }
+ return _layoutCache!!
+ }
+
+ private fun getLayoutCache(density: Density): MultiParagraphLayoutCache {
+ return layoutCache.also { it.density = density }
+ }
+
+ fun updateText(text: AnnotatedString): Boolean {
+ if (this.text == text) return false
+ this.text = text
+ return true
+ }
+
+ fun updateLayoutRelatedArgs(
+ style: TextStyle,
+ placeholders: List<AnnotatedString.Range<Placeholder>>?,
+ minLines: Int,
+ maxLines: Int,
+ softWrap: Boolean,
+ fontFamilyResolver: FontFamily.Resolver,
+ overflow: TextOverflow
+ ): Boolean {
+ var changed = false
+ if (this.style != style) {
+ this.style = style
+ changed = true
+ }
+ if (this.placeholders != placeholders) {
+ this.placeholders = placeholders
+ changed = true
+ }
+
+ if (this.minLines != minLines) {
+ this.minLines = minLines
+ changed = true
+ }
+
+ if (this.maxLines != maxLines) {
+ this.maxLines != maxLines
+ changed = true
+ }
+
+ if (this.softWrap != softWrap) {
+ this.softWrap = softWrap
+ changed = true
+ }
+
+ if (this.fontFamilyResolver != fontFamilyResolver) {
+ this.fontFamilyResolver = fontFamilyResolver
+ changed = true
+ }
+
+ if (this.overflow != overflow) {
+ this.overflow = overflow
+ changed = true
+ }
+
+ return changed
+ }
+
+ fun updateCallbacks(
+ onTextLayout: ((TextLayoutResult) -> Unit)?,
+ onPlaceholderLayout: ((List<Rect?>) -> Unit)?,
+ selectionController: SelectionController?
+ ): Boolean {
+ var changed = false
+
+ if (this.onTextLayout != onTextLayout) {
+ this.>
+ changed = true
+ }
+
+ if (this.onPlaceholderLayout != onPlaceholderLayout) {
+ this.>
+ changed = true
+ }
+
+ if (this.selectionController != selectionController) {
+ this.selectionController = selectionController
+ changed = true
+ }
+ return changed
+ }
+
+ fun doInvalidations(
+ textChanged: Boolean,
+ layoutChanged: Boolean,
+ callbacksChanged: Boolean
+ ) {
+ if (textChanged) {
+ _semanticsConfiguration = null
+ invalidateSemantics()
+ }
+
+ if (textChanged || layoutChanged || callbacksChanged) {
+ layoutCache.update(
+ text = text,
+ style = style,
+ fontFamilyResolver = fontFamilyResolver,
+ overflow = overflow,
+ softWrap = softWrap,
+ maxLines = maxLines,
+ minLines = minLines,
+ placeholders = placeholders
+ )
+ invalidateMeasurements()
+ invalidateDraw()
+ }
+ }
+
+ private var _semanticsConfiguration: SemanticsConfiguration? = null
+
+ private var semanticsTextLayoutResult: ((MutableList<TextLayoutResult>) -> Boolean)? = null
+
+ private fun generateSemantics(text: AnnotatedString): SemanticsConfiguration {
+ var localSemanticsTextLayoutResult = semanticsTextLayoutResult
+ if (localSemanticsTextLayoutResult == null) {
+ localSemanticsTextLayoutResult = { textLayoutResult ->
+ val layout = layoutCache.layoutOrNull?.also {
+ textLayoutResult.add(it)
+ }
+ layout != null
+ }
+ semanticsTextLayoutResult = localSemanticsTextLayoutResult
+ }
+ return SemanticsConfiguration().also {
+ it.isMergingSemanticsOfDescendants = false
+ it.isClearingSemantics = false
+ it.text = text
+ it.getTextLayoutResult(action = localSemanticsTextLayoutResult)
+ }
+ }
+
+ override val semanticsConfiguration: SemanticsConfiguration
+ get() {
+ var localSemantics = _semanticsConfiguration
+ if (localSemantics == null) {
+ localSemantics = generateSemantics(text)
+ _semanticsConfiguration = localSemantics
+ }
+ return localSemantics
+ }
+
+ fun measureNonExtension(
+ measureScope: MeasureScope,
+ measurable: Measurable,
+ constraints: Constraints
+ ): MeasureResult {
+ return measureScope.measure(measurable, constraints)
+ }
+
+ override fun MeasureScope.measure(
+ measurable: Measurable,
+ constraints: Constraints
+ ): MeasureResult {
+ val layoutCache = getLayoutCache(this)
+
+ val didChangeLayout = layoutCache.layoutWithConstraints(constraints, layoutDirection)
+ val textLayoutResult = layoutCache.layout
+
+ // ensure measure restarts when hasStaleResolvedFonts by reading in measure
+ textLayoutResult.multiParagraph.intrinsics.hasStaleResolvedFonts
+
+ if (didChangeLayout) {
+ invalidateLayer()
+ onTextLayout?.invoke(textLayoutResult)
+ selectionController?.updateTextLayout(textLayoutResult)
+ baselineCache = mapOf(
+ FirstBaseline to textLayoutResult.firstBaseline.roundToInt(),
+ LastBaseline to textLayoutResult.lastBaseline.roundToInt()
+ )
+ }
+
+ // first share the placeholders
+ onPlaceholderLayout?.invoke(textLayoutResult.placeholderRects)
+
+ // then allow children to measure _inside_ our final box, with the above placeholders
+ val placeable = measurable.measure(
+ Constraints.fixed(
+ textLayoutResult.size.width,
+ textLayoutResult.size.height
+ )
+ )
+
+ return layout(
+ textLayoutResult.size.width,
+ textLayoutResult.size.height,
+ baselineCache!!
+ ) {
+ // this is basically a graphicsLayer
+ placeable.place(0, 0)
+ }
+ }
+
+ fun minIntrinsicWidthNonExtension(
+ intrinsicMeasureScope: IntrinsicMeasureScope,
+ measurable: IntrinsicMeasurable,
+ height: Int
+ ): Int {
+ return intrinsicMeasureScope.minIntrinsicWidth(measurable, height)
+ }
+
+ override fun IntrinsicMeasureScope.minIntrinsicWidth(
+ measurable: IntrinsicMeasurable,
+ height: Int
+ ): Int {
+ return getLayoutCache(this).minIntrinsicWidth
+ }
+
+ fun minIntrinsicHeightNonExtension(
+ intrinsicMeasureScope: IntrinsicMeasureScope,
+ measurable: IntrinsicMeasurable,
+ width: Int
+ ): Int {
+ return intrinsicMeasureScope.minIntrinsicHeight(measurable, width)
+ }
+
+ override fun IntrinsicMeasureScope.minIntrinsicHeight(
+ measurable: IntrinsicMeasurable,
+ width: Int
+ ): Int = getLayoutCache(this).intrinsicHeightAt(width, layoutDirection)
+
+ fun maxIntrinsicWidthNonExtension(
+ intrinsicMeasureScope: IntrinsicMeasureScope,
+ measurable: IntrinsicMeasurable,
+ height: Int
+ ): Int = intrinsicMeasureScope.maxIntrinsicWidth(measurable, height)
+
+ override fun IntrinsicMeasureScope.maxIntrinsicWidth(
+ measurable: IntrinsicMeasurable,
+ height: Int
+ ): Int = getLayoutCache(this).maxIntrinsicWidth
+
+ fun maxIntrinsicHeightNonExtension(
+ intrinsicMeasureScope: IntrinsicMeasureScope,
+ measurable: IntrinsicMeasurable,
+ width: Int
+ ): Int = intrinsicMeasureScope.maxIntrinsicHeight(measurable, width)
+
+ override fun IntrinsicMeasureScope.maxIntrinsicHeight(
+ measurable: IntrinsicMeasurable,
+ width: Int
+ ): Int = getLayoutCache(this).intrinsicHeightAt(width, layoutDirection)
+
+ fun drawNonExtension(
+ contentDrawScope: ContentDrawScope
+ ) {
+ return contentDrawScope.draw()
+ }
+
+ override fun ContentDrawScope.draw() {
+ selectionController?.draw(this)
+ drawIntoCanvas { canvas ->
+ TextPainter.paint(canvas, requireNotNull(layoutCache.layout))
+ }
+ if (!placeholders.isNullOrEmpty()) {
+ drawContent()
+ }
+ }
+}
\ No newline at end of file
diff --git a/compose/foundation/foundation-newtext/src/test/kotlin/androidx/compose/foundation/newtext/text/modifiers/MultiParagraphLayoutCacheTest.kt b/compose/foundation/foundation-newtext/src/test/kotlin/androidx/compose/foundation/newtext/text/modifiers/MultiParagraphLayoutCacheTest.kt
index 8615074..32ef628 100644
--- a/compose/foundation/foundation-newtext/src/test/kotlin/androidx/compose/foundation/newtext/text/modifiers/MultiParagraphLayoutCacheTest.kt
+++ b/compose/foundation/foundation-newtext/src/test/kotlin/androidx/compose/foundation/newtext/text/modifiers/MultiParagraphLayoutCacheTest.kt
@@ -33,13 +33,12 @@
@Test(expected = IllegalStateException::class)
fun whenMinInstrinsicWidth_withoutLayout_throws() {
val textDelegate = MultiParagraphLayoutCache(
- StaticTextLayoutDrawParams(
- text = AnnotatedString(""),
- style = TextStyle.Default,
- fontFamilyResolver = fontFamilyResolver
- ),
- density = density,
- )
+ text = AnnotatedString(""),
+ style = TextStyle.Default,
+ fontFamilyResolver = fontFamilyResolver
+ ).also {
+ it.density = density
+ }
textDelegate.minIntrinsicWidth
}
@@ -47,13 +46,12 @@
@Test(expected = IllegalStateException::class)
fun whenMaxIntrinsicWidth_withoutLayout_throws() {
val textDelegate = MultiParagraphLayoutCache(
- StaticTextLayoutDrawParams(
- text = AnnotatedString(""),
- style = TextStyle.Default,
- fontFamilyResolver = fontFamilyResolver
- ),
- density = density,
- )
+ text = AnnotatedString(""),
+ style = TextStyle.Default,
+ fontFamilyResolver = fontFamilyResolver
+ ).also {
+ it.density = density
+ }
textDelegate.maxIntrinsicWidth
}
diff --git a/compose/foundation/foundation-newtext/src/test/kotlin/androidx/compose/foundation/newtext/text/modifiers/StaticTextLayouDrawParamsTest.kt b/compose/foundation/foundation-newtext/src/test/kotlin/androidx/compose/foundation/newtext/text/modifiers/StaticTextLayouDrawParamsTest.kt
deleted file mode 100644
index 5bff284..0000000
--- a/compose/foundation/foundation-newtext/src/test/kotlin/androidx/compose/foundation/newtext/text/modifiers/StaticTextLayouDrawParamsTest.kt
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Copyright 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.compose.foundation.newtext.text.modifiers
-
-import androidx.compose.foundation.newtext.text.copypasta.selection.SelectionRegistrarImpl
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.Density
-import com.google.common.truth.Truth.assertThat
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
-import org.mockito.kotlin.mock
-
-@RunWith(JUnit4::class)
-class StaticTextLayouDrawParamsTest {
- private val density = Density(density = 1f)
- private val fontFamilyResolver = mock<FontFamily.Resolver>()
-
- @Test
- fun textDiffers_flipsLayoutAndSemantics() {
- val subject = StaticTextLayoutDrawParams(
- AnnotatedString("text"),
- TextStyle.Default,
- fontFamilyResolver
- )
- val other = subject.copy(text = AnnotatedString("other"))
-
- val diff = subject.diff(other)
-
- assertThat(diff.value).isEqualTo(1.toShort())
- assertThat(diff.anyDiffs).isTrue()
- assertThat(diff.hasLayoutDiffs).isTrue()
- assertThat(diff.hasSemanticsDiffs).isTrue()
- assertThat(diff.hasCallbackDiffs).isFalse()
- }
-
- @Test
- fun styleDiffers_flipsLayout() {
- val subject = StaticTextLayoutDrawParams(
- AnnotatedString("text"),
- TextStyle.Default,
- fontFamilyResolver
- )
- val other = subject.copy(style = TextStyle(fontFeatureSettings = "other"))
-
- val diff = subject.diff(other)
-
- assertThat(diff.anyDiffs).isTrue()
- assertThat(diff.hasLayoutDiffs).isTrue()
- assertThat(diff.hasSemanticsDiffs).isFalse()
- assertThat(diff.hasCallbackDiffs).isFalse()
- }
-
- @Test
- fun ffrDiffers_flipsLayout() {
- val subject = StaticTextLayoutDrawParams(
- AnnotatedString("text"),
- TextStyle.Default,
- fontFamilyResolver
- )
- val other = subject.copy(fontFamilyResolver = mock<FontFamily.Resolver>())
-
- val diff = subject.diff(other)
-
- assertThat(diff.anyDiffs).isTrue()
- assertThat(diff.hasLayoutDiffs).isTrue()
- assertThat(diff.hasSemanticsDiffs).isFalse()
- assertThat(diff.hasCallbackDiffs).isFalse()
- }
-
- @Test
- fun overflow_flipsLayout() {
- val subject = StaticTextLayoutDrawParams(
- AnnotatedString("text"),
- TextStyle.Default,
- fontFamilyResolver
- )
- val other = subject.copy(overflow = TextOverflow.Ellipsis)
-
- val diff = subject.diff(other)
-
- assertThat(diff.anyDiffs).isTrue()
- assertThat(diff.hasLayoutDiffs).isTrue()
- assertThat(diff.hasSemanticsDiffs).isFalse()
- assertThat(diff.hasCallbackDiffs).isFalse()
- }
-
- @Test
- fun softWrap_flipsLayout() {
- val subject = StaticTextLayoutDrawParams(
- AnnotatedString("text"),
- TextStyle.Default,
- fontFamilyResolver
- )
- val other = subject.copy(softWrap = false)
-
- val diff = subject.diff(other)
-
- assertThat(diff.anyDiffs).isTrue()
- assertThat(diff.hasLayoutDiffs).isTrue()
- assertThat(diff.hasSemanticsDiffs).isFalse()
- assertThat(diff.hasCallbackDiffs).isFalse()
- }
-
- @Test
- fun maxLines_flipsLayout() {
- val subject = StaticTextLayoutDrawParams(
- AnnotatedString("text"),
- TextStyle.Default,
- fontFamilyResolver
- )
- val other = subject.copy(maxLines = 10)
-
- val diff = subject.diff(other)
-
- assertThat(diff.anyDiffs).isTrue()
- assertThat(diff.hasLayoutDiffs).isTrue()
- assertThat(diff.hasSemanticsDiffs).isFalse()
- assertThat(diff.hasCallbackDiffs).isFalse()
- }
-
- @Test
- fun minLines_flipsLayout() {
- val subject = StaticTextLayoutDrawParams(
- AnnotatedString("text"),
- TextStyle.Default,
- fontFamilyResolver
- )
- val other = subject.copy(minLines = 10)
-
- val diff = subject.diff(other)
-
- assertThat(diff.anyDiffs).isTrue()
- assertThat(diff.hasLayoutDiffs).isTrue()
- assertThat(diff.hasSemanticsDiffs).isFalse()
- assertThat(diff.hasCallbackDiffs).isFalse()
- }
-
- @Test
- fun placeholders_flipsLayout() {
- val subject = StaticTextLayoutDrawParams(
- AnnotatedString("text"),
- TextStyle.Default,
- fontFamilyResolver
- )
- val other = subject.copy(placeholders = emptyList())
-
- val diff = subject.diff(other)
-
- assertThat(diff.anyDiffs).isTrue()
- assertThat(diff.hasLayoutDiffs).isTrue()
- assertThat(diff.hasSemanticsDiffs).isFalse()
- assertThat(diff.hasCallbackDiffs).isFalse()
- }
-
- @Test
- fun onPlaceholderLayout_flipsCallbacks() {
- val subject = StaticTextLayoutDrawParams(
- AnnotatedString("text"),
- TextStyle.Default,
- fontFamilyResolver
- )
- val other = subject.copy( println("Do it") })
-
- val diff = subject.diff(other)
-
- assertThat(diff.anyDiffs).isTrue()
- assertThat(diff.hasLayoutDiffs).isFalse()
- assertThat(diff.hasSemanticsDiffs).isFalse()
- assertThat(diff.hasCallbackDiffs).isTrue()
- }
-
- @Test
- fun onTextLayout_flipsCallbacks() {
- val subject = StaticTextLayoutDrawParams(
- AnnotatedString("text"),
- TextStyle.Default,
- fontFamilyResolver
- )
- val other = subject.copy( println("Did a layout") })
-
- val diff = subject.diff(other)
-
- assertThat(diff.anyDiffs).isTrue()
- assertThat(diff.hasLayoutDiffs).isFalse()
- assertThat(diff.hasSemanticsDiffs).isFalse()
- assertThat(diff.hasCallbackDiffs).isTrue()
- }
-
- @Test
- fun onSelectionController_flipsAnyAndCallbacks() {
- val subject = StaticTextLayoutDrawParams(
- AnnotatedString("text"),
- TextStyle.Default,
- fontFamilyResolver
- )
- val other = subject.copy(
- selectionController = StaticTextSelectionModifierController(
- SelectionRegistrarImpl(),
- Color.Black
- )
- )
-
- val diff = subject.diff(other)
-
- assertThat(diff.anyDiffs).isTrue()
- assertThat(diff.hasLayoutDiffs).isFalse()
- assertThat(diff.hasSemanticsDiffs).isFalse()
- assertThat(diff.hasCallbackDiffs).isTrue()
- }
-}
diff --git a/compose/foundation/foundation/api/current.txt b/compose/foundation/foundation/api/current.txt
index cd16cf5..1ccb795 100644
--- a/compose/foundation/foundation/api/current.txt
+++ b/compose/foundation/foundation/api/current.txt
@@ -81,7 +81,7 @@
method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Image(androidx.compose.ui.graphics.ImageBitmap bitmap, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int filterQuality);
method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Image(androidx.compose.ui.graphics.vector.ImageVector imageVector, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
method @androidx.compose.runtime.Composable public static void Image(androidx.compose.ui.graphics.painter.Painter painter, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
- method @Deprecated @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Image(androidx.compose.ui.graphics.ImageBitmap bitmap, String contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+ method @Deprecated @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Image(androidx.compose.ui.graphics.ImageBitmap bitmap, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
}
@androidx.compose.runtime.Stable public interface Indication {
diff --git a/compose/foundation/foundation/api/public_plus_experimental_current.txt b/compose/foundation/foundation/api/public_plus_experimental_current.txt
index 53a8c9a..c01d3ec 100644
--- a/compose/foundation/foundation/api/public_plus_experimental_current.txt
+++ b/compose/foundation/foundation/api/public_plus_experimental_current.txt
@@ -99,7 +99,7 @@
method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Image(androidx.compose.ui.graphics.ImageBitmap bitmap, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int filterQuality);
method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Image(androidx.compose.ui.graphics.vector.ImageVector imageVector, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
method @androidx.compose.runtime.Composable public static void Image(androidx.compose.ui.graphics.painter.Painter painter, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
- method @Deprecated @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Image(androidx.compose.ui.graphics.ImageBitmap bitmap, String contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+ method @Deprecated @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Image(androidx.compose.ui.graphics.ImageBitmap bitmap, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
}
@androidx.compose.runtime.Stable public interface Indication {
@@ -902,10 +902,10 @@
public final class LazyStaggeredGridDslKt {
method @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Composable public static void LazyHorizontalStaggeredGrid(androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells rows, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridScope,kotlin.Unit> content);
method @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Composable public static void LazyVerticalStaggeredGrid(androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells columns, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridScope,kotlin.Unit> content);
- method @androidx.compose.foundation.ExperimentalFoundationApi public static <T> void items(androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, optional kotlin.jvm.functions.Function1<? super T,?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridItemScope,? super T,kotlin.Unit> itemContent);
- method @androidx.compose.foundation.ExperimentalFoundationApi public static <T> void items(androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridScope, T![] items, optional kotlin.jvm.functions.Function1<? super T,?>? key, optional kotlin.jvm.functions.Function1<? super T,?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridItemScope,? super T,kotlin.Unit> itemContent);
- method @androidx.compose.foundation.ExperimentalFoundationApi public static <T> void itemsIndexed(androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?> contentType, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
- method @androidx.compose.foundation.ExperimentalFoundationApi public static <T> void itemsIndexed(androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?> contentType, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ method @androidx.compose.foundation.ExperimentalFoundationApi public static inline <T> void items(androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, optional kotlin.jvm.functions.Function1<? super T,?> contentType, optional kotlin.jvm.functions.Function1<? super T,androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridItemSpan>? span, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridItemScope,? super T,kotlin.Unit> itemContent);
+ method @androidx.compose.foundation.ExperimentalFoundationApi public static inline <T> void items(androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridScope, T![] items, optional kotlin.jvm.functions.Function1<? super T,?>? key, optional kotlin.jvm.functions.Function1<? super T,?> contentType, optional kotlin.jvm.functions.Function1<? super T,androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridItemSpan>? span, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridItemScope,? super T,kotlin.Unit> itemContent);
+ method @androidx.compose.foundation.ExperimentalFoundationApi public static inline <T> void itemsIndexed(androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?> contentType, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridItemSpan>? span, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ method @androidx.compose.foundation.ExperimentalFoundationApi public static inline <T> void itemsIndexed(androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?> contentType, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridItemSpan>? span, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
}
@androidx.compose.foundation.ExperimentalFoundationApi public sealed interface LazyStaggeredGridItemInfo {
@@ -959,8 +959,8 @@
}
@androidx.compose.foundation.ExperimentalFoundationApi public sealed interface LazyStaggeredGridScope {
- method @androidx.compose.foundation.ExperimentalFoundationApi public void item(optional Object? key, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridItemScope,kotlin.Unit> content);
- method public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
+ method @androidx.compose.foundation.ExperimentalFoundationApi public void item(optional Object? key, optional Object? contentType, optional androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridItemSpan? span, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridItemScope,kotlin.Unit> content);
+ method public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?> contentType, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridItemSpan>? span, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
}
public final class LazyStaggeredGridSemanticsKt {
@@ -1010,6 +1010,17 @@
method public java.util.List<java.lang.Integer> calculateCrossAxisCellSizes(androidx.compose.ui.unit.Density, int availableSize, int spacing);
}
+ @androidx.compose.foundation.ExperimentalFoundationApi public final class StaggeredGridItemSpan {
+ field public static final androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridItemSpan.Companion Companion;
+ }
+
+ public static final class StaggeredGridItemSpan.Companion {
+ method public androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridItemSpan getFullLine();
+ method public androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridItemSpan getSingleLane();
+ property public final androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridItemSpan FullLine;
+ property public final androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridItemSpan SingleLane;
+ }
+
}
package androidx.compose.foundation.pager {
diff --git a/compose/foundation/foundation/api/restricted_current.txt b/compose/foundation/foundation/api/restricted_current.txt
index cd16cf5..1ccb795 100644
--- a/compose/foundation/foundation/api/restricted_current.txt
+++ b/compose/foundation/foundation/api/restricted_current.txt
@@ -81,7 +81,7 @@
method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Image(androidx.compose.ui.graphics.ImageBitmap bitmap, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter, optional int filterQuality);
method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Image(androidx.compose.ui.graphics.vector.ImageVector imageVector, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
method @androidx.compose.runtime.Composable public static void Image(androidx.compose.ui.graphics.painter.Painter painter, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
- method @Deprecated @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Image(androidx.compose.ui.graphics.ImageBitmap bitmap, String contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
+ method @Deprecated @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable public static void Image(androidx.compose.ui.graphics.ImageBitmap bitmap, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment alignment, optional androidx.compose.ui.layout.ContentScale contentScale, optional float alpha, optional androidx.compose.ui.graphics.ColorFilter? colorFilter);
}
@androidx.compose.runtime.Stable public interface Indication {
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/ListDemos.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/ListDemos.kt
index 8972e35..7092564 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/ListDemos.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/ListDemos.kt
@@ -59,6 +59,7 @@
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.lazy.staggeredgrid.LazyVerticalStaggeredGrid
import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells
+import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridItemSpan
import androidx.compose.foundation.lazy.staggeredgrid.rememberLazyStaggeredGridState
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.samples.StickyHeaderSample
@@ -972,18 +973,26 @@
Button( if (count != 0) count-- }) { Text(text = "--") }
}
- val state = rememberLazyStaggeredGridState()
+ val state = rememberLazyStaggeredGridState(initialFirstVisibleItemIndex = 29)
LazyVerticalStaggeredGrid(
columns = StaggeredGridCells.Fixed(3),
modifier = Modifier.fillMaxSize(),
state = state,
- contentPadding = PaddingValues(vertical = 500.dp, horizontal = 20.dp),
+ contentPadding = PaddingValues(vertical = 30.dp, horizontal = 20.dp),
horizontalArrangement = Arrangement.spacedBy(10.dp),
verticalArrangement = Arrangement.spacedBy(10.dp),
content = {
- items(count) {
- var expanded by rememberSaveable { mutableStateOf(false) }
+ items(
+ count,
+ span = {
+ if (it % 30 == 0)
+ StaggeredGridItemSpan.FullLine
+ else
+ StaggeredGridItemSpan.SingleLane
+ }
+ ) {
+ var expanded by remember { mutableStateOf(false) }
val index = indices.value[it % indices.value.size]
val color = colors[index]
Box(
@@ -1059,7 +1068,10 @@
Checkbox(checked = selected, >
selectedIndexes[item] = it
})
- Spacer(Modifier.width(16.dp).height(height))
+ Spacer(
+ Modifier
+ .width(16.dp)
+ .height(height))
Text("Item $item")
}
}
diff --git a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/BaseLazyLayoutTestWithOrientation.kt b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/BaseLazyLayoutTestWithOrientation.kt
index e1837d2..7a60556 100644
--- a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/BaseLazyLayoutTestWithOrientation.kt
+++ b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/BaseLazyLayoutTestWithOrientation.kt
@@ -33,6 +33,8 @@
import androidx.compose.ui.test.getUnclippedBoundsInRoot
import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.DpOffset
+import androidx.compose.ui.unit.DpSize
import androidx.compose.ui.unit.dp
import org.junit.Rule
@@ -119,6 +121,15 @@
assertTopPositionInRootIsEqualTo(expectedStart)
}
+ fun SemanticsNodeInteraction.assertAxisBounds(
+ offset: DpOffset,
+ size: DpSize
+ ) =
+ assertMainAxisStartPositionInRootIsEqualTo(offset.y)
+ .assertCrossAxisStartPositionInRootIsEqualTo(offset.x)
+ .assertMainAxisSizeIsEqualTo(size.height)
+ .assertCrossAxisSizeIsEqualTo(size.width)
+
fun PaddingValues(
mainAxis: Dp = 0.dp,
crossAxis: Dp = 0.dp
diff --git a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridAnimatedScrollTest.kt b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridAnimatedScrollTest.kt
index 7f7e5da..dbb0f0c 100644
--- a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridAnimatedScrollTest.kt
+++ b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridAnimatedScrollTest.kt
@@ -19,20 +19,15 @@
import androidx.compose.animation.core.FloatSpringSpec
import androidx.compose.foundation.AutoTestFrameClock
import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.border
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.gestures.animateScrollBy
import androidx.compose.foundation.lazy.grid.isEqualTo
import androidx.compose.foundation.text.BasicText
import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
import androidx.test.filters.MediumTest
import com.google.common.truth.Truth.assertThat
import com.google.common.truth.Truth.assertWithMessage
@@ -139,7 +134,32 @@
state.animateScrollToItem(100)
}
rule.waitForIdle()
- assertThat(state.firstVisibleItemIndex).isEqualTo(90)
+ assertThat(state.firstVisibleItemIndex).isEqualTo(91)
+ assertThat(state.firstVisibleItemScrollOffset).isEqualTo(0)
+ }
+
+ @Test
+ fun animateScrollToItem_toFullSpan() {
+ runBlocking(Dispatchers.Main + AutoTestFrameClock()) {
+ state.animateScrollToItem(50, 10)
+ }
+ rule.waitForIdle()
+ assertThat(state.firstVisibleItemIndex).isEqualTo(50)
+ assertThat(state.firstVisibleItemScrollOffset).isEqualTo(10)
+ }
+
+ @Test
+ fun animateScrollToItem_toFullSpan_andBack() {
+ runBlocking(Dispatchers.Main + AutoTestFrameClock()) {
+ state.animateScrollToItem(50, 10)
+ }
+ rule.waitForIdle()
+
+ runBlocking(Dispatchers.Main + AutoTestFrameClock()) {
+ state.animateScrollToItem(45, 0)
+ }
+
+ assertThat(state.firstVisibleItemIndex).isEqualTo(44)
assertThat(state.firstVisibleItemScrollOffset).isEqualTo(0)
}
@@ -232,13 +252,22 @@
state = state,
modifier = Modifier.axisSize(itemSizeDp * 2, itemSizeDp * 5)
) {
- items(100) {
+ items(
+ count = 100,
+ span = {
+ // mark a span to check scroll through
+ if (it == 50)
+ StaggeredGridItemSpan.FullLine
+ else
+ StaggeredGridItemSpan.SingleLane
+ }
+ ) {
BasicText(
"$it",
Modifier
.mainAxisSize(itemSizeDp)
.testTag("$it")
- .border(1.dp, Color.Black)
+ .debugBorder()
)
}
}
diff --git a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridContentPaddingTest.kt b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridContentPaddingTest.kt
index c718b43..a17afd8 100644
--- a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridContentPaddingTest.kt
+++ b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridContentPaddingTest.kt
@@ -121,7 +121,7 @@
state = state
) {
items(100) {
- Spacer(Modifier.mainAxisSize(itemSizeDp).testTag("$it"))
+ Spacer(Modifier.mainAxisSize(itemSizeDp).testTag("$it").debugBorder())
}
}
}
diff --git a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridLaneInfoTest.kt b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridLaneInfoTest.kt
new file mode 100644
index 0000000..aac67a3
--- /dev/null
+++ b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridLaneInfoTest.kt
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.foundation.lazy.staggeredgrid
+
+import com.google.common.truth.Truth.assertThat
+import kotlin.test.assertEquals
+import org.junit.Test
+
+class LazyStaggeredGridLaneInfoTest {
+ private val laneInfo = LazyStaggeredGridLaneInfo()
+
+ @Test
+ fun emptySpan_unset() {
+ assertEquals(LazyStaggeredGridLaneInfo.Unset, laneInfo.getLane(0))
+ }
+
+ @Test
+ fun setLane() {
+ laneInfo.setLane(0, 42)
+ laneInfo.setLane(1, 0)
+
+ assertEquals(42, laneInfo.getLane(0))
+ assertEquals(0, laneInfo.getLane(1))
+ }
+
+ @Test
+ fun setLane_beyondBound() {
+ val bound = laneInfo.upperBound()
+ laneInfo.setLane(bound - 1, 42)
+ laneInfo.setLane(bound, 42)
+
+ assertEquals(42, laneInfo.getLane(bound - 1))
+ assertEquals(42, laneInfo.getLane(bound))
+ }
+
+ @Test
+ fun setLane_largeNumber() {
+ laneInfo.setLane(Int.MAX_VALUE / 2, 42)
+
+ assertEquals(42, laneInfo.getLane(Int.MAX_VALUE / 2))
+ }
+
+ @Test
+ fun setLane_decreaseBound() {
+ laneInfo.setLane(Int.MAX_VALUE / 2, 42)
+ laneInfo.setLane(0, 42)
+
+ assertEquals(-1, laneInfo.getLane(Int.MAX_VALUE / 2))
+ assertEquals(42, laneInfo.getLane(0))
+ }
+
+ @Test(expected = IllegalArgumentException::class)
+ fun setLane_negative() {
+ laneInfo.setLane(-1, 0)
+ }
+
+ @Test
+ fun setLaneGaps() {
+ laneInfo.setLane(0, 0)
+ laneInfo.setLane(1, 1)
+ laneInfo.setGaps(0, intArrayOf(42, 24))
+ laneInfo.setGaps(1, intArrayOf(12, 21))
+
+ assertThat(laneInfo.getGaps(0)).asList().isEqualTo(listOf(42, 24))
+ assertThat(laneInfo.getGaps(1)).asList().isEqualTo(listOf(12, 21))
+ }
+
+ @Test
+ fun missingLaneGaps() {
+ laneInfo.setLane(42, 0)
+ laneInfo.setGaps(0, intArrayOf(42, 24))
+
+ assertThat(laneInfo.getGaps(42)).isNull()
+ }
+
+ @Test
+ fun clearLaneGaps() {
+ laneInfo.setLane(42, 0)
+ laneInfo.setGaps(42, intArrayOf(42, 24))
+
+ assertThat(laneInfo.getGaps(42)).isNotNull()
+
+ laneInfo.setGaps(42, null)
+ assertThat(laneInfo.getGaps(42)).isNull()
+ }
+
+ @Test
+ fun resetOnLaneInfoContentMove() {
+ laneInfo.setLane(0, 0)
+ laneInfo.setGaps(0, intArrayOf(42, 24))
+
+ laneInfo.setLane(Int.MAX_VALUE / 2, 1)
+
+ laneInfo.setGaps(0, null)
+ assertThat(laneInfo.getGaps(0)).isNull()
+ }
+}
\ No newline at end of file
diff --git a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridPrefetcherTest.kt b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridPrefetcherTest.kt
index ffe5acc..224a1cc 100644
--- a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridPrefetcherTest.kt
+++ b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridPrefetcherTest.kt
@@ -33,7 +33,9 @@
import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.assertIsNotDisplayed
import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.unit.Constraints
import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
import androidx.test.filters.LargeTest
import com.google.common.truth.Truth.assertThat
import kotlinx.coroutines.runBlocking
@@ -521,6 +523,133 @@
waitForPrefetch(9)
}
+ @Test
+ fun fullSpanIsPrefetchedCorrectly() {
+ val nodeConstraints = mutableMapOf<Int, Constraints>()
+ rule.setContent {
+ state = rememberLazyStaggeredGridState()
+ LazyStaggeredGrid(
+ 2,
+ Modifier.mainAxisSize(itemsSizeDp * 5f).crossAxisSize(itemsSizeDp * 2f),
+ state,
+ ) {
+ items(
+ count = 100,
+ span = {
+ if (it % 10 == 0)
+ StaggeredGridItemSpan.FullLine
+ else
+ StaggeredGridItemSpan.SingleLane
+ }
+ ) {
+ DisposableEffect(it) {
+ activeNodes.add(it)
+ onDispose {
+ activeNodes.remove(it)
+ activeMeasuredNodes.remove(it)
+ }
+ }
+ Spacer(
+ Modifier
+ .border(Dp.Hairline, Color.Black)
+ .testTag("$it")
+ .layout { measurable, constraints ->
+ val placeable = measurable.measure(constraints)
+ activeMeasuredNodes.add(it)
+ nodeConstraints.put(it, constraints)
+ layout(placeable.width, placeable.height) {
+ placeable.place(0, 0)
+ }
+ }
+ .mainAxisSize(if (it == 0) itemsSizeDp else itemsSizeDp * 2)
+ )
+ }
+ }
+ }
+
+ // ┌─┬─┐
+ // │5├─┤
+ // ├─┤6│
+ // │7├─┤
+ // ├─┤8│
+ // └─┴─┘
+
+ state.scrollBy(itemsSizeDp * 5f)
+ assertThat(activeNodes).contains(9)
+
+ waitForPrefetch(10)
+ val expectedConstraints = if (vertical) {
+ Constraints.fixedWidth(itemsSizePx * 2)
+ } else {
+ Constraints.fixedHeight(itemsSizePx * 2)
+ }
+ assertThat(nodeConstraints[10]).isEqualTo(expectedConstraints)
+ }
+
+ @Test
+ fun fullSpanIsPrefetchedCorrectly_scrollingBack() {
+ rule.setContent {
+ state = rememberLazyStaggeredGridState()
+ LazyStaggeredGrid(
+ 2,
+ Modifier.mainAxisSize(itemsSizeDp * 5f),
+ state,
+ ) {
+ items(
+ count = 100,
+ span = {
+ if (it % 10 == 0)
+ StaggeredGridItemSpan.FullLine
+ else
+ StaggeredGridItemSpan.SingleLane
+ }
+ ) {
+ DisposableEffect(it) {
+ activeNodes.add(it)
+ onDispose {
+ activeNodes.remove(it)
+ activeMeasuredNodes.remove(it)
+ }
+ }
+ Spacer(
+ Modifier
+ .mainAxisSize(if (it == 0) itemsSizeDp else itemsSizeDp * 2)
+ .border(Dp.Hairline, Color.Black)
+ .testTag("$it")
+ .layout { measurable, constraints ->
+ val placeable = measurable.measure(constraints)
+ activeMeasuredNodes.add(it)
+ layout(placeable.width, placeable.height) {
+ placeable.place(0, 0)
+ }
+ }
+ )
+ }
+ }
+ }
+
+ state.scrollBy(itemsSizeDp * 13f + 2.dp)
+ rule.waitForIdle()
+
+ // second scroll to make sure subcompose marks elements as /not/ active
+ state.scrollBy(2.dp)
+ rule.waitForIdle()
+
+ // ┌──┬──┐
+ // │11│12│
+ // ├──┼──┤
+ // │13│14│
+ // ├──┼──┤
+ // └──┴──┘
+
+ assertThat(activeNodes).contains(11)
+ assertThat(activeNodes).doesNotContain(10)
+
+ state.scrollBy(-1.dp)
+
+ waitForPrefetch(10)
+ }
+
private fun waitForPrefetch(index: Int) {
rule.waitUntil {
activeNodes.contains(index) && activeMeasuredNodes.contains(index)
diff --git a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridScrollTest.kt b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridScrollTest.kt
index 49c2a4e..d52aa77 100644
--- a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridScrollTest.kt
+++ b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridScrollTest.kt
@@ -18,17 +18,14 @@
import androidx.compose.foundation.AutoTestFrameClock
import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.border
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.text.BasicText
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.onNodeWithTag
import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
import androidx.test.filters.MediumTest
import com.google.common.truth.Truth.assertThat
import kotlinx.coroutines.Dispatchers
@@ -204,6 +201,16 @@
assertThat(state.canScrollBackward).isTrue()
}
+ @Test
+ fun sctollToItem_fullSpan() = runBlocking {
+ withContext(Dispatchers.Main + AutoTestFrameClock()) {
+ state.scrollToItem(49, 10)
+ }
+
+ assertThat(state.firstVisibleItemIndex).isEqualTo(49)
+ assertThat(state.firstVisibleItemScrollOffset).isEqualTo(10)
+ }
+
@Composable
private fun TestContent() {
// |-|-|
@@ -220,13 +227,22 @@
state = state,
modifier = Modifier.axisSize(itemSizeDp * 2, itemSizeDp * 5)
) {
- items(100) {
+ items(
+ count = 100,
+ span = {
+ if (it == 50) {
+ StaggeredGridItemSpan.FullLine
+ } else {
+ StaggeredGridItemSpan.SingleLane
+ }
+ }
+ ) {
BasicText(
"$it",
Modifier
.mainAxisSize(itemSizeDp * ((it % 2) + 1))
.testTag("$it")
- .border(1.dp, Color.Black)
+ .debugBorder()
)
}
}
diff --git a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridSemanticTest.kt b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridSemanticTest.kt
index d9ba110..3ee1508 100644
--- a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridSemanticTest.kt
+++ b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridSemanticTest.kt
@@ -19,6 +19,7 @@
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.text.BasicText
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.semantics.SemanticsActions
@@ -97,7 +98,7 @@
.crossAxisSize(itemSizeDp * 2)
) {
items(items = List(ItemCount) { it }, key = { key(it) }) {
- Spacer(Modifier.testTag(tag(it)).mainAxisSize(itemSizeDp))
+ BasicText("$it", Modifier.testTag(tag(it)).mainAxisSize(itemSizeDp))
}
}
}
diff --git a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridSpansTest.kt b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridSpansTest.kt
deleted file mode 100644
index 63621ea..0000000
--- a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridSpansTest.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.compose.foundation.lazy.staggeredgrid
-
-import kotlin.test.assertEquals
-import org.junit.Test
-
-class LazyStaggeredGridSpansTest {
- private val spans = LazyStaggeredGridSpans()
-
- @Test
- fun emptySpan_unset() {
- assertEquals(LazyStaggeredGridSpans.Unset, spans.getSpan(0))
- }
-
- @Test
- fun setSpan() {
- spans.setSpan(0, 42)
- spans.setSpan(1, 0)
-
- assertEquals(42, spans.getSpan(0))
- assertEquals(0, spans.getSpan(1))
- }
-
- @Test
- fun setSpan_beyondBound() {
- val bound = spans.upperBound()
- spans.setSpan(bound - 1, 42)
- spans.setSpan(bound, 42)
-
- assertEquals(42, spans.getSpan(bound - 1))
- assertEquals(42, spans.getSpan(bound))
- }
-
- @Test
- fun setSpan_largeNumber() {
- spans.setSpan(Int.MAX_VALUE / 2, 42)
-
- assertEquals(42, spans.getSpan(Int.MAX_VALUE / 2))
- }
-
- @Test
- fun setSpan_decreaseBound() {
- spans.setSpan(Int.MAX_VALUE / 2, 42)
- spans.setSpan(0, 42)
-
- assertEquals(-1, spans.getSpan(Int.MAX_VALUE / 2))
- assertEquals(42, spans.getSpan(0))
- }
-
- @Test(expected = IllegalArgumentException::class)
- fun setSpan_negative() {
- spans.setSpan(-1, 0)
- }
-}
\ No newline at end of file
diff --git a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridTest.kt b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridTest.kt
index 7eec8ab..01cadd0 100644
--- a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridTest.kt
+++ b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridTest.kt
@@ -35,10 +35,13 @@
import androidx.compose.ui.test.assertCountEquals
import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.assertIsNotDisplayed
+import androidx.compose.ui.test.assertPositionInRootIsEqualTo
import androidx.compose.ui.test.junit4.StateRestorationTester
import androidx.compose.ui.test.onChildren
import androidx.compose.ui.test.onNodeWithTag
import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.DpOffset
+import androidx.compose.ui.unit.DpSize
import androidx.compose.ui.unit.dp
import androidx.test.filters.MediumTest
import com.google.common.truth.Truth.assertThat
@@ -851,7 +854,7 @@
fun resizingItems_maintainsScrollingRange() {
val state = LazyStaggeredGridState()
var itemSizes by mutableStateOf(
- List(20) {
+ List(10) {
itemSizeDp * (it % 4 + 1)
}
)
@@ -867,7 +870,7 @@
.testTag(LazyStaggeredGridTag)
.border(1.dp, Color.Red),
) {
- items(20) {
+ items(itemSizes.size) {
Box(
Modifier
.axisSize(
@@ -884,24 +887,24 @@
}
rule.onNodeWithTag(LazyStaggeredGridTag)
- .scrollMainAxisBy(itemSizeDp * 20)
+ .scrollMainAxisBy(itemSizeDp * 10)
- rule.onNodeWithTag("18")
- .assertMainAxisSizeIsEqualTo(itemSizes[18])
+ rule.onNodeWithTag("8")
+ .assertMainAxisSizeIsEqualTo(itemSizes[8])
- rule.onNodeWithTag("19")
- .assertMainAxisSizeIsEqualTo(itemSizes[19])
+ rule.onNodeWithTag("9")
+ .assertMainAxisSizeIsEqualTo(itemSizes[9])
itemSizes = itemSizes.reversed()
- rule.onNodeWithTag("18")
+ rule.onNodeWithTag("8")
.assertIsDisplayed()
- rule.onNodeWithTag("19")
+ rule.onNodeWithTag("9")
.assertIsDisplayed()
rule.onNodeWithTag(LazyStaggeredGridTag)
- .scrollMainAxisBy(-itemSizeDp * 20)
+ .scrollMainAxisBy(-itemSizeDp * 10)
rule.onNodeWithTag("0")
.assertMainAxisStartPositionInRootIsEqualTo(0.dp)
@@ -996,10 +999,16 @@
// check that scrolling back and forth doesn't crash
rule.onNodeWithTag(LazyStaggeredGridTag)
- .scrollMainAxisBy(10000.dp)
+ .scrollMainAxisBy(1000.dp)
rule.onNodeWithTag(LazyStaggeredGridTag)
- .scrollMainAxisBy(-10000.dp)
+ .scrollMainAxisBy(-1000.dp)
+
+ rule.onNodeWithTag("${Int.MAX_VALUE / 2}")
+ .assertMainAxisStartPositionInRootIsEqualTo(0.dp)
+
+ rule.onNodeWithTag("${Int.MAX_VALUE / 2 + 1}")
+ .assertMainAxisStartPositionInRootIsEqualTo(0.dp)
}
@Test
@@ -1294,4 +1303,394 @@
}
}
}
+
+ @Test
+ fun fullSpan_fillsAllCrossAxisSpace() {
+ val state = LazyStaggeredGridState()
+ state.prefetchingEnabled = false
+ rule.setContentWithTestViewConfiguration {
+ LazyStaggeredGrid(
+ 3,
+ Modifier
+ .testTag(LazyStaggeredGridTag)
+ .crossAxisSize(itemSizeDp * 3)
+ .mainAxisSize(itemSizeDp * 10),
+ state
+ ) {
+ item(span = StaggeredGridItemSpan.FullLine) {
+ Box(Modifier.testTag("0").mainAxisSize(itemSizeDp))
+ }
+ }
+ }
+
+ rule.onNodeWithTag("0")
+ .assertMainAxisSizeIsEqualTo(itemSizeDp)
+ .assertCrossAxisSizeIsEqualTo(itemSizeDp * 3)
+ .assertPositionInRootIsEqualTo(0.dp, 0.dp)
+ }
+
+ @Test
+ fun fullSpan_leavesEmptyGapsWithOtherItems() {
+ val state = LazyStaggeredGridState()
+ state.prefetchingEnabled = false
+ rule.setContentWithTestViewConfiguration {
+ LazyStaggeredGrid(
+ 3,
+ Modifier
+ .testTag(LazyStaggeredGridTag)
+ .crossAxisSize(itemSizeDp * 3)
+ .mainAxisSize(itemSizeDp * 10),
+ state
+ ) {
+ items(2) {
+ Box(Modifier.testTag("$it").mainAxisSize(itemSizeDp))
+ }
+
+ item(span = StaggeredGridItemSpan.FullLine) {
+ Box(Modifier.testTag("full").mainAxisSize(itemSizeDp))
+ }
+ }
+ }
+
+ // ┌─┬─┬─┐
+ // │0│1│#│
+ // ├─┴─┴─┤
+ // │full │
+ // └─────┘
+ rule.onNodeWithTag("0")
+ .assertAxisBounds(
+ DpOffset(0.dp, 0.dp),
+ DpSize(itemSizeDp, itemSizeDp)
+ )
+
+ rule.onNodeWithTag("1")
+ .assertAxisBounds(
+ DpOffset(itemSizeDp, 0.dp),
+ DpSize(itemSizeDp, itemSizeDp)
+ )
+
+ rule.onNodeWithTag("full")
+ .assertAxisBounds(
+ DpOffset(0.dp, itemSizeDp),
+ DpSize(itemSizeDp * 3, itemSizeDp)
+ )
+ }
+
+ @Test
+ fun fullSpan_leavesGapsBetweenItems() {
+ val state = LazyStaggeredGridState()
+ state.prefetchingEnabled = false
+ rule.setContentWithTestViewConfiguration {
+ LazyStaggeredGrid(
+ 3,
+ Modifier
+ .testTag(LazyStaggeredGridTag)
+ .crossAxisSize(itemSizeDp * 3)
+ .mainAxisSize(itemSizeDp * 10),
+ state
+ ) {
+ items(3) {
+ Box(Modifier.testTag("$it").mainAxisSize(itemSizeDp + itemSizeDp * it / 2))
+ }
+
+ item(span = StaggeredGridItemSpan.FullLine) {
+ Box(Modifier.testTag("full").mainAxisSize(itemSizeDp))
+ }
+ }
+ }
+
+ // ┌───┬───┬───┐
+ // │ 0 │ 1 │ 2 │
+ // ├───┤ │ │
+ // │ └───┤ │
+ // ├───────┴───┤
+ // │ full │
+ // └───────────┘
+ rule.onNodeWithTag("0")
+ .assertAxisBounds(
+ DpOffset(0.dp, 0.dp),
+ DpSize(itemSizeDp, itemSizeDp)
+ )
+
+ rule.onNodeWithTag("1")
+ .assertAxisBounds(
+ DpOffset(itemSizeDp, 0.dp),
+ DpSize(itemSizeDp, itemSizeDp * 1.5f)
+ )
+
+ rule.onNodeWithTag("2")
+ .assertAxisBounds(
+ DpOffset(itemSizeDp * 2, 0.dp),
+ DpSize(itemSizeDp, itemSizeDp * 2f)
+ )
+
+ rule.onNodeWithTag("full")
+ .assertAxisBounds(
+ DpOffset(0.dp, itemSizeDp * 2f),
+ DpSize(itemSizeDp * 3, itemSizeDp)
+ )
+ }
+
+ @Test
+ fun fullSpan_scrollsCorrectly() {
+ val state = LazyStaggeredGridState()
+ state.prefetchingEnabled = false
+ rule.setContentWithTestViewConfiguration {
+ LazyStaggeredGrid(
+ 3,
+ Modifier
+ .testTag(LazyStaggeredGridTag)
+ .crossAxisSize(itemSizeDp * 3)
+ .mainAxisSize(itemSizeDp * 2),
+ state
+ ) {
+ items(3) {
+ Box(
+ Modifier
+ .testTag("$it")
+ .mainAxisSize(itemSizeDp + itemSizeDp * it / 2)
+ )
+ }
+
+ item(span = StaggeredGridItemSpan.FullLine) {
+ Box(Modifier.testTag("full").mainAxisSize(itemSizeDp))
+ }
+
+ items(3) {
+ Box(
+ Modifier
+ .testTag("${it + 3}")
+ .mainAxisSize(itemSizeDp + itemSizeDp * it / 2)
+ )
+ }
+
+ item(span = StaggeredGridItemSpan.FullLine) {
+ Box(Modifier.testTag("full-2").mainAxisSize(itemSizeDp))
+ }
+ }
+ }
+
+ // ┌───┬───┬───┐
+ // │ 0 │ 1 │ 2 │
+ // ├───┤ │ │
+ // │ └───┤ │
+ // ├───────┴───┤ <-- scroll offset
+ // │ full │
+ // ├───┬───┬───┤
+ // │ 3 │ 4 │ 5 │
+ // ├───┤ │ │ <-- end of screen
+ // │ └───┤ │
+ // ├───────┴───┤
+ // │ full-2 │
+ // └───────────┘
+ rule.onNodeWithTag(LazyStaggeredGridTag)
+ .scrollMainAxisBy(itemSizeDp * 2f)
+
+ rule.onNodeWithTag("full")
+ .assertAxisBounds(
+ DpOffset(0.dp, 0.dp),
+ DpSize(itemSizeDp * 3, itemSizeDp)
+ )
+
+ assertThat(state.firstVisibleItemIndex).isEqualTo(3)
+ assertThat(state.firstVisibleItemScrollOffset).isEqualTo(0)
+ }
+
+ @Test
+ fun fullSpan_scrollsCorrectly_pastFullSpan() {
+ val state = LazyStaggeredGridState()
+ state.prefetchingEnabled = false
+ rule.setContentWithTestViewConfiguration {
+ LazyStaggeredGrid(
+ 3,
+ Modifier
+ .testTag(LazyStaggeredGridTag)
+ .crossAxisSize(itemSizeDp * 3)
+ .mainAxisSize(itemSizeDp * 2),
+ state
+ ) {
+ repeat(10) { repeatIndex ->
+ items(3) {
+ Box(
+ Modifier
+ .testTag("${repeatIndex * 3 + it}")
+ .mainAxisSize(itemSizeDp + itemSizeDp * it / 2)
+ )
+ }
+
+ item(span = StaggeredGridItemSpan.FullLine) {
+ Box(Modifier.testTag("full-$repeatIndex").mainAxisSize(itemSizeDp))
+ }
+ }
+ }
+ }
+
+ // ┌───┬───┬───┐
+ // │ 0 │ 1 │ 2 │
+ // ├───┤ │ │
+ // │ └───┤ │
+ // ├───────┴───┤
+ // │ full-0 │
+ // ├───┬───┬───┤ <-- scroll offset
+ // │ 3 │ 4 │ 5 │
+ // ├───┤ │ │
+ // │ └───┤ │
+ // ├───────┴───┤ <-- end of screen
+ // │ full-1 │
+ // └───────────┘
+ rule.onNodeWithTag(LazyStaggeredGridTag)
+ .scrollMainAxisBy(itemSizeDp * 3f)
+
+ rule.onNodeWithTag("3")
+ .assertAxisBounds(
+ DpOffset(0.dp, 0.dp),
+ DpSize(itemSizeDp, itemSizeDp)
+ )
+
+ rule.onNodeWithTag("4")
+ .assertAxisBounds(
+ DpOffset(itemSizeDp, 0.dp),
+ DpSize(itemSizeDp, itemSizeDp * 1.5f)
+ )
+
+ rule.onNodeWithTag("5")
+ .assertAxisBounds(
+ DpOffset(itemSizeDp * 2, 0.dp),
+ DpSize(itemSizeDp, itemSizeDp * 2)
+ )
+
+ assertThat(state.firstVisibleItemIndex).isEqualTo(4)
+ assertThat(state.firstVisibleItemScrollOffset).isEqualTo(0)
+ }
+
+ @Test
+ fun fullSpan_scrollsCorrectly_pastFullSpan_andBack() {
+ val state = LazyStaggeredGridState()
+ state.prefetchingEnabled = false
+ rule.setContentWithTestViewConfiguration {
+ LazyStaggeredGrid(
+ 3,
+ Modifier
+ .testTag(LazyStaggeredGridTag)
+ .crossAxisSize(itemSizeDp * 3)
+ .mainAxisSize(itemSizeDp * 2),
+ state
+ ) {
+ repeat(10) { repeatIndex ->
+ items(3) {
+ Box(
+ Modifier
+ .testTag("${repeatIndex * 3 + it}")
+ .mainAxisSize(itemSizeDp + itemSizeDp * it / 2)
+ )
+ }
+
+ item(span = StaggeredGridItemSpan.FullLine) {
+ Box(Modifier.testTag("full-$repeatIndex").mainAxisSize(itemSizeDp))
+ }
+ }
+ }
+ }
+
+ rule.onNodeWithTag(LazyStaggeredGridTag)
+ .scrollMainAxisBy(itemSizeDp * 3f)
+
+ rule.onNodeWithTag(LazyStaggeredGridTag)
+ .scrollMainAxisBy(-itemSizeDp * 3f)
+
+ // ┌───┬───┬───┐ <-- scroll offset
+ // │ 0 │ 1 │ 2 │
+ // ├───┤ │ │
+ // │ └───┤ │
+ // ├───────┴───┤ <-- end of screen
+ // │ full-0 │
+ // ├───┬───┬───┤
+ // │ 3 │ 4 │ 5 │
+ // ├───┤ │ │
+ // │ └───┤ │
+ // ├───────┴───┤
+ // │ full-1 │
+ // └───────────┘
+
+ rule.onNodeWithTag("0")
+ .assertAxisBounds(
+ DpOffset(0.dp, 0.dp),
+ DpSize(itemSizeDp, itemSizeDp)
+ )
+
+ rule.onNodeWithTag("1")
+ .assertAxisBounds(
+ DpOffset(itemSizeDp, 0.dp),
+ DpSize(itemSizeDp, itemSizeDp * 1.5f)
+ )
+
+ rule.onNodeWithTag("2")
+ .assertAxisBounds(
+ DpOffset(itemSizeDp * 2, 0.dp),
+ DpSize(itemSizeDp, itemSizeDp * 2)
+ )
+
+ assertThat(state.firstVisibleItemIndex).isEqualTo(0)
+ assertThat(state.firstVisibleItemScrollOffset).isEqualTo(0)
+ }
+
+ @Test
+ fun fullSpan_scrollsCorrectly_multipleFullSpans() {
+ val state = LazyStaggeredGridState()
+ state.prefetchingEnabled = false
+ rule.setContentWithTestViewConfiguration {
+ LazyStaggeredGrid(
+ 3,
+ Modifier
+ .testTag(LazyStaggeredGridTag)
+ .crossAxisSize(itemSizeDp * 3)
+ .mainAxisSize(itemSizeDp * 2),
+ state
+ ) {
+ items(10, span = { StaggeredGridItemSpan.FullLine }) {
+ Box(
+ Modifier
+ .testTag("$it")
+ .mainAxisSize(itemSizeDp)
+ )
+ }
+ }
+ }
+
+ rule.onNodeWithTag(LazyStaggeredGridTag)
+ .scrollMainAxisBy(itemSizeDp * 3f)
+
+ rule.onNodeWithTag("3")
+ .assertAxisBounds(
+ DpOffset(0.dp, 0.dp),
+ DpSize(itemSizeDp * 3, itemSizeDp)
+ )
+
+ rule.onNodeWithTag("4")
+ .assertAxisBounds(
+ DpOffset(0.dp, itemSizeDp),
+ DpSize(itemSizeDp * 3, itemSizeDp)
+ )
+
+ assertThat(state.firstVisibleItemIndex).isEqualTo(3)
+ assertThat(state.firstVisibleItemScrollOffset).isEqualTo(0)
+
+ rule.onNodeWithTag(LazyStaggeredGridTag)
+ .scrollMainAxisBy(itemSizeDp * 10f)
+
+ rule.onNodeWithTag("8")
+ .assertAxisBounds(
+ DpOffset(0.dp, 0.dp),
+ DpSize(itemSizeDp * 3, itemSizeDp)
+ )
+
+ rule.onNodeWithTag("9")
+ .assertAxisBounds(
+ DpOffset(0.dp, itemSizeDp),
+ DpSize(itemSizeDp * 3, itemSizeDp)
+ )
+
+ assertThat(state.firstVisibleItemIndex).isEqualTo(8)
+ assertThat(state.firstVisibleItemScrollOffset).isEqualTo(0)
+ }
}
diff --git a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/textfield/TextFieldCursorTest.kt b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/textfield/TextFieldCursorTest.kt
index 319f135..3e2c1f1 100644
--- a/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/textfield/TextFieldCursorTest.kt
+++ b/compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/textfield/TextFieldCursorTest.kt
@@ -58,6 +58,7 @@
import com.google.common.truth.Truth.assertThat
import kotlin.math.ceil
import kotlin.math.floor
+import org.junit.Ignore
import org.junit.Rule
import org.junit.Test
@@ -205,6 +206,50 @@
)
}
+ // TODO(b/265177763) Update this test to set MotionDurationScale to 0 when that's supported.
+ @Ignore("b/265177763")
+ @Test
+ @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+ fun cursorBlinkingAnimation_whenSystemDisablesAnimations() = with(rule.density) {
+ rule.setContent {
+ // The padding helps if the test is run accidentally in landscape. Landscape makes
+ // the cursor to be next to the navigation bar which affects the red color to be a bit
+ // different - possibly anti-aliasing.
+ Box(Modifier.padding(boxPadding)) {
+ BasicTextField(
+ value = "",
+ >
+ textStyle = textStyle,
+ modifier = textFieldModifier,
+ cursorBrush = SolidColor(cursorColor),
+ >
+ )
+ }
+ }
+
+ focusAndWait()
+
+ // cursor visible first 500 ms
+ rule.mainClock.advanceTimeBy(100)
+ with(rule.density) {
+ rule.onNode(hasSetTextAction())
+ .captureToImage()
+ .assertCursor(2.dp, this, cursorRect)
+ }
+
+ // cursor invisible during next 500 ms
+ rule.mainClock.advanceTimeBy(700)
+ rule.onNode(hasSetTextAction())
+ .captureToImage()
+ .assertShape(
+ density = rule.density,
+ shape = RectangleShape,
+ shapeColor = Color.White,
+ backgroundColor = Color.White,
+ shapeOverlapPixelCount = 0.0f
+ )
+ }
+
@Test
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
fun cursorUnsetColor_noCursor() = with(rule.density) {
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridDsl.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridDsl.kt
index 28f690f..1a506df 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridDsl.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridDsl.kt
@@ -214,7 +214,7 @@
/**
* Add a single item to the staggered grid.
*
- * @param key a factory of stable and unique keys representing the item. The key
+ * @param key a stable and unique key representing the item. The key
* MUST be saveable via Bundle on Android. If set to null (by default), the position of the
* item will be used as a key instead.
* Using the same key for multiple items in the staggered grid is not allowed.
@@ -222,15 +222,18 @@
* When you specify the key the scroll position will be maintained based on the key, which
* means if you add/remove items before the current visible item the item with the given key
* will be kept as the first visible one.
- * @param contentType a factory of content types representing the item. Content for item of
+ * @param contentType a content type representing the item. Content for item of
* the same type can be reused more efficiently. null is a valid type as well and items
* of such type will be considered compatible.
+ * @param span a custom span for this item. Spans configure how many lanes defined by
+ * [StaggeredGridCells] the item will occupy. By default each item will take one lane.
* @param content composable content displayed by current item
*/
@ExperimentalFoundationApi
fun item(
key: Any? = null,
contentType: Any? = null,
+ span: StaggeredGridItemSpan? = null,
content: @Composable LazyStaggeredGridItemScope.() -> Unit
)
@@ -249,12 +252,15 @@
* @param contentType a factory of content types representing the item. Content for item of
* the same type can be reused more efficiently. null is a valid type as well and items
* of such type will be considered compatible.
+ * @param span a factory of custom spans for this item. Spans configure how many lanes defined
+ * by [StaggeredGridCells] the item will occupy. By default each item will take one lane.
* @param itemContent composable content displayed by item on provided position
*/
fun items(
count: Int,
key: ((index: Int) -> Any)? = null,
contentType: (index: Int) -> Any? = { null },
+ span: ((index: Int) -> StaggeredGridItemSpan)? = null,
itemContent: @Composable LazyStaggeredGridItemScope.(index: Int) -> Unit
)
}
@@ -274,14 +280,17 @@
* @param contentType a factory of content types representing the item. Content for item of
* the same type can be reused more efficiently. null is a valid type as well and items
* of such type will be considered compatible.
+ * @param span a factory of custom spans for this item. Spans configure how many lanes defined
+ * by [StaggeredGridCells] the item will occupy. By default each item will take one lane.
* @param itemContent composable content displayed by the provided item
*/
@ExperimentalFoundationApi
-fun <T> LazyStaggeredGridScope.items(
+inline fun <T> LazyStaggeredGridScope.items(
items: List<T>,
- key: ((item: T) -> Any)? = null,
- contentType: (item: T) -> Any? = { null },
- itemContent: @Composable LazyStaggeredGridItemScope.(item: T) -> Unit
+ noinline key: ((item: T) -> Any)? = null,
+ crossinline contentType: (item: T) -> Any? = { null },
+ noinline span: ((item: T) -> StaggeredGridItemSpan)? = null,
+ crossinline itemContent: @Composable LazyStaggeredGridItemScope.(item: T) -> Unit
) {
items(
count = items.size,
@@ -289,6 +298,9 @@
{ index -> key(items[index]) }
},
contentType = { index -> contentType(items[index]) },
+ span = span?.let {
+ { index -> span(items[index]) }
+ },
itemContent = { index -> itemContent(items[index]) }
)
}
@@ -308,14 +320,17 @@
* @param contentType a factory of content types representing the item. Content for item of
* the same type can be reused more efficiently. null is a valid type as well and items
* of such type will be considered compatible.
+ * @param span a factory of custom spans for this item. Spans configure how many lanes defined
+ * by [StaggeredGridCells] the item will occupy. By default each item will take one lane.
* @param itemContent composable content displayed given item and index
*/
@ExperimentalFoundationApi
-fun <T> LazyStaggeredGridScope.itemsIndexed(
+inline fun <T> LazyStaggeredGridScope.itemsIndexed(
items: List<T>,
- key: ((index: Int, item: T) -> Any)? = null,
- contentType: (index: Int, item: T) -> Any? = { _, _ -> null },
- itemContent: @Composable LazyStaggeredGridItemScope.(index: Int, item: T) -> Unit
+ noinline key: ((index: Int, item: T) -> Any)? = null,
+ crossinline contentType: (index: Int, item: T) -> Any? = { _, _ -> null },
+ noinline span: ((index: Int, item: T) -> StaggeredGridItemSpan)? = null,
+ crossinline itemContent: @Composable LazyStaggeredGridItemScope.(index: Int, item: T) -> Unit
) {
items(
count = items.size,
@@ -323,6 +338,9 @@
{ index -> key(index, items[index]) }
},
contentType = { index -> contentType(index, items[index]) },
+ span = span?.let {
+ { index -> span(index, items[index]) }
+ },
itemContent = { index -> itemContent(index, items[index]) }
)
}
@@ -342,14 +360,17 @@
* @param contentType a factory of content types representing the item. Content for item of
* the same type can be reused more efficiently. null is a valid type as well and items
* of such type will be considered compatible.
+ * @param span a factory of custom spans for this item. Spans configure how many lanes defined
+ * by [StaggeredGridCells] the item will occupy. By default each item will take one lane.
* @param itemContent composable content displayed by the provided item
*/
@ExperimentalFoundationApi
-fun <T> LazyStaggeredGridScope.items(
+inline fun <T> LazyStaggeredGridScope.items(
items: Array<T>,
- key: ((item: T) -> Any)? = null,
- contentType: (item: T) -> Any? = { null },
- itemContent: @Composable LazyStaggeredGridItemScope.(item: T) -> Unit
+ noinline key: ((item: T) -> Any)? = null,
+ crossinline contentType: (item: T) -> Any? = { null },
+ noinline span: ((item: T) -> StaggeredGridItemSpan)? = null,
+ crossinline itemContent: @Composable LazyStaggeredGridItemScope.(item: T) -> Unit
) {
items(
count = items.size,
@@ -357,6 +378,9 @@
{ index -> key(items[index]) }
},
contentType = { index -> contentType(items[index]) },
+ span = span?.let {
+ { index -> span(items[index]) }
+ },
itemContent = { index -> itemContent(items[index]) }
)
}
@@ -376,14 +400,17 @@
* @param contentType a factory of content types representing the item. Content for item of
* the same type can be reused more efficiently. null is a valid type as well and items
* of such type will be considered compatible.
+ * @param span a factory of custom spans for this item. Spans configure how many lanes defined
+ * by [StaggeredGridCells] the item will occupy. By default each item will take one lane.
* @param itemContent composable content displayed given item and index
*/
@ExperimentalFoundationApi
-fun <T> LazyStaggeredGridScope.itemsIndexed(
+inline fun <T> LazyStaggeredGridScope.itemsIndexed(
items: Array<T>,
- key: ((index: Int, item: T) -> Any)? = null,
- contentType: (index: Int, item: T) -> Any? = { _, _ -> null },
- itemContent: @Composable LazyStaggeredGridItemScope.(index: Int, item: T) -> Unit
+ noinline key: ((index: Int, item: T) -> Any)? = null,
+ crossinline contentType: (index: Int, item: T) -> Any? = { _, _ -> null },
+ noinline span: ((index: Int, item: T) -> StaggeredGridItemSpan)? = null,
+ crossinline itemContent: @Composable LazyStaggeredGridItemScope.(index: Int, item: T) -> Unit
) {
items(
count = items.size,
@@ -391,6 +418,9 @@
{ index -> key(index, items[index]) }
},
contentType = { index -> contentType(index, items[index]) },
+ span = span?.let {
+ { index -> span(index, items[index]) }
+ },
itemContent = { index -> itemContent(index, items[index]) }
)
}
\ No newline at end of file
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridItemProvider.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridItemProvider.kt
index 5d35898..be07e927 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridItemProvider.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridItemProvider.kt
@@ -25,12 +25,17 @@
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberUpdatedState
+@OptIn(ExperimentalFoundationApi::class)
+internal interface LazyStaggeredGridItemProvider : LazyLayoutItemProvider {
+ val spanProvider: LazyStaggeredGridSpanProvider
+}
+
@Composable
@ExperimentalFoundationApi
internal fun rememberStaggeredGridItemProvider(
state: LazyStaggeredGridState,
content: LazyStaggeredGridScope.() -> Unit,
-): LazyLayoutItemProvider {
+): LazyStaggeredGridItemProvider {
val latestContent = rememberUpdatedState(content)
val nearestItemsRangeState = rememberLazyNearestItemsRangeState(
firstVisibleItemIndex = { state.firstVisibleItemIndex },
@@ -40,16 +45,24 @@
return remember(state) {
val itemProviderState = derivedStateOf {
val scope = LazyStaggeredGridScopeImpl().apply(latestContent.value)
- LazyLayoutItemProvider(
+ object : LazyLayoutItemProvider by LazyLayoutItemProvider(
scope.intervals,
nearestItemsRangeState.value,
- ) { interval, index ->
- interval.value.item.invoke(
- LazyStaggeredGridItemScopeImpl,
- index - interval.startIndex
- )
+ { interval, index ->
+ interval.value.item.invoke(
+ LazyStaggeredGridItemScopeImpl,
+ index - interval.startIndex
+ )
+ }
+ ), LazyStaggeredGridItemProvider {
+ override val spanProvider = LazyStaggeredGridSpanProvider(scope.intervals)
}
}
- object : LazyLayoutItemProvider by DelegatingLazyLayoutItemProvider(itemProviderState) { }
+
+ object : LazyLayoutItemProvider by DelegatingLazyLayoutItemProvider(itemProviderState),
+ LazyStaggeredGridItemProvider {
+
+ override val spanProvider get() = itemProviderState.value.spanProvider
+ }
}
}
\ No newline at end of file
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridLaneInfo.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridLaneInfo.kt
new file mode 100644
index 0000000..eee96e9
--- /dev/null
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridLaneInfo.kt
@@ -0,0 +1,207 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.foundation.lazy.staggeredgrid
+
+/**
+ * Utility class to remember grid lane assignments in a sliding window relative to requested
+ * item position (usually reflected by scroll position).
+ * Remembers the maximum range of remembered items is reflected by [MaxCapacity], if index is beyond
+ * the bounds, [anchor] moves to reflect new position.
+ */
+internal class LazyStaggeredGridLaneInfo {
+ private var anchor = 0
+ private var lanes = IntArray(16)
+ private val spannedItems = ArrayDeque<SpannedItem>()
+
+ private class SpannedItem(val index: Int, var gaps: IntArray)
+
+ /**
+ * Sets given lane for given item index.
+ */
+ fun setLane(itemIndex: Int, lane: Int) {
+ require(itemIndex >= 0) { "Negative lanes are not supported" }
+ ensureValidIndex(itemIndex)
+ lanes[itemIndex - anchor] = lane + 1
+ }
+
+ /**
+ * Get lane for given item index.
+ * @return lane previously recorded for given item or [Unset] if it doesn't exist.
+ */
+ fun getLane(itemIndex: Int): Int {
+ if (itemIndex < lowerBound() || itemIndex >= upperBound()) {
+ return Unset
+ }
+ return lanes[itemIndex - anchor] - 1
+ }
+
+ /**
+ * Checks whether item can be in the target lane
+ * @param itemIndex item to check lane for
+ * @param targetLane lane it should belong to
+ */
+ fun assignedToLane(itemIndex: Int, targetLane: Int): Boolean {
+ val lane = getLane(itemIndex)
+ return lane == targetLane || lane == Unset || lane == FullSpan
+ }
+
+ /**
+ * @return upper bound of currently valid item range
+ */
+ /* @VisibleForTests */
+ fun upperBound(): Int = anchor + lanes.size
+
+ /**
+ * @return lower bound of currently valid item range
+ */
+ /* @VisibleForTests */
+ fun lowerBound(): Int = anchor
+
+ /**
+ * Delete remembered lane assignments.
+ */
+ fun reset() {
+ lanes.fill(0)
+ spannedItems.clear()
+ }
+
+ /**
+ * Find the previous item relative to [itemIndex] set to target lane
+ * @return found item index or -1 if it doesn't exist.
+ */
+ fun findPreviousItemIndex(itemIndex: Int, targetLane: Int): Int {
+ for (i in (itemIndex - 1) downTo 0) {
+ if (assignedToLane(i, targetLane)) {
+ return i
+ }
+ }
+ return -1
+ }
+
+ /**
+ * Find the next item relative to [itemIndex] set to target lane
+ * @return found item index or [upperBound] if it doesn't exist.
+ */
+ fun findNextItemIndex(itemIndex: Int, targetLane: Int): Int {
+ for (i in itemIndex + 1 until upperBound()) {
+ if (assignedToLane(i, targetLane)) {
+ return i
+ }
+ }
+ return upperBound()
+ }
+
+ fun ensureValidIndex(requestedIndex: Int) {
+ val requestedCapacity = requestedIndex - anchor
+
+ if (requestedCapacity in 0 until MaxCapacity) {
+ // simplest path - just grow array to given capacity
+ ensureCapacity(requestedCapacity + 1)
+ } else {
+ // requested index is beyond current span bounds
+ // rebase anchor so that requested index is in the middle of span array
+ val oldAnchor = anchor
+ anchor = maxOf(requestedIndex - (lanes.size / 2), 0)
+ var delta = anchor - oldAnchor
+
+ if (delta >= 0) {
+ // copy previous span data if delta is smaller than span size
+ if (delta < lanes.size) {
+ lanes.copyInto(
+ lanes,
+ destinationOffset = 0,
+ startIndex = delta,
+ endIndex = lanes.size
+ )
+ }
+ // fill the rest of the spans with default values
+ lanes.fill(0, maxOf(0, lanes.size - delta), lanes.size)
+ } else {
+ delta = -delta
+ // check if we can grow spans to match delta
+ if (lanes.size + delta < MaxCapacity) {
+ // grow spans and leave space in the start
+ ensureCapacity(lanes.size + delta + 1, delta)
+ } else {
+ // otherwise, just move data that fits
+ if (delta < lanes.size) {
+ lanes.copyInto(
+ lanes,
+ destinationOffset = delta,
+ startIndex = 0,
+ endIndex = lanes.size - delta
+ )
+ }
+ // fill the rest of the spans with default values
+ lanes.fill(0, 0, minOf(lanes.size, delta))
+ }
+ }
+ }
+
+ // ensure full item spans beyond saved index are forgotten to save memory
+
+ while (spannedItems.isNotEmpty() && spannedItems.first().index < lowerBound()) {
+ spannedItems.removeFirst()
+ }
+
+ while (spannedItems.isNotEmpty() && spannedItems.last().index > upperBound()) {
+ spannedItems.removeLast()
+ }
+ }
+
+ fun setGaps(itemIndex: Int, gaps: IntArray?) {
+ val foundIndex = spannedItems.binarySearchBy(itemIndex) { it.index }
+ if (foundIndex < 0) {
+ if (gaps == null) {
+ return
+ }
+ // not found, insert new element
+ val insertionIndex = -(foundIndex + 1)
+ spannedItems.add(insertionIndex, SpannedItem(itemIndex, gaps))
+ } else {
+ if (gaps == null) {
+ // found, but gaps are reset, remove item
+ spannedItems.removeAt(foundIndex)
+ } else {
+ // found, update gaps
+ spannedItems[foundIndex].gaps = gaps
+ }
+ }
+ }
+
+ fun getGaps(itemIndex: Int): IntArray? {
+ val foundIndex = spannedItems.binarySearchBy(itemIndex) { it.index }
+ return spannedItems.getOrNull(foundIndex)?.gaps
+ }
+
+ private fun ensureCapacity(capacity: Int, newOffset: Int = 0) {
+ require(capacity <= MaxCapacity) {
+ "Requested item capacity $capacity is larger than max supported: $MaxCapacity!"
+ }
+ if (lanes.size < capacity) {
+ var newSize = lanes.size
+ while (newSize < capacity) newSize *= 2
+ lanes = lanes.copyInto(IntArray(newSize), destinationOffset = newOffset)
+ }
+ }
+
+ companion object {
+ private const val MaxCapacity = 131_072 // Closest to 100_000, 2 ^ 17
+ internal const val Unset = -1
+ internal const val FullSpan = -2
+ }
+}
\ No newline at end of file
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridMeasure.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridMeasure.kt
index 138d229..1c365bf 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridMeasure.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridMeasure.kt
@@ -21,6 +21,8 @@
import androidx.compose.foundation.fastMaxOfOrNull
import androidx.compose.foundation.lazy.layout.LazyLayoutItemProvider
import androidx.compose.foundation.lazy.layout.LazyLayoutMeasureScope
+import androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridLaneInfo.Companion.FullSpan
+import androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridLaneInfo.Companion.Unset
import androidx.compose.runtime.collection.MutableVector
import androidx.compose.runtime.snapshots.Snapshot
import androidx.compose.ui.layout.Placeable
@@ -30,15 +32,24 @@
import androidx.compose.ui.unit.constrainHeight
import androidx.compose.ui.unit.constrainWidth
import androidx.compose.ui.util.fastForEach
+import androidx.compose.ui.util.packInts
+import androidx.compose.ui.util.unpackInt1
+import androidx.compose.ui.util.unpackInt2
import kotlin.math.abs
-import kotlin.math.min
import kotlin.math.roundToInt
import kotlin.math.sign
+private const val DebugLoggingEnabled = false
+private inline fun debugLog(message: () -> String) {
+ if (DebugLoggingEnabled) {
+ println(message())
+ }
+}
+
@ExperimentalFoundationApi
internal fun LazyLayoutMeasureScope.measureStaggeredGrid(
state: LazyStaggeredGridState,
- itemProvider: LazyLayoutItemProvider,
+ itemProvider: LazyStaggeredGridItemProvider,
resolvedSlotSums: IntArray,
constraints: Constraints,
isVertical: Boolean,
@@ -77,23 +88,23 @@
} else {
// Grid got resized (or we are in a initial state)
// Adjust indices accordingly
- context.spans.reset()
+ context.laneInfo.reset()
IntArray(resolvedSlotSums.size).apply {
// Try to adjust indices in case grid got resized
for (lane in indices) {
this[lane] = if (
- lane < firstVisibleIndices.size && firstVisibleIndices[lane] != -1
+ lane < firstVisibleIndices.size && firstVisibleIndices[lane] != Unset
) {
firstVisibleIndices[lane]
} else {
if (lane == 0) {
0
} else {
- context.findNextItemIndex(this[lane - 1], lane)
+ maxInRange(SpanRange(0, lane)) + 1
}
}
// Ensure spans are updated to be in correct range
- context.spans.setSpan(this[lane], lane)
+ context.laneInfo.setLane(this[lane], lane)
}
}
}
@@ -127,7 +138,7 @@
@OptIn(ExperimentalFoundationApi::class)
private class LazyStaggeredGridMeasureContext(
val state: LazyStaggeredGridState,
- val itemProvider: LazyLayoutItemProvider,
+ val itemProvider: LazyStaggeredGridItemProvider,
val resolvedSlotSums: IntArray,
val constraints: Constraints,
val isVertical: Boolean,
@@ -143,20 +154,40 @@
isVertical,
itemProvider,
measureScope,
- resolvedSlotSums
- ) { index, lane, key, placeables ->
- val isLastInLane = spans.findNextItemIndex(index, lane) >= itemProvider.itemCount
+ resolvedSlotSums,
+ crossAxisSpacing
+ ) { index, lane, span, key, placeables ->
LazyStaggeredGridMeasuredItem(
index,
key,
placeables,
isVertical,
contentOffset,
- if (isLastInLane) 0 else mainAxisSpacing
+ mainAxisSpacing,
+ lane,
+ span
)
}
- val spans = state.spans
+ val laneInfo = state.laneInfo
+
+ val laneCount = resolvedSlotSums.size
+
+ fun LazyStaggeredGridItemProvider.isFullSpan(itemIndex: Int): Boolean =
+ spanProvider.isFullSpan(itemIndex)
+
+ fun LazyStaggeredGridItemProvider.getSpanRange(itemIndex: Int, lane: Int): SpanRange {
+ val isFullSpan = spanProvider.isFullSpan(itemIndex)
+ val span = if (isFullSpan) laneCount else 1
+ val targetLane = if (isFullSpan) 0 else lane
+ return SpanRange(targetLane, span)
+ }
+
+ inline val SpanRange.isFullSpan: Boolean
+ get() = end - start != 1
+
+ inline val SpanRange.laneInfo: Int
+ get() = if (isFullSpan) FullSpan else start
}
@ExperimentalFoundationApi
@@ -169,7 +200,7 @@
with(measureScope) {
val itemCount = itemProvider.itemCount
- if (itemCount <= 0 || resolvedSlotSums.isEmpty()) {
+ if (itemCount <= 0 || laneCount == 0) {
return LazyStaggeredGridMeasureResult(
firstVisibleItemIndices = initialItemIndices,
firstVisibleItemScrollOffsets = initialItemOffsets,
@@ -202,7 +233,7 @@
firstItemOffsets.offsetBy(-scrollDelta)
// this will contain all the MeasuredItems representing the visible items
- val measuredItems = Array(resolvedSlotSums.size) {
+ val measuredItems = Array(laneCount) {
ArrayDeque<LazyStaggeredGridMeasuredItem>()
}
@@ -215,7 +246,7 @@
val itemIndex = firstItemIndices[lane]
val itemOffset = firstItemOffsets[lane]
- if (itemOffset < -mainAxisSpacing && itemIndex > 0) {
+ if (itemOffset < maxOf(-mainAxisSpacing, 0) && itemIndex > 0) {
return true
}
}
@@ -225,33 +256,60 @@
var laneToCheckForGaps = -1
- // we had scrolled backward or we compose items in the start padding area, which means
- // items before current firstItemScrollOffset should be visible. compose them and update
- // firstItemScrollOffset
- while (hasSpaceBeforeFirst()) {
- val laneIndex = firstItemOffsets.indexOfMinValue()
- val previousItemIndex = findPreviousItemIndex(
- item = firstItemIndices[laneIndex],
- lane = laneIndex
- )
+ debugLog { "=========== MEASURE START ==========" }
+ debugLog {
+ "| Filling up from indices: ${firstItemIndices.toList()}, " +
+ "offsets: ${firstItemOffsets.toList()}"
+ }
+ // we had scrolled backward or we compose items in the start padding area, which means
+ // items before current firstItemOffset should be visible. compose them and update
+ // firstItemOffsets
+ while (hasSpaceBeforeFirst()) {
+ // staggered grid always keeps item index increasing top to bottom
+ // the first item that should contain something before it must have the largest index
+ // among the rest
+ val laneIndex = firstItemIndices.indexOfMaxValue()
+ val itemIndex = firstItemIndices[laneIndex]
+
+ // other lanes might have smaller offsets than the one chosen above, which indicates
+ // incorrect measurement (e.g. item was deleted or it changed size)
+ // correct this by offsetting affected lane back to match currently chosen offset
+ for (i in firstItemOffsets.indices) {
+ if (
+ firstItemIndices[i] != firstItemIndices[laneIndex] &&
+ firstItemOffsets[i] < firstItemOffsets[laneIndex]
+ ) {
+ // If offset of the lane is smaller than currently chosen lane,
+ // offset the lane to be where current value of the chosen index is.
+ firstItemOffsets[i] = firstItemOffsets[laneIndex]
+ }
+ }
+
+ val previousItemIndex = findPreviousItemIndex(itemIndex, laneIndex)
if (previousItemIndex < 0) {
laneToCheckForGaps = laneIndex
break
}
- if (spans.getSpan(previousItemIndex) == LazyStaggeredGridSpans.Unset) {
- spans.setSpan(previousItemIndex, laneIndex)
- }
-
+ val spanRange = itemProvider.getSpanRange(previousItemIndex, laneIndex)
+ laneInfo.setLane(previousItemIndex, spanRange.laneInfo)
val measuredItem = measuredItemProvider.getAndMeasure(
- previousItemIndex,
- laneIndex
+ index = previousItemIndex,
+ span = spanRange
)
- measuredItems[laneIndex].addFirst(measuredItem)
- firstItemIndices[laneIndex] = previousItemIndex
- firstItemOffsets[laneIndex] += measuredItem.sizeWithSpacings
+ val offset = firstItemOffsets.maxInRange(spanRange)
+ val gaps = if (spanRange.isFullSpan) laneInfo.getGaps(previousItemIndex) else null
+ spanRange.forEach { lane ->
+ firstItemIndices[lane] = previousItemIndex
+ val gap = if (gaps == null) 0 else gaps[lane]
+ firstItemOffsets[lane] = offset + measuredItem.sizeWithSpacings + gap
+ }
+ }
+ debugLog {
+ @Suppress("ListIterator")
+ "| up filled, measured items are ${measuredItems.map { it.map { it.index } }}"
}
fun misalignedStart(referenceLane: Int): Boolean {
@@ -261,17 +319,19 @@
// Case 1: Each lane has laid out all items, but offsets do no match
val misalignedOffsets = laneRange.any { lane ->
- findPreviousItemIndex(firstItemIndices[lane], lane) == -1 &&
+ findPreviousItemIndex(firstItemIndices[lane], lane) == Unset &&
firstItemOffsets[lane] != firstItemOffsets[referenceLane]
}
// Case 2: Some lanes are still missing items, and there's no space left to place them
val moreItemsInOtherLanes = laneRange.any { lane ->
- findPreviousItemIndex(firstItemIndices[lane], lane) != -1 &&
+ findPreviousItemIndex(firstItemIndices[lane], lane) != Unset &&
firstItemOffsets[lane] >= firstItemOffsets[referenceLane]
}
// Case 3: the first item is in the wrong lane (it should always be in
// the first one)
- val firstItemInWrongLane = spans.getSpan(0) != 0
+ val firstItemLane = laneInfo.getLane(0)
+ val firstItemInWrongLane =
+ firstItemLane != 0 && firstItemLane != Unset && firstItemLane != FullSpan
// If items are not aligned, reset all measurement data we gathered before and
// proceed with initial measure
return misalignedOffsets || moreItemsInOtherLanes || firstItemInWrongLane
@@ -285,6 +345,9 @@
if (firstItemOffsets[0] < minOffset) {
scrollDelta += firstItemOffsets[0]
firstItemOffsets.offsetBy(minOffset - firstItemOffsets[0])
+ debugLog {
+ "| correcting scroll delta from ${firstItemOffsets[0]} to $minOffset"
+ }
}
// neutralize previously added start padding as we stopped filling the before content padding
@@ -297,7 +360,7 @@
if (laneToCheckForGaps != -1) {
val lane = laneToCheckForGaps
if (misalignedStart(lane) && canRestartMeasure) {
- spans.reset()
+ laneInfo.reset()
return measure(
initialScrollDelta = scrollDelta,
initialItemIndices = IntArray(firstItemIndices.size) { -1 },
@@ -309,29 +372,73 @@
}
}
- val currentItemIndices = initialItemIndices.copyOf().apply {
- // ensure indices match item count, in case it decreased
- ensureIndicesInRange(this, itemCount)
- }
- val currentItemOffsets = IntArray(initialItemOffsets.size) {
- -(initialItemOffsets[it] - scrollDelta)
+ // start measuring down from first item indices/offsets decided above to ensure correct
+ // arrangement.
+ // this means we are calling measure second time on items previously measured in this
+ // function, but LazyLayout caches them, so no overhead.
+ val currentItemIndices = firstItemIndices.copyOf()
+ val currentItemOffsets = IntArray(firstItemOffsets.size) {
+ -firstItemOffsets[it]
}
val maxOffset = (mainAxisAvailableSize + afterContentPadding).coerceAtLeast(0)
- // compose first visible items we received from state
- currentItemIndices.forEachIndexed { laneIndex, itemIndex ->
- if (itemIndex < 0) return@forEachIndexed
+ debugLog {
+ "| filling from current: indices: ${currentItemIndices.toList()}, " +
+ "offsets: ${currentItemOffsets.toList()}"
+ }
- val measuredItem = measuredItemProvider.getAndMeasure(itemIndex, laneIndex)
- currentItemOffsets[laneIndex] += measuredItem.sizeWithSpacings
- measuredItems[laneIndex].addLast(measuredItem)
+ // current item should be pointing to the index of previously measured item below,
+ // as lane assignments must be decided based on size and offset of all previous items
+ // this loop makes sure to measure items that were initially passed to the current item
+ // indices with correct item order
+ var initialItemsMeasured = 0
+ var initialLaneToMeasure = currentItemIndices.indexOfMinValue()
+ while (initialLaneToMeasure != -1 && initialItemsMeasured < laneCount) {
+ val itemIndex = currentItemIndices[initialLaneToMeasure]
+ val laneIndex = initialLaneToMeasure
- spans.setSpan(itemIndex, laneIndex)
+ initialLaneToMeasure = currentItemIndices.indexOfMinValue(minBound = itemIndex)
+ initialItemsMeasured++
+
+ if (itemIndex < 0) continue
+
+ val spanRange = itemProvider.getSpanRange(itemIndex, laneIndex)
+ val measuredItem = measuredItemProvider.getAndMeasure(
+ itemIndex,
+ spanRange
+ )
+
+ laneInfo.setLane(itemIndex, spanRange.laneInfo)
+ val offset = currentItemOffsets.maxInRange(spanRange) + measuredItem.sizeWithSpacings
+ spanRange.forEach { lane ->
+ currentItemOffsets[lane] = offset
+ currentItemIndices[lane] = itemIndex
+ measuredItems[lane].addLast(measuredItem)
+ }
+
+ if (currentItemOffsets[spanRange.start] <= minOffset + mainAxisSpacing) {
+ measuredItem.isVisible = false
+ }
+
+ if (spanRange.isFullSpan) {
+ // full span items overwrite other slots if we measure it here, so skip measuring
+ // the rest of the slots
+ initialItemsMeasured = laneCount
+ }
+ }
+
+ debugLog {
+ @Suppress("ListIterator")
+ "| current filled, measured items are ${measuredItems.map { it.map { it.index } }}"
+ }
+ debugLog {
+ "| filling down from indices: ${currentItemIndices.toList()}, " +
+ "offsets: ${currentItemOffsets.toList()}"
}
// then composing visible items forward until we fill the whole viewport.
- // we want to have at least one item in visibleItems even if in fact all the items are
+ // we want to have at least one item in measuredItems even if in fact all the items are
// offscreen, this can happen if the content padding is larger than the available size.
while (
currentItemOffsets.any {
@@ -340,74 +447,72 @@
} || measuredItems.all { it.isEmpty() }
) {
val currentLaneIndex = currentItemOffsets.indexOfMinValue()
- val nextItemIndex =
- findNextItemIndex(currentItemIndices[currentLaneIndex], currentLaneIndex)
+ val previousItemIndex = currentItemIndices.max()
+ val itemIndex = previousItemIndex + 1
- if (nextItemIndex >= itemCount) {
- // if any items changed its size, the spans may not behave correctly
- // there are no more items in this lane, but there could be more in others
- // recheck if we can add more items and reset spans accordingly
- var missedItemIndex = Int.MAX_VALUE
- currentItemIndices.forEachIndexed { laneIndex, i ->
- if (laneIndex == currentLaneIndex) return@forEachIndexed
- var itemIndex = findNextItemIndex(i, laneIndex)
- while (itemIndex < itemCount) {
- missedItemIndex = minOf(itemIndex, missedItemIndex)
- spans.setSpan(itemIndex, LazyStaggeredGridSpans.Unset)
- itemIndex = findNextItemIndex(itemIndex, laneIndex)
- }
- }
- // there's at least one missed item which may fit current lane
- if (missedItemIndex != Int.MAX_VALUE && canRestartMeasure) {
- // reset current lane to the missed item index and restart measure
- initialItemIndices[currentLaneIndex] =
- min(initialItemIndices[currentLaneIndex], missedItemIndex)
- return measure(
- initialScrollDelta = initialScrollDelta,
- initialItemIndices = initialItemIndices,
- initialItemOffsets = initialItemOffsets,
- canRestartMeasure = false
- )
- } else {
- break
- }
+ if (itemIndex >= itemCount) {
+ break
}
- if (firstItemIndices[currentLaneIndex] == -1) {
- firstItemIndices[currentLaneIndex] = nextItemIndex
- }
- spans.setSpan(nextItemIndex, currentLaneIndex)
+ val spanRange = itemProvider.getSpanRange(itemIndex, currentLaneIndex)
- val measuredItem =
- measuredItemProvider.getAndMeasure(nextItemIndex, currentLaneIndex)
- currentItemOffsets[currentLaneIndex] += measuredItem.sizeWithSpacings
- measuredItems[currentLaneIndex].addLast(measuredItem)
- currentItemIndices[currentLaneIndex] = nextItemIndex
+ laneInfo.setLane(itemIndex, spanRange.laneInfo)
+ val measuredItem = measuredItemProvider.getAndMeasure(itemIndex, spanRange)
+
+ val offset = currentItemOffsets.maxInRange(spanRange)
+ val gaps = if (spanRange.isFullSpan) {
+ laneInfo.getGaps(itemIndex) ?: IntArray(laneCount)
+ } else {
+ null
+ }
+ spanRange.forEach { lane ->
+ if (gaps != null) {
+ gaps[lane] = offset - currentItemOffsets[lane]
+ }
+ currentItemIndices[lane] = itemIndex
+ currentItemOffsets[lane] = offset + measuredItem.sizeWithSpacings
+ measuredItems[lane].addLast(measuredItem)
+ }
+ laneInfo.setGaps(itemIndex, gaps)
+
+ if (currentItemOffsets[spanRange.start] <= minOffset + mainAxisSpacing) {
+ // We scrolled past measuredItem, and it is not visible anymore. We measured it
+ // for correct positioning of other items, but there's no need to place it.
+ // Mark it as not visible and filter below.
+ measuredItem.isVisible = false
+ }
+ }
+
+ debugLog {
+ @Suppress("ListIterator")
+ "| down filled, measured items are ${measuredItems.map { it.map { it.index } }}"
}
// some measured items are offscreen, remove them from the list and adjust indices/offsets
for (laneIndex in measuredItems.indices) {
val laneItems = measuredItems[laneIndex]
- var offset = currentItemOffsets[laneIndex]
- var inBoundsIndex = 0
- for (i in laneItems.lastIndex downTo 0) {
- val item = laneItems[i]
- offset -= item.sizeWithSpacings
- inBoundsIndex = i
- if (offset <= minOffset + mainAxisSpacing) {
- break
- }
+
+ while (laneItems.size > 1 && !laneItems.first().isVisible) {
+ val item = laneItems.removeFirst()
+ val gaps = if (item.span != 1) laneInfo.getGaps(item.index) else null
+ firstItemOffsets[laneIndex] -=
+ item.sizeWithSpacings + if (gaps == null) 0 else gaps[laneIndex]
}
- // the rest of the items are offscreen, update firstIndex/Offset for lane and remove
- // items from measured list
- for (i in 0 until inBoundsIndex) {
- val item = laneItems.removeFirst()
- firstItemOffsets[laneIndex] -= item.sizeWithSpacings
- }
- if (laneItems.isNotEmpty()) {
- firstItemIndices[laneIndex] = laneItems.first().index
- }
+ firstItemIndices[laneIndex] = laneItems.firstOrNull()?.index ?: Unset
+ }
+
+ if (currentItemIndices.any { it == itemCount - 1 }) {
+ currentItemOffsets.offsetBy(-mainAxisSpacing)
+ }
+
+ debugLog {
+ @Suppress("ListIterator")
+ "| removed invisible items: ${measuredItems.map { it.map { it.index } }}"
+ }
+ debugLog {
+ "| filling back up from indices: ${firstItemIndices.toList()}, " +
+ "offsets: ${firstItemOffsets.toList()}"
}
// we didn't fill the whole viewport with items starting from firstVisibleItemIndex.
@@ -433,7 +538,7 @@
if (previousIndex < 0) {
if (misalignedStart(laneIndex) && canRestartMeasure) {
- spans.reset()
+ laneInfo.reset()
return measure(
initialScrollDelta = scrollDelta,
initialItemIndices = IntArray(firstItemIndices.size) { -1 },
@@ -446,15 +551,21 @@
break
}
- spans.setSpan(previousIndex, laneIndex)
-
+ val spanRange = itemProvider.getSpanRange(previousIndex, laneIndex)
+ laneInfo.setLane(previousIndex, spanRange.laneInfo)
val measuredItem = measuredItemProvider.getAndMeasure(
- previousIndex,
- laneIndex
+ index = previousIndex,
+ spanRange
)
- measuredItems[laneIndex].addFirst(measuredItem)
- firstItemOffsets[laneIndex] += measuredItem.sizeWithSpacings
- firstItemIndices[laneIndex] = previousIndex
+
+ val offset = firstItemOffsets.maxInRange(spanRange)
+ val gaps = if (spanRange.isFullSpan) laneInfo.getGaps(previousIndex) else null
+ spanRange.forEach { lane ->
+ measuredItems[lane].addFirst(measuredItem)
+ firstItemIndices[lane] = previousIndex
+ val gap = if (gaps == null) 0 else gaps[lane]
+ firstItemOffsets[lane] = offset + measuredItem.sizeWithSpacings + gap
+ }
}
scrollDelta += toScrollBack
@@ -467,6 +578,14 @@
}
}
+ debugLog {
+ @Suppress("ListIterator")
+ "| measured: ${measuredItems.map { it.map { it.index } }}"
+ }
+ debugLog {
+ "| first indices: ${firstItemIndices.toList()}, offsets: ${firstItemOffsets.toList()}"
+ }
+
// report the amount of pixels we consumed. scrollDelta can be smaller than
// scrollToBeConsumed if there were not enough items to fill the offered space or it
// can be larger if items were resized, or if, for example, we were previously
@@ -487,12 +606,15 @@
for (laneIndex in measuredItems.indices) {
val laneItems = measuredItems[laneIndex]
for (i in laneItems.indices) {
- val size = laneItems[i].sizeWithSpacings
+ val item = laneItems[i]
+ val gaps = laneInfo.getGaps(item.index)
+ val size = item.sizeWithSpacings + if (gaps == null) 0 else gaps[laneIndex]
if (
i != laneItems.lastIndex &&
firstItemOffsets[laneIndex] != 0 &&
firstItemOffsets[laneIndex] >= size
) {
+
firstItemOffsets[laneIndex] -= size
firstItemIndices[laneIndex] = laneItems[i + 1].index
} else {
@@ -502,6 +624,11 @@
}
}
+ debugLog {
+ "| final first indices: ${firstItemIndices.toList()}, " +
+ "offsets: ${firstItemOffsets.toList()}"
+ }
+
// end measure
val layoutWidth = if (isVertical) {
@@ -526,8 +653,13 @@
}
val item = measuredItems[laneIndex].removeFirst()
+ if (item.lane != laneIndex) {
+ continue
+ }
+
// todo(b/182882362): arrangement support
- val mainAxisOffset = itemScrollOffsets[laneIndex]
+ val spanRange = SpanRange(item.lane, item.span)
+ val mainAxisOffset = itemScrollOffsets.maxInRange(spanRange)
val crossAxisOffset =
if (laneIndex == 0) {
0
@@ -535,8 +667,22 @@
resolvedSlotSums[laneIndex - 1] + crossAxisSpacing * laneIndex
}
+ if (item.placeables.isEmpty()) {
+ // nothing to place, ignore spacings
+ continue
+ }
+
positionedItems += item.position(laneIndex, mainAxisOffset, crossAxisOffset)
- itemScrollOffsets[laneIndex] += item.sizeWithSpacings
+ spanRange.forEach { lane ->
+ itemScrollOffsets[lane] = mainAxisOffset + item.sizeWithSpacings
+ }
+ }
+
+ debugLog {
+ "| positioned: ${positionedItems.map { "${it.index} at ${it.offset}" }.toList()}"
+ }
+ debugLog {
+ "========== MEASURE DONE ==========="
}
// todo: reverse layout support
@@ -573,17 +719,40 @@
}
}
+@JvmInline
+private value class SpanRange private constructor(val packedValue: Long) {
+ constructor(lane: Int, span: Int) : this(packInts(lane, lane + span))
+
+ inline val start get(): Int = unpackInt1(packedValue)
+ inline val end get(): Int = unpackInt2(packedValue)
+ inline val size get(): Int = end - start
+}
+
+private inline fun SpanRange.forEach(block: (Int) -> Unit) {
+ for (i in start until end) {
+ block(i)
+ }
+}
+
private fun IntArray.offsetBy(delta: Int) {
for (i in indices) {
this[i] = this[i] + delta
}
}
-internal fun IntArray.indexOfMinValue(): Int {
+private fun IntArray.maxInRange(indexRange: SpanRange): Int {
+ var max = Int.MIN_VALUE
+ indexRange.forEach {
+ max = maxOf(max, this[it])
+ }
+ return max
+}
+
+internal fun IntArray.indexOfMinValue(minBound: Int = Int.MIN_VALUE): Int {
var result = -1
var min = Int.MAX_VALUE
for (i in indices) {
- if (min > this[i]) {
+ if (this[i] in (minBound + 1) until min) {
min = this[i]
result = i
}
@@ -632,21 +801,20 @@
) {
// reverse traverse to make sure last items are recorded to the latter lanes
for (i in indices.indices.reversed()) {
- while (indices[i] >= itemCount) {
+ while (indices[i] >= itemCount || !laneInfo.assignedToLane(indices[i], i)) {
indices[i] = findPreviousItemIndex(indices[i], i)
}
- if (indices[i] != -1) {
+ if (indices[i] >= 0) {
// reserve item for span
- spans.setSpan(indices[i], i)
+ if (!itemProvider.isFullSpan(indices[i])) {
+ laneInfo.setLane(indices[i], i)
+ }
}
}
}
private fun LazyStaggeredGridMeasureContext.findPreviousItemIndex(item: Int, lane: Int): Int =
- spans.findPreviousItemIndex(item, lane)
-
-private fun LazyStaggeredGridMeasureContext.findNextItemIndex(item: Int, lane: Int): Int =
- spans.findNextItemIndex(item, lane)
+ laneInfo.findPreviousItemIndex(item, lane)
@OptIn(ExperimentalFoundationApi::class)
private class LazyStaggeredGridMeasureProvider(
@@ -654,11 +822,13 @@
private val itemProvider: LazyLayoutItemProvider,
private val measureScope: LazyLayoutMeasureScope,
private val resolvedSlotSums: IntArray,
- private val measuredItemFactory: MeasuredItemFactory
+ private val crossAxisSpacing: Int,
+ private val measuredItemFactory: MeasuredItemFactory,
) {
- private fun childConstraints(slot: Int): Constraints {
+ private fun childConstraints(slot: Int, span: Int): Constraints {
val previousSum = if (slot == 0) 0 else resolvedSlotSums[slot - 1]
- val crossAxisSize = resolvedSlotSums[slot] - previousSum
+ val crossAxisSize =
+ resolvedSlotSums[slot + span - 1] - previousSum + crossAxisSpacing * (span - 1)
return if (isVertical) {
Constraints.fixedWidth(crossAxisSize)
} else {
@@ -666,10 +836,10 @@
}
}
- fun getAndMeasure(index: Int, lane: Int): LazyStaggeredGridMeasuredItem {
+ fun getAndMeasure(index: Int, span: SpanRange): LazyStaggeredGridMeasuredItem {
val key = itemProvider.getKey(index)
- val placeables = measureScope.measure(index, childConstraints(lane))
- return measuredItemFactory.createItem(index, lane, key, placeables)
+ val placeables = measureScope.measure(index, childConstraints(span.start, span.size))
+ return measuredItemFactory.createItem(index, span.start, span.size, key, placeables)
}
}
@@ -678,6 +848,7 @@
fun createItem(
index: Int,
lane: Int,
+ span: Int,
key: Any,
placeables: List<Placeable>
): LazyStaggeredGridMeasuredItem
@@ -689,8 +860,12 @@
val placeables: List<Placeable>,
val isVertical: Boolean,
val contentOffset: IntOffset,
- val spacing: Int
+ val spacing: Int,
+ val lane: Int,
+ val span: Int
) {
+ var isVisible = true
+
val mainAxisSize: Int = placeables.fastFold(0) { size, placeable ->
size + if (isVertical) placeable.height else placeable.width
}
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridMeasurePolicy.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridMeasurePolicy.kt
index a645632..29ec864 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridMeasurePolicy.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridMeasurePolicy.kt
@@ -23,7 +23,6 @@
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.calculateEndPadding
import androidx.compose.foundation.layout.calculateStartPadding
-import androidx.compose.foundation.lazy.layout.LazyLayoutItemProvider
import androidx.compose.foundation.lazy.layout.LazyLayoutMeasureScope
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
@@ -39,7 +38,7 @@
@ExperimentalFoundationApi
internal fun rememberStaggeredGridMeasurePolicy(
state: LazyStaggeredGridState,
- itemProvider: LazyLayoutItemProvider,
+ itemProvider: LazyStaggeredGridItemProvider,
contentPadding: PaddingValues,
reverseLayout: Boolean,
orientation: Orientation,
@@ -67,6 +66,7 @@
// setup information for prefetch
state.laneWidthsPrefixSum = resolvedSlotSums
state.isVertical = isVertical
+ state.spanProvider = itemProvider.spanProvider
val beforeContentPadding = contentPadding.beforePadding(
orientation, reverseLayout, layoutDirection
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridScope.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridScope.kt
index 4d748da..364b075 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridScope.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridScope.kt
@@ -21,20 +21,21 @@
import androidx.compose.foundation.lazy.layout.MutableIntervalList
import androidx.compose.runtime.Composable
-@ExperimentalFoundationApi
+@OptIn(ExperimentalFoundationApi::class)
internal class LazyStaggeredGridScopeImpl : LazyStaggeredGridScope {
val intervals = MutableIntervalList<LazyStaggeredGridIntervalContent>()
- @ExperimentalFoundationApi
override fun item(
key: Any?,
contentType: Any?,
+ span: StaggeredGridItemSpan?,
content: @Composable LazyStaggeredGridItemScope.() -> Unit
) {
items(
count = 1,
key = key?.let { { key } },
contentType = { contentType },
+ span = span?.let { { span } },
itemContent = { content() }
)
}
@@ -43,6 +44,7 @@
count: Int,
key: ((index: Int) -> Any)?,
contentType: (index: Int) -> Any?,
+ span: ((index: Int) -> StaggeredGridItemSpan)?,
itemContent: @Composable LazyStaggeredGridItemScope.(index: Int) -> Unit
) {
intervals.addInterval(
@@ -50,6 +52,7 @@
LazyStaggeredGridIntervalContent(
key,
contentType,
+ span,
itemContent
)
)
@@ -63,5 +66,6 @@
internal class LazyStaggeredGridIntervalContent(
override val key: ((index: Int) -> Any)?,
override val type: ((index: Int) -> Any?),
+ val span: ((index: Int) -> StaggeredGridItemSpan)?,
val item: @Composable LazyStaggeredGridItemScope.(Int) -> Unit
) : LazyLayoutIntervalContent
\ No newline at end of file
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridSpan.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridSpan.kt
new file mode 100644
index 0000000..1379767a
--- /dev/null
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridSpan.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.foundation.lazy.staggeredgrid
+
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.lazy.layout.IntervalList
+import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridItemSpan.Companion.FullLine
+
+/**
+ * Span defines a number of lanes (columns in vertical grid/rows in horizontal grid) for
+ * staggered grid items.
+ * Two variations of span are supported:
+ * - item taking a single lane ([SingleLane]);
+ * - item all lanes in line ([FullLine]).
+ * By default, staggered grid uses [SingleLane] for all items.
+ */
+@ExperimentalFoundationApi
+class StaggeredGridItemSpan private constructor(internal val value: Int) {
+ companion object {
+ /**
+ * Force item to occupy whole line in cross axis.
+ */
+ val FullLine = StaggeredGridItemSpan(0)
+
+ /**
+ * Force item to use a single lane.
+ */
+ val SingleLane = StaggeredGridItemSpan(1)
+ }
+}
+
+@OptIn(ExperimentalFoundationApi::class)
+internal class LazyStaggeredGridSpanProvider(
+ val intervals: IntervalList<LazyStaggeredGridIntervalContent>
+) {
+ fun isFullSpan(itemIndex: Int): Boolean {
+ if (itemIndex !in 0 until intervals.size) return false
+ intervals[itemIndex].run {
+ val span = value.span
+ val localIndex = itemIndex - startIndex
+
+ return span != null && span(localIndex) === FullLine
+ }
+ }
+}
\ No newline at end of file
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridSpans.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridSpans.kt
deleted file mode 100644
index 5ec8708..0000000
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridSpans.kt
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.compose.foundation.lazy.staggeredgrid
-
-/**
- * Utility class to remember grid lane assignments (spans) in a sliding window relative to requested
- * item position (usually reflected by scroll position).
- * Remembers the maximum range of remembered items is reflected by [MaxCapacity], if index is beyond
- * the bounds, [anchor] moves to reflect new position.
- */
-internal class LazyStaggeredGridSpans {
- private var anchor = 0
- private var spans = IntArray(16)
-
- /**
- * Sets given span for given item index.
- */
- fun setSpan(item: Int, span: Int) {
- require(item >= 0) { "Negative spans are not supported" }
- ensureValidIndex(item)
- spans[item - anchor] = span + 1
- }
-
- /**
- * Get span for given item index.
- * @return span previously recorded for given item or [Unset] if it doesn't exist.
- */
- fun getSpan(item: Int): Int {
- if (item < lowerBound() || item >= upperBound()) {
- return Unset
- }
- return spans[item - anchor] - 1
- }
-
- /**
- * @return upper bound of currently valid span range
- */
- /* @VisibleForTests */
- fun upperBound(): Int = anchor + spans.size
-
- /**
- * @return lower bound of currently valid span range
- */
- /* @VisibleForTests */
- fun lowerBound(): Int = anchor
-
- /**
- * Delete remembered span assignments.
- */
- fun reset() {
- spans.fill(0)
- }
-
- /**
- * Find the previous item relative to [item] set to target span
- * @return found item index or -1 if it doesn't exist.
- */
- fun findPreviousItemIndex(item: Int, target: Int): Int {
- for (i in (item - 1) downTo 0) {
- val span = getSpan(i)
- if (span == target || span == Unset) {
- return i
- }
- }
- return -1
- }
-
- /**
- * Find the next item relative to [item] set to target span
- * @return found item index or [upperBound] if it doesn't exist.
- */
- fun findNextItemIndex(item: Int, target: Int): Int {
- for (i in item + 1 until upperBound()) {
- val span = getSpan(i)
- if (span == target || span == Unset) {
- return i
- }
- }
- return upperBound()
- }
-
- fun ensureValidIndex(requestedIndex: Int) {
- val requestedCapacity = requestedIndex - anchor
-
- if (requestedCapacity in 0 until MaxCapacity) {
- // simplest path - just grow array to given capacity
- ensureCapacity(requestedCapacity + 1)
- } else {
- // requested index is beyond current span bounds
- // rebase anchor so that requested index is in the middle of span array
- val oldAnchor = anchor
- anchor = maxOf(requestedIndex - (spans.size / 2), 0)
- var delta = anchor - oldAnchor
-
- if (delta >= 0) {
- // copy previous span data if delta is smaller than span size
- if (delta < spans.size) {
- spans.copyInto(
- spans,
- destinationOffset = 0,
- startIndex = delta,
- endIndex = spans.size
- )
- }
- // fill the rest of the spans with default values
- spans.fill(0, maxOf(0, spans.size - delta), spans.size)
- } else {
- delta = -delta
- // check if we can grow spans to match delta
- if (spans.size + delta < MaxCapacity) {
- // grow spans and leave space in the start
- ensureCapacity(spans.size + delta + 1, delta)
- } else {
- // otherwise, just move data that fits
- if (delta < spans.size) {
- spans.copyInto(
- spans,
- destinationOffset = delta,
- startIndex = 0,
- endIndex = spans.size - delta
- )
- }
- // fill the rest of the spans with default values
- spans.fill(0, 0, minOf(spans.size, delta))
- }
- }
- }
- }
-
- private fun ensureCapacity(capacity: Int, newOffset: Int = 0) {
- require(capacity <= MaxCapacity) {
- "Requested span capacity $capacity is larger than max supported: $MaxCapacity!"
- }
- if (spans.size < capacity) {
- var newSize = spans.size
- while (newSize < capacity) newSize *= 2
- spans = spans.copyInto(IntArray(newSize), destinationOffset = newOffset)
- }
- }
-
- companion object {
- private const val MaxCapacity = 131_072 // Closest to 100_000, 2 ^ 17
- internal const val Unset = -1
- }
-}
\ No newline at end of file
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridState.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridState.kt
index cd08ee3..bf95c2e 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridState.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridState.kt
@@ -27,13 +27,16 @@
import androidx.compose.foundation.lazy.layout.LazyLayoutPrefetchState
import androidx.compose.foundation.lazy.layout.LazyLayoutPrefetchState.PrefetchHandle
import androidx.compose.foundation.lazy.layout.animateScrollToItem
+import androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridLaneInfo.Companion.Unset
import androidx.compose.runtime.Composable
import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.saveable.listSaver
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
+import androidx.compose.runtime.structuralEqualityPolicy
import androidx.compose.ui.layout.Remeasurement
import androidx.compose.ui.layout.RemeasurementModifier
import androidx.compose.ui.unit.Constraints
@@ -94,12 +97,13 @@
* This property is observable and when use it in composable function it will be recomposed on
* each scroll, potentially causing performance issues.
*/
- val firstVisibleItemIndex: Int
- get() = scrollPosition.indices.minOfOrNull {
+ val firstVisibleItemIndex: Int by derivedStateOf(structuralEqualityPolicy()) {
+ scrollPosition.indices.minOfOrNull {
// index array can contain -1, indicating lane being empty (cell number > itemCount)
// if any of the lanes are empty, we always on 0th item index
if (it == -1) 0 else it
} ?: 0
+ }
/**
* Current offset of the item with [firstVisibleItemIndex] relative to the container start.
@@ -107,10 +111,19 @@
* This property is observable and when use it in composable function it will be recomposed on
* each scroll, potentially causing performance issues.
*/
- val firstVisibleItemScrollOffset: Int
- get() = scrollPosition.offsets.run {
- if (isEmpty()) 0 else this[scrollPosition.indices.indexOfMinValue()]
+ val firstVisibleItemScrollOffset: Int by derivedStateOf(structuralEqualityPolicy()) {
+ scrollPosition.offsets.let { offsets ->
+ val firstVisibleIndex = firstVisibleItemIndex
+ val indices = scrollPosition.indices
+ var minOffset = Int.MAX_VALUE
+ for (lane in offsets.indices) {
+ if (indices[lane] == firstVisibleIndex) {
+ minOffset = minOf(minOffset, offsets[lane])
+ }
+ }
+ if (minOffset == Int.MAX_VALUE) 0 else minOffset
}
+ }
/** holder for current scroll position **/
internal val scrollPosition = LazyStaggeredGridScrollPosition(
@@ -133,7 +146,7 @@
mutableStateOf(EmptyLazyStaggeredGridLayoutInfo)
/** storage for lane assignments for each item for consistent scrolling in both directions **/
- internal val spans = LazyStaggeredGridSpans()
+ internal val laneInfo = LazyStaggeredGridLaneInfo()
override var canScrollForward: Boolean by mutableStateOf(false)
private set
@@ -170,9 +183,11 @@
/* @VisibleForTesting */
internal var measurePassCount = 0
- /** states required for prefetching **/
+ /** transient information from measure required for prefetching **/
internal var isVertical = false
internal var laneWidthsPrefixSum: IntArray = IntArray(0)
+ internal var spanProvider: LazyStaggeredGridSpanProvider? = null
+ /** prefetch state **/
private var prefetchBaseIndex: Int = -1
private val currentItemPrefetchHandles = mutableMapOf<Int, PrefetchHandle>()
@@ -329,15 +344,15 @@
// find the next item for each line and prefetch if it is valid
targetIndex = if (scrollingForward) {
- spans.findNextItemIndex(previousIndex, lane)
+ laneInfo.findNextItemIndex(previousIndex, lane)
} else {
- spans.findPreviousItemIndex(previousIndex, lane)
+ laneInfo.findPreviousItemIndex(previousIndex, lane)
}
if (
targetIndex !in (0 until info.totalItemsCount) ||
- previousIndex == targetIndex
+ targetIndex in prefetchHandlesUsed
) {
- return
+ break
}
prefetchHandlesUsed += targetIndex
@@ -345,8 +360,12 @@
continue
}
- val crossAxisSize = laneWidthsPrefixSum[lane] -
- if (lane == 0) 0 else laneWidthsPrefixSum[lane - 1]
+ val isFullSpan = spanProvider?.isFullSpan(targetIndex) == true
+ val slot = if (isFullSpan) 0 else lane
+ val span = if (isFullSpan) laneCount else 1
+
+ val crossAxisSize = laneWidthsPrefixSum[slot + span - 1] -
+ if (slot == 0) 0 else laneWidthsPrefixSum[slot - 1]
val constraints = if (isVertical) {
Constraints.fixedWidth(crossAxisSize)
@@ -399,19 +418,22 @@
}
private fun fillNearestIndices(itemIndex: Int, laneCount: Int): IntArray {
- // reposition spans if needed to ensure valid indices
- spans.ensureValidIndex(itemIndex + laneCount)
-
- val span = spans.getSpan(itemIndex)
- val targetLaneIndex =
- if (span == LazyStaggeredGridSpans.Unset) 0 else minOf(span, laneCount)
val indices = IntArray(laneCount)
+ if (spanProvider?.isFullSpan(itemIndex) == true) {
+ indices.fill(itemIndex)
+ return indices
+ }
+
+ // reposition spans if needed to ensure valid indices
+ laneInfo.ensureValidIndex(itemIndex + laneCount)
+ val previousLane = laneInfo.getLane(itemIndex)
+ val targetLaneIndex = if (previousLane == Unset) 0 else minOf(previousLane, laneCount)
// fill lanes before starting index
var currentItemIndex = itemIndex
for (lane in (targetLaneIndex - 1) downTo 0) {
- indices[lane] = spans.findPreviousItemIndex(currentItemIndex, lane)
- if (indices[lane] == -1) {
+ indices[lane] = laneInfo.findPreviousItemIndex(currentItemIndex, lane)
+ if (indices[lane] == Unset) {
indices.fill(-1, toIndex = lane)
break
}
@@ -423,7 +445,7 @@
// fill lanes after starting index
currentItemIndex = itemIndex
for (lane in (targetLaneIndex + 1) until laneCount) {
- indices[lane] = spans.findNextItemIndex(currentItemIndex, lane)
+ indices[lane] = laneInfo.findNextItemIndex(currentItemIndex, lane)
currentItemIndex = indices[lane]
}
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/TextFieldCursor.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/TextFieldCursor.kt
index bf87a63..69c0ab3 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/TextFieldCursor.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/TextFieldCursor.kt
@@ -23,6 +23,7 @@
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
+import androidx.compose.ui.MotionDurationScale
import androidx.compose.ui.composed
import androidx.compose.ui.draw.drawWithContent
import androidx.compose.ui.geometry.Offset
@@ -33,6 +34,7 @@
import androidx.compose.ui.text.input.OffsetMapping
import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.ui.unit.dp
+import kotlinx.coroutines.withContext
@Suppress("ModifierInspectorInfo")
internal fun Modifier.cursor(
@@ -46,10 +48,13 @@
val isBrushSpecified = !(cursorBrush is SolidColor && cursorBrush.value.isUnspecified)
if (state.hasFocus && value.selection.collapsed && isBrushSpecified) {
LaunchedEffect(value.annotatedString, value.selection) {
- // ensure that the value is always 1f _this_ frame by calling snapTo
- cursorAlpha.snapTo(1f)
- // then start the cursor blinking on animation clock (500ms on to start)
- cursorAlpha.animateTo(0f, cursorAnimationSpec)
+ // Animate the cursor even when animations are disabled by the system.
+ withContext(FixedMotionDurationScale) {
+ // ensure that the value is always 1f _this_ frame by calling snapTo
+ cursorAlpha.snapTo(1f)
+ // then start the cursor blinking on animation clock (500ms on to start)
+ cursorAlpha.animateTo(0f, cursorAnimationSpec)
+ }
}
drawWithContent {
this.drawContent()
@@ -88,3 +93,8 @@
)
internal val DefaultCursorThickness = 2.dp
+
+private object FixedMotionDurationScale : MotionDurationScale {
+ override val scaleFactor: Float
+ get() = 1f
+}
\ No newline at end of file
diff --git a/compose/integration-tests/demos/src/androidTest/java/androidx/compose/integration/demos/test/DemoTest.kt b/compose/integration-tests/demos/src/androidTest/java/androidx/compose/integration/demos/test/DemoTest.kt
index 68967e3..a99722f 100644
--- a/compose/integration-tests/demos/src/androidTest/java/androidx/compose/integration/demos/test/DemoTest.kt
+++ b/compose/integration-tests/demos/src/androidTest/java/androidx/compose/integration/demos/test/DemoTest.kt
@@ -110,6 +110,7 @@
onNodeWithTag(Tags.AppBarTitle).assertTextEquals(demo.title)
}
+ @Ignore("b/265281736")
@Test
fun navigateThroughAllDemos_1() {
navigateThroughAllDemos(SplitDemoCategories[0])
diff --git a/compose/runtime/runtime/api/current.ignore b/compose/runtime/runtime/api/current.ignore
index e6959b9..b2e1b75 100644
--- a/compose/runtime/runtime/api/current.ignore
+++ b/compose/runtime/runtime/api/current.ignore
@@ -5,3 +5,7 @@
Added method androidx.compose.runtime.Composer.endToMarker(int)
AddedAbstractMethod: androidx.compose.runtime.Composer#getCurrentMarker():
Added method androidx.compose.runtime.Composer.getCurrentMarker()
+
+
+RemovedMethod: androidx.compose.runtime.collection.MutableVectorKt#mutableVectorOf(T):
+ Removed method androidx.compose.runtime.collection.MutableVectorKt.mutableVectorOf(T)
diff --git a/compose/runtime/runtime/api/current.txt b/compose/runtime/runtime/api/current.txt
index cd22d03..b885979 100644
--- a/compose/runtime/runtime/api/current.txt
+++ b/compose/runtime/runtime/api/current.txt
@@ -647,7 +647,7 @@
method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T>! MutableVector(optional int capacity);
method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T> MutableVector(int size, kotlin.jvm.functions.Function1<? super java.lang.Integer,? extends T> init);
method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T>! mutableVectorOf();
- method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T> mutableVectorOf(T? elements);
+ method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T> mutableVectorOf(T?... elements);
}
}
diff --git a/compose/runtime/runtime/api/public_plus_experimental_current.txt b/compose/runtime/runtime/api/public_plus_experimental_current.txt
index 9e24b69..969339d 100644
--- a/compose/runtime/runtime/api/public_plus_experimental_current.txt
+++ b/compose/runtime/runtime/api/public_plus_experimental_current.txt
@@ -696,7 +696,7 @@
method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T>! MutableVector(optional int capacity);
method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T> MutableVector(int size, kotlin.jvm.functions.Function1<? super java.lang.Integer,? extends T> init);
method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T>! mutableVectorOf();
- method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T> mutableVectorOf(T? elements);
+ method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T> mutableVectorOf(T?... elements);
}
}
diff --git a/compose/runtime/runtime/api/restricted_current.ignore b/compose/runtime/runtime/api/restricted_current.ignore
index e6959b9..b2e1b75 100644
--- a/compose/runtime/runtime/api/restricted_current.ignore
+++ b/compose/runtime/runtime/api/restricted_current.ignore
@@ -5,3 +5,7 @@
Added method androidx.compose.runtime.Composer.endToMarker(int)
AddedAbstractMethod: androidx.compose.runtime.Composer#getCurrentMarker():
Added method androidx.compose.runtime.Composer.getCurrentMarker()
+
+
+RemovedMethod: androidx.compose.runtime.collection.MutableVectorKt#mutableVectorOf(T):
+ Removed method androidx.compose.runtime.collection.MutableVectorKt.mutableVectorOf(T)
diff --git a/compose/runtime/runtime/api/restricted_current.txt b/compose/runtime/runtime/api/restricted_current.txt
index 40275f6..bd0e1a0 100644
--- a/compose/runtime/runtime/api/restricted_current.txt
+++ b/compose/runtime/runtime/api/restricted_current.txt
@@ -676,7 +676,7 @@
method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T>! MutableVector(optional int capacity);
method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T> MutableVector(int size, kotlin.jvm.functions.Function1<? super java.lang.Integer,? extends T> init);
method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T>! mutableVectorOf();
- method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T> mutableVectorOf(T? elements);
+ method public static inline <reified T> androidx.compose.runtime.collection.MutableVector<T> mutableVectorOf(T?... elements);
}
}
diff --git a/compose/ui/ui-text/api/current.ignore b/compose/ui/ui-text/api/current.ignore
index a4b016c..24501fb 100644
--- a/compose/ui/ui-text/api/current.ignore
+++ b/compose/ui/ui-text/api/current.ignore
@@ -1,13 +1,3 @@
// Baseline format: 1.0
ChangedType: androidx.compose.ui.text.AnnotatedString.Builder#append(char):
Method androidx.compose.ui.text.AnnotatedString.Builder.append has changed return type from void to androidx.compose.ui.text.AnnotatedString.Builder
-
-
-InvalidNullConversion: androidx.compose.ui.text.TextStyle#TextStyle(long, long, androidx.compose.ui.text.font.FontWeight, androidx.compose.ui.text.font.FontStyle, androidx.compose.ui.text.font.FontSynthesis, androidx.compose.ui.text.font.FontFamily, String, long, androidx.compose.ui.text.style.BaselineShift, androidx.compose.ui.text.style.TextGeometricTransform, androidx.compose.ui.text.intl.LocaleList, long, androidx.compose.ui.text.style.TextDecoration, androidx.compose.ui.graphics.Shadow, androidx.compose.ui.text.style.TextAlign, androidx.compose.ui.text.style.TextDirection, long, androidx.compose.ui.text.style.TextIndent) parameter #6:
- Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter fontFeatureSettings in androidx.compose.ui.text.TextStyle(long color, long fontSize, androidx.compose.ui.text.font.FontWeight fontWeight, androidx.compose.ui.text.font.FontStyle fontStyle, androidx.compose.ui.text.font.FontSynthesis fontSynthesis, androidx.compose.ui.text.font.FontFamily fontFamily, String fontFeatureSettings, long letterSpacing, androidx.compose.ui.text.style.BaselineShift baselineShift, androidx.compose.ui.text.style.TextGeometricTransform textGeometricTransform, androidx.compose.ui.text.intl.LocaleList localeList, long background, androidx.compose.ui.text.style.TextDecoration textDecoration, androidx.compose.ui.graphics.Shadow shadow, androidx.compose.ui.text.style.TextAlign textAlign, androidx.compose.ui.text.style.TextDirection textDirection, long lineHeight, androidx.compose.ui.text.style.TextIndent textIndent)
-InvalidNullConversion: androidx.compose.ui.text.TextStyle#TextStyle(long, long, androidx.compose.ui.text.font.FontWeight, androidx.compose.ui.text.font.FontStyle, androidx.compose.ui.text.font.FontSynthesis, androidx.compose.ui.text.font.FontFamily, String, long, androidx.compose.ui.text.style.BaselineShift, androidx.compose.ui.text.style.TextGeometricTransform, androidx.compose.ui.text.intl.LocaleList, long, androidx.compose.ui.text.style.TextDecoration, androidx.compose.ui.graphics.Shadow, androidx.compose.ui.text.style.TextAlign, androidx.compose.ui.text.style.TextDirection, long, androidx.compose.ui.text.style.TextIndent, androidx.compose.ui.text.PlatformTextStyle, androidx.compose.ui.text.style.LineHeightStyle) parameter #6:
- Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter fontFeatureSettings in androidx.compose.ui.text.TextStyle(long color, long fontSize, androidx.compose.ui.text.font.FontWeight fontWeight, androidx.compose.ui.text.font.FontStyle fontStyle, androidx.compose.ui.text.font.FontSynthesis fontSynthesis, androidx.compose.ui.text.font.FontFamily fontFamily, String fontFeatureSettings, long letterSpacing, androidx.compose.ui.text.style.BaselineShift baselineShift, androidx.compose.ui.text.style.TextGeometricTransform textGeometricTransform, androidx.compose.ui.text.intl.LocaleList localeList, long background, androidx.compose.ui.text.style.TextDecoration textDecoration, androidx.compose.ui.graphics.Shadow shadow, androidx.compose.ui.text.style.TextAlign textAlign, androidx.compose.ui.text.style.TextDirection textDirection, long lineHeight, androidx.compose.ui.text.style.TextIndent textIndent, androidx.compose.ui.text.PlatformTextStyle platformStyle, androidx.compose.ui.text.style.LineHeightStyle lineHeightStyle)
-InvalidNullConversion: androidx.compose.ui.text.TextStyle#copy(long, long, androidx.compose.ui.text.font.FontWeight, androidx.compose.ui.text.font.FontStyle, androidx.compose.ui.text.font.FontSynthesis, androidx.compose.ui.text.font.FontFamily, String, long, androidx.compose.ui.text.style.BaselineShift, androidx.compose.ui.text.style.TextGeometricTransform, androidx.compose.ui.text.intl.LocaleList, long, androidx.compose.ui.text.style.TextDecoration, androidx.compose.ui.graphics.Shadow, androidx.compose.ui.text.style.TextAlign, androidx.compose.ui.text.style.TextDirection, long, androidx.compose.ui.text.style.TextIndent) parameter #6:
- Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter fontFeatureSettings in androidx.compose.ui.text.TextStyle.copy(long color, long fontSize, androidx.compose.ui.text.font.FontWeight fontWeight, androidx.compose.ui.text.font.FontStyle fontStyle, androidx.compose.ui.text.font.FontSynthesis fontSynthesis, androidx.compose.ui.text.font.FontFamily fontFamily, String fontFeatureSettings, long letterSpacing, androidx.compose.ui.text.style.BaselineShift baselineShift, androidx.compose.ui.text.style.TextGeometricTransform textGeometricTransform, androidx.compose.ui.text.intl.LocaleList localeList, long background, androidx.compose.ui.text.style.TextDecoration textDecoration, androidx.compose.ui.graphics.Shadow shadow, androidx.compose.ui.text.style.TextAlign textAlign, androidx.compose.ui.text.style.TextDirection textDirection, long lineHeight, androidx.compose.ui.text.style.TextIndent textIndent)
-InvalidNullConversion: androidx.compose.ui.text.TextStyle#copy(long, long, androidx.compose.ui.text.font.FontWeight, androidx.compose.ui.text.font.FontStyle, androidx.compose.ui.text.font.FontSynthesis, androidx.compose.ui.text.font.FontFamily, String, long, androidx.compose.ui.text.style.BaselineShift, androidx.compose.ui.text.style.TextGeometricTransform, androidx.compose.ui.text.intl.LocaleList, long, androidx.compose.ui.text.style.TextDecoration, androidx.compose.ui.graphics.Shadow, androidx.compose.ui.text.style.TextAlign, androidx.compose.ui.text.style.TextDirection, long, androidx.compose.ui.text.style.TextIndent, androidx.compose.ui.text.PlatformTextStyle, androidx.compose.ui.text.style.LineHeightStyle) parameter #6:
- Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter fontFeatureSettings in androidx.compose.ui.text.TextStyle.copy(long color, long fontSize, androidx.compose.ui.text.font.FontWeight fontWeight, androidx.compose.ui.text.font.FontStyle fontStyle, androidx.compose.ui.text.font.FontSynthesis fontSynthesis, androidx.compose.ui.text.font.FontFamily fontFamily, String fontFeatureSettings, long letterSpacing, androidx.compose.ui.text.style.BaselineShift baselineShift, androidx.compose.ui.text.style.TextGeometricTransform textGeometricTransform, androidx.compose.ui.text.intl.LocaleList localeList, long background, androidx.compose.ui.text.style.TextDecoration textDecoration, androidx.compose.ui.graphics.Shadow shadow, androidx.compose.ui.text.style.TextAlign textAlign, androidx.compose.ui.text.style.TextDirection textDirection, long lineHeight, androidx.compose.ui.text.style.TextIndent textIndent, androidx.compose.ui.text.PlatformTextStyle platformStyle, androidx.compose.ui.text.style.LineHeightStyle lineHeightStyle)
diff --git a/compose/ui/ui-text/api/current.txt b/compose/ui/ui-text/api/current.txt
index 2c75232..df13e31 100644
--- a/compose/ui/ui-text/api/current.txt
+++ b/compose/ui/ui-text/api/current.txt
@@ -514,11 +514,11 @@
@androidx.compose.runtime.Immutable public final class TextStyle {
ctor public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens);
- ctor @Deprecated public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
- ctor @Deprecated public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
+ ctor @Deprecated public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
+ ctor @Deprecated public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
method public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens);
- method @Deprecated public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
- method @Deprecated public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
+ method @Deprecated public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
+ method @Deprecated public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
method public long getBackground();
method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift();
method public long getColor();
diff --git a/compose/ui/ui-text/api/public_plus_experimental_current.txt b/compose/ui/ui-text/api/public_plus_experimental_current.txt
index 5c39454..b27caf4 100644
--- a/compose/ui/ui-text/api/public_plus_experimental_current.txt
+++ b/compose/ui/ui-text/api/public_plus_experimental_current.txt
@@ -557,13 +557,13 @@
ctor public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens);
ctor @androidx.compose.ui.text.ExperimentalTextApi public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion);
ctor @androidx.compose.ui.text.ExperimentalTextApi public TextStyle(androidx.compose.ui.graphics.Brush? brush, optional float alpha, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion);
- ctor @Deprecated public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
- ctor @Deprecated public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
+ ctor @Deprecated public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
+ ctor @Deprecated public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
method public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens);
method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion);
method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.TextStyle copy(androidx.compose.ui.graphics.Brush? brush, optional float alpha, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion);
- method @Deprecated public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
- method @Deprecated public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
+ method @Deprecated public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
+ method @Deprecated public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
method @androidx.compose.ui.text.ExperimentalTextApi public float getAlpha();
method public long getBackground();
method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift();
diff --git a/compose/ui/ui-text/api/restricted_current.ignore b/compose/ui/ui-text/api/restricted_current.ignore
index a4b016c..24501fb 100644
--- a/compose/ui/ui-text/api/restricted_current.ignore
+++ b/compose/ui/ui-text/api/restricted_current.ignore
@@ -1,13 +1,3 @@
// Baseline format: 1.0
ChangedType: androidx.compose.ui.text.AnnotatedString.Builder#append(char):
Method androidx.compose.ui.text.AnnotatedString.Builder.append has changed return type from void to androidx.compose.ui.text.AnnotatedString.Builder
-
-
-InvalidNullConversion: androidx.compose.ui.text.TextStyle#TextStyle(long, long, androidx.compose.ui.text.font.FontWeight, androidx.compose.ui.text.font.FontStyle, androidx.compose.ui.text.font.FontSynthesis, androidx.compose.ui.text.font.FontFamily, String, long, androidx.compose.ui.text.style.BaselineShift, androidx.compose.ui.text.style.TextGeometricTransform, androidx.compose.ui.text.intl.LocaleList, long, androidx.compose.ui.text.style.TextDecoration, androidx.compose.ui.graphics.Shadow, androidx.compose.ui.text.style.TextAlign, androidx.compose.ui.text.style.TextDirection, long, androidx.compose.ui.text.style.TextIndent) parameter #6:
- Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter fontFeatureSettings in androidx.compose.ui.text.TextStyle(long color, long fontSize, androidx.compose.ui.text.font.FontWeight fontWeight, androidx.compose.ui.text.font.FontStyle fontStyle, androidx.compose.ui.text.font.FontSynthesis fontSynthesis, androidx.compose.ui.text.font.FontFamily fontFamily, String fontFeatureSettings, long letterSpacing, androidx.compose.ui.text.style.BaselineShift baselineShift, androidx.compose.ui.text.style.TextGeometricTransform textGeometricTransform, androidx.compose.ui.text.intl.LocaleList localeList, long background, androidx.compose.ui.text.style.TextDecoration textDecoration, androidx.compose.ui.graphics.Shadow shadow, androidx.compose.ui.text.style.TextAlign textAlign, androidx.compose.ui.text.style.TextDirection textDirection, long lineHeight, androidx.compose.ui.text.style.TextIndent textIndent)
-InvalidNullConversion: androidx.compose.ui.text.TextStyle#TextStyle(long, long, androidx.compose.ui.text.font.FontWeight, androidx.compose.ui.text.font.FontStyle, androidx.compose.ui.text.font.FontSynthesis, androidx.compose.ui.text.font.FontFamily, String, long, androidx.compose.ui.text.style.BaselineShift, androidx.compose.ui.text.style.TextGeometricTransform, androidx.compose.ui.text.intl.LocaleList, long, androidx.compose.ui.text.style.TextDecoration, androidx.compose.ui.graphics.Shadow, androidx.compose.ui.text.style.TextAlign, androidx.compose.ui.text.style.TextDirection, long, androidx.compose.ui.text.style.TextIndent, androidx.compose.ui.text.PlatformTextStyle, androidx.compose.ui.text.style.LineHeightStyle) parameter #6:
- Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter fontFeatureSettings in androidx.compose.ui.text.TextStyle(long color, long fontSize, androidx.compose.ui.text.font.FontWeight fontWeight, androidx.compose.ui.text.font.FontStyle fontStyle, androidx.compose.ui.text.font.FontSynthesis fontSynthesis, androidx.compose.ui.text.font.FontFamily fontFamily, String fontFeatureSettings, long letterSpacing, androidx.compose.ui.text.style.BaselineShift baselineShift, androidx.compose.ui.text.style.TextGeometricTransform textGeometricTransform, androidx.compose.ui.text.intl.LocaleList localeList, long background, androidx.compose.ui.text.style.TextDecoration textDecoration, androidx.compose.ui.graphics.Shadow shadow, androidx.compose.ui.text.style.TextAlign textAlign, androidx.compose.ui.text.style.TextDirection textDirection, long lineHeight, androidx.compose.ui.text.style.TextIndent textIndent, androidx.compose.ui.text.PlatformTextStyle platformStyle, androidx.compose.ui.text.style.LineHeightStyle lineHeightStyle)
-InvalidNullConversion: androidx.compose.ui.text.TextStyle#copy(long, long, androidx.compose.ui.text.font.FontWeight, androidx.compose.ui.text.font.FontStyle, androidx.compose.ui.text.font.FontSynthesis, androidx.compose.ui.text.font.FontFamily, String, long, androidx.compose.ui.text.style.BaselineShift, androidx.compose.ui.text.style.TextGeometricTransform, androidx.compose.ui.text.intl.LocaleList, long, androidx.compose.ui.text.style.TextDecoration, androidx.compose.ui.graphics.Shadow, androidx.compose.ui.text.style.TextAlign, androidx.compose.ui.text.style.TextDirection, long, androidx.compose.ui.text.style.TextIndent) parameter #6:
- Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter fontFeatureSettings in androidx.compose.ui.text.TextStyle.copy(long color, long fontSize, androidx.compose.ui.text.font.FontWeight fontWeight, androidx.compose.ui.text.font.FontStyle fontStyle, androidx.compose.ui.text.font.FontSynthesis fontSynthesis, androidx.compose.ui.text.font.FontFamily fontFamily, String fontFeatureSettings, long letterSpacing, androidx.compose.ui.text.style.BaselineShift baselineShift, androidx.compose.ui.text.style.TextGeometricTransform textGeometricTransform, androidx.compose.ui.text.intl.LocaleList localeList, long background, androidx.compose.ui.text.style.TextDecoration textDecoration, androidx.compose.ui.graphics.Shadow shadow, androidx.compose.ui.text.style.TextAlign textAlign, androidx.compose.ui.text.style.TextDirection textDirection, long lineHeight, androidx.compose.ui.text.style.TextIndent textIndent)
-InvalidNullConversion: androidx.compose.ui.text.TextStyle#copy(long, long, androidx.compose.ui.text.font.FontWeight, androidx.compose.ui.text.font.FontStyle, androidx.compose.ui.text.font.FontSynthesis, androidx.compose.ui.text.font.FontFamily, String, long, androidx.compose.ui.text.style.BaselineShift, androidx.compose.ui.text.style.TextGeometricTransform, androidx.compose.ui.text.intl.LocaleList, long, androidx.compose.ui.text.style.TextDecoration, androidx.compose.ui.graphics.Shadow, androidx.compose.ui.text.style.TextAlign, androidx.compose.ui.text.style.TextDirection, long, androidx.compose.ui.text.style.TextIndent, androidx.compose.ui.text.PlatformTextStyle, androidx.compose.ui.text.style.LineHeightStyle) parameter #6:
- Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter fontFeatureSettings in androidx.compose.ui.text.TextStyle.copy(long color, long fontSize, androidx.compose.ui.text.font.FontWeight fontWeight, androidx.compose.ui.text.font.FontStyle fontStyle, androidx.compose.ui.text.font.FontSynthesis fontSynthesis, androidx.compose.ui.text.font.FontFamily fontFamily, String fontFeatureSettings, long letterSpacing, androidx.compose.ui.text.style.BaselineShift baselineShift, androidx.compose.ui.text.style.TextGeometricTransform textGeometricTransform, androidx.compose.ui.text.intl.LocaleList localeList, long background, androidx.compose.ui.text.style.TextDecoration textDecoration, androidx.compose.ui.graphics.Shadow shadow, androidx.compose.ui.text.style.TextAlign textAlign, androidx.compose.ui.text.style.TextDirection textDirection, long lineHeight, androidx.compose.ui.text.style.TextIndent textIndent, androidx.compose.ui.text.PlatformTextStyle platformStyle, androidx.compose.ui.text.style.LineHeightStyle lineHeightStyle)
diff --git a/compose/ui/ui-text/api/restricted_current.txt b/compose/ui/ui-text/api/restricted_current.txt
index 2c75232..df13e31 100644
--- a/compose/ui/ui-text/api/restricted_current.txt
+++ b/compose/ui/ui-text/api/restricted_current.txt
@@ -514,11 +514,11 @@
@androidx.compose.runtime.Immutable public final class TextStyle {
ctor public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens);
- ctor @Deprecated public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
- ctor @Deprecated public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
+ ctor @Deprecated public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
+ ctor @Deprecated public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
method public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens);
- method @Deprecated public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
- method @Deprecated public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
+ method @Deprecated public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
+ method @Deprecated public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
method public long getBackground();
method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift();
method public long getColor();
diff --git a/compose/ui/ui/api/current.txt b/compose/ui/ui/api/current.txt
index bbb411c..2ac063c 100644
--- a/compose/ui/ui/api/current.txt
+++ b/compose/ui/ui/api/current.txt
@@ -1761,6 +1761,15 @@
method public void resetTracking();
}
+ public final class VelocityTracker1D {
+ ctor public VelocityTracker1D(boolean isDataDifferential);
+ method public void addDataPoint(long timeMillis, float dataPoint);
+ method public float calculateVelocity();
+ method public boolean isDataDifferential();
+ method public void resetTracking();
+ property public final boolean isDataDifferential;
+ }
+
public final class VelocityTrackerKt {
method public static void addPointerInputChange(androidx.compose.ui.input.pointer.util.VelocityTracker, androidx.compose.ui.input.pointer.PointerInputChange event);
}
diff --git a/compose/ui/ui/api/public_plus_experimental_current.txt b/compose/ui/ui/api/public_plus_experimental_current.txt
index 004340e..b6e2c40 100644
--- a/compose/ui/ui/api/public_plus_experimental_current.txt
+++ b/compose/ui/ui/api/public_plus_experimental_current.txt
@@ -1937,6 +1937,15 @@
method public void resetTracking();
}
+ public final class VelocityTracker1D {
+ ctor public VelocityTracker1D(boolean isDataDifferential);
+ method public void addDataPoint(long timeMillis, float dataPoint);
+ method public float calculateVelocity();
+ method public boolean isDataDifferential();
+ method public void resetTracking();
+ property public final boolean isDataDifferential;
+ }
+
public final class VelocityTrackerKt {
method public static void addPointerInputChange(androidx.compose.ui.input.pointer.util.VelocityTracker, androidx.compose.ui.input.pointer.PointerInputChange event);
}
diff --git a/compose/ui/ui/api/restricted_current.txt b/compose/ui/ui/api/restricted_current.txt
index a480734..32d140b 100644
--- a/compose/ui/ui/api/restricted_current.txt
+++ b/compose/ui/ui/api/restricted_current.txt
@@ -1761,6 +1761,15 @@
method public void resetTracking();
}
+ public final class VelocityTracker1D {
+ ctor public VelocityTracker1D(boolean isDataDifferential);
+ method public void addDataPoint(long timeMillis, float dataPoint);
+ method public float calculateVelocity();
+ method public boolean isDataDifferential();
+ method public void resetTracking();
+ property public final boolean isDataDifferential;
+ }
+
public final class VelocityTrackerKt {
method public static void addPointerInputChange(androidx.compose.ui.input.pointer.util.VelocityTracker, androidx.compose.ui.input.pointer.PointerInputChange event);
}
diff --git a/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/input/focus/FocusAwareEventPropagationTest.kt b/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/input/focus/FocusAwareEventPropagationTest.kt
index 6845b6a..7d5100e 100644
--- a/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/input/focus/FocusAwareEventPropagationTest.kt
+++ b/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/input/focus/FocusAwareEventPropagationTest.kt
@@ -42,6 +42,7 @@
import androidx.compose.ui.unit.dp
import androidx.test.filters.MediumTest
import com.google.common.truth.Truth.assertThat
+import org.junit.Ignore
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
@@ -182,6 +183,7 @@
}
}
+ @Ignore("b/265319988")
@Test
fun onFocusAwareEvent_isTriggered() {
// Arrange.
diff --git a/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/layout/TestRuleExecutesLayoutPassesWhenWaitingForIdleTest.kt b/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/layout/TestRuleExecutesLayoutPassesWhenWaitingForIdleTest.kt
index acf4e1a..ec23d95 100644
--- a/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/layout/TestRuleExecutesLayoutPassesWhenWaitingForIdleTest.kt
+++ b/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/layout/TestRuleExecutesLayoutPassesWhenWaitingForIdleTest.kt
@@ -32,6 +32,7 @@
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.MediumTest
import com.google.common.truth.Truth.assertThat
+import org.junit.Ignore
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
@@ -104,6 +105,7 @@
}
}
+ @Ignore("b/265281787")
@Test
fun child_AndroidView() {
val numUpdates = 5
diff --git a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/input/pointer/util/VelocityTracker.kt b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/input/pointer/util/VelocityTracker.kt
index 482ac9b..d24885c 100644
--- a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/input/pointer/util/VelocityTracker.kt
+++ b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/input/pointer/util/VelocityTracker.kt
@@ -88,22 +88,47 @@
* A velocity tracker calculating velocity in 1 dimension.
*
* Add displacement data points using [addDataPoint], and obtain velocity using [calculateVelocity].
+ *
+ * Note: for calculating touch-related or other 2 dimensional/planar velocities, please use
+ * [VelocityTracker], which handles velocity tracking across both X and Y dimensions at once.
*/
-internal class VelocityTracker1D(
+class VelocityTracker1D internal constructor(
// whether the data points added to the tracker represent differential values
// (i.e. change in the tracked object's displacement since the previous data point).
// If false, it means that the data points added to the tracker will be considered as absolute
// values (e.g. positional values).
- private val differentialDataPoints: Boolean = false,
+ val isDataDifferential: Boolean = false,
// The velocity tracking strategy that this instance uses for all velocity calculations.
private val strategy: Strategy = Strategy.Lsq2,
) {
init {
- if (differentialDataPoints && strategy.equals(Strategy.Lsq2)) {
+ if (isDataDifferential && strategy.equals(Strategy.Lsq2)) {
throw IllegalStateException("Lsq2 not (yet) supported for differential axes")
}
}
+
+ /**
+ * Constructor to create a new velocity tracker. It allows to specify whether or not the tracker
+ * should consider the data ponits provided via [addDataPoint] as differential or
+ * non-differential.
+ *
+ * Differential data ponits represent change in displacement. For instance, differential data
+ * points of [2, -1, 5] represent: the object moved by "2" units, then by "-1" units, then by
+ * "5" units. An example use case for differential data points is when tracking velocity for an
+ * object whose displacements (or change in positions) over time are known.
+ *
+ * Non-differential data ponits represent position of the object whose velocity is tracked. For
+ * instance, non-differential data points of [2, -1, 5] represent: the object was at position
+ * "2", then at position "-1", then at position "5". An example use case for non-differential
+ * data points is when tracking velocity for an object whose positions on a geometrical axis
+ * over different instances of time are known.
+ *
+ * @param isDataDifferential [true] if the data ponits provided to the constructed tracker
+ * are differential. [false] otherwise.
+ */
+ constructor(isDataDifferential: Boolean) : this(isDataDifferential, Strategy.Impulse)
+
private val minSampleSize: Int = when (strategy) {
Strategy.Impulse -> 2
Strategy.Lsq2 -> 3
@@ -114,7 +139,7 @@
* result in notably different velocities than the others, so make careful choice or change of
* strategy whenever you want to make one.
*/
- enum class Strategy {
+ internal enum class Strategy {
/**
* Least squares strategy. Polynomial fit at degree 2.
* Note that the implementation of this strategy currently supports only non-differential
@@ -133,8 +158,11 @@
private var index: Int = 0
/**
- * Adds a data point for velocity calculation. A data point should represent a position along
- * the tracked axis at a given time, [timeMillis].
+ * Adds a data point for velocity calculation at a given time, [timeMillis]. The data ponit
+ * represents an amount of a change in position (for differential data points), or an absolute
+ * position (for non-differential data points). Whether or not the tracker handles differential
+ * data points is decided by [isDataDifferential], which is set once and finally during
+ * the construction of the tracker.
*
* Use the same units for the data points provided. For example, having some data points in `cm`
* and some in `m` will result in incorrect velocity calculations, as this method (and the
@@ -188,7 +216,7 @@
// Multiply by "1000" to convert from units/ms to units/s
return when (strategy) {
Strategy.Impulse ->
- calculateImpulseVelocity(dataPoints, time, differentialDataPoints) * 1000
+ calculateImpulseVelocity(dataPoints, time, isDataDifferential) * 1000
Strategy.Lsq2 -> calculateLeastSquaresVelocity(dataPoints, time) * 1000
}
}
@@ -199,7 +227,7 @@
}
/**
- * Clears the tracked positions added by [addDataPoint].
+ * Clears data points added by [addDataPoint].
*/
fun resetTracking() {
samples.fill(element = null)
@@ -487,7 +515,7 @@
private fun calculateImpulseVelocity(
dataPoints: List<Float>,
time: List<Float>,
- differentialDataPoints: Boolean
+ isDataDifferential: Boolean
): Float {
val numDataPoints = dataPoints.size
if (numDataPoints < 2) {
@@ -501,7 +529,7 @@
// For differential data ponits, each measurement reflects the amount of change in the
// subject's position. However, the first sample is discarded in computation because we
// don't know the time duration over which this change has occurred.
- if (differentialDataPoints) dataPoints[0]
+ if (isDataDifferential) dataPoints[0]
else dataPoints[0] - dataPoints[1]
return dataPointsDelta / (time[0] - time[1])
}
@@ -512,7 +540,7 @@
}
val vPrev = kineticEnergyToVelocity(work)
val dataPointsDelta =
- if (differentialDataPoints) -dataPoints[i - 1]
+ if (isDataDifferential) -dataPoints[i - 1]
else dataPoints[i] - dataPoints[i - 1]
val vCurr = dataPointsDelta / (time[i] - time[i - 1])
work += (vCurr - vPrev) * abs(vCurr)
diff --git a/compose/ui/ui/src/test/kotlin/androidx/compose/ui/input/pointer/util/VelocityTracker1DTest.kt b/compose/ui/ui/src/test/kotlin/androidx/compose/ui/input/pointer/util/VelocityTracker1DTest.kt
index 83771ee..8283e89 100644
--- a/compose/ui/ui/src/test/kotlin/androidx/compose/ui/input/pointer/util/VelocityTracker1DTest.kt
+++ b/compose/ui/ui/src/test/kotlin/androidx/compose/ui/input/pointer/util/VelocityTracker1DTest.kt
@@ -35,7 +35,7 @@
@Test
fun lsq2_differentialValues_unsupported() {
assertThrows(IllegalStateException::class.java) {
- VelocityTracker1D(differentialDataPoints = true, Strategy.Lsq2)
+ VelocityTracker1D(isDataDifferential = true, Strategy.Lsq2)
}
}
@Test
@@ -154,7 +154,7 @@
@Test
fun resetTracking_differentialValues_impulse() {
// Fixed velocity at 5 points per 10 milliseconds
- val tracker = VelocityTracker1D(differentialDataPoints = true, Strategy.Impulse)
+ val tracker = VelocityTracker1D(isDataDifferential = true, Strategy.Impulse)
tracker.addDataPoint(0, 0f)
tracker.addDataPoint(10, 5f)
tracker.addDataPoint(20, 10f)
@@ -169,7 +169,7 @@
@Test
fun resetTracking_nonDifferentialValues_impulse() {
// Fixed velocity at 5 points per 10 milliseconds
- val tracker = VelocityTracker1D(differentialDataPoints = false, Strategy.Impulse)
+ val tracker = VelocityTracker1D(isDataDifferential = false, Strategy.Impulse)
tracker.addDataPoint(0, 0f)
tracker.addDataPoint(10, 5f)
tracker.addDataPoint(20, 10f)
@@ -184,7 +184,7 @@
@Test
fun resetTracking_nonDifferentialValues_lsq2() {
// Fixed velocity at 5 points per 10 milliseconds
- val tracker = VelocityTracker1D(differentialDataPoints = false, Strategy.Lsq2)
+ val tracker = VelocityTracker1D(isDataDifferential = false, Strategy.Lsq2)
tracker.addDataPoint(0, 0f)
tracker.addDataPoint(10, 5f)
tracker.addDataPoint(20, 10f)
diff --git a/fragment/fragment-ktx/api/current.txt b/fragment/fragment-ktx/api/current.txt
index b582114..052abdb 100644
--- a/fragment/fragment-ktx/api/current.txt
+++ b/fragment/fragment-ktx/api/current.txt
@@ -15,9 +15,9 @@
}
public final class FragmentTransactionKt {
- method public static inline <reified F extends androidx.fragment.app.Fragment> androidx.fragment.app.FragmentTransaction add(androidx.fragment.app.FragmentTransaction, @IdRes int containerViewId, optional String tag, optional android.os.Bundle? args);
+ method public static inline <reified F extends androidx.fragment.app.Fragment> androidx.fragment.app.FragmentTransaction add(androidx.fragment.app.FragmentTransaction, @IdRes int containerViewId, optional String? tag, optional android.os.Bundle? args);
method public static inline <reified F extends androidx.fragment.app.Fragment> androidx.fragment.app.FragmentTransaction add(androidx.fragment.app.FragmentTransaction, String tag, optional android.os.Bundle? args);
- method public static inline <reified F extends androidx.fragment.app.Fragment> androidx.fragment.app.FragmentTransaction replace(androidx.fragment.app.FragmentTransaction, @IdRes int containerViewId, optional String tag, optional android.os.Bundle? args);
+ method public static inline <reified F extends androidx.fragment.app.Fragment> androidx.fragment.app.FragmentTransaction replace(androidx.fragment.app.FragmentTransaction, @IdRes int containerViewId, optional String? tag, optional android.os.Bundle? args);
}
public final class FragmentViewModelLazyKt {
diff --git a/fragment/fragment-ktx/api/public_plus_experimental_current.txt b/fragment/fragment-ktx/api/public_plus_experimental_current.txt
index b582114..052abdb 100644
--- a/fragment/fragment-ktx/api/public_plus_experimental_current.txt
+++ b/fragment/fragment-ktx/api/public_plus_experimental_current.txt
@@ -15,9 +15,9 @@
}
public final class FragmentTransactionKt {
- method public static inline <reified F extends androidx.fragment.app.Fragment> androidx.fragment.app.FragmentTransaction add(androidx.fragment.app.FragmentTransaction, @IdRes int containerViewId, optional String tag, optional android.os.Bundle? args);
+ method public static inline <reified F extends androidx.fragment.app.Fragment> androidx.fragment.app.FragmentTransaction add(androidx.fragment.app.FragmentTransaction, @IdRes int containerViewId, optional String? tag, optional android.os.Bundle? args);
method public static inline <reified F extends androidx.fragment.app.Fragment> androidx.fragment.app.FragmentTransaction add(androidx.fragment.app.FragmentTransaction, String tag, optional android.os.Bundle? args);
- method public static inline <reified F extends androidx.fragment.app.Fragment> androidx.fragment.app.FragmentTransaction replace(androidx.fragment.app.FragmentTransaction, @IdRes int containerViewId, optional String tag, optional android.os.Bundle? args);
+ method public static inline <reified F extends androidx.fragment.app.Fragment> androidx.fragment.app.FragmentTransaction replace(androidx.fragment.app.FragmentTransaction, @IdRes int containerViewId, optional String? tag, optional android.os.Bundle? args);
}
public final class FragmentViewModelLazyKt {
diff --git a/fragment/fragment-ktx/api/restricted_current.txt b/fragment/fragment-ktx/api/restricted_current.txt
index b582114..052abdb 100644
--- a/fragment/fragment-ktx/api/restricted_current.txt
+++ b/fragment/fragment-ktx/api/restricted_current.txt
@@ -15,9 +15,9 @@
}
public final class FragmentTransactionKt {
- method public static inline <reified F extends androidx.fragment.app.Fragment> androidx.fragment.app.FragmentTransaction add(androidx.fragment.app.FragmentTransaction, @IdRes int containerViewId, optional String tag, optional android.os.Bundle? args);
+ method public static inline <reified F extends androidx.fragment.app.Fragment> androidx.fragment.app.FragmentTransaction add(androidx.fragment.app.FragmentTransaction, @IdRes int containerViewId, optional String? tag, optional android.os.Bundle? args);
method public static inline <reified F extends androidx.fragment.app.Fragment> androidx.fragment.app.FragmentTransaction add(androidx.fragment.app.FragmentTransaction, String tag, optional android.os.Bundle? args);
- method public static inline <reified F extends androidx.fragment.app.Fragment> androidx.fragment.app.FragmentTransaction replace(androidx.fragment.app.FragmentTransaction, @IdRes int containerViewId, optional String tag, optional android.os.Bundle? args);
+ method public static inline <reified F extends androidx.fragment.app.Fragment> androidx.fragment.app.FragmentTransaction replace(androidx.fragment.app.FragmentTransaction, @IdRes int containerViewId, optional String? tag, optional android.os.Bundle? args);
}
public final class FragmentViewModelLazyKt {
diff --git a/hilt/hilt-navigation-compose/api/current.txt b/hilt/hilt-navigation-compose/api/current.txt
index ff89117..99cdd72 100644
--- a/hilt/hilt-navigation-compose/api/current.txt
+++ b/hilt/hilt-navigation-compose/api/current.txt
@@ -2,7 +2,7 @@
package androidx.hilt.navigation.compose {
public final class HiltViewModelKt {
- method @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM hiltViewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String key);
+ method @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM hiltViewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String? key);
}
}
diff --git a/hilt/hilt-navigation-compose/api/public_plus_experimental_current.txt b/hilt/hilt-navigation-compose/api/public_plus_experimental_current.txt
index ff89117..99cdd72 100644
--- a/hilt/hilt-navigation-compose/api/public_plus_experimental_current.txt
+++ b/hilt/hilt-navigation-compose/api/public_plus_experimental_current.txt
@@ -2,7 +2,7 @@
package androidx.hilt.navigation.compose {
public final class HiltViewModelKt {
- method @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM hiltViewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String key);
+ method @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM hiltViewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String? key);
}
}
diff --git a/hilt/hilt-navigation-compose/api/restricted_current.txt b/hilt/hilt-navigation-compose/api/restricted_current.txt
index 3bf1a26..40d2a82 100644
--- a/hilt/hilt-navigation-compose/api/restricted_current.txt
+++ b/hilt/hilt-navigation-compose/api/restricted_current.txt
@@ -3,7 +3,7 @@
public final class HiltViewModelKt {
method @androidx.compose.runtime.Composable @kotlin.PublishedApi internal static androidx.lifecycle.ViewModelProvider.Factory? createHiltViewModelFactory(androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner);
- method @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM hiltViewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String key);
+ method @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM hiltViewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String? key);
}
}
diff --git a/libraryversions.toml b/libraryversions.toml
index 494e5f39..4e3538a 100644
--- a/libraryversions.toml
+++ b/libraryversions.toml
@@ -21,7 +21,7 @@
COLLECTION = "1.3.0-alpha03"
COLLECTION_KMP = "1.3.0-dev01"
COMPOSE = "1.4.0-alpha05"
-COMPOSE_COMPILER = "1.4.0-alpha02"
+COMPOSE_COMPILER = "1.4.0"
COMPOSE_MATERIAL3 = "1.1.0-alpha05"
COMPOSE_RUNTIME_TRACING = "1.0.0-alpha02"
CONSTRAINTLAYOUT = "2.2.0-alpha06"
diff --git a/lifecycle/lifecycle-viewmodel-compose/api/current.txt b/lifecycle/lifecycle-viewmodel-compose/api/current.txt
index 12fad78..05b6910 100644
--- a/lifecycle/lifecycle-viewmodel-compose/api/current.txt
+++ b/lifecycle/lifecycle-viewmodel-compose/api/current.txt
@@ -13,10 +13,10 @@
public final class ViewModelKt {
method @androidx.compose.runtime.Composable public static <VM extends androidx.lifecycle.ViewModel> VM viewModel(Class<VM> modelClass, optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String? key, optional androidx.lifecycle.ViewModelProvider.Factory? factory, optional androidx.lifecycle.viewmodel.CreationExtras extras);
- method @Deprecated @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM viewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String key, optional androidx.lifecycle.ViewModelProvider.Factory? factory);
- method @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM viewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String key, optional androidx.lifecycle.ViewModelProvider.Factory? factory, optional androidx.lifecycle.viewmodel.CreationExtras extras);
- method @Deprecated @androidx.compose.runtime.Composable public static <VM extends androidx.lifecycle.ViewModel> VM viewModel(Class<VM> modelClass, optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String key, optional androidx.lifecycle.ViewModelProvider.Factory? factory);
- method @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM viewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String key, kotlin.jvm.functions.Function1<? super androidx.lifecycle.viewmodel.CreationExtras,? extends VM> initializer);
+ method @Deprecated @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM viewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String? key, optional androidx.lifecycle.ViewModelProvider.Factory? factory);
+ method @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM viewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String? key, optional androidx.lifecycle.ViewModelProvider.Factory? factory, optional androidx.lifecycle.viewmodel.CreationExtras extras);
+ method @Deprecated @androidx.compose.runtime.Composable public static <VM extends androidx.lifecycle.ViewModel> VM viewModel(Class<VM> modelClass, optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String? key, optional androidx.lifecycle.ViewModelProvider.Factory? factory);
+ method @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM viewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String? key, kotlin.jvm.functions.Function1<? super androidx.lifecycle.viewmodel.CreationExtras,? extends VM> initializer);
}
}
diff --git a/lifecycle/lifecycle-viewmodel-compose/api/public_plus_experimental_current.txt b/lifecycle/lifecycle-viewmodel-compose/api/public_plus_experimental_current.txt
index fdd4c83..188b922 100644
--- a/lifecycle/lifecycle-viewmodel-compose/api/public_plus_experimental_current.txt
+++ b/lifecycle/lifecycle-viewmodel-compose/api/public_plus_experimental_current.txt
@@ -20,10 +20,10 @@
public final class ViewModelKt {
method @androidx.compose.runtime.Composable public static <VM extends androidx.lifecycle.ViewModel> VM viewModel(Class<VM> modelClass, optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String? key, optional androidx.lifecycle.ViewModelProvider.Factory? factory, optional androidx.lifecycle.viewmodel.CreationExtras extras);
- method @Deprecated @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM viewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String key, optional androidx.lifecycle.ViewModelProvider.Factory? factory);
- method @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM viewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String key, optional androidx.lifecycle.ViewModelProvider.Factory? factory, optional androidx.lifecycle.viewmodel.CreationExtras extras);
- method @Deprecated @androidx.compose.runtime.Composable public static <VM extends androidx.lifecycle.ViewModel> VM viewModel(Class<VM> modelClass, optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String key, optional androidx.lifecycle.ViewModelProvider.Factory? factory);
- method @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM viewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String key, kotlin.jvm.functions.Function1<? super androidx.lifecycle.viewmodel.CreationExtras,? extends VM> initializer);
+ method @Deprecated @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM viewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String? key, optional androidx.lifecycle.ViewModelProvider.Factory? factory);
+ method @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM viewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String? key, optional androidx.lifecycle.ViewModelProvider.Factory? factory, optional androidx.lifecycle.viewmodel.CreationExtras extras);
+ method @Deprecated @androidx.compose.runtime.Composable public static <VM extends androidx.lifecycle.ViewModel> VM viewModel(Class<VM> modelClass, optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String? key, optional androidx.lifecycle.ViewModelProvider.Factory? factory);
+ method @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM viewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String? key, kotlin.jvm.functions.Function1<? super androidx.lifecycle.viewmodel.CreationExtras,? extends VM> initializer);
}
}
diff --git a/lifecycle/lifecycle-viewmodel-compose/api/restricted_current.txt b/lifecycle/lifecycle-viewmodel-compose/api/restricted_current.txt
index 12fad78..05b6910 100644
--- a/lifecycle/lifecycle-viewmodel-compose/api/restricted_current.txt
+++ b/lifecycle/lifecycle-viewmodel-compose/api/restricted_current.txt
@@ -13,10 +13,10 @@
public final class ViewModelKt {
method @androidx.compose.runtime.Composable public static <VM extends androidx.lifecycle.ViewModel> VM viewModel(Class<VM> modelClass, optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String? key, optional androidx.lifecycle.ViewModelProvider.Factory? factory, optional androidx.lifecycle.viewmodel.CreationExtras extras);
- method @Deprecated @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM viewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String key, optional androidx.lifecycle.ViewModelProvider.Factory? factory);
- method @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM viewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String key, optional androidx.lifecycle.ViewModelProvider.Factory? factory, optional androidx.lifecycle.viewmodel.CreationExtras extras);
- method @Deprecated @androidx.compose.runtime.Composable public static <VM extends androidx.lifecycle.ViewModel> VM viewModel(Class<VM> modelClass, optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String key, optional androidx.lifecycle.ViewModelProvider.Factory? factory);
- method @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM viewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String key, kotlin.jvm.functions.Function1<? super androidx.lifecycle.viewmodel.CreationExtras,? extends VM> initializer);
+ method @Deprecated @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM viewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String? key, optional androidx.lifecycle.ViewModelProvider.Factory? factory);
+ method @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM viewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String? key, optional androidx.lifecycle.ViewModelProvider.Factory? factory, optional androidx.lifecycle.viewmodel.CreationExtras extras);
+ method @Deprecated @androidx.compose.runtime.Composable public static <VM extends androidx.lifecycle.ViewModel> VM viewModel(Class<VM> modelClass, optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String? key, optional androidx.lifecycle.ViewModelProvider.Factory? factory);
+ method @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM viewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String? key, kotlin.jvm.functions.Function1<? super androidx.lifecycle.viewmodel.CreationExtras,? extends VM> initializer);
}
}
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProvider.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProvider.java
index ed033e1..34f191f 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProvider.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProvider.java
@@ -602,6 +602,10 @@
* the route controller.
* @param dynamicRoutes The dynamic route descriptors for published routes.
* At least a selected or selecting route should be included.
+ *
+ * @throws IllegalArgumentException Thrown when no dynamic route descriptors are {@link
+ * DynamicRouteDescriptor#SELECTED SELECTED} or {@link DynamicRouteDescriptor#SELECTING
+ * SELECTING}.
*/
public final void notifyDynamicRoutesChanged(
@NonNull MediaRouteDescriptor groupRoute,
@@ -612,6 +616,23 @@
if (dynamicRoutes == null) {
throw new NullPointerException("dynamicRoutes must not be null");
}
+
+ boolean hasSelectedRoute = false;
+ for (DynamicRouteDescriptor route: dynamicRoutes) {
+ int state = route.getSelectionState();
+ if (state == DynamicRouteDescriptor.SELECTED
+ || state == DynamicRouteDescriptor.SELECTING) {
+ hasSelectedRoute = true;
+ break;
+ }
+ }
+
+ if (!hasSelectedRoute) {
+ throw new IllegalArgumentException("dynamicRoutes must have at least one selected"
+ + " or selecting route.");
+
+ }
+
synchronized (mLock) {
if (mExecutor != null) {
final OnDynamicRoutesChangedListener listener = mListener;
diff --git a/navigation/navigation-common/src/main/java/androidx/navigation/NavDestination.kt b/navigation/navigation-common/src/main/java/androidx/navigation/NavDestination.kt
index fd67cc1..d16d702 100644
--- a/navigation/navigation-common/src/main/java/androidx/navigation/NavDestination.kt
+++ b/navigation/navigation-common/src/main/java/androidx/navigation/NavDestination.kt
@@ -26,6 +26,7 @@
import androidx.collection.SparseArrayCompat
import androidx.collection.valueIterator
import androidx.core.content.res.use
+import androidx.core.net.toUri
import androidx.navigation.common.R
import java.util.regex.Pattern
import kotlin.reflect.KClass
@@ -410,6 +411,54 @@
}
/**
+ * Returns true if the [NavBackStackEntry.destination] contains the route.
+ *
+ * The route may be either:
+ * 1. an exact route without arguments
+ * 2. a route containing arguments where no arguments are filled in
+ * 3. a route containing arguments where some or all arguments are filled in
+ *
+ * In the case of 3., it will only match if the entry arguments
+ * match exactly with the arguments that were filled in inside the route.
+ *
+ * @param [route] The route to match with the route of this destination
+ *
+ * @param [arguments] The [NavBackStackEntry.arguments] of the entry for this destination.
+ *
+ * @param [graph] The [NavGraph] of the backStack containing the entry for this destination.
+ */
+ @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+ public fun hasRoute(route: String, arguments: Bundle?, graph: NavGraph): Boolean {
+ // this matches based on routePattern
+ if (this.route == route) return true
+
+ // if no match based on routePattern, this means route contains filled in args.
+ val request = NavDeepLinkRequest.Builder.fromUri(createRoute(route).toUri()).build()
+ val matchingDeepLink = graph.matchDeepLink(request)
+
+ // If matchingDeepLink is null or it has no matching args, the route does not contain
+ // filled in args. Since it didn't match with routePattern earlier, we just return false.
+ val matchingArgs = matchingDeepLink?.matchingArgs
+ if (matchingArgs == null || matchingArgs.isEmpty) return false
+
+ // any args (partially or completely filled in) must exactly match between
+ // the route and entry's route
+ matchingArgs.keySet().forEach { key ->
+ if (this != matchingDeepLink.destination || arguments == null ||
+ !arguments.containsKey(key)
+ ) {
+ return false
+ }
+ val type = matchingDeepLink.destination.arguments[key]?.type
+ val routeArgValue = type?.get(matchingArgs, key)
+ val entryArgValue = type?.get(arguments, key)
+ if (routeArgValue == null || entryArgValue == null || routeArgValue != entryArgValue)
+ return false
+ }
+ return true
+ }
+
+ /**
* @return Whether this NavDestination supports outgoing actions
* @see NavDestination.putAction
* @suppress
diff --git a/navigation/navigation-runtime/build.gradle b/navigation/navigation-runtime/build.gradle
index a7e476e..06b831b 100644
--- a/navigation/navigation-runtime/build.gradle
+++ b/navigation/navigation-runtime/build.gradle
@@ -46,6 +46,7 @@
androidTestImplementation(libs.mockitoCore, excludes.bytebuddy)
androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy)
androidTestImplementation(libs.kotlinStdlib)
+ androidTestImplementation(libs.kotlinTest)
androidTestImplementation(libs.multidex)
lintPublish(project(':navigation:navigation-runtime-lint'))
diff --git a/navigation/navigation-runtime/src/androidTest/java/androidx/navigation/NavControllerRouteTest.kt b/navigation/navigation-runtime/src/androidTest/java/androidx/navigation/NavControllerRouteTest.kt
index 33fa054..49c2ce6 100644
--- a/navigation/navigation-runtime/src/androidTest/java/androidx/navigation/NavControllerRouteTest.kt
+++ b/navigation/navigation-runtime/src/androidTest/java/androidx/navigation/NavControllerRouteTest.kt
@@ -49,6 +49,7 @@
import androidx.testutils.test
import com.google.common.truth.Truth.assertThat
import com.google.common.truth.Truth.assertWithMessage
+import kotlin.test.assertFailsWith
import org.hamcrest.CoreMatchers.allOf
import org.hamcrest.CoreMatchers.not
import org.hamcrest.Matchers
@@ -345,6 +346,215 @@
@UiThreadTest
@Test
+ fun testGetBackStackEntryWithExactRoute() {
+ val navController = createNavController()
+ navController.graph =
+ navController.createGraph(route = "nav_root", startDestination = "start_test") {
+ test("start_test")
+ test("second_test/{arg}") {
+ argument("arg") { type = NavType.StringType }
+ }
+ }
+
+ // first nav with arg filed in
+ val deepLink = Uri.parse("android-app://androidx.navigation/second_test/13")
+ navController.navigate(deepLink)
+
+ // second nav with arg filled in
+ val deepLink2 = Uri.parse("android-app://androidx.navigation/second_test/18")
+ navController.navigate(deepLink2)
+
+ val navigator = navController.navigatorProvider.getNavigator(TestNavigator::class.java)
+ // ["start_test", "second_test/13", "second_test/18"]
+ assertThat(navigator.backStack.size).isEqualTo(3)
+
+ val entry1 = navController.getBackStackEntry("second_test/13")
+ assertThat(entry1).isEqualTo(navigator.backStack[1])
+
+ val entry2 = navController.getBackStackEntry("second_test/18")
+ assertThat(entry2).isEqualTo(navigator.backStack[2])
+ }
+
+ @UiThreadTest
+ @Test
+ fun testGetBackStackEntryWithExactRoute_multiArgs() {
+ val navController = createNavController()
+ navController.graph =
+ navController.createGraph(route = "nav_root", startDestination = "start_test") {
+ test("start_test")
+ test("second_test/{arg}/{arg2}") {
+ argument("arg") { type = NavType.StringType }
+ argument("arg2") { type = NavType.StringType }
+ }
+ }
+
+ // navigate with both args filed in
+ val deepLink = Uri.parse("android-app://androidx.navigation/second_test/13/18")
+ navController.navigate(deepLink)
+
+ val navigator = navController.navigatorProvider.getNavigator(TestNavigator::class.java)
+ // ["start_test", "second_test/13/18"]
+ assertThat(navigator.backStack.size).isEqualTo(2)
+
+ val entry1 = navController.getBackStackEntry("second_test/13/18")
+ assertThat(entry1).isEqualTo(navigator.backStack[1])
+ }
+
+ @UiThreadTest
+ @Test
+ fun testGetBackStackEntryWithPartialExactRoute() {
+ val navController = createNavController()
+ navController.graph =
+ navController.createGraph(route = "nav_root", startDestination = "start_test") {
+ test("start_test")
+ test("second_test/{arg}/{arg2}") {
+ argument("arg") { type = NavType.StringType }
+ argument("arg2") { type = NavType.StringType }
+ }
+ }
+
+ // navigate with args partially filed in
+ val deepLink = Uri.parse("android-app://androidx.navigation/second_test/13/{arg2}")
+ navController.navigate(deepLink)
+
+ val navigator = navController.navigatorProvider.getNavigator(TestNavigator::class.java)
+ // ["start_test", "second_test/13/{arg2}"]
+ assertThat(navigator.backStack.size).isEqualTo(2)
+ // routes with partially filled in args will also match as long as the args
+ // are filled in the exact same way
+ val entry1 = navController.getBackStackEntry("second_test/13/{arg2}")
+ assertThat(entry1).isEqualTo(navigator.backStack[1])
+ }
+
+ @UiThreadTest
+ @Test
+ fun testGetBackStackEntryWithIncorrectExactRoute() {
+ val navController = createNavController()
+ navController.graph =
+ navController.createGraph(route = "nav_root", startDestination = "start_test") {
+ test("start_test")
+ test("second_test/{arg}") {
+ argument("arg") { type = NavType.StringType }
+ }
+ }
+
+ // navigate with arg filed in
+ val deepLink = Uri.parse("android-app://androidx.navigation/second_test/13")
+ navController.navigate(deepLink)
+
+ val navigator = navController.navigatorProvider.getNavigator(TestNavigator::class.java)
+ // ["start_test", "second_test/13"]
+ assertThat(navigator.backStack.size).isEqualTo(2)
+
+ // route "second_test/18" should not match with any entries in backstack since we never
+ // navigated with args "18"
+ val route = "second_test/18"
+ val exception = assertFailsWith<IllegalArgumentException> {
+ navController.getBackStackEntry(route)
+ }
+ assertThat(exception.message).isEqualTo(
+ "No destination with route $route is on the NavController's " +
+ "back stack. The current destination is ${navController.currentDestination}"
+ )
+ }
+
+ @UiThreadTest
+ @Test
+ fun testGetBackStackEntryWithIncorrectExactRoute_multiArgs() {
+ val navController = createNavController()
+ navController.graph =
+ navController.createGraph(route = "nav_root", startDestination = "start_test") {
+ test("start_test")
+ test("second_test/{arg}/{arg2}") {
+ argument("arg") { type = NavType.StringType }
+ argument("arg2") { type = NavType.StringType }
+ }
+ }
+
+ // navigate with args partially filed in
+ val deepLink = Uri.parse("android-app://androidx.navigation/second_test/13/18")
+ navController.navigate(deepLink)
+
+ val navigator = navController.navigatorProvider.getNavigator(TestNavigator::class.java)
+ // ["start_test", "second_test/13/18"]
+ assertThat(navigator.backStack.size).isEqualTo(2)
+
+ // route "second_test/13/13" should not match with any entries in backstack
+ val route = "second_test/13/19"
+ val exception = assertFailsWith<IllegalArgumentException> {
+ navController.getBackStackEntry(route)
+ }
+ assertThat(exception.message).isEqualTo(
+ "No destination with route $route is on the NavController's " +
+ "back stack. The current destination is ${navController.currentDestination}"
+ )
+ }
+
+ @UiThreadTest
+ @Test
+ fun testGetBackStackEntryWithAdditionalPartialArgs() {
+ val navController = createNavController()
+ navController.graph =
+ navController.createGraph(route = "nav_root", startDestination = "start_test") {
+ test("start_test")
+ test("second_test/{arg}/{arg2}") {
+ argument("arg") { type = NavType.StringType }
+ argument("arg2") { type = NavType.StringType }
+ }
+ }
+
+ // navigate with args partially filed in
+ val deepLink = Uri.parse("android-app://androidx.navigation/second_test/13/{arg2}")
+ navController.navigate(deepLink)
+
+ val navigator = navController.navigatorProvider.getNavigator(TestNavigator::class.java)
+ // ["start_test", "second_test/13/{arg2}"]
+ assertThat(navigator.backStack.size).isEqualTo(2)
+
+ // route with additional arg "14" should not match
+ val route = "second_test/13/14"
+ val exception = assertFailsWith<IllegalArgumentException> {
+ navController.getBackStackEntry(route)
+ }
+ assertThat(exception.message).isEqualTo(
+ "No destination with route $route is on the NavController's " +
+ "back stack. The current destination is ${navController.currentDestination}"
+ )
+ }
+
+ @UiThreadTest
+ @Test
+ fun testGetBackStackEntryWithMissingPartialArgs() {
+ val navController = createNavController()
+ navController.graph =
+ navController.createGraph(route = "nav_root", startDestination = "start_test") {
+ test("start_test")
+ test("second_test/{arg}/{arg2}") {
+ argument("arg") { type = NavType.StringType }
+ argument("arg2") { type = NavType.StringType }
+ }
+ }
+
+ val deepLink = Uri.parse("android-app://androidx.navigation/second_test/13/18")
+ navController.navigate(deepLink)
+
+ val navigator = navController.navigatorProvider.getNavigator(TestNavigator::class.java)
+ // ["start_test", "second_test/13/18"]
+ assertThat(navigator.backStack.size).isEqualTo(2)
+
+ // route missing arg "18" should not match
+ val route = "second_test/13/{arg2}"
+ val exception = assertFailsWith<IllegalArgumentException> {
+ navController.getBackStackEntry(route)
+ }
+ assertThat(exception.message).isEqualTo(
+ "No destination with route $route is on the NavController's " +
+ "back stack. The current destination is ${navController.currentDestination}"
+ )
+ }
+
+ @UiThreadTest
+ @Test
fun testNavigateViaDeepLinkDefaultArgs() {
val navController = createNavController()
navController.graph = nav_simple_route_graph
diff --git a/navigation/navigation-runtime/src/main/java/androidx/navigation/NavController.kt b/navigation/navigation-runtime/src/main/java/androidx/navigation/NavController.kt
index 4a1ba0f..401c387 100644
--- a/navigation/navigation-runtime/src/main/java/androidx/navigation/NavController.kt
+++ b/navigation/navigation-runtime/src/main/java/androidx/navigation/NavController.kt
@@ -2281,7 +2281,7 @@
*/
public fun getBackStackEntry(route: String): NavBackStackEntry {
val lastFromBackStack: NavBackStackEntry? = backQueue.lastOrNull { entry ->
- entry.destination.route == route
+ entry.destination.hasRoute(route, entry.arguments, _graph!!)
}
requireNotNull(lastFromBackStack) {
"No destination with route $route is on the NavController's back stack. The " +
diff --git a/paging/paging-testing/api/current.txt b/paging/paging-testing/api/current.txt
index bcde83a..b48b6de 100644
--- a/paging/paging-testing/api/current.txt
+++ b/paging/paging-testing/api/current.txt
@@ -9,6 +9,14 @@
method public suspend Object? appendScrollWhile(kotlin.jvm.functions.Function1<Value,java.lang.Boolean> predicate, kotlin.coroutines.Continuation<kotlin.Unit>);
method public suspend Object? prependScrollWhile(kotlin.jvm.functions.Function1<Value,java.lang.Boolean> predicate, kotlin.coroutines.Continuation<kotlin.Unit>);
method public suspend Object? refresh(kotlin.coroutines.Continuation<kotlin.Unit>);
+ method public suspend Object? scrollTo(int index, optional androidx.paging.testing.SnapshotLoader.ScrollBehavior scrollBehavior, optional kotlin.coroutines.Continuation<kotlin.Unit>);
+ }
+
+ public enum SnapshotLoader.ScrollBehavior {
+ method public static androidx.paging.testing.SnapshotLoader.ScrollBehavior valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.paging.testing.SnapshotLoader.ScrollBehavior[] values();
+ enum_constant public static final androidx.paging.testing.SnapshotLoader.ScrollBehavior ScrollIntoPlaceholders;
+ enum_constant public static final androidx.paging.testing.SnapshotLoader.ScrollBehavior WaitForPlaceholdersToLoad;
}
public final class StaticListPagingSourceFactoryKt {
diff --git a/paging/paging-testing/api/public_plus_experimental_current.txt b/paging/paging-testing/api/public_plus_experimental_current.txt
index bcde83a..b48b6de 100644
--- a/paging/paging-testing/api/public_plus_experimental_current.txt
+++ b/paging/paging-testing/api/public_plus_experimental_current.txt
@@ -9,6 +9,14 @@
method public suspend Object? appendScrollWhile(kotlin.jvm.functions.Function1<Value,java.lang.Boolean> predicate, kotlin.coroutines.Continuation<kotlin.Unit>);
method public suspend Object? prependScrollWhile(kotlin.jvm.functions.Function1<Value,java.lang.Boolean> predicate, kotlin.coroutines.Continuation<kotlin.Unit>);
method public suspend Object? refresh(kotlin.coroutines.Continuation<kotlin.Unit>);
+ method public suspend Object? scrollTo(int index, optional androidx.paging.testing.SnapshotLoader.ScrollBehavior scrollBehavior, optional kotlin.coroutines.Continuation<kotlin.Unit>);
+ }
+
+ public enum SnapshotLoader.ScrollBehavior {
+ method public static androidx.paging.testing.SnapshotLoader.ScrollBehavior valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.paging.testing.SnapshotLoader.ScrollBehavior[] values();
+ enum_constant public static final androidx.paging.testing.SnapshotLoader.ScrollBehavior ScrollIntoPlaceholders;
+ enum_constant public static final androidx.paging.testing.SnapshotLoader.ScrollBehavior WaitForPlaceholdersToLoad;
}
public final class StaticListPagingSourceFactoryKt {
diff --git a/paging/paging-testing/api/restricted_current.txt b/paging/paging-testing/api/restricted_current.txt
index bcde83a..b48b6de 100644
--- a/paging/paging-testing/api/restricted_current.txt
+++ b/paging/paging-testing/api/restricted_current.txt
@@ -9,6 +9,14 @@
method public suspend Object? appendScrollWhile(kotlin.jvm.functions.Function1<Value,java.lang.Boolean> predicate, kotlin.coroutines.Continuation<kotlin.Unit>);
method public suspend Object? prependScrollWhile(kotlin.jvm.functions.Function1<Value,java.lang.Boolean> predicate, kotlin.coroutines.Continuation<kotlin.Unit>);
method public suspend Object? refresh(kotlin.coroutines.Continuation<kotlin.Unit>);
+ method public suspend Object? scrollTo(int index, optional androidx.paging.testing.SnapshotLoader.ScrollBehavior scrollBehavior, optional kotlin.coroutines.Continuation<kotlin.Unit>);
+ }
+
+ public enum SnapshotLoader.ScrollBehavior {
+ method public static androidx.paging.testing.SnapshotLoader.ScrollBehavior valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.paging.testing.SnapshotLoader.ScrollBehavior[] values();
+ enum_constant public static final androidx.paging.testing.SnapshotLoader.ScrollBehavior ScrollIntoPlaceholders;
+ enum_constant public static final androidx.paging.testing.SnapshotLoader.ScrollBehavior WaitForPlaceholdersToLoad;
}
public final class StaticListPagingSourceFactoryKt {
diff --git a/paging/paging-testing/src/main/java/androidx/paging/testing/SnapshotLoader.kt b/paging/paging-testing/src/main/java/androidx/paging/testing/SnapshotLoader.kt
index e4f73ac..a65cc1b 100644
--- a/paging/paging-testing/src/main/java/androidx/paging/testing/SnapshotLoader.kt
+++ b/paging/paging-testing/src/main/java/androidx/paging/testing/SnapshotLoader.kt
@@ -123,6 +123,71 @@
}
/**
+ * Imitates scrolling from current index to the target index.
+ *
+ * The scroll direction (prepend or append) is dependent on current index and target index. In
+ * general, scrolling to a smaller index triggers [PREPEND] while scrolling to a larger
+ * index triggers [APPEND].
+ *
+ * @param [index] The target index to scroll to
+ *
+ * @param [scrollBehavior] The default scroll behavior is
+ * [ScrollBehavior.WaitForPlaceholdersToLoad]. See [ScrollBehavior] for all scroll types.
+ */
+ public suspend fun scrollTo(
+ index: Int,
+ scrollBehavior: ScrollBehavior = ScrollBehavior.WaitForPlaceholdersToLoad
+ ): @JvmSuppressWildcards Unit {
+ differ.awaitNotLoading()
+ appendOrPrependScrollTo(index, scrollBehavior)
+ differ.awaitNotLoading()
+ }
+
+ /**
+ * Scrolls from current index to targeted [index].
+ *
+ * Internally this method scrolls until it fulfills requested index
+ * differential (Math.abs(requested index - current index)) rather than scrolling
+ * to the exact requested index. This is because item indices can shift depending on scroll
+ * direction and placeholders. Therefore we try to fulfill the expected amount of scrolling
+ * rather than the actual requested index.
+ */
+ private suspend fun appendOrPrependScrollTo(
+ index: Int,
+ scrollBehavior: ScrollBehavior,
+ ) {
+ val startIndex = generations.value.lastAccessedIndex.get()
+ val loadType = if (startIndex > index) LoadType.PREPEND else LoadType.APPEND
+ when (loadType) {
+ LoadType.PREPEND -> prependScrollTo(index, startIndex, scrollBehavior)
+ LoadType.APPEND -> {
+ // TODO
+ }
+ }
+ }
+
+ private suspend fun prependScrollTo(
+ index: Int,
+ startIndex: Int,
+ scrollBehavior: ScrollBehavior
+ ) {
+ val endIndex = maxOf(0, index)
+ val scrollCount = startIndex - endIndex
+ when (scrollBehavior) {
+ ScrollBehavior.WaitForPlaceholdersToLoad -> awaitScrollTo(LoadType.PREPEND, scrollCount)
+ ScrollBehavior.ScrollIntoPlaceholders -> {
+ // TODO
+ }
+ }
+ }
+
+ private suspend fun awaitScrollTo(loadType: LoadType, scrollCount: Int) {
+ repeat(scrollCount) {
+ awaitNextItem(loadType)
+ }
+ }
+
+ /**
* Triggers load for next item, awaits for it to be loaded and returns the loaded item.
*
* It calculates the next load index based on loadType and this generation's
@@ -228,6 +293,29 @@
PREPEND,
APPEND
}
+
+ /**
+ * Determines whether the fake scroll will wait for asynchronous data to be loaded in or not.
+ *
+ * @see scrollTo
+ */
+ public enum class ScrollBehavior {
+ /**
+ * Imitates slow scrolls by waiting for item to be loaded in before triggering
+ * load on next item. A scroll with this behavior will return all available data
+ * that has been scrolled through.
+ */
+ ScrollIntoPlaceholders,
+
+ /**
+ * Imitates fast scrolling that will continue scrolling as data is being loaded in
+ * asynchronously. A scroll with this behavior will return only the data that has been
+ * loaded in by the time scrolling ends. This mode can also be used to trigger paging
+ * jumps if the number of placeholders scrolled through is larger than
+ * [PagingConfig.jumpThreshold].
+ */
+ WaitForPlaceholdersToLoad
+ }
}
internal data class Generation(
diff --git a/paging/paging-testing/src/test/kotlin/androidx/paging/testing/PagerFlowSnapshotTest.kt b/paging/paging-testing/src/test/kotlin/androidx/paging/testing/PagerFlowSnapshotTest.kt
index b65ce1a..8a4c15d 100644
--- a/paging/paging-testing/src/test/kotlin/androidx/paging/testing/PagerFlowSnapshotTest.kt
+++ b/paging/paging-testing/src/test/kotlin/androidx/paging/testing/PagerFlowSnapshotTest.kt
@@ -19,6 +19,7 @@
import androidx.paging.Pager
import androidx.paging.PagingConfig
import androidx.paging.cachedIn
+import androidx.paging.testing.SnapshotLoader.ScrollBehavior
import com.google.common.truth.Truth.assertThat
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
@@ -756,6 +757,172 @@
}
}
+ @Test
+ fun prependToAwait() {
+ val dataFlow = flowOf(List(100) { it })
+ val factory = dataFlow.asPagingSourceFactory(testScope.backgroundScope)
+ val pager = Pager(
+ config = CONFIG,
+ initialKey = 50,
+ pagingSourceFactory = factory,
+ )
+ testScope.runTest {
+ val snapshot = pager.flow.asSnapshot(this) {
+ scrollTo(42, ScrollBehavior.WaitForPlaceholdersToLoad)
+ }
+ // initial load [50-54]
+ // prefetched [47-49], [55-57]
+ // prepended [41-46]
+ // prefetched [38-40]
+ assertThat(snapshot).containsExactlyElementsIn(
+ listOf(
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57
+ )
+ )
+ }
+ }
+
+ @Test
+ fun consecutivePrependToAwait() {
+ val dataFlow = flowOf(List(100) { it })
+ val factory = dataFlow.asPagingSourceFactory(testScope.backgroundScope)
+ val pager = Pager(
+ config = CONFIG,
+ initialKey = 50,
+ pagingSourceFactory = factory,
+ )
+ testScope.runTest {
+ val snapshot = pager.flow.asSnapshot(this) {
+ scrollTo(42, ScrollBehavior.WaitForPlaceholdersToLoad)
+ }
+ // initial load [50-54]
+ // prefetched [47-49], [55-57]
+ // prepended [41-46]
+ // prefetched [38-40]
+ assertThat(snapshot).containsExactlyElementsIn(
+ listOf(
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57
+ )
+ )
+
+ val snapshot2 = pager.flow.asSnapshot(this) {
+ scrollTo(38, ScrollBehavior.WaitForPlaceholdersToLoad)
+ }
+ // prefetched [35-37]
+ assertThat(snapshot2).containsExactlyElementsIn(
+ listOf(
+ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+ 51, 52, 53, 54, 55, 56, 57
+ )
+ )
+ }
+ }
+
+ @Test
+ fun prependToAwait_withoutPrefetch() {
+ val dataFlow = flowOf(List(100) { it })
+ val factory = dataFlow.asPagingSourceFactory(testScope.backgroundScope)
+ val pager = Pager(
+ config = CONFIG_NO_PREFETCH,
+ initialKey = 50,
+ pagingSourceFactory = factory,
+ )
+ testScope.runTest {
+ val snapshot = pager.flow.asSnapshot(this) {
+ scrollTo(42, ScrollBehavior.WaitForPlaceholdersToLoad)
+ }
+ // initial load [50-54]
+ // prepended [41-49]
+ assertThat(snapshot).containsExactlyElementsIn(
+ listOf(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54)
+ )
+ }
+ }
+
+ @Test
+ fun prependToAwait_withoutPlaceholders() {
+ val dataFlow = flowOf(List(100) { it })
+ val factory = dataFlow.asPagingSourceFactory(testScope.backgroundScope)
+ val pager = Pager(
+ config = CONFIG_NO_PLACEHOLDERS,
+ initialKey = 50,
+ pagingSourceFactory = factory,
+ ).flow.cachedIn(testScope.backgroundScope)
+ testScope.runTest {
+ val snapshot = pager.asSnapshot(this) {
+ // Without placeholders, first loaded page always starts at index[0]
+ scrollTo(0, ScrollBehavior.WaitForPlaceholdersToLoad)
+ }
+ // initial load [50-54]
+ // prefetched [47-49], [55-57]
+ // scrollTo prepended [44-46]
+ assertThat(snapshot).containsExactlyElementsIn(
+ listOf(44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57)
+ )
+ }
+ }
+
+ @Test
+ fun consecutivePrependToAwait_withoutPlaceholders() {
+ val dataFlow = flowOf(List(100) { it })
+ val factory = dataFlow.asPagingSourceFactory(testScope.backgroundScope)
+ val pager = Pager(
+ config = CONFIG_NO_PLACEHOLDERS,
+ initialKey = 50,
+ pagingSourceFactory = factory,
+ ).flow.cachedIn(testScope.backgroundScope)
+ testScope.runTest {
+ val snapshot = pager.asSnapshot(this) {
+ // Without placeholders, first loaded page always starts at index[0]
+ scrollTo(0, ScrollBehavior.WaitForPlaceholdersToLoad)
+ }
+ // initial load [50-54]
+ // prefetched [47-49], [55-57]
+ // scrollTo prepended [44-46]
+ assertThat(snapshot).containsExactlyElementsIn(
+ listOf(44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57)
+ )
+
+ val snapshot2 = pager.asSnapshot(this) {
+ // Without placeholders, first loaded page always starts at index[0]
+ scrollTo(0, ScrollBehavior.WaitForPlaceholdersToLoad)
+ }
+ // scrollTo prepended [41-43]
+ assertThat(snapshot2).containsExactlyElementsIn(
+ listOf(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57)
+ )
+ }
+ }
+
+ @Test
+ fun prependToAwait_withoutPlaceholders_noPrefetchTriggered() {
+ val dataFlow = flowOf(List(100) { it })
+ val factory = dataFlow.asPagingSourceFactory(testScope.backgroundScope)
+ val pager = Pager(
+ config = PagingConfig(
+ pageSize = 4,
+ initialLoadSize = 8,
+ enablePlaceholders = false,
+ // a small prefetchDistance to prevent prefetch until we scroll to boundary
+ prefetchDistance = 1
+ ),
+ initialKey = 50,
+ pagingSourceFactory = factory,
+ ).flow.cachedIn(testScope.backgroundScope)
+ testScope.runTest {
+ val snapshot = pager.asSnapshot(this) {
+ // Without placeholders, first loaded page always starts at index[0]
+ scrollTo(0)
+ }
+ // initial load [50-57]
+ // no prefetch after initial load because it didn't hit prefetch distance
+ // scrollTo prepended [46-49]
+ assertThat(snapshot).containsExactlyElementsIn(
+ listOf(46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57)
+ )
+ }
+ }
+
val CONFIG = PagingConfig(
pageSize = 3,
initialLoadSize = 5,
diff --git a/privacysandbox/tools/tools-apicompiler/src/main/java/androidx/privacysandbox/tools/apicompiler/generator/AbstractSdkProviderGenerator.kt b/privacysandbox/tools/tools-apicompiler/src/main/java/androidx/privacysandbox/tools/apicompiler/generator/AbstractSdkProviderGenerator.kt
index c9e8b12..6c070aa 100644
--- a/privacysandbox/tools/tools-apicompiler/src/main/java/androidx/privacysandbox/tools/apicompiler/generator/AbstractSdkProviderGenerator.kt
+++ b/privacysandbox/tools/tools-apicompiler/src/main/java/androidx/privacysandbox/tools/apicompiler/generator/AbstractSdkProviderGenerator.kt
@@ -41,7 +41,7 @@
return null
}
val packageName = api.getOnlyService().type.packageName
- val className = "AbstractSandboxedSdkProvider"
+ val className = "AbstractSandboxedSdkProviderCompat"
val classSpec =
TypeSpec.classBuilder(className)
.superclass(superclassName)
diff --git a/privacysandbox/tools/tools-apicompiler/src/main/java/androidx/privacysandbox/tools/apicompiler/generator/CompatSdkProviderGenerator.kt b/privacysandbox/tools/tools-apicompiler/src/main/java/androidx/privacysandbox/tools/apicompiler/generator/CompatSdkProviderGenerator.kt
index 9934deb..00b4801 100644
--- a/privacysandbox/tools/tools-apicompiler/src/main/java/androidx/privacysandbox/tools/apicompiler/generator/CompatSdkProviderGenerator.kt
+++ b/privacysandbox/tools/tools-apicompiler/src/main/java/androidx/privacysandbox/tools/apicompiler/generator/CompatSdkProviderGenerator.kt
@@ -23,7 +23,6 @@
import com.squareup.kotlinpoet.ClassName
import com.squareup.kotlinpoet.FunSpec
import com.squareup.kotlinpoet.KModifier
-import com.squareup.kotlinpoet.MemberName
/** SDK Provider generator that uses the SDK Runtime library to communicate with the sandbox. */
internal class CompatSdkProviderGenerator(parsedApi: ParsedApi) :
@@ -31,14 +30,6 @@
companion object {
private val sandboxedSdkCompatClass =
ClassName("androidx.privacysandbox.sdkruntime.core", "SandboxedSdkCompat")
- private val sandboxedSdkCompatCreateMethod =
- MemberName(
- ClassName(
- sandboxedSdkCompatClass.packageName,
- sandboxedSdkCompatClass.simpleName,
- "Companion"
- ), "create"
- )
}
override val superclassName =
@@ -52,8 +43,8 @@
"val sdk = ${createServiceFunctionName(api.getOnlyService())}(context!!)"
)
addStatement(
- "return %M(%T(sdk))",
- sandboxedSdkCompatCreateMethod,
+ "return %T(%T(sdk))",
+ sandboxedSdkCompatClass,
api.getOnlyService().stubDelegateNameSpec()
)
}
diff --git a/privacysandbox/tools/tools-apicompiler/src/test/java/androidx/privacysandbox/tools/apicompiler/FullFeaturedSdkTest.kt b/privacysandbox/tools/tools-apicompiler/src/test/java/androidx/privacysandbox/tools/apicompiler/FullFeaturedSdkTest.kt
index 71b9761..bb58b74 100644
--- a/privacysandbox/tools/tools-apicompiler/src/test/java/androidx/privacysandbox/tools/apicompiler/FullFeaturedSdkTest.kt
+++ b/privacysandbox/tools/tools-apicompiler/src/test/java/androidx/privacysandbox/tools/apicompiler/FullFeaturedSdkTest.kt
@@ -34,11 +34,7 @@
val inputSources = loadSourcesFromDirectory(inputTestDataDir)
val expectedKotlinSources = loadSourcesFromDirectory(outputTestDataDir)
- val result = compileWithPrivacySandboxKspCompiler(
- inputSources,
- platformStubs = PlatformStubs.API_33,
- extraProcessorOptions = mapOf("skip_sdk_runtime_compat_library" to "true")
- )
+ val result = compileWithPrivacySandboxKspCompiler(inputSources)
assertThat(result).succeeds()
val expectedAidlFilepath = listOf(
diff --git a/privacysandbox/tools/tools-apicompiler/src/test/java/androidx/privacysandbox/tools/apicompiler/SdkWithPackagesTest.kt b/privacysandbox/tools/tools-apicompiler/src/test/java/androidx/privacysandbox/tools/apicompiler/SdkWithPackagesTest.kt
index 51b78ad..7928c89 100644
--- a/privacysandbox/tools/tools-apicompiler/src/test/java/androidx/privacysandbox/tools/apicompiler/SdkWithPackagesTest.kt
+++ b/privacysandbox/tools/tools-apicompiler/src/test/java/androidx/privacysandbox/tools/apicompiler/SdkWithPackagesTest.kt
@@ -35,11 +35,7 @@
val inputSources = loadSourcesFromDirectory(inputTestDataDir)
val expectedKotlinSources = loadSourcesFromDirectory(outputTestDataDir)
- val result = compileWithPrivacySandboxKspCompiler(
- inputSources,
- platformStubs = PlatformStubs.API_33,
- extraProcessorOptions = mapOf("skip_sdk_runtime_compat_library" to "true")
- )
+ val result = compileWithPrivacySandboxKspCompiler(inputSources)
assertThat(result).succeeds()
val expectedAidlFilepath = listOf(
diff --git a/privacysandbox/tools/tools-apicompiler/src/test/java/androidx/privacysandbox/tools/apicompiler/TestUtils.kt b/privacysandbox/tools/tools-apicompiler/src/test/java/androidx/privacysandbox/tools/apicompiler/TestUtils.kt
index e6b6e3d..66b5d74 100644
--- a/privacysandbox/tools/tools-apicompiler/src/test/java/androidx/privacysandbox/tools/apicompiler/TestUtils.kt
+++ b/privacysandbox/tools/tools-apicompiler/src/test/java/androidx/privacysandbox/tools/apicompiler/TestUtils.kt
@@ -62,12 +62,8 @@
|import android.os.IBinder
|
|@Suppress("UNUSED_PARAMETER")
- |sealed class SandboxedSdkCompat {
- | abstract fun getInterface(): IBinder?
- |
- | companion object {
- | fun create(binder: IBinder): SandboxedSdkCompat = throw RuntimeException("Stub!")
- | }
+ |class SandboxedSdkCompat(sdkInterface: IBinder) {
+ | fun getInterface(): IBinder? = throw RuntimeException("Stub!")
|}
|""".trimMargin()
),
diff --git a/privacysandbox/tools/tools-apicompiler/src/test/java/androidx/privacysandbox/tools/apicompiler/SdkRuntimeLibrarySdkTest.kt b/privacysandbox/tools/tools-apicompiler/src/test/java/androidx/privacysandbox/tools/apicompiler/WithoutRuntimeLibrarySdkTest.kt
similarity index 76%
rename from privacysandbox/tools/tools-apicompiler/src/test/java/androidx/privacysandbox/tools/apicompiler/SdkRuntimeLibrarySdkTest.kt
rename to privacysandbox/tools/tools-apicompiler/src/test/java/androidx/privacysandbox/tools/apicompiler/WithoutRuntimeLibrarySdkTest.kt
index 1ef27b0..0c98829 100644
--- a/privacysandbox/tools/tools-apicompiler/src/test/java/androidx/privacysandbox/tools/apicompiler/SdkRuntimeLibrarySdkTest.kt
+++ b/privacysandbox/tools/tools-apicompiler/src/test/java/androidx/privacysandbox/tools/apicompiler/WithoutRuntimeLibrarySdkTest.kt
@@ -24,20 +24,24 @@
import org.junit.runners.JUnit4
@RunWith(JUnit4::class)
-class SdkRuntimeLibrarySdkTest {
+class WithoutRuntimeLibrarySdkTest {
@Test
fun compileServiceInterface_ok() {
- val inputTestDataDir = File("src/test/test-data/sdkruntimelibrarysdk/input")
- val outputTestDataDir = File("src/test/test-data/sdkruntimelibrarysdk/output")
+ val inputTestDataDir = File("src/test/test-data/withoutruntimelibrarysdk/input")
+ val outputTestDataDir = File("src/test/test-data/withoutruntimelibrarysdk/output")
val inputSources = loadSourcesFromDirectory(inputTestDataDir)
val expectedKotlinSources = loadSourcesFromDirectory(outputTestDataDir)
- val result = compileWithPrivacySandboxKspCompiler(inputSources)
+ val result = compileWithPrivacySandboxKspCompiler(
+ inputSources,
+ platformStubs = PlatformStubs.API_33,
+ extraProcessorOptions = mapOf("skip_sdk_runtime_compat_library" to "true")
+ )
assertThat(result).succeeds()
val expectedAidlFilepath = listOf(
"com/mysdk/ICancellationSignal.java",
- "com/mysdk/IBackwardsCompatibleSdk.java",
+ "com/mysdk/IWithoutRuntimeLibrarySdk.java",
"com/mysdk/IStringTransactionCallback.java",
"com/mysdk/ParcelableStackFrame.java",
"com/mysdk/PrivacySandboxThrowableParcel.java",
diff --git a/privacysandbox/tools/tools-apicompiler/src/test/test-data/fullfeaturedsdk/output/com/mysdk/AbstractSandboxedSdkProvider.kt b/privacysandbox/tools/tools-apicompiler/src/test/test-data/fullfeaturedsdk/output/com/mysdk/AbstractSandboxedSdkProvider.kt
deleted file mode 100644
index 43c54ac..0000000
--- a/privacysandbox/tools/tools-apicompiler/src/test/test-data/fullfeaturedsdk/output/com/mysdk/AbstractSandboxedSdkProvider.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.mysdk
-
-import android.app.sdksandbox.SandboxedSdk
-import android.app.sdksandbox.SandboxedSdkProvider
-import android.content.Context
-import android.os.Bundle
-import android.view.View
-import kotlin.Int
-
-public abstract class AbstractSandboxedSdkProvider : SandboxedSdkProvider() {
- public override fun onLoadSdk(params: Bundle): SandboxedSdk {
- val sdk = createMySdk(context!!)
- return SandboxedSdk(MySdkStubDelegate(sdk))
- }
-
- public override fun getView(
- windowContext: Context,
- params: Bundle,
- width: Int,
- height: Int,
- ): View {
- TODO("Implement")
- }
-
- protected abstract fun createMySdk(context: Context): MySdk
-}
diff --git a/privacysandbox/tools/tools-apicompiler/src/test/test-data/fullfeaturedsdk/output/com/mysdk/AbstractSandboxedSdkProviderCompat.kt b/privacysandbox/tools/tools-apicompiler/src/test/test-data/fullfeaturedsdk/output/com/mysdk/AbstractSandboxedSdkProviderCompat.kt
new file mode 100644
index 0000000..afe24f8
--- /dev/null
+++ b/privacysandbox/tools/tools-apicompiler/src/test/test-data/fullfeaturedsdk/output/com/mysdk/AbstractSandboxedSdkProviderCompat.kt
@@ -0,0 +1,26 @@
+package com.mysdk
+
+import android.content.Context
+import android.os.Bundle
+import android.view.View
+import androidx.privacysandbox.sdkruntime.core.SandboxedSdkCompat
+import androidx.privacysandbox.sdkruntime.core.SandboxedSdkProviderCompat
+import kotlin.Int
+
+public abstract class AbstractSandboxedSdkProviderCompat : SandboxedSdkProviderCompat() {
+ public override fun onLoadSdk(params: Bundle): SandboxedSdkCompat {
+ val sdk = createMySdk(context!!)
+ return SandboxedSdkCompat(MySdkStubDelegate(sdk))
+ }
+
+ public override fun getView(
+ windowContext: Context,
+ params: Bundle,
+ width: Int,
+ height: Int,
+ ): View {
+ TODO("Implement")
+ }
+
+ protected abstract fun createMySdk(context: Context): MySdk
+}
diff --git a/privacysandbox/tools/tools-apicompiler/src/test/test-data/sdkruntimelibrarysdk/output/com/mysdk/AbstractSandboxedSdkProvider.kt b/privacysandbox/tools/tools-apicompiler/src/test/test-data/sdkruntimelibrarysdk/output/com/mysdk/AbstractSandboxedSdkProvider.kt
deleted file mode 100644
index 5a0d588..0000000
--- a/privacysandbox/tools/tools-apicompiler/src/test/test-data/sdkruntimelibrarysdk/output/com/mysdk/AbstractSandboxedSdkProvider.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.mysdk
-
-import android.content.Context
-import android.os.Bundle
-import android.view.View
-import androidx.privacysandbox.sdkruntime.core.SandboxedSdkCompat
-import androidx.privacysandbox.sdkruntime.core.SandboxedSdkCompat.Companion.create
-import androidx.privacysandbox.sdkruntime.core.SandboxedSdkProviderCompat
-import kotlin.Int
-
-public abstract class AbstractSandboxedSdkProvider : SandboxedSdkProviderCompat() {
- public override fun onLoadSdk(params: Bundle): SandboxedSdkCompat {
- val sdk = createBackwardsCompatibleSdk(context!!)
- return create(BackwardsCompatibleSdkStubDelegate(sdk))
- }
-
- public override fun getView(
- windowContext: Context,
- params: Bundle,
- width: Int,
- height: Int,
- ): View {
- TODO("Implement")
- }
-
- protected abstract fun createBackwardsCompatibleSdk(context: Context): BackwardsCompatibleSdk
-}
diff --git a/privacysandbox/tools/tools-apicompiler/src/test/test-data/sdkruntimelibrarysdk/output/com/mysdk/BackwardsCompatibleSdkFactory.kt b/privacysandbox/tools/tools-apicompiler/src/test/test-data/sdkruntimelibrarysdk/output/com/mysdk/BackwardsCompatibleSdkFactory.kt
deleted file mode 100644
index 63749650..0000000
--- a/privacysandbox/tools/tools-apicompiler/src/test/test-data/sdkruntimelibrarysdk/output/com/mysdk/BackwardsCompatibleSdkFactory.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.mysdk
-
-import android.os.IBinder
-import androidx.privacysandbox.tools.`internal`.GeneratedPublicApi
-
-@GeneratedPublicApi
-public object BackwardsCompatibleSdkFactory {
- @Suppress("UNUSED_PARAMETER")
- public fun wrapToBackwardsCompatibleSdk(binder: IBinder): BackwardsCompatibleSdk = throw
- RuntimeException("Stub!")
-}
diff --git a/privacysandbox/tools/tools-apicompiler/src/test/test-data/sdkwithpackages/output/com/mysdk/AbstractSandboxedSdkProvider.kt b/privacysandbox/tools/tools-apicompiler/src/test/test-data/sdkwithpackages/output/com/mysdk/AbstractSandboxedSdkProvider.kt
deleted file mode 100644
index 43c54ac..0000000
--- a/privacysandbox/tools/tools-apicompiler/src/test/test-data/sdkwithpackages/output/com/mysdk/AbstractSandboxedSdkProvider.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.mysdk
-
-import android.app.sdksandbox.SandboxedSdk
-import android.app.sdksandbox.SandboxedSdkProvider
-import android.content.Context
-import android.os.Bundle
-import android.view.View
-import kotlin.Int
-
-public abstract class AbstractSandboxedSdkProvider : SandboxedSdkProvider() {
- public override fun onLoadSdk(params: Bundle): SandboxedSdk {
- val sdk = createMySdk(context!!)
- return SandboxedSdk(MySdkStubDelegate(sdk))
- }
-
- public override fun getView(
- windowContext: Context,
- params: Bundle,
- width: Int,
- height: Int,
- ): View {
- TODO("Implement")
- }
-
- protected abstract fun createMySdk(context: Context): MySdk
-}
diff --git a/privacysandbox/tools/tools-apicompiler/src/test/test-data/sdkwithpackages/output/com/mysdk/AbstractSandboxedSdkProviderCompat.kt b/privacysandbox/tools/tools-apicompiler/src/test/test-data/sdkwithpackages/output/com/mysdk/AbstractSandboxedSdkProviderCompat.kt
new file mode 100644
index 0000000..afe24f8
--- /dev/null
+++ b/privacysandbox/tools/tools-apicompiler/src/test/test-data/sdkwithpackages/output/com/mysdk/AbstractSandboxedSdkProviderCompat.kt
@@ -0,0 +1,26 @@
+package com.mysdk
+
+import android.content.Context
+import android.os.Bundle
+import android.view.View
+import androidx.privacysandbox.sdkruntime.core.SandboxedSdkCompat
+import androidx.privacysandbox.sdkruntime.core.SandboxedSdkProviderCompat
+import kotlin.Int
+
+public abstract class AbstractSandboxedSdkProviderCompat : SandboxedSdkProviderCompat() {
+ public override fun onLoadSdk(params: Bundle): SandboxedSdkCompat {
+ val sdk = createMySdk(context!!)
+ return SandboxedSdkCompat(MySdkStubDelegate(sdk))
+ }
+
+ public override fun getView(
+ windowContext: Context,
+ params: Bundle,
+ width: Int,
+ height: Int,
+ ): View {
+ TODO("Implement")
+ }
+
+ protected abstract fun createMySdk(context: Context): MySdk
+}
diff --git a/privacysandbox/tools/tools-apicompiler/src/test/test-data/sdkruntimelibrarysdk/input/com/mysdk/BackwardsCompatibleSdk.kt b/privacysandbox/tools/tools-apicompiler/src/test/test-data/withoutruntimelibrarysdk/input/com/mysdk/WithoutRuntimeLibrarySdk.kt
similarity index 89%
rename from privacysandbox/tools/tools-apicompiler/src/test/test-data/sdkruntimelibrarysdk/input/com/mysdk/BackwardsCompatibleSdk.kt
rename to privacysandbox/tools/tools-apicompiler/src/test/test-data/withoutruntimelibrarysdk/input/com/mysdk/WithoutRuntimeLibrarySdk.kt
index 8424489..c06a208 100644
--- a/privacysandbox/tools/tools-apicompiler/src/test/test-data/sdkruntimelibrarysdk/input/com/mysdk/BackwardsCompatibleSdk.kt
+++ b/privacysandbox/tools/tools-apicompiler/src/test/test-data/withoutruntimelibrarysdk/input/com/mysdk/WithoutRuntimeLibrarySdk.kt
@@ -6,6 +6,6 @@
import androidx.privacysandbox.tools.PrivacySandboxValue
@PrivacySandboxService
-interface BackwardsCompatibleSdk {
+interface WithoutRuntimeLibrarySdk {
suspend fun doStuff(x: Int, y: Int): String
}
diff --git a/privacysandbox/tools/tools-apicompiler/src/test/test-data/withoutruntimelibrarysdk/output/com/mysdk/AbstractSandboxedSdkProviderCompat.kt b/privacysandbox/tools/tools-apicompiler/src/test/test-data/withoutruntimelibrarysdk/output/com/mysdk/AbstractSandboxedSdkProviderCompat.kt
new file mode 100644
index 0000000..744be58
--- /dev/null
+++ b/privacysandbox/tools/tools-apicompiler/src/test/test-data/withoutruntimelibrarysdk/output/com/mysdk/AbstractSandboxedSdkProviderCompat.kt
@@ -0,0 +1,26 @@
+package com.mysdk
+
+import android.app.sdksandbox.SandboxedSdk
+import android.app.sdksandbox.SandboxedSdkProvider
+import android.content.Context
+import android.os.Bundle
+import android.view.View
+import kotlin.Int
+
+public abstract class AbstractSandboxedSdkProviderCompat : SandboxedSdkProvider() {
+ public override fun onLoadSdk(params: Bundle): SandboxedSdk {
+ val sdk = createWithoutRuntimeLibrarySdk(context!!)
+ return SandboxedSdk(WithoutRuntimeLibrarySdkStubDelegate(sdk))
+ }
+
+ public override fun getView(
+ windowContext: Context,
+ params: Bundle,
+ width: Int,
+ height: Int,
+ ): View {
+ TODO("Implement")
+ }
+
+ protected abstract fun createWithoutRuntimeLibrarySdk(context: Context): WithoutRuntimeLibrarySdk
+}
diff --git a/privacysandbox/tools/tools-apicompiler/src/test/test-data/sdkruntimelibrarysdk/output/com/mysdk/PrivacySandboxThrowableParcelConverter.kt b/privacysandbox/tools/tools-apicompiler/src/test/test-data/withoutruntimelibrarysdk/output/com/mysdk/PrivacySandboxThrowableParcelConverter.kt
similarity index 100%
rename from privacysandbox/tools/tools-apicompiler/src/test/test-data/sdkruntimelibrarysdk/output/com/mysdk/PrivacySandboxThrowableParcelConverter.kt
rename to privacysandbox/tools/tools-apicompiler/src/test/test-data/withoutruntimelibrarysdk/output/com/mysdk/PrivacySandboxThrowableParcelConverter.kt
diff --git a/privacysandbox/tools/tools-apicompiler/src/test/test-data/sdkruntimelibrarysdk/output/com/mysdk/TransportCancellationCallback.kt b/privacysandbox/tools/tools-apicompiler/src/test/test-data/withoutruntimelibrarysdk/output/com/mysdk/TransportCancellationCallback.kt
similarity index 100%
rename from privacysandbox/tools/tools-apicompiler/src/test/test-data/sdkruntimelibrarysdk/output/com/mysdk/TransportCancellationCallback.kt
rename to privacysandbox/tools/tools-apicompiler/src/test/test-data/withoutruntimelibrarysdk/output/com/mysdk/TransportCancellationCallback.kt
diff --git a/privacysandbox/tools/tools-apicompiler/src/test/test-data/withoutruntimelibrarysdk/output/com/mysdk/WithoutRuntimeLibrarySdkFactory.kt b/privacysandbox/tools/tools-apicompiler/src/test/test-data/withoutruntimelibrarysdk/output/com/mysdk/WithoutRuntimeLibrarySdkFactory.kt
new file mode 100644
index 0000000..71eaa79
--- /dev/null
+++ b/privacysandbox/tools/tools-apicompiler/src/test/test-data/withoutruntimelibrarysdk/output/com/mysdk/WithoutRuntimeLibrarySdkFactory.kt
@@ -0,0 +1,11 @@
+package com.mysdk
+
+import android.os.IBinder
+import androidx.privacysandbox.tools.`internal`.GeneratedPublicApi
+
+@GeneratedPublicApi
+public object WithoutRuntimeLibrarySdkFactory {
+ @Suppress("UNUSED_PARAMETER")
+ public fun wrapToWithoutRuntimeLibrarySdk(binder: IBinder): WithoutRuntimeLibrarySdk = throw
+ RuntimeException("Stub!")
+}
diff --git a/privacysandbox/tools/tools-apicompiler/src/test/test-data/sdkruntimelibrarysdk/output/com/mysdk/BackwardsCompatibleSdkStubDelegate.kt b/privacysandbox/tools/tools-apicompiler/src/test/test-data/withoutruntimelibrarysdk/output/com/mysdk/WithoutRuntimeLibrarySdkStubDelegate.kt
similarity index 83%
rename from privacysandbox/tools/tools-apicompiler/src/test/test-data/sdkruntimelibrarysdk/output/com/mysdk/BackwardsCompatibleSdkStubDelegate.kt
rename to privacysandbox/tools/tools-apicompiler/src/test/test-data/withoutruntimelibrarysdk/output/com/mysdk/WithoutRuntimeLibrarySdkStubDelegate.kt
index bca930d..3a82d43 100644
--- a/privacysandbox/tools/tools-apicompiler/src/test/test-data/sdkruntimelibrarysdk/output/com/mysdk/BackwardsCompatibleSdkStubDelegate.kt
+++ b/privacysandbox/tools/tools-apicompiler/src/test/test-data/withoutruntimelibrarysdk/output/com/mysdk/WithoutRuntimeLibrarySdkStubDelegate.kt
@@ -8,9 +8,9 @@
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
-public class BackwardsCompatibleSdkStubDelegate internal constructor(
- public val `delegate`: BackwardsCompatibleSdk,
-) : IBackwardsCompatibleSdk.Stub() {
+public class WithoutRuntimeLibrarySdkStubDelegate internal constructor(
+ public val `delegate`: WithoutRuntimeLibrarySdk,
+) : IWithoutRuntimeLibrarySdk.Stub() {
public override fun doStuff(
x: Int,
y: Int,
diff --git a/settings.gradle b/settings.gradle
index 986447d..62f973f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -912,6 +912,7 @@
includeProject(":wear:benchmark:integration-tests:macrobenchmark-target", [BuildType.MAIN, BuildType.COMPOSE])
includeProject(":wear:benchmark:integration-tests:macrobenchmark", [BuildType.MAIN, BuildType.COMPOSE])
includeProject(":wear:compose:compose-foundation", [BuildType.COMPOSE])
+includeProject(":wear:compose:compose-foundation-benchmark", "wear/compose/compose-foundation/benchmark", [BuildType.COMPOSE])
includeProject(":wear:compose:compose-foundation-samples", "wear/compose/compose-foundation/samples", [BuildType.COMPOSE])
includeProject(":wear:compose:compose-material", [BuildType.COMPOSE])
includeProject(":wear:compose:compose-material3", [BuildType.COMPOSE])
diff --git a/tv/tv-material/src/main/java/androidx/tv/material/ExperimentalTvMaterialApi.kt b/testutils/testutils-kmp/src/commonMain/kotlin/androidx/kruth/FailingOrdered.kt
similarity index 64%
copy from tv/tv-material/src/main/java/androidx/tv/material/ExperimentalTvMaterialApi.kt
copy to testutils/testutils-kmp/src/commonMain/kotlin/androidx/kruth/FailingOrdered.kt
index ebac64e..559e0e6 100644
--- a/tv/tv-material/src/main/java/androidx/tv/material/ExperimentalTvMaterialApi.kt
+++ b/testutils/testutils-kmp/src/commonMain/kotlin/androidx/kruth/FailingOrdered.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2023 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,10 +14,18 @@
* limitations under the License.
*/
-package androidx.tv.material
+package androidx.kruth
-@RequiresOptIn(
- "This tv-material API is experimental and likely to change or be removed in the future."
-)
-@Retention(AnnotationRetention.BINARY)
-annotation class ExperimentalTvMaterialApi
\ No newline at end of file
+import kotlin.test.fail
+
+/**
+ * Always fails with the provided error message.
+ */
+internal class FailingOrdered(
+ private val message: () -> String,
+) : Ordered {
+
+ override fun inOrder() {
+ fail(message())
+ }
+}
\ No newline at end of file
diff --git a/testutils/testutils-kmp/src/commonMain/kotlin/androidx/kruth/IterableSubject.kt b/testutils/testutils-kmp/src/commonMain/kotlin/androidx/kruth/IterableSubject.kt
index f366d55..2bad306 100644
--- a/testutils/testutils-kmp/src/commonMain/kotlin/androidx/kruth/IterableSubject.kt
+++ b/testutils/testutils-kmp/src/commonMain/kotlin/androidx/kruth/IterableSubject.kt
@@ -151,6 +151,84 @@
containsAnyIn(requireNonNull(expected).asList())
}
+ fun containsAtLeast(
+ firstExpected: Any?,
+ secondExpected: Any?,
+ vararg restOfExpected: Any?,
+ ): Ordered =
+ containsAtLeastElementsIn(listOf(firstExpected, secondExpected, *restOfExpected))
+
+ fun containsAtLeastElementsIn(expected: Iterable<*>?): Ordered {
+ requireNonNull(expected)
+ val actualList = requireNonNull(actual).toMutableList()
+
+ val missing = ArrayList<Any?>()
+ val actualNotInOrder = ArrayList<Any?>()
+
+ var ordered = true
+ // step through the expected elements...
+ for (e in expected) {
+ val index = actualList.indexOf(e)
+ if (index != -1) { // if we find the element in the actual list...
+ // drain all the elements that come before that element into actualNotInOrder
+ repeat(index) {
+ actualNotInOrder += actualList.removeAt(0)
+ }
+
+ // and remove the element from the actual list
+ actualList.removeAt(0)
+ } else { // otherwise try removing it from actualNotInOrder...
+ if (actualNotInOrder.remove(e)) {
+ // if it was in actualNotInOrder, we're not in order
+ ordered = false
+ } else {
+ // if it's not in actualNotInOrder, we're missing an expected element
+ missing.add(e)
+ }
+ }
+ }
+
+ // if we have any missing expected elements, fail
+ if (missing.isNotEmpty()) {
+ val nearMissing = actualList.retainMatchingToString(missing)
+
+ fail(
+ """
+ Expected to contain at least $expected, but did not.
+ Missing $missing, though it did contain $nearMissing.
+ """.trimIndent()
+ )
+ }
+
+ if (ordered) {
+ return NoopOrdered
+ }
+
+ return FailingOrdered {
+ buildString {
+ append("Required elements were all found, but order was wrong.")
+ append("Expected order: $expected.")
+
+ if (actualList.any { it !in expected }) {
+ append("Actual order: $actualList.")
+ }
+ }
+ }
+ }
+
+ /**
+ * Checks that the actual iterable contains at least all of the expected elements or fails. If
+ * an element appears more than once in the expected elements then it must appear at least that
+ * number of times in the actual elements.
+ *
+ *
+ * To also test that the contents appear in the given order, make a call to `inOrder()`
+ * on the object returned by this method. The expected elements must appear in the given order
+ * within the actual elements, but they are not required to be consecutive.
+ */
+ fun containsAtLeastElementsIn(expected: Array<Any?>?): Ordered =
+ containsAtLeastElementsIn(expected?.asList())
+
/**
* Checks that the subject contains exactly the provided objects or fails.
*
@@ -233,16 +311,13 @@
* This containsExactly() call is a success. But the iterables were not in the same order,
* so return an object that will fail the test if the user calls inOrder().
*/
- return object : Ordered {
- override fun inOrder() {
- fail(
- """
- Contents match. Expected the order to also match, but was not.
- Expected: $required.
- Actual: $actual.
- """.trimIndent()
- )
- }
+
+ return FailingOrdered {
+ """
+ Contents match. Expected the order to also match, but was not.
+ Expected: $required.
+ Actual: $actual.
+ """.trimIndent()
}
}
diff --git a/testutils/testutils-kmp/src/commonTest/kotlin/androidx/kruth/IterableSubjectTest.kt b/testutils/testutils-kmp/src/commonTest/kotlin/androidx/kruth/IterableSubjectTest.kt
index 60ecd75..ba97a52 100644
--- a/testutils/testutils-kmp/src/commonTest/kotlin/androidx/kruth/IterableSubjectTest.kt
+++ b/testutils/testutils-kmp/src/commonTest/kotlin/androidx/kruth/IterableSubjectTest.kt
@@ -192,259 +192,232 @@
}
}
-// @Test
-// fun iterableContainsAtLeast() {
-// assertThat(listOf(1, 2, 3)).containsAtLeast(1, 2)
-// }
-//
-// @Test
-// fun iterableContainsAtLeastWithMany() {
-// assertThat(listOf(1, 2, 3)).containsAtLeast(1, 2)
-// }
-//
-// @Test
-// fun iterableContainsAtLeastWithDuplicates() {
-// assertThat(listOf(1, 2, 2, 2, 3)).containsAtLeast(2, 2)
-// }
-//
-// @Test
-// fun iterableContainsAtLeastWithNull() {
-// assertThat(listOf(1, null, 3)).containsAtLeast(3, null as Int?)
-// }
-//
-// @Test
-// fun iterableContainsAtLeastWithNullAtThirdAndFinalPosition() {
-// assertThat(listOf(1, null, 3)).containsAtLeast(1, 3, null as Any?)
-// }
-//
-// /*
-// * Test that we only call toString() if the assertion fails -- that is, not just if the elements
-// * are out of order, but only if someone actually calls inOrder(). There are 2 reasons for this:
-// *
-// * 1. Calling toString() uses extra time and space. (To be fair, Iterable assertions often use a
-// * lot of those already.)
-// *
-// * 2. Some toString() methods are buggy. Arguably we shouldn't accommodate these, especially since
-// * those users are in for a nasty surprise if their tests actually fail someday, but I don't want
-// * to bite that off now. (Maybe Fact should catch exceptions from toString()?)
-// */
-// @Test
-// fun iterableContainsAtLeastElementsInOutOfOrderDoesNotStringify() {
-// val o = CountsToStringCalls()
-// val actual: List<Any> = listOf(o, 1)
-// val expected: List<Any> = listOf(1, o)
-// assertThat(actual).containsAtLeastElementsIn(expected)
-// assertThat(o.calls).isEqualTo(0)
-// expectFailureWhenTestingThat(actual).containsAtLeastElementsIn(expected).inOrder()
-// assertThat(o.calls).isGreaterThan(0)
-// }
+ @Test
+ fun iterableContainsAtLeast() {
+ assertThat(listOf(1, 2, 3)).containsAtLeast(1, 2)
+ }
-// @Test
-// fun iterableContainsAtLeastFailure() {
-// expectFailureWhenTestingThat(listOf(1, 2, 3)).containsAtLeast(1, 2, 4)
-// assertFailureKeys("missing (1)", "---", "expected to contain at least", "but was")
-// assertFailureValue("missing (1)", "4")
-// assertFailureValue("expected to contain at least", "[1, 2, 4]")
-// }
-//
-// @Test
-// fun iterableContainsAtLeastWithExtras() {
-// expectFailureWhenTestingThat(listOf("y", "x")).containsAtLeast("x", "y", "z")
-// assertFailureValue("missing (1)", "z")
-// }
-//
-// @Test
-// fun iterableContainsAtLeastWithExtraCopiesOfOutOfOrder() {
-// expectFailureWhenTestingThat(listOf("y", "x")).containsAtLeast("x", "y", "y")
-// assertFailureValue("missing (1)", "y")
-// }
-//
-// @Test
-// fun iterableContainsAtLeastWithDuplicatesFailure() {
-// expectFailureWhenTestingThat(listOf(1, 2, 3)).containsAtLeast(1, 2, 2, 2, 3, 4)
-// assertFailureValue("missing (3)", "2 [2 copies], 4")
-// }
-//
-// /*
-// * Slightly subtle test to ensure that if multiple equal elements are found
-// * to be missing we only reference it once in the output message.
-// */
-// @Test
-// fun iterableContainsAtLeastWithDuplicateMissingElements() {
-// expectFailureWhenTestingThat(listOf(1, 2)).containsAtLeast(4, 4, 4)
-// assertFailureValue("missing (3)", "4 [3 copies]")
-// }
-//
-// @Test
-// fun iterableContainsAtLeastWithNullFailure() {
-// expectFailureWhenTestingThat(listOf(1, null, 3)).containsAtLeast(1, null, null, 3)
-// assertFailureValue("missing (1)", "null")
-// }
-//
-// @Test
-// fun iterableContainsAtLeastFailsWithSameToStringAndHomogeneousList() {
-// expectFailureWhenTestingThat(listOf(1L, 2L)).containsAtLeast(1, 2)
-// assertFailureValue("missing (2)", "1, 2 (java.lang.Integer)")
-// assertFailureValue("though it did contain (2)", "1, 2 (java.lang.Long)")
-// }
-//
-// @Test
-// fun iterableContainsAtLeastFailsWithSameToStringAndHomogeneousListWithDuplicates() {
-// expectFailureWhenTestingThat(listOf(1L, 2L, 2L)).containsAtLeast(1, 1, 2)
-// assertFailureValue("missing (3)", "1 [2 copies], 2 (java.lang.Integer)")
-// assertFailureValue("though it did contain (3)", "1, 2 [2 copies] (java.lang.Long)")
-// }
-//
-// @Test
-// fun iterableContainsAtLeastFailsWithSameToStringAndHomogeneousListWithNull() {
-// expectFailureWhenTestingThat(listOf("null", "abc")).containsAtLeast("abc", null)
-// assertFailureValue("missing (1)", "null (null type)")
-// assertFailureValue("though it did contain (1)", "null (java.lang.String)")
-// }
-//
-// @Test
-// fun iterableContainsAtLeastFailsWithSameToStringAndHeterogeneousListWithDuplicates() {
-// expectFailureWhenTestingThat(listOf(1, 2, 2L, 3L, 3L)).containsAtLeast(2L, 2L, 3, 3)
-// assertFailureValue("missing (3)", "2 (java.lang.Long), 3 (java.lang.Integer) [2 copies]")
-// assertFailureValue(
-// "though it did contain (3)", "2 (java.lang.Integer), 3 (java.lang.Long) [2 copies]"
-// )
-// }
-//
-// @Test
-// fun iterableContainsAtLeastFailsWithEmptyString() {
-// expectFailureWhenTestingThat(listOf("a", null)).containsAtLeast("", null)
-// assertFailureKeys("missing (1)", "---", "expected to contain at least", "but was")
-// assertFailureValue("missing (1)", "")
-// }
-//
-// @Test
-// fun iterableContainsAtLeastInOrder() {
-// assertThat(listOf(3, 2, 5)).containsAtLeast(3, 2, 5).inOrder()
-// }
-//
-// @Test
-// fun iterableContainsAtLeastInOrderWithGaps() {
-// assertThat(listOf(3, 2, 5)).containsAtLeast(3, 5).inOrder()
-// assertThat(listOf(3, 2, 2, 4, 5)).containsAtLeast(3, 2, 2, 5).inOrder()
-// assertThat(listOf(3, 1, 4, 1, 5)).containsAtLeast(3, 1, 5).inOrder()
-// assertThat(listOf("x", "y", "y", "z")).containsAtLeast("x", "y", "z").inOrder()
-// assertThat(listOf("x", "x", "y", "z")).containsAtLeast("x", "y", "z").inOrder()
-// assertThat(listOf("z", "x", "y", "z")).containsAtLeast("x", "y", "z").inOrder()
-// assertThat(listOf("x", "x", "y", "z", "x")).containsAtLeast("x", "y", "z", "x").inOrder()
-// }
-//
-// @Test
-// fun iterableContainsAtLeastInOrderWithNull() {
-// assertThat(listOf(3, null, 5)).containsAtLeast(3, null, 5).inOrder()
-// assertThat(listOf(3, null, 7, 5)).containsAtLeast(3, null, 5).inOrder()
-// }
-//
-// @Test
-// fun iterableContainsAtLeastInOrderWithFailure() {
-// expectFailureWhenTestingThat(listOf(1, null, 3)).containsAtLeast(null, 1, 3).inOrder()
-// assertFailureKeys(
-// "required elements were all found, but order was wrong",
-// "expected order for required elements",
-// "but was"
-// )
-// assertFailureValue("expected order for required elements", "[null, 1, 3]")
-// assertFailureValue("but was", "[1, null, 3]")
-// }
-//
-// @Test
-// fun iterableContainsAtLeastInOrderWithFailureWithActualOrder() {
-// expectFailureWhenTestingThat(listOf(1, 2, null, 3, 4)).containsAtLeast(null, 1, 3).inOrder()
-// assertFailureKeys(
-// "required elements were all found, but order was wrong",
-// "expected order for required elements",
-// "but order was",
-// "full contents"
-// )
-// assertFailureValue("expected order for required elements", "[null, 1, 3]")
-// assertFailureValue("but order was", "[1, null, 3]")
-// assertFailureValue("full contents", "[1, 2, null, 3, 4]")
-// }
-//
-// @Test
-// fun iterableContainsAtLeastInOrderWithOneShotIterable() {
-// val iterable: Iterable<Any> =
-// Arrays.< Object > asList < kotlin . Any ? > 2, 1, null, 4, "a", 3, "b")
-// val iterator = iterable.iterator()
-// val oneShot: Iterable<Any> = object : Iterable<Any?> {
-// override fun iterator(): Iterator<Any> {
-// return iterator
-// }
-//
-// override fun toString(): String {
-// return Iterables.toString(iterable)
-// }
-// }
-// assertThat(oneShot).containsAtLeast(1, null, 3).inOrder()
-// }
-//
-// @Test
-// fun iterableContainsAtLeastInOrderWithOneShotIterableWrongOrder() {
-// val iterator: Iterator<Any> = listOf(2 as Any, 1, null, 4, "a", 3, "b").iterator()
-// val iterable: Iterable<Any> = object : Iterable<Any?> {
-// override fun iterator(): Iterator<Any> {
-// return iterator
-// }
-//
-// override fun toString(): String {
-// return "BadIterable"
-// }
-// }
-// expectFailureWhenTestingThat(iterable).containsAtLeast(1, 3, null as Any?).inOrder()
-// assertFailureKeys(
-// "required elements were all found, but order was wrong",
-// "expected order for required elements",
-// "but was"
-// )
-// assertFailureValue("expected order for required elements", "[1, 3, null]")
-// assertFailureValue("but was", "BadIterable") // TODO(b/231966021): Output its elements.
-// }
-//
-// @Test
-// fun iterableContainsAtLeastInOrderWrongOrderAndMissing() {
-// expectFailureWhenTestingThat(listOf(1, 2)).containsAtLeast(2, 1, 3).inOrder()
-// }
-//
-// @Test
-// fun iterableContainsAtLeastElementsInIterable() {
-// assertThat(listOf(1, 2, 3)).containsAtLeastElementsIn(listOf(1, 2))
-// expectFailureWhenTestingThat(listOf(1, 2, 3)).containsAtLeastElementsIn(listOf(1, 2, 4))
-// assertFailureKeys("missing (1)", "---", "expected to contain at least", "but was")
-// assertFailureValue("missing (1)", "4")
-// assertFailureValue("expected to contain at least", "[1, 2, 4]")
-// }
-//
-// @Test
-// fun iterableContainsAtLeastElementsInCanUseFactPerElement() {
-// expectFailureWhenTestingThat(listOf("abc"))
-// .containsAtLeastElementsIn(listOf("123\n456", "789"))
-// assertFailureKeys(
-// "missing (2)",
-// "#1",
-// "#2",
-// "---",
-// "expected to contain at least",
-// "but was"
-// )
-// assertFailureValue("#1", "123\n456")
-// assertFailureValue("#2", "789")
-// }
-//
-// @Test
-// fun iterableContainsAtLeastElementsInArray() {
-// assertThat(listOf(1, 2, 3)).containsAtLeastElementsIn(arrayOf(1, 2))
-// expectFailureWhenTestingThat(listOf(1, 2, 3))
-// .containsAtLeastElementsIn(arrayOf(1, 2, 4))
-// assertFailureKeys("missing (1)", "---", "expected to contain at least", "but was")
-// assertFailureValue("missing (1)", "4")
-// assertFailureValue("expected to contain at least", "[1, 2, 4]")
-// }
-//
+ @Test
+ fun iterableContainsAtLeastWithMany() {
+ assertThat(listOf(1, 2, 3)).containsAtLeast(1, 2)
+ }
+
+ @Test
+ fun iterableContainsAtLeastWithDuplicates() {
+ assertThat(listOf(1, 2, 2, 2, 3)).containsAtLeast(2, 2)
+ }
+
+ @Test
+ fun iterableContainsAtLeastWithNull() {
+ assertThat(listOf(1, null, 3)).containsAtLeast(3, null as Int?)
+ }
+
+ @Test
+ fun iterableContainsAtLeastWithNullAtThirdAndFinalPosition() {
+ assertThat(listOf(1, null, 3)).containsAtLeast(1, 3, null as Any?)
+ }
+
+ /*
+ * Test that we only call toString() if the assertion fails -- that is, not just if the elements
+ * are out of order, but only if someone actually calls inOrder(). There are 2 reasons for this:
+ *
+ * 1. Calling toString() uses extra time and space. (To be fair, Iterable assertions often use a
+ * lot of those already.)
+ *
+ * 2. Some toString() methods are buggy. Arguably we shouldn't accommodate these, especially since
+ * those users are in for a nasty surprise if their tests actually fail someday, but I don't want
+ * to bite that off now. (Maybe Fact should catch exceptions from toString()?)
+ */
+ @Test
+ fun iterableContainsAtLeastElementsInOutOfOrderDoesNotStringify() {
+ val o = CountsToStringCalls()
+ val actual: List<Any> = listOf(o, 1)
+ val expected: List<Any> = listOf(1, o)
+ assertThat(actual).containsAtLeastElementsIn(expected)
+ assertThat(o.calls).isEqualTo(0)
+
+ assertFailsWith<AssertionError> {
+ assertThat(actual).containsAtLeastElementsIn(expected).inOrder()
+ }
+
+ assertThat(o.calls > 0)
+ }
+
+ @Test
+ fun iterableContainsAtLeastFailure() {
+ assertFailsWith<AssertionError> {
+ assertThat(listOf(1, 2, 3)).containsAtLeast(1, 2, 4)
+ }
+ }
+
+ @Test
+ fun iterableContainsAtLeastWithExtras() {
+ assertFailsWith<AssertionError> {
+ assertThat(listOf("y", "x")).containsAtLeast("x", "y", "z")
+ }
+ }
+
+ @Test
+ fun iterableContainsAtLeastWithExtraCopiesOfOutOfOrder() {
+ assertFailsWith<AssertionError> {
+ assertThat(listOf("y", "x")).containsAtLeast("x", "y", "y")
+ }
+ }
+
+ @Test
+ fun iterableContainsAtLeastWithDuplicatesFailure() {
+ assertFailsWith<AssertionError> {
+ assertThat(listOf(1, 2, 3)).containsAtLeast(1, 2, 2, 2, 3, 4)
+ }
+ }
+
+ /*
+ * Slightly subtle test to ensure that if multiple equal elements are found
+ * to be missing we only reference it once in the output message.
+ */
+ @Test
+ fun iterableContainsAtLeastWithDuplicateMissingElements() {
+ assertFailsWith<AssertionError> {
+ assertThat(listOf(1, 2)).containsAtLeast(4, 4, 4)
+ }
+ }
+
+ @Test
+ fun iterableContainsAtLeastWithNullFailure() {
+ assertFailsWith<AssertionError> {
+ assertThat(listOf(1, null, 3)).containsAtLeast(1, null, null, 3)
+ }
+ }
+
+ @Test
+ fun iterableContainsAtLeastFailsWithSameToStringAndHomogeneousList() {
+ assertFailsWith<AssertionError> {
+ assertThat(listOf(1L, 2L)).containsAtLeast(1, 2)
+ }
+ }
+
+ @Test
+ fun iterableContainsAtLeastFailsWithSameToStringAndHomogeneousListWithDuplicates() {
+ assertFailsWith<AssertionError> {
+ assertThat(listOf(1L, 2L, 2L)).containsAtLeast(1, 1, 2)
+ }
+ }
+
+ @Test
+ fun iterableContainsAtLeastFailsWithSameToStringAndHomogeneousListWithNull() {
+ assertFailsWith<AssertionError> {
+ assertThat(listOf("null", "abc")).containsAtLeast("abc", null)
+ }
+ }
+
+ @Test
+ fun iterableContainsAtLeastFailsWithSameToStringAndHeterogeneousListWithDuplicates() {
+ assertFailsWith<AssertionError> {
+ assertThat(listOf(1, 2, 2L, 3L, 3L)).containsAtLeast(2L, 2L, 3, 3)
+ }
+ }
+
+ @Test
+ fun iterableContainsAtLeastFailsWithEmptyString() {
+ assertFailsWith<AssertionError> {
+ assertThat(listOf("a", null)).containsAtLeast("", null)
+ }
+ }
+
+ @Test
+ fun iterableContainsAtLeastInOrder() {
+ assertThat(listOf(3, 2, 5)).containsAtLeast(3, 2, 5).inOrder()
+ }
+
+ @Test
+ fun iterableContainsAtLeastInOrderWithGaps() {
+ assertThat(listOf(3, 2, 5)).containsAtLeast(3, 5).inOrder()
+ assertThat(listOf(3, 2, 2, 4, 5)).containsAtLeast(3, 2, 2, 5).inOrder()
+ assertThat(listOf(3, 1, 4, 1, 5)).containsAtLeast(3, 1, 5).inOrder()
+ assertThat(listOf("x", "y", "y", "z")).containsAtLeast("x", "y", "z").inOrder()
+ assertThat(listOf("x", "x", "y", "z")).containsAtLeast("x", "y", "z").inOrder()
+ assertThat(listOf("z", "x", "y", "z")).containsAtLeast("x", "y", "z").inOrder()
+ assertThat(listOf("x", "x", "y", "z", "x")).containsAtLeast("x", "y", "z", "x").inOrder()
+ }
+
+ @Test
+ fun iterableContainsAtLeastInOrderWithNull() {
+ assertThat(listOf(3, null, 5)).containsAtLeast(3, null, 5).inOrder()
+ assertThat(listOf(3, null, 7, 5)).containsAtLeast(3, null, 5).inOrder()
+ }
+
+ @Test
+ fun iterableContainsAtLeastInOrderWithFailure() {
+ assertFailsWith<AssertionError> {
+ assertThat(listOf(1, null, 3)).containsAtLeast(null, 1, 3).inOrder()
+ }
+ }
+
+ @Test
+ fun iterableContainsAtLeastInOrderWithFailureWithActualOrder() {
+ assertFailsWith<AssertionError> {
+ assertThat(listOf(1, 2, null, 3, 4)).containsAtLeast(null, 1, 3).inOrder()
+ }
+ }
+
+ @Test
+ fun iterableContainsAtLeastInOrderWithOneShotIterable() {
+ val iterable = listOf(2, 1, null, 4, "a", 3, "b")
+ val iterator = iterable.iterator()
+
+ val >
+ object : Iterable<Any?> {
+ override fun iterator(): Iterator<Any?> = iterator
+ }
+
+ assertThat(oneShot).containsAtLeast(1, null, 3).inOrder()
+ }
+
+ @Test
+ fun iterableContainsAtLeastInOrderWithOneShotIterableWrongOrder() {
+ val iterator = listOf(2, 1, null, 4, "a", 3, "b").iterator()
+
+ val iterable =
+ object : Iterable<Any?> {
+ override fun iterator(): Iterator<Any?> = iterator
+ }
+ assertFailsWith<AssertionError> {
+ assertThat(iterable).containsAtLeast(1, 3, null as Any?).inOrder()
+ }
+ }
+
+ @Test
+ fun iterableContainsAtLeastInOrderWrongOrderAndMissing() {
+ assertFailsWith<AssertionError> {
+ assertThat(listOf(1, 2)).containsAtLeast(2, 1, 3).inOrder()
+ }
+ }
+
+ @Test
+ fun iterableContainsAtLeastElementsInIterable() {
+ assertThat(listOf(1, 2, 3)).containsAtLeastElementsIn(listOf(1, 2))
+
+ assertFailsWith<AssertionError> {
+ assertThat(listOf(1, 2, 3)).containsAtLeastElementsIn(listOf(1, 2, 4))
+ }
+ }
+
+ @Test
+ fun iterableContainsAtLeastElementsInCanUseFactPerElement() {
+ assertFailsWith<AssertionError> {
+ assertThat(listOf("abc")).containsAtLeastElementsIn(listOf("123\n456", "789"))
+ }
+ }
+
+ @Test
+ fun iterableContainsAtLeastElementsInArray() {
+ assertThat(listOf(1, 2, 3)).containsAtLeastElementsIn(arrayOf(1, 2))
+
+ assertFailsWith<AssertionError> {
+ assertThat(listOf(1, 2, 3)).containsAtLeastElementsIn(arrayOf(1, 2, 4))
+ }
+ }
+
// @Test
// fun iterableContainsNoneOf() {
// assertThat(listOf(1, 2, 3)).containsNoneOf(4, 5, 6)
diff --git a/tv/integration-tests/demos/src/main/java/androidx/tv/integration/demos/App.kt b/tv/integration-tests/demos/src/main/java/androidx/tv/integration/demos/App.kt
index 7898201..00ea81e 100644
--- a/tv/integration-tests/demos/src/main/java/androidx/tv/integration/demos/App.kt
+++ b/tv/integration-tests/demos/src/main/java/androidx/tv/integration/demos/App.kt
@@ -26,16 +26,24 @@
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
+import androidx.tv.material3.ExperimentalTvMaterial3Api
+import androidx.tv.material3.MaterialTheme
+import androidx.tv.material3.darkColorScheme
+@OptIn(ExperimentalTvMaterial3Api::class)
@Composable
fun App() {
var selectedTab by remember { mutableStateOf(Navigation.FeaturedCarousel) }
- Column(
- modifier = Modifier.padding(20.dp),
- verticalArrangement = Arrangement.spacedBy(20.dp),
+ MaterialTheme(
+ colorScheme = darkColorScheme()
) {
- TopNavigation(updateSelectedTab = { selectedTab = it })
- selectedTab.action.invoke()
+ Column(
+ modifier = Modifier.padding(20.dp),
+ verticalArrangement = Arrangement.spacedBy(20.dp)
+ ) {
+ TopNavigation(updateSelectedTab = { selectedTab = it })
+ selectedTab.action.invoke()
+ }
}
-}
\ No newline at end of file
+}
diff --git a/tv/integration-tests/demos/src/main/java/androidx/tv/integration/demos/FeaturedCarousel.kt b/tv/integration-tests/demos/src/main/java/androidx/tv/integration/demos/FeaturedCarousel.kt
index 5cecda2..821281f 100644
--- a/tv/integration-tests/demos/src/main/java/androidx/tv/integration/demos/FeaturedCarousel.kt
+++ b/tv/integration-tests/demos/src/main/java/androidx/tv/integration/demos/FeaturedCarousel.kt
@@ -42,11 +42,11 @@
import androidx.compose.ui.focus.onFocusChanged
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
-import androidx.tv.material.ExperimentalTvMaterialApi
-import androidx.tv.material.carousel.Carousel
-import androidx.tv.material.carousel.CarouselDefaults
-import androidx.tv.material.carousel.CarouselItem
-import androidx.tv.material.carousel.CarouselState
+import androidx.tv.material3.ExperimentalTvMaterial3Api
+import androidx.tv.material3.Carousel
+import androidx.tv.material3.CarouselDefaults
+import androidx.tv.material3.CarouselItem
+import androidx.tv.material3.CarouselState
@Composable
fun FeaturedCarouselContent() {
@@ -81,7 +81,7 @@
.onFocusChanged { isFocused = it.isFocused }
}
-@OptIn(ExperimentalTvMaterialApi::class)
+@OptIn(ExperimentalTvMaterial3Api::class)
@Composable
internal fun FeaturedCarousel() {
val backgrounds = listOf(
diff --git a/tv/integration-tests/demos/src/main/java/androidx/tv/integration/demos/ImmersiveList.kt b/tv/integration-tests/demos/src/main/java/androidx/tv/integration/demos/ImmersiveList.kt
index a3bcc25..a690908 100644
--- a/tv/integration-tests/demos/src/main/java/androidx/tv/integration/demos/ImmersiveList.kt
+++ b/tv/integration-tests/demos/src/main/java/androidx/tv/integration/demos/ImmersiveList.kt
@@ -16,8 +16,10 @@
package androidx.tv.integration.demos
+import android.util.Log
import androidx.compose.foundation.background
import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row
@@ -34,8 +36,8 @@
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
import androidx.tv.foundation.lazy.list.TvLazyColumn
-import androidx.tv.material.ExperimentalTvMaterialApi
-import androidx.tv.material.immersivelist.ImmersiveList
+import androidx.tv.material3.ExperimentalTvMaterial3Api
+import androidx.tv.material3.ImmersiveList
@Composable
fun ImmersiveListContent() {
@@ -46,7 +48,7 @@
}
}
-@OptIn(ExperimentalTvMaterialApi::class)
+@OptIn(ExperimentalTvMaterial3Api::class)
@Composable
private fun SampleImmersiveList() {
val immersiveListHeight = 300.dp
@@ -60,7 +62,9 @@
)
ImmersiveList(
- modifier = Modifier.height(immersiveListHeight + cardHeight / 2).fillMaxWidth(),
+ modifier = Modifier
+ .height(immersiveListHeight + cardHeight / 2)
+ .fillMaxWidth(),
background = { index, _ ->
Box(
modifier = Modifier
@@ -81,7 +85,10 @@
.height(cardHeight)
.border(5.dp, Color.White.copy(alpha = if (isFocused) 1f else 0.3f))
.onFocusChanged { isFocused = it.isFocused }
- .focusableItem(index)
+ .immersiveListItem(index)
+ .clickable {
+ Log.d("ImmersiveList", "Item $index was clicked")
+ }
)
}
}
diff --git a/tv/integration-tests/demos/src/main/java/androidx/tv/integration/demos/TopNavigation.kt b/tv/integration-tests/demos/src/main/java/androidx/tv/integration/demos/TopNavigation.kt
index a7c2da4..1b34fd8 100644
--- a/tv/integration-tests/demos/src/main/java/androidx/tv/integration/demos/TopNavigation.kt
+++ b/tv/integration-tests/demos/src/main/java/androidx/tv/integration/demos/TopNavigation.kt
@@ -29,9 +29,9 @@
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
-import androidx.tv.material.LocalContentColor
-import androidx.tv.material.Tab
-import androidx.tv.material.TabRow
+import androidx.tv.material3.LocalContentColor
+import androidx.tv.material3.Tab
+import androidx.tv.material3.TabRow
import kotlinx.coroutines.delay
enum class Navigation(val displayName: String, val action: @Composable () -> Unit) {
diff --git a/tv/samples/src/main/java/androidx/tv/samples/CarouselSamples.kt b/tv/samples/src/main/java/androidx/tv/samples/CarouselSamples.kt
index 3916c9f..b235403 100644
--- a/tv/samples/src/main/java/androidx/tv/samples/CarouselSamples.kt
+++ b/tv/samples/src/main/java/androidx/tv/samples/CarouselSamples.kt
@@ -39,13 +39,13 @@
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.RectangleShape
import androidx.compose.ui.unit.dp
-import androidx.tv.material.ExperimentalTvMaterialApi
-import androidx.tv.material.carousel.Carousel
-import androidx.tv.material.carousel.CarouselDefaults
-import androidx.tv.material.carousel.CarouselItem
-import androidx.tv.material.carousel.CarouselState
+import androidx.tv.material3.ExperimentalTvMaterial3Api
+import androidx.tv.material3.Carousel
+import androidx.tv.material3.CarouselDefaults
+import androidx.tv.material3.CarouselItem
+import androidx.tv.material3.CarouselState
-@OptIn(ExperimentalTvMaterialApi::class)
+@OptIn(ExperimentalTvMaterial3Api::class)
@Sampled
@Composable
fun SimpleCarousel() {
@@ -92,7 +92,7 @@
}
}
-@OptIn(ExperimentalTvMaterialApi::class)
+@OptIn(ExperimentalTvMaterial3Api::class)
@Sampled
@Composable
fun CarouselIndicatorWithRectangleShape() {
diff --git a/tv/samples/src/main/java/androidx/tv/samples/ImmersiveListSamples.kt b/tv/samples/src/main/java/androidx/tv/samples/ImmersiveListSamples.kt
new file mode 100644
index 0000000..9654fd7
--- /dev/null
+++ b/tv/samples/src/main/java/androidx/tv/samples/ImmersiveListSamples.kt
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.tv.samples
+
+import android.util.Log
+import androidx.annotation.Sampled
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.width
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import androidx.tv.material3.ExperimentalTvMaterial3Api
+import androidx.tv.material3.ImmersiveList
+
+@OptIn(ExperimentalTvMaterial3Api::class)
+@Sampled
+@Composable
+private fun SampleImmersiveList() {
+ val immersiveListHeight = 300.dp
+ val cardSpacing = 10.dp
+ val cardWidth = 200.dp
+ val cardHeight = 150.dp
+ val backgrounds = listOf(
+ Color.Red,
+ Color.Blue,
+ Color.Magenta,
+ )
+
+ ImmersiveList(
+ modifier = Modifier
+ .height(immersiveListHeight + cardHeight / 2)
+ .fillMaxWidth(),
+ background = { index, _ ->
+ Box(
+ modifier = Modifier
+ .background(backgrounds[index].copy(alpha = 0.3f))
+ .height(immersiveListHeight)
+ .fillMaxWidth()
+ )
+ }
+ ) {
+ Row(horizontalArrangement = Arrangement.spacedBy(cardSpacing)) {
+ backgrounds.forEachIndexed { index, backgroundColor ->
+ var isFocused by remember { mutableStateOf(false) }
+
+ Box(
+ modifier = Modifier
+ .background(backgroundColor)
+ .width(cardWidth)
+ .height(cardHeight)
+ .border(5.dp, Color.White.copy(alpha = if (isFocused) 1f else 0.3f))
+ .onFocusChanged { isFocused = it.isFocused }
+ .immersiveListItem(index)
+ .clickable {
+ Log.d("ImmersiveList", "Item $index was clicked")
+ }
+ )
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/tv/samples/src/main/java/androidx/tv/samples/TabRowSamples.kt b/tv/samples/src/main/java/androidx/tv/samples/TabRowSamples.kt
index c8d85ab..b2c506e 100644
--- a/tv/samples/src/main/java/androidx/tv/samples/TabRowSamples.kt
+++ b/tv/samples/src/main/java/androidx/tv/samples/TabRowSamples.kt
@@ -34,11 +34,11 @@
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
-import androidx.tv.material.LocalContentColor
-import androidx.tv.material.Tab
-import androidx.tv.material.TabDefaults
-import androidx.tv.material.TabRow
-import androidx.tv.material.TabRowDefaults
+import androidx.tv.material3.LocalContentColor
+import androidx.tv.material3.Tab
+import androidx.tv.material3.TabDefaults
+import androidx.tv.material3.TabRow
+import androidx.tv.material3.TabRowDefaults
import kotlin.time.Duration.Companion.microseconds
import kotlinx.coroutines.delay
diff --git a/tv/tv-material/api/current.txt b/tv/tv-material/api/current.txt
index 0c788a4..0b46921 100644
--- a/tv/tv-material/api/current.txt
+++ b/tv/tv-material/api/current.txt
@@ -1,25 +1,81 @@
// Signature format: 4.0
-package androidx.tv.material {
+package androidx.tv.material3 {
public final class BringIntoViewIfChildrenAreFocusedKt {
}
+ public final class CarouselItemKt {
+ }
+
+ public final class CarouselKt {
+ }
+
+ public final class ColorSchemeKt {
+ }
+
public final class ContentColorKt {
method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.graphics.Color> getLocalContentColor();
property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.graphics.Color> LocalContentColor;
}
+ public final class ImmersiveListKt {
+ }
+
+ public final class MaterialTheme {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ColorScheme getColorScheme();
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.Shapes getShapes();
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.Typography getTypography();
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.tv.material3.Shapes shapes;
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.tv.material3.Typography typography;
+ field public static final androidx.tv.material3.MaterialTheme INSTANCE;
+ }
+
+ public final class MaterialThemeKt {
+ }
+
+ public final class ShapeDefaults {
+ method public androidx.compose.foundation.shape.CornerBasedShape getExtraLarge();
+ method public androidx.compose.foundation.shape.CornerBasedShape getExtraSmall();
+ method public androidx.compose.foundation.shape.CornerBasedShape getLarge();
+ method public androidx.compose.foundation.shape.CornerBasedShape getMedium();
+ method public androidx.compose.foundation.shape.CornerBasedShape getSmall();
+ property public final androidx.compose.foundation.shape.CornerBasedShape ExtraLarge;
+ property public final androidx.compose.foundation.shape.CornerBasedShape ExtraSmall;
+ property public final androidx.compose.foundation.shape.CornerBasedShape Large;
+ property public final androidx.compose.foundation.shape.CornerBasedShape Medium;
+ property public final androidx.compose.foundation.shape.CornerBasedShape Small;
+ field public static final androidx.tv.material3.ShapeDefaults INSTANCE;
+ }
+
+ @androidx.compose.runtime.Immutable public final class Shapes {
+ ctor public Shapes(optional androidx.compose.foundation.shape.CornerBasedShape extraSmall, optional androidx.compose.foundation.shape.CornerBasedShape small, optional androidx.compose.foundation.shape.CornerBasedShape medium, optional androidx.compose.foundation.shape.CornerBasedShape large, optional androidx.compose.foundation.shape.CornerBasedShape extraLarge);
+ method public androidx.tv.material3.Shapes copy(optional androidx.compose.foundation.shape.CornerBasedShape extraSmall, optional androidx.compose.foundation.shape.CornerBasedShape small, optional androidx.compose.foundation.shape.CornerBasedShape medium, optional androidx.compose.foundation.shape.CornerBasedShape large, optional androidx.compose.foundation.shape.CornerBasedShape extraLarge);
+ method public androidx.compose.foundation.shape.CornerBasedShape getExtraLarge();
+ method public androidx.compose.foundation.shape.CornerBasedShape getExtraSmall();
+ method public androidx.compose.foundation.shape.CornerBasedShape getLarge();
+ method public androidx.compose.foundation.shape.CornerBasedShape getMedium();
+ method public androidx.compose.foundation.shape.CornerBasedShape getSmall();
+ property public final androidx.compose.foundation.shape.CornerBasedShape extraLarge;
+ property public final androidx.compose.foundation.shape.CornerBasedShape extraSmall;
+ property public final androidx.compose.foundation.shape.CornerBasedShape large;
+ property public final androidx.compose.foundation.shape.CornerBasedShape medium;
+ property public final androidx.compose.foundation.shape.CornerBasedShape small;
+ }
+
+ public final class ShapesKt {
+ }
+
public final class TabColors {
}
public final class TabDefaults {
- method @androidx.compose.runtime.Composable public androidx.tv.material.TabColors pillIndicatorTabColors(optional long activeContentColor, optional long selectedContentColor, optional long focusedContentColor, optional long disabledActiveContentColor, optional long disabledSelectedContentColor);
- method @androidx.compose.runtime.Composable public androidx.tv.material.TabColors underlinedIndicatorTabColors(optional long activeContentColor, optional long selectedContentColor, optional long focusedContentColor, optional long disabledActiveContentColor, optional long disabledSelectedContentColor);
- field public static final androidx.tv.material.TabDefaults INSTANCE;
+ method @androidx.compose.runtime.Composable public androidx.tv.material3.TabColors pillIndicatorTabColors(optional long activeContentColor, optional long selectedContentColor, optional long focusedContentColor, optional long disabledActiveContentColor, optional long disabledSelectedContentColor);
+ method @androidx.compose.runtime.Composable public androidx.tv.material3.TabColors underlinedIndicatorTabColors(optional long activeContentColor, optional long selectedContentColor, optional long focusedContentColor, optional long disabledActiveContentColor, optional long disabledSelectedContentColor);
+ field public static final androidx.tv.material3.TabDefaults INSTANCE;
}
public final class TabKt {
- method @androidx.compose.runtime.Composable public static void Tab(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onFocus, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional boolean enabled, optional androidx.tv.material.TabColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Tab(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onFocus, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional boolean enabled, optional androidx.tv.material3.TabColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
}
public final class TabRowDefaults {
@@ -29,28 +85,57 @@
method @androidx.compose.runtime.Composable public long contentColor();
method public long getContainerColor();
property public final long ContainerColor;
- field public static final androidx.tv.material.TabRowDefaults INSTANCE;
+ field public static final androidx.tv.material3.TabRowDefaults INSTANCE;
}
public final class TabRowKt {
method @androidx.compose.runtime.Composable public static void TabRow(int selectedTabIndex, optional androidx.compose.ui.Modifier modifier, optional long containerColor, optional long contentColor, optional kotlin.jvm.functions.Function0<kotlin.Unit> separator, optional kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.ui.unit.DpRect>,kotlin.Unit> indicator, kotlin.jvm.functions.Function0<kotlin.Unit> tabs);
}
-}
-
-package androidx.tv.material.carousel {
-
- public final class CarouselItemKt {
+ public final class TextKt {
+ method @androidx.compose.runtime.Composable public static void ProvideTextStyle(androidx.compose.ui.text.TextStyle value, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Text(String text, optional androidx.compose.ui.Modifier modifier, optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional long letterSpacing, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional long lineHeight, optional int overflow, optional boolean softWrap, optional int maxLines, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.TextStyle style);
+ method @androidx.compose.runtime.Composable public static void Text(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional long letterSpacing, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional long lineHeight, optional int overflow, optional boolean softWrap, optional int maxLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.TextStyle style);
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.TextStyle> getLocalTextStyle();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.TextStyle> LocalTextStyle;
}
- public final class CarouselKt {
+ @androidx.compose.runtime.Immutable public final class Typography {
+ ctor public Typography(optional androidx.compose.ui.text.TextStyle displayLarge, optional androidx.compose.ui.text.TextStyle displayMedium, optional androidx.compose.ui.text.TextStyle displaySmall, optional androidx.compose.ui.text.TextStyle headlineLarge, optional androidx.compose.ui.text.TextStyle headlineMedium, optional androidx.compose.ui.text.TextStyle headlineSmall, optional androidx.compose.ui.text.TextStyle titleLarge, optional androidx.compose.ui.text.TextStyle titleMedium, optional androidx.compose.ui.text.TextStyle titleSmall, optional androidx.compose.ui.text.TextStyle bodyLarge, optional androidx.compose.ui.text.TextStyle bodyMedium, optional androidx.compose.ui.text.TextStyle bodySmall, optional androidx.compose.ui.text.TextStyle labelLarge, optional androidx.compose.ui.text.TextStyle labelMedium, optional androidx.compose.ui.text.TextStyle labelSmall);
+ method public androidx.tv.material3.Typography copy(optional androidx.compose.ui.text.TextStyle displayLarge, optional androidx.compose.ui.text.TextStyle displayMedium, optional androidx.compose.ui.text.TextStyle displaySmall, optional androidx.compose.ui.text.TextStyle headlineLarge, optional androidx.compose.ui.text.TextStyle headlineMedium, optional androidx.compose.ui.text.TextStyle headlineSmall, optional androidx.compose.ui.text.TextStyle titleLarge, optional androidx.compose.ui.text.TextStyle titleMedium, optional androidx.compose.ui.text.TextStyle titleSmall, optional androidx.compose.ui.text.TextStyle bodyLarge, optional androidx.compose.ui.text.TextStyle bodyMedium, optional androidx.compose.ui.text.TextStyle bodySmall, optional androidx.compose.ui.text.TextStyle labelLarge, optional androidx.compose.ui.text.TextStyle labelMedium, optional androidx.compose.ui.text.TextStyle labelSmall);
+ method public androidx.compose.ui.text.TextStyle getBodyLarge();
+ method public androidx.compose.ui.text.TextStyle getBodyMedium();
+ method public androidx.compose.ui.text.TextStyle getBodySmall();
+ method public androidx.compose.ui.text.TextStyle getDisplayLarge();
+ method public androidx.compose.ui.text.TextStyle getDisplayMedium();
+ method public androidx.compose.ui.text.TextStyle getDisplaySmall();
+ method public androidx.compose.ui.text.TextStyle getHeadlineLarge();
+ method public androidx.compose.ui.text.TextStyle getHeadlineMedium();
+ method public androidx.compose.ui.text.TextStyle getHeadlineSmall();
+ method public androidx.compose.ui.text.TextStyle getLabelLarge();
+ method public androidx.compose.ui.text.TextStyle getLabelMedium();
+ method public androidx.compose.ui.text.TextStyle getLabelSmall();
+ method public androidx.compose.ui.text.TextStyle getTitleLarge();
+ method public androidx.compose.ui.text.TextStyle getTitleMedium();
+ method public androidx.compose.ui.text.TextStyle getTitleSmall();
+ property public final androidx.compose.ui.text.TextStyle bodyLarge;
+ property public final androidx.compose.ui.text.TextStyle bodyMedium;
+ property public final androidx.compose.ui.text.TextStyle bodySmall;
+ property public final androidx.compose.ui.text.TextStyle displayLarge;
+ property public final androidx.compose.ui.text.TextStyle displayMedium;
+ property public final androidx.compose.ui.text.TextStyle displaySmall;
+ property public final androidx.compose.ui.text.TextStyle headlineLarge;
+ property public final androidx.compose.ui.text.TextStyle headlineMedium;
+ property public final androidx.compose.ui.text.TextStyle headlineSmall;
+ property public final androidx.compose.ui.text.TextStyle labelLarge;
+ property public final androidx.compose.ui.text.TextStyle labelMedium;
+ property public final androidx.compose.ui.text.TextStyle labelSmall;
+ property public final androidx.compose.ui.text.TextStyle titleLarge;
+ property public final androidx.compose.ui.text.TextStyle titleMedium;
+ property public final androidx.compose.ui.text.TextStyle titleSmall;
}
-}
-
-package androidx.tv.material.immersivelist {
-
- public final class ImmersiveListKt {
+ public final class TypographyKt {
}
}
diff --git a/tv/tv-material/api/public_plus_experimental_current.txt b/tv/tv-material/api/public_plus_experimental_current.txt
index a086e3e..475b193 100644
--- a/tv/tv-material/api/public_plus_experimental_current.txt
+++ b/tv/tv-material/api/public_plus_experimental_current.txt
@@ -1,28 +1,204 @@
// Signature format: 4.0
-package androidx.tv.material {
+package androidx.tv.material3 {
public final class BringIntoViewIfChildrenAreFocusedKt {
}
+ @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CarouselDefaults {
+ method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public void IndicatorRow(int slideCount, int activeSlideIndex, optional androidx.compose.ui.Modifier modifier, optional float spacing, optional kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> indicator);
+ method public androidx.compose.animation.EnterTransition getEnterTransition();
+ method public androidx.compose.animation.ExitTransition getExitTransition();
+ property public final androidx.compose.animation.EnterTransition EnterTransition;
+ property public final androidx.compose.animation.ExitTransition ExitTransition;
+ field public static final androidx.tv.material3.CarouselDefaults INSTANCE;
+ field public static final long TimeToDisplaySlideMillis = 5000L; // 0x1388L
+ }
+
+ @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CarouselItemDefaults {
+ method public androidx.compose.animation.EnterTransition getOverlayEnterTransition();
+ method public androidx.compose.animation.ExitTransition getOverlayExitTransition();
+ property public final androidx.compose.animation.EnterTransition OverlayEnterTransition;
+ property public final androidx.compose.animation.ExitTransition OverlayExitTransition;
+ field public static final androidx.tv.material3.CarouselItemDefaults INSTANCE;
+ field public static final long OverlayEnterTransitionStartDelayMillis = 200L; // 0xc8L
+ }
+
+ public final class CarouselItemKt {
+ method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void CarouselItem(kotlin.jvm.functions.Function0<kotlin.Unit> background, optional androidx.compose.ui.Modifier modifier, optional long overlayEnterTransitionStartDelayMillis, optional androidx.compose.animation.EnterTransition overlayEnterTransition, optional androidx.compose.animation.ExitTransition overlayExitTransition, kotlin.jvm.functions.Function0<kotlin.Unit> overlay);
+ }
+
+ public final class CarouselKt {
+ method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Carousel(int slideCount, optional androidx.compose.ui.Modifier modifier, optional androidx.tv.material3.CarouselState carouselState, optional long timeToDisplaySlideMillis, optional androidx.compose.animation.EnterTransition enterTransition, optional androidx.compose.animation.ExitTransition exitTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> carouselIndicator, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> content);
+ }
+
+ @androidx.compose.runtime.Stable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CarouselState {
+ ctor public CarouselState(optional int initialActiveSlideIndex);
+ method public int getActiveSlideIndex();
+ method public androidx.tv.material3.ScrollPauseHandle pauseAutoScroll(int slideIndex);
+ property public final int activeSlideIndex;
+ }
+
+ @androidx.compose.runtime.Stable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ColorScheme {
+ ctor public ColorScheme(long primary, long onPrimary, long primaryContainer, long onPrimaryContainer, long inversePrimary, long secondary, long onSecondary, long secondaryContainer, long onSecondaryContainer, long tertiary, long onTertiary, long tertiaryContainer, long onTertiaryContainer, long background, long onBackground, long surface, long onSurface, long surfaceVariant, long onSurfaceVariant, long surfaceTint, long inverseSurface, long inverseOnSurface, long error, long onError, long errorContainer, long onErrorContainer, long outline, long outlineVariant, long scrim);
+ method public androidx.tv.material3.ColorScheme copy(optional long primary, optional long onPrimary, optional long primaryContainer, optional long onPrimaryContainer, optional long inversePrimary, optional long secondary, optional long onSecondary, optional long secondaryContainer, optional long onSecondaryContainer, optional long tertiary, optional long onTertiary, optional long tertiaryContainer, optional long onTertiaryContainer, optional long background, optional long onBackground, optional long surface, optional long onSurface, optional long surfaceVariant, optional long onSurfaceVariant, optional long surfaceTint, optional long inverseSurface, optional long inverseOnSurface, optional long error, optional long onError, optional long errorContainer, optional long onErrorContainer, optional long outline, optional long outlineVariant, optional long scrim);
+ method public long getBackground();
+ method public long getError();
+ method public long getErrorContainer();
+ method public long getInverseOnSurface();
+ method public long getInversePrimary();
+ method public long getInverseSurface();
+ method public long getOnBackground();
+ method public long getOnError();
+ method public long getOnErrorContainer();
+ method public long getOnPrimary();
+ method public long getOnPrimaryContainer();
+ method public long getOnSecondary();
+ method public long getOnSecondaryContainer();
+ method public long getOnSurface();
+ method public long getOnSurfaceVariant();
+ method public long getOnTertiary();
+ method public long getOnTertiaryContainer();
+ method public long getOutline();
+ method public long getOutlineVariant();
+ method public long getPrimary();
+ method public long getPrimaryContainer();
+ method public long getScrim();
+ method public long getSecondary();
+ method public long getSecondaryContainer();
+ method public long getSurface();
+ method public long getSurfaceTint();
+ method public long getSurfaceVariant();
+ method public long getTertiary();
+ method public long getTertiaryContainer();
+ property public final long background;
+ property public final long error;
+ property public final long errorContainer;
+ property public final long inverseOnSurface;
+ property public final long inversePrimary;
+ property public final long inverseSurface;
+ property public final long onBackground;
+ property public final long onError;
+ property public final long onErrorContainer;
+ property public final long onPrimary;
+ property public final long onPrimaryContainer;
+ property public final long onSecondary;
+ property public final long onSecondaryContainer;
+ property public final long onSurface;
+ property public final long onSurfaceVariant;
+ property public final long onTertiary;
+ property public final long onTertiaryContainer;
+ property public final long outline;
+ property public final long outlineVariant;
+ property public final long primary;
+ property public final long primaryContainer;
+ property public final long scrim;
+ property public final long secondary;
+ property public final long secondaryContainer;
+ property public final long surface;
+ property public final long surfaceTint;
+ property public final long surfaceVariant;
+ property public final long tertiary;
+ property public final long tertiaryContainer;
+ }
+
+ public final class ColorSchemeKt {
+ method @androidx.tv.material3.ExperimentalTvMaterial3Api public static long contentColorFor(androidx.tv.material3.ColorScheme, long backgroundColor);
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable @androidx.tv.material3.ExperimentalTvMaterial3Api public static long contentColorFor(long backgroundColor);
+ method @androidx.tv.material3.ExperimentalTvMaterial3Api public static androidx.tv.material3.ColorScheme darkColorScheme(optional long primary, optional long onPrimary, optional long primaryContainer, optional long onPrimaryContainer, optional long inversePrimary, optional long secondary, optional long onSecondary, optional long secondaryContainer, optional long onSecondaryContainer, optional long tertiary, optional long onTertiary, optional long tertiaryContainer, optional long onTertiaryContainer, optional long background, optional long onBackground, optional long surface, optional long onSurface, optional long surfaceVariant, optional long onSurfaceVariant, optional long surfaceTint, optional long inverseSurface, optional long inverseOnSurface, optional long error, optional long onError, optional long errorContainer, optional long onErrorContainer, optional long outline, optional long outlineVariant, optional long scrim);
+ method @androidx.tv.material3.ExperimentalTvMaterial3Api public static androidx.tv.material3.ColorScheme lightColorScheme(optional long primary, optional long onPrimary, optional long primaryContainer, optional long onPrimaryContainer, optional long inversePrimary, optional long secondary, optional long onSecondary, optional long secondaryContainer, optional long onSecondaryContainer, optional long tertiary, optional long onTertiary, optional long tertiaryContainer, optional long onTertiaryContainer, optional long background, optional long onBackground, optional long surface, optional long onSurface, optional long surfaceVariant, optional long onSurfaceVariant, optional long surfaceTint, optional long inverseSurface, optional long inverseOnSurface, optional long error, optional long onError, optional long errorContainer, optional long onErrorContainer, optional long outline, optional long outlineVariant, optional long scrim);
+ method @androidx.tv.material3.ExperimentalTvMaterial3Api public static long surfaceColorAtElevation(androidx.tv.material3.ColorScheme, float elevation);
+ }
+
public final class ContentColorKt {
method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.graphics.Color> getLocalContentColor();
property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.graphics.Color> LocalContentColor;
}
- @kotlin.RequiresOptIn(message="This tv-material API is experimental and likely to change or be removed in the future.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalTvMaterialApi {
+ @kotlin.RequiresOptIn(message="This tv-material API is experimental and likely to change or be removed in the future.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalTvMaterial3Api {
+ }
+
+ @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ImmersiveListBackgroundScope implements androidx.compose.foundation.layout.BoxScope {
+ method @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Composable public void AnimatedContent(int targetState, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentScope<java.lang.Integer>,androidx.compose.animation.ContentTransform> transitionSpec, optional androidx.compose.ui.Alignment contentAlignment, kotlin.jvm.functions.Function2<? super androidx.compose.animation.AnimatedVisibilityScope,? super java.lang.Integer,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public void AnimatedVisibility(boolean visible, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.EnterTransition enter, optional androidx.compose.animation.ExitTransition exit, optional String label, kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedVisibilityScope,kotlin.Unit> content);
+ }
+
+ @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ImmersiveListDefaults {
+ method public androidx.compose.animation.EnterTransition getEnterTransition();
+ method public androidx.compose.animation.ExitTransition getExitTransition();
+ property public final androidx.compose.animation.EnterTransition EnterTransition;
+ property public final androidx.compose.animation.ExitTransition ExitTransition;
+ field public static final androidx.tv.material3.ImmersiveListDefaults INSTANCE;
+ }
+
+ public final class ImmersiveListKt {
+ method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void ImmersiveList(kotlin.jvm.functions.Function3<? super androidx.tv.material3.ImmersiveListBackgroundScope,? super java.lang.Integer,? super java.lang.Boolean,kotlin.Unit> background, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment listAlignment, kotlin.jvm.functions.Function1<? super androidx.tv.material3.ImmersiveListScope,kotlin.Unit> list);
+ }
+
+ @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ImmersiveListScope {
+ method public androidx.compose.ui.Modifier immersiveListItem(androidx.compose.ui.Modifier, int index);
+ }
+
+ public final class MaterialTheme {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ColorScheme getColorScheme();
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.Shapes getShapes();
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.Typography getTypography();
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable @androidx.tv.material3.ExperimentalTvMaterial3Api public final androidx.tv.material3.ColorScheme colorScheme;
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.tv.material3.Shapes shapes;
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.tv.material3.Typography typography;
+ field public static final androidx.tv.material3.MaterialTheme INSTANCE;
+ }
+
+ public final class MaterialThemeKt {
+ method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void MaterialTheme(optional androidx.tv.material3.ColorScheme colorScheme, optional androidx.tv.material3.Shapes shapes, optional androidx.tv.material3.Typography typography, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ }
+
+ @androidx.tv.material3.ExperimentalTvMaterial3Api public sealed interface ScrollPauseHandle {
+ method public void resumeAutoScroll();
+ }
+
+ public final class ShapeDefaults {
+ method public androidx.compose.foundation.shape.CornerBasedShape getExtraLarge();
+ method public androidx.compose.foundation.shape.CornerBasedShape getExtraSmall();
+ method public androidx.compose.foundation.shape.CornerBasedShape getLarge();
+ method public androidx.compose.foundation.shape.CornerBasedShape getMedium();
+ method public androidx.compose.foundation.shape.CornerBasedShape getSmall();
+ property public final androidx.compose.foundation.shape.CornerBasedShape ExtraLarge;
+ property public final androidx.compose.foundation.shape.CornerBasedShape ExtraSmall;
+ property public final androidx.compose.foundation.shape.CornerBasedShape Large;
+ property public final androidx.compose.foundation.shape.CornerBasedShape Medium;
+ property public final androidx.compose.foundation.shape.CornerBasedShape Small;
+ field public static final androidx.tv.material3.ShapeDefaults INSTANCE;
+ }
+
+ @androidx.compose.runtime.Immutable public final class Shapes {
+ ctor public Shapes(optional androidx.compose.foundation.shape.CornerBasedShape extraSmall, optional androidx.compose.foundation.shape.CornerBasedShape small, optional androidx.compose.foundation.shape.CornerBasedShape medium, optional androidx.compose.foundation.shape.CornerBasedShape large, optional androidx.compose.foundation.shape.CornerBasedShape extraLarge);
+ method public androidx.tv.material3.Shapes copy(optional androidx.compose.foundation.shape.CornerBasedShape extraSmall, optional androidx.compose.foundation.shape.CornerBasedShape small, optional androidx.compose.foundation.shape.CornerBasedShape medium, optional androidx.compose.foundation.shape.CornerBasedShape large, optional androidx.compose.foundation.shape.CornerBasedShape extraLarge);
+ method public androidx.compose.foundation.shape.CornerBasedShape getExtraLarge();
+ method public androidx.compose.foundation.shape.CornerBasedShape getExtraSmall();
+ method public androidx.compose.foundation.shape.CornerBasedShape getLarge();
+ method public androidx.compose.foundation.shape.CornerBasedShape getMedium();
+ method public androidx.compose.foundation.shape.CornerBasedShape getSmall();
+ property public final androidx.compose.foundation.shape.CornerBasedShape extraLarge;
+ property public final androidx.compose.foundation.shape.CornerBasedShape extraSmall;
+ property public final androidx.compose.foundation.shape.CornerBasedShape large;
+ property public final androidx.compose.foundation.shape.CornerBasedShape medium;
+ property public final androidx.compose.foundation.shape.CornerBasedShape small;
+ }
+
+ public final class ShapesKt {
}
public final class TabColors {
}
public final class TabDefaults {
- method @androidx.compose.runtime.Composable public androidx.tv.material.TabColors pillIndicatorTabColors(optional long activeContentColor, optional long selectedContentColor, optional long focusedContentColor, optional long disabledActiveContentColor, optional long disabledSelectedContentColor);
- method @androidx.compose.runtime.Composable public androidx.tv.material.TabColors underlinedIndicatorTabColors(optional long activeContentColor, optional long selectedContentColor, optional long focusedContentColor, optional long disabledActiveContentColor, optional long disabledSelectedContentColor);
- field public static final androidx.tv.material.TabDefaults INSTANCE;
+ method @androidx.compose.runtime.Composable public androidx.tv.material3.TabColors pillIndicatorTabColors(optional long activeContentColor, optional long selectedContentColor, optional long focusedContentColor, optional long disabledActiveContentColor, optional long disabledSelectedContentColor);
+ method @androidx.compose.runtime.Composable public androidx.tv.material3.TabColors underlinedIndicatorTabColors(optional long activeContentColor, optional long selectedContentColor, optional long focusedContentColor, optional long disabledActiveContentColor, optional long disabledSelectedContentColor);
+ field public static final androidx.tv.material3.TabDefaults INSTANCE;
}
public final class TabKt {
- method @androidx.compose.runtime.Composable public static void Tab(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onFocus, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional boolean enabled, optional androidx.tv.material.TabColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Tab(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onFocus, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional boolean enabled, optional androidx.tv.material3.TabColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
}
public final class TabRowDefaults {
@@ -32,78 +208,57 @@
method @androidx.compose.runtime.Composable public long contentColor();
method public long getContainerColor();
property public final long ContainerColor;
- field public static final androidx.tv.material.TabRowDefaults INSTANCE;
+ field public static final androidx.tv.material3.TabRowDefaults INSTANCE;
}
public final class TabRowKt {
method @androidx.compose.runtime.Composable public static void TabRow(int selectedTabIndex, optional androidx.compose.ui.Modifier modifier, optional long containerColor, optional long contentColor, optional kotlin.jvm.functions.Function0<kotlin.Unit> separator, optional kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.ui.unit.DpRect>,kotlin.Unit> indicator, kotlin.jvm.functions.Function0<kotlin.Unit> tabs);
}
-}
-
-package androidx.tv.material.carousel {
-
- @androidx.tv.material.ExperimentalTvMaterialApi public final class CarouselDefaults {
- method @androidx.compose.runtime.Composable @androidx.tv.material.ExperimentalTvMaterialApi public void IndicatorRow(int slideCount, int activeSlideIndex, optional androidx.compose.ui.Modifier modifier, optional float spacing, optional kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> indicator);
- method public androidx.compose.animation.EnterTransition getEnterTransition();
- method public androidx.compose.animation.ExitTransition getExitTransition();
- property public final androidx.compose.animation.EnterTransition EnterTransition;
- property public final androidx.compose.animation.ExitTransition ExitTransition;
- field public static final androidx.tv.material.carousel.CarouselDefaults INSTANCE;
- field public static final long TimeToDisplaySlideMillis = 5000L; // 0x1388L
+ public final class TextKt {
+ method @androidx.compose.runtime.Composable public static void ProvideTextStyle(androidx.compose.ui.text.TextStyle value, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Text(String text, optional androidx.compose.ui.Modifier modifier, optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional long letterSpacing, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional long lineHeight, optional int overflow, optional boolean softWrap, optional int maxLines, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.TextStyle style);
+ method @androidx.compose.runtime.Composable public static void Text(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional long letterSpacing, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional long lineHeight, optional int overflow, optional boolean softWrap, optional int maxLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.TextStyle style);
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.TextStyle> getLocalTextStyle();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.TextStyle> LocalTextStyle;
}
- @androidx.tv.material.ExperimentalTvMaterialApi public final class CarouselItemDefaults {
- method public androidx.compose.animation.EnterTransition getOverlayEnterTransition();
- method public androidx.compose.animation.ExitTransition getOverlayExitTransition();
- property public final androidx.compose.animation.EnterTransition OverlayEnterTransition;
- property public final androidx.compose.animation.ExitTransition OverlayExitTransition;
- field public static final androidx.tv.material.carousel.CarouselItemDefaults INSTANCE;
- field public static final long OverlayEnterTransitionStartDelayMillis = 200L; // 0xc8L
+ @androidx.compose.runtime.Immutable public final class Typography {
+ ctor public Typography(optional androidx.compose.ui.text.TextStyle displayLarge, optional androidx.compose.ui.text.TextStyle displayMedium, optional androidx.compose.ui.text.TextStyle displaySmall, optional androidx.compose.ui.text.TextStyle headlineLarge, optional androidx.compose.ui.text.TextStyle headlineMedium, optional androidx.compose.ui.text.TextStyle headlineSmall, optional androidx.compose.ui.text.TextStyle titleLarge, optional androidx.compose.ui.text.TextStyle titleMedium, optional androidx.compose.ui.text.TextStyle titleSmall, optional androidx.compose.ui.text.TextStyle bodyLarge, optional androidx.compose.ui.text.TextStyle bodyMedium, optional androidx.compose.ui.text.TextStyle bodySmall, optional androidx.compose.ui.text.TextStyle labelLarge, optional androidx.compose.ui.text.TextStyle labelMedium, optional androidx.compose.ui.text.TextStyle labelSmall);
+ method public androidx.tv.material3.Typography copy(optional androidx.compose.ui.text.TextStyle displayLarge, optional androidx.compose.ui.text.TextStyle displayMedium, optional androidx.compose.ui.text.TextStyle displaySmall, optional androidx.compose.ui.text.TextStyle headlineLarge, optional androidx.compose.ui.text.TextStyle headlineMedium, optional androidx.compose.ui.text.TextStyle headlineSmall, optional androidx.compose.ui.text.TextStyle titleLarge, optional androidx.compose.ui.text.TextStyle titleMedium, optional androidx.compose.ui.text.TextStyle titleSmall, optional androidx.compose.ui.text.TextStyle bodyLarge, optional androidx.compose.ui.text.TextStyle bodyMedium, optional androidx.compose.ui.text.TextStyle bodySmall, optional androidx.compose.ui.text.TextStyle labelLarge, optional androidx.compose.ui.text.TextStyle labelMedium, optional androidx.compose.ui.text.TextStyle labelSmall);
+ method public androidx.compose.ui.text.TextStyle getBodyLarge();
+ method public androidx.compose.ui.text.TextStyle getBodyMedium();
+ method public androidx.compose.ui.text.TextStyle getBodySmall();
+ method public androidx.compose.ui.text.TextStyle getDisplayLarge();
+ method public androidx.compose.ui.text.TextStyle getDisplayMedium();
+ method public androidx.compose.ui.text.TextStyle getDisplaySmall();
+ method public androidx.compose.ui.text.TextStyle getHeadlineLarge();
+ method public androidx.compose.ui.text.TextStyle getHeadlineMedium();
+ method public androidx.compose.ui.text.TextStyle getHeadlineSmall();
+ method public androidx.compose.ui.text.TextStyle getLabelLarge();
+ method public androidx.compose.ui.text.TextStyle getLabelMedium();
+ method public androidx.compose.ui.text.TextStyle getLabelSmall();
+ method public androidx.compose.ui.text.TextStyle getTitleLarge();
+ method public androidx.compose.ui.text.TextStyle getTitleMedium();
+ method public androidx.compose.ui.text.TextStyle getTitleSmall();
+ property public final androidx.compose.ui.text.TextStyle bodyLarge;
+ property public final androidx.compose.ui.text.TextStyle bodyMedium;
+ property public final androidx.compose.ui.text.TextStyle bodySmall;
+ property public final androidx.compose.ui.text.TextStyle displayLarge;
+ property public final androidx.compose.ui.text.TextStyle displayMedium;
+ property public final androidx.compose.ui.text.TextStyle displaySmall;
+ property public final androidx.compose.ui.text.TextStyle headlineLarge;
+ property public final androidx.compose.ui.text.TextStyle headlineMedium;
+ property public final androidx.compose.ui.text.TextStyle headlineSmall;
+ property public final androidx.compose.ui.text.TextStyle labelLarge;
+ property public final androidx.compose.ui.text.TextStyle labelMedium;
+ property public final androidx.compose.ui.text.TextStyle labelSmall;
+ property public final androidx.compose.ui.text.TextStyle titleLarge;
+ property public final androidx.compose.ui.text.TextStyle titleMedium;
+ property public final androidx.compose.ui.text.TextStyle titleSmall;
}
- public final class CarouselItemKt {
- method @androidx.compose.runtime.Composable @androidx.tv.material.ExperimentalTvMaterialApi public static void CarouselItem(kotlin.jvm.functions.Function0<kotlin.Unit> background, optional androidx.compose.ui.Modifier modifier, optional long overlayEnterTransitionStartDelayMillis, optional androidx.compose.animation.EnterTransition overlayEnterTransition, optional androidx.compose.animation.ExitTransition overlayExitTransition, kotlin.jvm.functions.Function0<kotlin.Unit> overlay);
- }
-
- public final class CarouselKt {
- method @androidx.compose.runtime.Composable @androidx.tv.material.ExperimentalTvMaterialApi public static void Carousel(int slideCount, optional androidx.compose.ui.Modifier modifier, optional androidx.tv.material.carousel.CarouselState carouselState, optional long timeToDisplaySlideMillis, optional androidx.compose.animation.EnterTransition enterTransition, optional androidx.compose.animation.ExitTransition exitTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> carouselIndicator, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> content);
- }
-
- @androidx.compose.runtime.Stable @androidx.tv.material.ExperimentalTvMaterialApi public final class CarouselState {
- ctor public CarouselState(optional int initialActiveSlideIndex);
- method public int getActiveSlideIndex();
- method public androidx.tv.material.carousel.ScrollPauseHandle pauseAutoScroll(int slideIndex);
- property public final int activeSlideIndex;
- }
-
- @androidx.tv.material.ExperimentalTvMaterialApi public sealed interface ScrollPauseHandle {
- method public void resumeAutoScroll();
- }
-
-}
-
-package androidx.tv.material.immersivelist {
-
- @androidx.compose.runtime.Immutable @androidx.tv.material.ExperimentalTvMaterialApi public final class ImmersiveListBackgroundScope implements androidx.compose.foundation.layout.BoxScope {
- method @androidx.compose.animation.ExperimentalAnimationApi @androidx.compose.runtime.Composable public void AnimatedContent(int targetState, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentScope<java.lang.Integer>,androidx.compose.animation.ContentTransform> transitionSpec, optional androidx.compose.ui.Alignment contentAlignment, kotlin.jvm.functions.Function2<? super androidx.compose.animation.AnimatedVisibilityScope,? super java.lang.Integer,kotlin.Unit> content);
- method @androidx.compose.runtime.Composable public void AnimatedVisibility(boolean visible, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.EnterTransition enter, optional androidx.compose.animation.ExitTransition exit, optional String label, kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedVisibilityScope,kotlin.Unit> content);
- }
-
- @androidx.tv.material.ExperimentalTvMaterialApi public final class ImmersiveListDefaults {
- method public androidx.compose.animation.EnterTransition getEnterTransition();
- method public androidx.compose.animation.ExitTransition getExitTransition();
- property public final androidx.compose.animation.EnterTransition EnterTransition;
- property public final androidx.compose.animation.ExitTransition ExitTransition;
- field public static final androidx.tv.material.immersivelist.ImmersiveListDefaults INSTANCE;
- }
-
- public final class ImmersiveListKt {
- method @androidx.compose.runtime.Composable @androidx.tv.material.ExperimentalTvMaterialApi public static void ImmersiveList(kotlin.jvm.functions.Function3<? super androidx.tv.material.immersivelist.ImmersiveListBackgroundScope,? super java.lang.Integer,? super java.lang.Boolean,kotlin.Unit> background, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment listAlignment, kotlin.jvm.functions.Function1<? super androidx.tv.material.immersivelist.ImmersiveListScope,kotlin.Unit> list);
- }
-
- @androidx.compose.runtime.Immutable @androidx.tv.material.ExperimentalTvMaterialApi public final class ImmersiveListScope {
- method public androidx.compose.ui.Modifier focusableItem(androidx.compose.ui.Modifier, int index);
+ public final class TypographyKt {
}
}
diff --git a/tv/tv-material/api/restricted_current.txt b/tv/tv-material/api/restricted_current.txt
index 0c788a4..0b46921 100644
--- a/tv/tv-material/api/restricted_current.txt
+++ b/tv/tv-material/api/restricted_current.txt
@@ -1,25 +1,81 @@
// Signature format: 4.0
-package androidx.tv.material {
+package androidx.tv.material3 {
public final class BringIntoViewIfChildrenAreFocusedKt {
}
+ public final class CarouselItemKt {
+ }
+
+ public final class CarouselKt {
+ }
+
+ public final class ColorSchemeKt {
+ }
+
public final class ContentColorKt {
method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.graphics.Color> getLocalContentColor();
property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.graphics.Color> LocalContentColor;
}
+ public final class ImmersiveListKt {
+ }
+
+ public final class MaterialTheme {
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ColorScheme getColorScheme();
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.Shapes getShapes();
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.Typography getTypography();
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.tv.material3.Shapes shapes;
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.tv.material3.Typography typography;
+ field public static final androidx.tv.material3.MaterialTheme INSTANCE;
+ }
+
+ public final class MaterialThemeKt {
+ }
+
+ public final class ShapeDefaults {
+ method public androidx.compose.foundation.shape.CornerBasedShape getExtraLarge();
+ method public androidx.compose.foundation.shape.CornerBasedShape getExtraSmall();
+ method public androidx.compose.foundation.shape.CornerBasedShape getLarge();
+ method public androidx.compose.foundation.shape.CornerBasedShape getMedium();
+ method public androidx.compose.foundation.shape.CornerBasedShape getSmall();
+ property public final androidx.compose.foundation.shape.CornerBasedShape ExtraLarge;
+ property public final androidx.compose.foundation.shape.CornerBasedShape ExtraSmall;
+ property public final androidx.compose.foundation.shape.CornerBasedShape Large;
+ property public final androidx.compose.foundation.shape.CornerBasedShape Medium;
+ property public final androidx.compose.foundation.shape.CornerBasedShape Small;
+ field public static final androidx.tv.material3.ShapeDefaults INSTANCE;
+ }
+
+ @androidx.compose.runtime.Immutable public final class Shapes {
+ ctor public Shapes(optional androidx.compose.foundation.shape.CornerBasedShape extraSmall, optional androidx.compose.foundation.shape.CornerBasedShape small, optional androidx.compose.foundation.shape.CornerBasedShape medium, optional androidx.compose.foundation.shape.CornerBasedShape large, optional androidx.compose.foundation.shape.CornerBasedShape extraLarge);
+ method public androidx.tv.material3.Shapes copy(optional androidx.compose.foundation.shape.CornerBasedShape extraSmall, optional androidx.compose.foundation.shape.CornerBasedShape small, optional androidx.compose.foundation.shape.CornerBasedShape medium, optional androidx.compose.foundation.shape.CornerBasedShape large, optional androidx.compose.foundation.shape.CornerBasedShape extraLarge);
+ method public androidx.compose.foundation.shape.CornerBasedShape getExtraLarge();
+ method public androidx.compose.foundation.shape.CornerBasedShape getExtraSmall();
+ method public androidx.compose.foundation.shape.CornerBasedShape getLarge();
+ method public androidx.compose.foundation.shape.CornerBasedShape getMedium();
+ method public androidx.compose.foundation.shape.CornerBasedShape getSmall();
+ property public final androidx.compose.foundation.shape.CornerBasedShape extraLarge;
+ property public final androidx.compose.foundation.shape.CornerBasedShape extraSmall;
+ property public final androidx.compose.foundation.shape.CornerBasedShape large;
+ property public final androidx.compose.foundation.shape.CornerBasedShape medium;
+ property public final androidx.compose.foundation.shape.CornerBasedShape small;
+ }
+
+ public final class ShapesKt {
+ }
+
public final class TabColors {
}
public final class TabDefaults {
- method @androidx.compose.runtime.Composable public androidx.tv.material.TabColors pillIndicatorTabColors(optional long activeContentColor, optional long selectedContentColor, optional long focusedContentColor, optional long disabledActiveContentColor, optional long disabledSelectedContentColor);
- method @androidx.compose.runtime.Composable public androidx.tv.material.TabColors underlinedIndicatorTabColors(optional long activeContentColor, optional long selectedContentColor, optional long focusedContentColor, optional long disabledActiveContentColor, optional long disabledSelectedContentColor);
- field public static final androidx.tv.material.TabDefaults INSTANCE;
+ method @androidx.compose.runtime.Composable public androidx.tv.material3.TabColors pillIndicatorTabColors(optional long activeContentColor, optional long selectedContentColor, optional long focusedContentColor, optional long disabledActiveContentColor, optional long disabledSelectedContentColor);
+ method @androidx.compose.runtime.Composable public androidx.tv.material3.TabColors underlinedIndicatorTabColors(optional long activeContentColor, optional long selectedContentColor, optional long focusedContentColor, optional long disabledActiveContentColor, optional long disabledSelectedContentColor);
+ field public static final androidx.tv.material3.TabDefaults INSTANCE;
}
public final class TabKt {
- method @androidx.compose.runtime.Composable public static void Tab(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onFocus, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional boolean enabled, optional androidx.tv.material.TabColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Tab(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onFocus, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional boolean enabled, optional androidx.tv.material3.TabColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
}
public final class TabRowDefaults {
@@ -29,28 +85,57 @@
method @androidx.compose.runtime.Composable public long contentColor();
method public long getContainerColor();
property public final long ContainerColor;
- field public static final androidx.tv.material.TabRowDefaults INSTANCE;
+ field public static final androidx.tv.material3.TabRowDefaults INSTANCE;
}
public final class TabRowKt {
method @androidx.compose.runtime.Composable public static void TabRow(int selectedTabIndex, optional androidx.compose.ui.Modifier modifier, optional long containerColor, optional long contentColor, optional kotlin.jvm.functions.Function0<kotlin.Unit> separator, optional kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.ui.unit.DpRect>,kotlin.Unit> indicator, kotlin.jvm.functions.Function0<kotlin.Unit> tabs);
}
-}
-
-package androidx.tv.material.carousel {
-
- public final class CarouselItemKt {
+ public final class TextKt {
+ method @androidx.compose.runtime.Composable public static void ProvideTextStyle(androidx.compose.ui.text.TextStyle value, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Text(String text, optional androidx.compose.ui.Modifier modifier, optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional long letterSpacing, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional long lineHeight, optional int overflow, optional boolean softWrap, optional int maxLines, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.TextStyle style);
+ method @androidx.compose.runtime.Composable public static void Text(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional long letterSpacing, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional long lineHeight, optional int overflow, optional boolean softWrap, optional int maxLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.TextStyle style);
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.TextStyle> getLocalTextStyle();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.TextStyle> LocalTextStyle;
}
- public final class CarouselKt {
+ @androidx.compose.runtime.Immutable public final class Typography {
+ ctor public Typography(optional androidx.compose.ui.text.TextStyle displayLarge, optional androidx.compose.ui.text.TextStyle displayMedium, optional androidx.compose.ui.text.TextStyle displaySmall, optional androidx.compose.ui.text.TextStyle headlineLarge, optional androidx.compose.ui.text.TextStyle headlineMedium, optional androidx.compose.ui.text.TextStyle headlineSmall, optional androidx.compose.ui.text.TextStyle titleLarge, optional androidx.compose.ui.text.TextStyle titleMedium, optional androidx.compose.ui.text.TextStyle titleSmall, optional androidx.compose.ui.text.TextStyle bodyLarge, optional androidx.compose.ui.text.TextStyle bodyMedium, optional androidx.compose.ui.text.TextStyle bodySmall, optional androidx.compose.ui.text.TextStyle labelLarge, optional androidx.compose.ui.text.TextStyle labelMedium, optional androidx.compose.ui.text.TextStyle labelSmall);
+ method public androidx.tv.material3.Typography copy(optional androidx.compose.ui.text.TextStyle displayLarge, optional androidx.compose.ui.text.TextStyle displayMedium, optional androidx.compose.ui.text.TextStyle displaySmall, optional androidx.compose.ui.text.TextStyle headlineLarge, optional androidx.compose.ui.text.TextStyle headlineMedium, optional androidx.compose.ui.text.TextStyle headlineSmall, optional androidx.compose.ui.text.TextStyle titleLarge, optional androidx.compose.ui.text.TextStyle titleMedium, optional androidx.compose.ui.text.TextStyle titleSmall, optional androidx.compose.ui.text.TextStyle bodyLarge, optional androidx.compose.ui.text.TextStyle bodyMedium, optional androidx.compose.ui.text.TextStyle bodySmall, optional androidx.compose.ui.text.TextStyle labelLarge, optional androidx.compose.ui.text.TextStyle labelMedium, optional androidx.compose.ui.text.TextStyle labelSmall);
+ method public androidx.compose.ui.text.TextStyle getBodyLarge();
+ method public androidx.compose.ui.text.TextStyle getBodyMedium();
+ method public androidx.compose.ui.text.TextStyle getBodySmall();
+ method public androidx.compose.ui.text.TextStyle getDisplayLarge();
+ method public androidx.compose.ui.text.TextStyle getDisplayMedium();
+ method public androidx.compose.ui.text.TextStyle getDisplaySmall();
+ method public androidx.compose.ui.text.TextStyle getHeadlineLarge();
+ method public androidx.compose.ui.text.TextStyle getHeadlineMedium();
+ method public androidx.compose.ui.text.TextStyle getHeadlineSmall();
+ method public androidx.compose.ui.text.TextStyle getLabelLarge();
+ method public androidx.compose.ui.text.TextStyle getLabelMedium();
+ method public androidx.compose.ui.text.TextStyle getLabelSmall();
+ method public androidx.compose.ui.text.TextStyle getTitleLarge();
+ method public androidx.compose.ui.text.TextStyle getTitleMedium();
+ method public androidx.compose.ui.text.TextStyle getTitleSmall();
+ property public final androidx.compose.ui.text.TextStyle bodyLarge;
+ property public final androidx.compose.ui.text.TextStyle bodyMedium;
+ property public final androidx.compose.ui.text.TextStyle bodySmall;
+ property public final androidx.compose.ui.text.TextStyle displayLarge;
+ property public final androidx.compose.ui.text.TextStyle displayMedium;
+ property public final androidx.compose.ui.text.TextStyle displaySmall;
+ property public final androidx.compose.ui.text.TextStyle headlineLarge;
+ property public final androidx.compose.ui.text.TextStyle headlineMedium;
+ property public final androidx.compose.ui.text.TextStyle headlineSmall;
+ property public final androidx.compose.ui.text.TextStyle labelLarge;
+ property public final androidx.compose.ui.text.TextStyle labelMedium;
+ property public final androidx.compose.ui.text.TextStyle labelSmall;
+ property public final androidx.compose.ui.text.TextStyle titleLarge;
+ property public final androidx.compose.ui.text.TextStyle titleMedium;
+ property public final androidx.compose.ui.text.TextStyle titleSmall;
}
-}
-
-package androidx.tv.material.immersivelist {
-
- public final class ImmersiveListKt {
+ public final class TypographyKt {
}
}
diff --git a/tv/tv-material/src/androidTest/java/androidx/tv/material/carousel/CarouselItemTest.kt b/tv/tv-material/src/androidTest/java/androidx/tv/material/carousel/CarouselItemTest.kt
deleted file mode 100644
index 25d05ef..0000000
--- a/tv/tv-material/src/androidTest/java/androidx/tv/material/carousel/CarouselItemTest.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.tv.material.carousel
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.size
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.testTag
-import androidx.compose.ui.test.junit4.createComposeRule
-import androidx.compose.ui.test.onNodeWithTag
-import androidx.compose.ui.unit.dp
-import androidx.tv.material.ExperimentalTvMaterialApi
-import org.junit.Rule
-import org.junit.Test
-
-class CarouselItemTest {
- @get:Rule
- val rule = createComposeRule()
-
- @OptIn(ExperimentalTvMaterialApi::class)
- @Test
- fun carouselItem_overlayVisibleAfterRenderTime() {
- val overlayEnterTransitionStartDelay: Long = 2000
- val overlayTag = "overlay"
- val backgroundTag = "background"
- rule.setContent {
- CarouselItem(
- overlayEnterTransitionStartDelayMillis = overlayEnterTransitionStartDelay,
- background = {
- Box(
- Modifier
- .testTag(backgroundTag)
- .size(200.dp)
- .background(Color.Blue)) }) {
- Box(
- Modifier
- .testTag(overlayTag)
- .size(50.dp)
- .background(Color.Red))
- }
- }
-
- // only background is visible
- rule.onNodeWithTag(backgroundTag).assertExists()
- rule.onNodeWithTag(overlayTag).assertDoesNotExist()
-
- // advance clock by `overlayEnterTransitionStartDelay`
- rule.mainClock.advanceTimeBy(overlayEnterTransitionStartDelay)
-
- rule.onNodeWithTag(backgroundTag).assertExists()
- rule.onNodeWithTag(overlayTag).assertExists()
- }
-}
diff --git a/tv/tv-material/src/androidTest/java/androidx/tv/material3/CarouselItemTest.kt b/tv/tv-material/src/androidTest/java/androidx/tv/material3/CarouselItemTest.kt
new file mode 100644
index 0000000..bc41a0f
--- /dev/null
+++ b/tv/tv-material/src/androidTest/java/androidx/tv/material3/CarouselItemTest.kt
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.tv.material3
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.focusable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.text.BasicText
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.input.key.NativeKeyEvent
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.semantics.SemanticsActions
+import androidx.compose.ui.test.assertIsFocused
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.performSemanticsAction
+import androidx.compose.ui.unit.dp
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Rule
+import org.junit.Test
+
+class CarouselItemTest {
+ @get:Rule
+ val rule = createComposeRule()
+
+ @OptIn(ExperimentalTvMaterial3Api::class)
+ @Test
+ fun carouselItem_overlayVisibleAfterRenderTime() {
+ val overlayEnterTransitionStartDelay: Long = 2000
+ val overlayTag = "overlay"
+ val backgroundTag = "background"
+ rule.setContent {
+ CarouselItem(
+ overlayEnterTransitionStartDelayMillis = overlayEnterTransitionStartDelay,
+ background = {
+ Box(
+ Modifier
+ .testTag(backgroundTag)
+ .size(200.dp)
+ .background(Color.Blue)) }) {
+ Box(
+ Modifier
+ .testTag(overlayTag)
+ .size(50.dp)
+ .background(Color.Red))
+ }
+ }
+
+ // only background is visible
+ rule.onNodeWithTag(backgroundTag).assertExists()
+ rule.onNodeWithTag(overlayTag).assertDoesNotExist()
+
+ // advance clock by `overlayEnterTransitionStartDelay`
+ rule.mainClock.advanceTimeBy(overlayEnterTransitionStartDelay)
+
+ rule.onNodeWithTag(backgroundTag).assertExists()
+ rule.onNodeWithTag(overlayTag).assertExists()
+ }
+
+ @OptIn(ExperimentalTvMaterial3Api::class)
+ @Test
+ fun carouselItem_parentContainerGainsFocused_onBackPress() {
+ rule.setContent {
+ Box(modifier = Modifier
+ .testTag("box-container")
+ .fillMaxSize()
+ .focusable()) {
+ CarouselItem(
+ overlayEnterTransitionStartDelayMillis = 0,
+ modifier = Modifier.testTag("carousel-item"),
+ background = { Box(Modifier.size(300.dp).background(Color.Cyan)) }
+ ) {
+ SampleButton()
+ }
+ }
+ }
+
+ // Request focus for Carousel Item on start
+ rule.onNodeWithTag("carousel-item")
+ .performSemanticsAction(SemanticsActions.RequestFocus)
+ rule.waitForIdle()
+
+ // Check if overlay button in carousel item is focused
+ rule.onNodeWithTag("sample-button").assertIsFocused()
+
+ // Trigger back press
+ performKeyPress(NativeKeyEvent.KEYCODE_BACK)
+ rule.waitForIdle()
+
+ // Check if carousel item loses focus and parent container gains focus
+ rule.onNodeWithTag("box-container").assertIsFocused()
+ }
+
+ @Composable
+ private fun SampleButton(text: String = "sample-button") {
+ var isFocused by remember { mutableStateOf(false) }
+ BasicText(
+ text = text,
+ modifier = Modifier.testTag(text)
+ .size(100.dp, 20.dp)
+ .background(Color.Yellow)
+ .onFocusChanged { isFocused = it.isFocused }
+ .border(2.dp, if (isFocused) Color.Green else Color.Transparent)
+ .focusable()
+ )
+ }
+
+ private fun performKeyPress(keyCode: Int, count: Int = 1) {
+ repeat(count) {
+ InstrumentationRegistry.getInstrumentation().sendKeyDownUpSync(keyCode)
+ }
+ }
+}
diff --git a/tv/tv-material/src/androidTest/java/androidx/tv/material/carousel/CarouselTest.kt b/tv/tv-material/src/androidTest/java/androidx/tv/material3/CarouselTest.kt
similarity index 88%
rename from tv/tv-material/src/androidTest/java/androidx/tv/material/carousel/CarouselTest.kt
rename to tv/tv-material/src/androidTest/java/androidx/tv/material3/CarouselTest.kt
index a89cb06..2b0855f 100644
--- a/tv/tv-material/src/androidTest/java/androidx/tv/material/carousel/CarouselTest.kt
+++ b/tv/tv-material/src/androidTest/java/androidx/tv/material3/CarouselTest.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.tv.material.carousel
+package androidx.tv.material
import androidx.compose.foundation.background
import androidx.compose.foundation.border
@@ -61,7 +61,13 @@
import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.unit.dp
import androidx.test.platform.app.InstrumentationRegistry
-import androidx.tv.material.ExperimentalTvMaterialApi
+import androidx.tv.material3.Carousel
+import androidx.tv.material3.CarouselDefaults
+import androidx.tv.material3.CarouselItem
+import androidx.tv.material3.CarouselItemDefaults
+import androidx.tv.material3.CarouselState
+import androidx.tv.material3.ExperimentalTvMaterial3Api
+import androidx.tv.material3.ScrollPauseHandle
import com.google.common.truth.Truth.assertThat
import org.junit.Rule
import org.junit.Test
@@ -70,7 +76,7 @@
private const val animationTime = 900L
private const val overlayRenderWaitTime = 1500L
-@OptIn(ExperimentalTvMaterialApi::class)
+@OptIn(ExperimentalTvMaterial3Api::class)
class CarouselTest {
@get:Rule
val rule = createComposeRule()
@@ -326,6 +332,78 @@
}
@Test
+ fun carousel_parentContainerGainsFocus_onBackPress() {
+ rule.setContent {
+ Box(modifier = Modifier
+ .testTag("box-container")
+ .fillMaxSize()
+ .focusable()) {
+ SampleCarousel { index ->
+ SampleButton("Button-${index + 1}")
+ }
+ }
+ }
+
+ // Request focus for Carousel on start
+ rule.mainClock.autoAdvance = false
+ rule.onNodeWithTag("pager")
+ .performSemanticsAction(SemanticsActions.RequestFocus)
+
+ // Trigger recomposition after requesting focus
+ rule.mainClock.advanceTimeByFrame()
+ rule.waitForIdle()
+
+ // Check if the overlay button is focused
+ rule.onNodeWithText("Button-1").assertIsFocused()
+
+ // Trigger back press event to exit focus
+ performKeyPress(NativeKeyEvent.KEYCODE_BACK)
+ rule.mainClock.advanceTimeByFrame()
+ rule.waitForIdle()
+
+ // Check if carousel loses focus and parent container gains focus
+ rule.onNodeWithText("Button-1").assertIsNotFocused()
+ rule.onNodeWithTag("box-container").assertIsFocused()
+ }
+
+ @Test
+ fun carousel_withCarouselItem_parentContainerGainsFocus_onBackPress() {
+ rule.setContent {
+ Box(modifier = Modifier
+ .testTag("box-container")
+ .fillMaxSize()
+ .focusable()) {
+ SampleCarousel {
+ SampleCarouselSlide(index = it)
+ }
+ }
+ }
+
+ // Request focus for Carousel on start
+ rule.mainClock.autoAdvance = false
+ rule.onNodeWithTag("pager")
+ .performSemanticsAction(SemanticsActions.RequestFocus)
+
+ // Trigger recomposition after requesting focus and advance time to finish animations
+ rule.mainClock.advanceTimeByFrame()
+ rule.waitForIdle()
+ rule.mainClock.advanceTimeBy(animationTime + overlayRenderWaitTime, false)
+ rule.waitForIdle()
+
+ // Check if the overlay button is focused
+ rule.onNodeWithText("Play 0").assertIsFocused()
+
+ // Trigger back press event to exit focus
+ performKeyPress(NativeKeyEvent.KEYCODE_BACK)
+ rule.mainClock.advanceTimeByFrame()
+ rule.waitForIdle()
+
+ // Check if carousel loses focus and parent container gains focus
+ rule.onNodeWithText("Play 0").assertIsNotFocused()
+ rule.onNodeWithTag("box-container").assertIsFocused()
+ }
+
+ @Test
fun carousel_scrollToRegainFocus_checkBringIntoView() {
val focusRequester = FocusRequester()
rule.setContent {
@@ -589,7 +667,7 @@
}
}
-@OptIn(ExperimentalTvMaterialApi::class)
+@OptIn(ExperimentalTvMaterial3Api::class)
@Composable
private fun SampleCarousel(
carouselState: CarouselState = remember { CarouselState() },
@@ -620,7 +698,7 @@
)
}
-@OptIn(ExperimentalTvMaterialApi::class)
+@OptIn(ExperimentalTvMaterial3Api::class)
@Composable
private fun SampleCarouselSlide(
index: Int,
@@ -671,7 +749,7 @@
}
private fun performKeyPress(keyCode: Int, count: Int = 1) {
- for (i in 1..count) {
+ repeat(count) {
InstrumentationRegistry
.getInstrumentation()
.sendKeyDownUpSync(keyCode)
diff --git a/tv/tv-material/src/androidTest/java/androidx/tv/material/immersivelist/ImmersiveListTest.kt b/tv/tv-material/src/androidTest/java/androidx/tv/material3/ImmersiveListTest.kt
similarity index 85%
rename from tv/tv-material/src/androidTest/java/androidx/tv/material/immersivelist/ImmersiveListTest.kt
rename to tv/tv-material/src/androidTest/java/androidx/tv/material3/ImmersiveListTest.kt
index d128958..cf85887 100644
--- a/tv/tv-material/src/androidTest/java/androidx/tv/material/immersivelist/ImmersiveListTest.kt
+++ b/tv/tv-material/src/androidTest/java/androidx/tv/material3/ImmersiveListTest.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2023 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,9 +14,10 @@
* limitations under the License.
*/
-package androidx.tv.material.immersivelist
+package androidx.tv.material3
import androidx.compose.animation.ExperimentalAnimationApi
+import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.focusable
import androidx.compose.foundation.layout.Box
@@ -26,25 +27,30 @@
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.text.BasicText
import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.onFocusChanged
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.RectangleShape
import androidx.compose.ui.input.key.NativeKeyEvent
import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.semantics.SemanticsActions
import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.assertIsFocused
import androidx.compose.ui.test.getUnclippedBoundsInRoot
import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.onNodeWithTag
import androidx.compose.ui.test.onRoot
+import androidx.compose.ui.test.performSemanticsAction
import androidx.compose.ui.unit.dp
import androidx.test.platform.app.InstrumentationRegistry
import androidx.tv.foundation.lazy.list.TvLazyColumn
import androidx.tv.foundation.lazy.list.TvLazyRow
-import androidx.tv.material.ExperimentalTvMaterialApi
import com.google.common.truth.Truth.assertThat
import org.junit.Rule
import org.junit.Test
@@ -53,43 +59,46 @@
@get:Rule
val rule = createComposeRule()
- @OptIn(ExperimentalTvMaterialApi::class, ExperimentalAnimationApi::class)
+ @OptIn(ExperimentalTvMaterial3Api::class, ExperimentalAnimationApi::class)
@Test
fun immersiveList_scroll_backgroundChanges() {
- val firstCard = FocusRequester()
- val secondCard = FocusRequester()
-
rule.setContent {
ImmersiveList(
background = { index, _ ->
AnimatedContent(targetState = index) {
Box(
- Modifier
+ modifier = Modifier
.testTag("background-$it")
- .size(200.dp)) {
+ .size(200.dp)
+ ) {
BasicText("background-$it")
}
}
}) {
TvLazyRow {
items(3) { index ->
- var modifier = Modifier
- .testTag("card-$index")
- .size(100.dp)
- when (index) {
- 0 -> modifier = modifier
- .focusRequester(firstCard)
- 1 -> modifier = modifier
- .focusRequester(secondCard)
- }
+ var isFocused by remember { mutableStateOf(false) }
- Box(modifier.focusableItem(index)) { BasicText("card-$index") }
+ Box(
+ modifier = Modifier
+ .size(100.dp)
+ .testTag("card-$index")
+ .background(if (isFocused) Color.Red else Color.Transparent)
+ .size(100.dp)
+ .onFocusChanged { isFocused = it.isFocused }
+ .immersiveListItem(index)
+ .focusable(true)
+ ) {
+ BasicText("card-$index")
+ }
}
}
}
}
- rule.runOnIdle { firstCard.requestFocus() }
+ rule.waitForIdle()
+ rule.onNodeWithTag("card-0").performSemanticsAction(SemanticsActions.RequestFocus)
+ rule.waitForIdle()
rule.onNodeWithTag("card-0").assertIsFocused()
rule.onNodeWithTag("background-0").assertIsDisplayed()
@@ -247,7 +256,7 @@
rule.runOnIdle { focusRequester.requestFocus() }
}
- @OptIn(ExperimentalTvMaterialApi::class, ExperimentalAnimationApi::class)
+ @OptIn(ExperimentalTvMaterial3Api::class, ExperimentalAnimationApi::class)
@Composable
private fun TestImmersiveList(focusRequesterList: List<FocusRequester>) {
val frList = remember { focusRequesterList }
@@ -275,7 +284,12 @@
for (item in frList) {
modifier = modifier.focusRequester(frList[index])
}
- Box(modifier.focusableItem(index)) { BasicText("list-card-$index") }
+ Box(
+ modifier
+ .immersiveListItem(index)
+ .focusable(true)) {
+ BasicText("list-card-$index")
+ }
}
}
}
@@ -285,4 +299,4 @@
for (index in 0 until numberOfPresses)
InstrumentationRegistry.getInstrumentation().sendKeyDownUpSync(keyCode)
}
-}
\ No newline at end of file
+}
diff --git a/tv/tv-material/src/androidTest/java/androidx/tv/material/TabRowTest.kt b/tv/tv-material/src/androidTest/java/androidx/tv/material3/TabRowTest.kt
similarity index 99%
rename from tv/tv-material/src/androidTest/java/androidx/tv/material/TabRowTest.kt
rename to tv/tv-material/src/androidTest/java/androidx/tv/material3/TabRowTest.kt
index 7698c60..0a835b2 100644
--- a/tv/tv-material/src/androidTest/java/androidx/tv/material/TabRowTest.kt
+++ b/tv/tv-material/src/androidTest/java/androidx/tv/material3/TabRowTest.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.tv.material
+package androidx.tv.material3
import androidx.compose.foundation.background
import androidx.compose.foundation.border
diff --git a/tv/tv-material/src/androidTest/java/androidx/tv/material3/TextTest.kt b/tv/tv-material/src/androidTest/java/androidx/tv/material3/TextTest.kt
new file mode 100644
index 0000000..5293277
--- /dev/null
+++ b/tv/tv-material/src/androidTest/java/androidx/tv/material3/TextTest.kt
@@ -0,0 +1,245 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.tv.material3
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.semantics.SemanticsActions
+import androidx.compose.ui.test.assertTextEquals
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.performSemanticsAction
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.em
+import androidx.compose.ui.unit.sp
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.MediumTest
+import com.google.common.truth.Truth
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@MediumTest
+@RunWith(AndroidJUnit4::class)
+class TextTest {
+
+ @get:Rule
+ val rule = createComposeRule()
+
+ private val ExpectedTextStyle = TextStyle(
+ color = Color.Blue,
+ textAlign = TextAlign.End,
+ fontSize = 32.sp,
+ fontStyle = FontStyle.Italic,
+ letterSpacing = 0.3.em
+ )
+
+ private val TestText = "TestText"
+
+ @Test
+ fun inheritsThemeTextStyle() {
+ var textColor: Color? = null
+ var textAlign: TextAlign? = null
+ var fontSize: TextUnit? = null
+ var fontStyle: FontStyle? = null
+ var letterSpacing: TextUnit? = null
+ rule.setContent {
+ ProvideTextStyle(ExpectedTextStyle) {
+ Box(Modifier.background(Color.White)) {
+ Text(
+ TestText,
+ >
+ textColor = it.layoutInput.style.color
+ textAlign = it.layoutInput.style.textAlign
+ fontSize = it.layoutInput.style.fontSize
+ fontStyle = it.layoutInput.style.fontStyle
+ letterSpacing = it.layoutInput.style.letterSpacing
+ }
+ )
+ }
+ }
+ }
+
+ rule.runOnIdle {
+ Truth.assertThat(textColor).isEqualTo(ExpectedTextStyle.color)
+ Truth.assertThat(textAlign).isEqualTo(ExpectedTextStyle.textAlign)
+ Truth.assertThat(fontSize).isEqualTo(ExpectedTextStyle.fontSize)
+ Truth.assertThat(fontStyle).isEqualTo(ExpectedTextStyle.fontStyle)
+ Truth.assertThat(letterSpacing).isEqualTo(ExpectedTextStyle.letterSpacing)
+ }
+ }
+
+ @Test
+ fun settingCustomTextStyle() {
+ var textColor: Color? = null
+ var textAlign: TextAlign? = null
+ var fontSize: TextUnit? = null
+ var fontStyle: FontStyle? = null
+ var letterSpacing: TextUnit? = null
+ val testStyle = TextStyle(
+ color = Color.Green,
+ textAlign = TextAlign.Center,
+ fontSize = 16.sp,
+ fontStyle = FontStyle.Normal,
+ letterSpacing = 0.6.em
+ )
+ rule.setContent {
+ ProvideTextStyle(ExpectedTextStyle) {
+ Box(Modifier.background(Color.White)) {
+ Text(
+ TestText,
+ style = testStyle,
+ >
+ textColor = it.layoutInput.style.color
+ textAlign = it.layoutInput.style.textAlign
+ fontSize = it.layoutInput.style.fontSize
+ fontStyle = it.layoutInput.style.fontStyle
+ letterSpacing = it.layoutInput.style.letterSpacing
+ }
+ )
+ }
+ }
+ }
+
+ rule.runOnIdle {
+ Truth.assertThat(textColor).isEqualTo(testStyle.color)
+ Truth.assertThat(textAlign).isEqualTo(testStyle.textAlign)
+ Truth.assertThat(fontSize).isEqualTo(testStyle.fontSize)
+ Truth.assertThat(fontStyle).isEqualTo(testStyle.fontStyle)
+ Truth.assertThat(letterSpacing).isEqualTo(testStyle.letterSpacing)
+ }
+ }
+
+ @Test
+ fun settingParametersExplicitly() {
+ var textColor: Color? = null
+ var textAlign: TextAlign? = null
+ var fontSize: TextUnit? = null
+ var fontStyle: FontStyle? = null
+ var letterSpacing: TextUnit? = null
+ val expectedColor = Color.Green
+ val expectedTextAlign = TextAlign.Center
+ val expectedFontSize = 16.sp
+ val expectedFontStyle = FontStyle.Normal
+ val expectedLetterSpacing = 0.6.em
+
+ rule.setContent {
+ ProvideTextStyle(ExpectedTextStyle) {
+ Box(Modifier.background(Color.White)) {
+ Text(
+ TestText,
+ color = expectedColor,
+ textAlign = expectedTextAlign,
+ fontSize = expectedFontSize,
+ fontStyle = expectedFontStyle,
+ letterSpacing = expectedLetterSpacing,
+ >
+ textColor = it.layoutInput.style.color
+ textAlign = it.layoutInput.style.textAlign
+ fontSize = it.layoutInput.style.fontSize
+ fontStyle = it.layoutInput.style.fontStyle
+ letterSpacing = it.layoutInput.style.letterSpacing
+ }
+ )
+ }
+ }
+ }
+
+ rule.runOnIdle {
+ // explicit parameters should override values from the style.
+ Truth.assertThat(textColor).isEqualTo(expectedColor)
+ Truth.assertThat(textAlign).isEqualTo(expectedTextAlign)
+ Truth.assertThat(fontSize).isEqualTo(expectedFontSize)
+ Truth.assertThat(fontStyle).isEqualTo(expectedFontStyle)
+ Truth.assertThat(letterSpacing).isEqualTo(expectedLetterSpacing)
+ }
+ }
+
+ // Not really an expected use-case, but we should ensure the behavior here is consistent.
+ @Test
+ fun settingColorAndTextStyle() {
+ var textColor: Color? = null
+ var textAlign: TextAlign? = null
+ var fontSize: TextUnit? = null
+ var fontStyle: FontStyle? = null
+ var letterSpacing: TextUnit? = null
+ val expectedColor = Color.Green
+ val expectedTextAlign = TextAlign.Center
+ val expectedFontSize = 16.sp
+ val expectedFontStyle = FontStyle.Normal
+ val expectedLetterSpacing = 0.6.em
+ rule.setContent {
+ ProvideTextStyle(ExpectedTextStyle) {
+ Box(Modifier.background(Color.White)) {
+ // Set both color and style
+ Text(
+ TestText,
+ color = expectedColor,
+ textAlign = expectedTextAlign,
+ fontSize = expectedFontSize,
+ fontStyle = expectedFontStyle,
+ letterSpacing = expectedLetterSpacing,
+ style = ExpectedTextStyle,
+ >
+ textColor = it.layoutInput.style.color
+ textAlign = it.layoutInput.style.textAlign
+ fontSize = it.layoutInput.style.fontSize
+ fontStyle = it.layoutInput.style.fontStyle
+ letterSpacing = it.layoutInput.style.letterSpacing
+ }
+ )
+ }
+ }
+ }
+
+ rule.runOnIdle {
+ // explicit parameters should override values from the style.
+ Truth.assertThat(textColor).isEqualTo(expectedColor)
+ Truth.assertThat(textAlign).isEqualTo(expectedTextAlign)
+ Truth.assertThat(fontSize).isEqualTo(expectedFontSize)
+ Truth.assertThat(fontStyle).isEqualTo(expectedFontStyle)
+ Truth.assertThat(letterSpacing).isEqualTo(expectedLetterSpacing)
+ }
+ }
+
+ @Test
+ fun testSemantics() {
+ rule.setContent {
+ ProvideTextStyle(ExpectedTextStyle) {
+ Box(Modifier.background(Color.White)) {
+ Text(
+ TestText,
+ modifier = Modifier.testTag("text")
+ )
+ }
+ }
+ }
+
+ val textLayoutResults = mutableListOf<TextLayoutResult>()
+ rule.onNodeWithTag("text")
+ .assertTextEquals(TestText)
+ .performSemanticsAction(SemanticsActions.GetTextLayoutResult) { it(textLayoutResults) }
+ assert(textLayoutResults.size == 1) { "TextLayoutResult is null" }
+ }
+}
diff --git a/tv/tv-material/src/main/java/androidx/tv/material/BringIntoViewIfChildrenAreFocused.kt b/tv/tv-material/src/main/java/androidx/tv/material3/BringIntoViewIfChildrenAreFocused.kt
similarity index 96%
rename from tv/tv-material/src/main/java/androidx/tv/material/BringIntoViewIfChildrenAreFocused.kt
rename to tv/tv-material/src/main/java/androidx/tv/material3/BringIntoViewIfChildrenAreFocused.kt
index 0c4e5a8..b973bb7 100644
--- a/tv/tv-material/src/main/java/androidx/tv/material/BringIntoViewIfChildrenAreFocused.kt
+++ b/tv/tv-material/src/main/java/androidx/tv/material3/BringIntoViewIfChildrenAreFocused.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2023 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.tv.material
+package androidx.tv.material3
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.relocation.BringIntoViewResponder
diff --git a/tv/tv-material/src/main/java/androidx/tv/material/carousel/Carousel.kt b/tv/tv-material/src/main/java/androidx/tv/material3/Carousel.kt
similarity index 92%
rename from tv/tv-material/src/main/java/androidx/tv/material/carousel/Carousel.kt
rename to tv/tv-material/src/main/java/androidx/tv/material3/Carousel.kt
index de7a1b3..d4b5887 100644
--- a/tv/tv-material/src/main/java/androidx/tv/material/carousel/Carousel.kt
+++ b/tv/tv-material/src/main/java/androidx/tv/material3/Carousel.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2023 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,8 +14,9 @@
* limitations under the License.
*/
-package androidx.tv.material.carousel
+package androidx.tv.material3
+import android.view.KeyEvent.KEYCODE_BACK
import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.AnimatedVisibilityScope
import androidx.compose.animation.EnterTransition
@@ -53,13 +54,16 @@
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.focus.onFocusChanged
import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.input.key.KeyEventType.Companion.KeyDown
+import androidx.compose.ui.input.key.key
+import androidx.compose.ui.input.key.nativeKeyCode
+import androidx.compose.ui.input.key.onKeyEvent
+import androidx.compose.ui.input.key.type
import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.platform.LocalLayoutDirection
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.unit.dp
-import androidx.tv.material.ExperimentalTvMaterialApi
-import androidx.tv.material.bringIntoViewIfChildrenAreFocused
import java.lang.Math.floorMod
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.first
@@ -72,6 +76,7 @@
* @sample androidx.tv.samples.SimpleCarousel
* @sample androidx.tv.samples.CarouselIndicatorWithRectangleShape
*
+ * @param modifier Modifier applied to the Carousel.
* @param slideCount total number of slides present in the carousel.
* @param carouselState state associated with this carousel.
* @param timeToDisplaySlideMillis duration for which slide should be visible before moving to
@@ -84,7 +89,7 @@
@Suppress("IllegalExperimentalApiUsage")
@OptIn(ExperimentalComposeUiApi::class, ExperimentalAnimationApi::class)
-@ExperimentalTvMaterialApi
+@ExperimentalTvMaterial3Api
@Composable
fun Carousel(
slideCount: Int,
@@ -122,6 +127,12 @@
Box(modifier = modifier
.bringIntoViewIfChildrenAreFocused()
.focusRequester(carouselOuterBoxFocusRequester)
+ .onKeyEvent {
+ if (it.key.nativeKeyCode == KEYCODE_BACK && it.type == KeyDown) {
+ focusManager.moveFocus(FocusDirection.Exit)
+ }
+ false
+ }
.onFocusChanged {
focusState = it
if (it.isFocused && isAutoScrollActive) {
@@ -155,7 +166,7 @@
action.invoke()
}
-@OptIn(ExperimentalTvMaterialApi::class)
+@OptIn(ExperimentalTvMaterial3Api::class)
@Composable
private fun AutoScrollSideEffect(
timeToDisplaySlideMillis: Long,
@@ -187,7 +198,7 @@
}
@Suppress("IllegalExperimentalApiUsage")
-@OptIn(ExperimentalTvMaterialApi::class, ExperimentalComposeUiApi::class)
+@OptIn(ExperimentalTvMaterial3Api::class, ExperimentalComposeUiApi::class)
private fun Modifier.manualScrolling(
carouselState: CarouselState,
slideCount: Int,
@@ -233,7 +244,7 @@
}
}
-@OptIn(ExperimentalTvMaterialApi::class)
+@OptIn(ExperimentalTvMaterial3Api::class)
@Composable
private fun CarouselStateUpdater(carouselState: CarouselState, slideCount: Int) {
LaunchedEffect(carouselState, slideCount) {
@@ -252,7 +263,7 @@
* @param initialActiveSlideIndex the index of the first active slide
*/
@Stable
-@ExperimentalTvMaterialApi
+@ExperimentalTvMaterial3Api
class CarouselState(initialActiveSlideIndex: Int = 0) {
internal var activePauseHandlesCount by mutableStateOf(0)
@@ -295,7 +306,7 @@
}
}
-@ExperimentalTvMaterialApi
+@ExperimentalTvMaterial3Api
/**
* Handle returned by [CarouselState.pauseAutoScroll] that can be used to resume auto-scroll.
*/
@@ -306,7 +317,7 @@
fun resumeAutoScroll()
}
-@OptIn(ExperimentalTvMaterialApi::class)
+@OptIn(ExperimentalTvMaterial3Api::class)
internal object NoOpScrollPauseHandle : ScrollPauseHandle {
/**
* Resumes the auto-scroll behaviour if there are no other active [ScrollPauseHandle]s.
@@ -314,7 +325,7 @@
override fun resumeAutoScroll() {}
}
-@OptIn(ExperimentalTvMaterialApi::class)
+@OptIn(ExperimentalTvMaterial3Api::class)
internal class ScrollPauseHandleImpl(private val carouselState: CarouselState) : ScrollPauseHandle {
private var active by mutableStateOf(true)
init {
@@ -331,7 +342,7 @@
}
}
-@ExperimentalTvMaterialApi
+@ExperimentalTvMaterial3Api
object CarouselDefaults {
/**
* Default time for which the slide is visible to the user.
@@ -358,7 +369,7 @@
* @param spacing spacing between the indicator dots
* @param indicator indicator dot representing each slide in the carousel
*/
- @ExperimentalTvMaterialApi
+ @ExperimentalTvMaterial3Api
@Composable
fun IndicatorRow(
slideCount: Int,
diff --git a/tv/tv-material/src/main/java/androidx/tv/material/carousel/CarouselItem.kt b/tv/tv-material/src/main/java/androidx/tv/material3/CarouselItem.kt
similarity index 83%
rename from tv/tv-material/src/main/java/androidx/tv/material/carousel/CarouselItem.kt
rename to tv/tv-material/src/main/java/androidx/tv/material3/CarouselItem.kt
index c39c68b..0b10e6f 100644
--- a/tv/tv-material/src/main/java/androidx/tv/material/carousel/CarouselItem.kt
+++ b/tv/tv-material/src/main/java/androidx/tv/material3/CarouselItem.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2023 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,8 +14,9 @@
* limitations under the License.
*/
-package androidx.tv.material.carousel
+package androidx.tv.material3
+import android.view.KeyEvent
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.EnterTransition
import androidx.compose.animation.ExitTransition
@@ -37,8 +38,12 @@
import androidx.compose.ui.focus.FocusDirection
import androidx.compose.ui.focus.FocusState
import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.input.key.KeyEventType.Companion.KeyDown
+import androidx.compose.ui.input.key.key
+import androidx.compose.ui.input.key.nativeKeyCode
+import androidx.compose.ui.input.key.onKeyEvent
+import androidx.compose.ui.input.key.type
import androidx.compose.ui.platform.LocalFocusManager
-import androidx.tv.material.ExperimentalTvMaterialApi
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.first
@@ -49,6 +54,7 @@
* - an [overlay] layer that is rendered after a delay of
* [overlayEnterTransitionStartDelayMillis].
*
+ * @param modifier modifier applied to the CarouselItem.
* @param overlayEnterTransitionStartDelayMillis time between the rendering of the
* background and the overlay.
* @param overlayEnterTransition animation used to bring the overlay into view.
@@ -58,7 +64,7 @@
*/
@Suppress("IllegalExperimentalApiUsage")
@OptIn(ExperimentalComposeUiApi::class)
-@ExperimentalTvMaterialApi
+@ExperimentalTvMaterial3Api
@Composable
fun CarouselItem(
background: @Composable () -> Unit,
@@ -72,6 +78,7 @@
val overlayVisible = remember { MutableTransitionState(initialState = false) }
var focusState: FocusState? by remember { mutableStateOf(null) }
val focusManager = LocalFocusManager.current
+ var exitFocus by remember { mutableStateOf(false) }
LaunchedEffect(overlayVisible) {
overlayVisible.onAnimationCompletion {
@@ -81,9 +88,16 @@
}
Box(modifier = modifier
+ .onKeyEvent {
+ exitFocus = it.key.nativeKeyCode == KeyEvent.KEYCODE_BACK && it.type == KeyDown
+ false
+ }
.onFocusChanged {
focusState = it
- if (it.isFocused && overlayVisible.isIdle && overlayVisible.currentState) {
+ if (it.isFocused && exitFocus) {
+ focusManager.moveFocus(FocusDirection.Exit)
+ exitFocus = false
+ } else if (it.isFocused && overlayVisible.isIdle && overlayVisible.currentState) {
focusManager.moveFocus(FocusDirection.Enter)
}
}
@@ -99,13 +113,7 @@
AnimatedVisibility(
modifier = Modifier
- .align(Alignment.BottomStart)
- .onFocusChanged {
- if (it.isFocused) {
- focusManager.moveFocus(FocusDirection.Enter)
- }
- }
- .focusable(),
+ .align(Alignment.BottomStart),
visibleState = overlayVisible,
enter = overlayEnterTransition,
exit = overlayExitTransition
@@ -122,7 +130,7 @@
action.invoke()
}
-@ExperimentalTvMaterialApi
+@ExperimentalTvMaterial3Api
object CarouselItemDefaults {
/**
* Default delay between the background being rendered and the overlay being rendered.
diff --git a/tv/tv-material/src/main/java/androidx/tv/material3/ColorScheme.kt b/tv/tv-material/src/main/java/androidx/tv/material3/ColorScheme.kt
new file mode 100644
index 0000000..257754a
--- /dev/null
+++ b/tv/tv-material/src/main/java/androidx/tv/material3/ColorScheme.kt
@@ -0,0 +1,625 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.tv.material3
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.ReadOnlyComposable
+import androidx.compose.runtime.Stable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.runtime.structuralEqualityPolicy
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.compositeOver
+import androidx.compose.ui.graphics.takeOrElse
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import androidx.tv.material3.tokens.ColorDarkTokens
+import androidx.tv.material3.tokens.ColorLightTokens
+import androidx.tv.material3.tokens.ColorSchemeKeyTokens
+import kotlin.math.ln
+
+/**
+ * Returns a light Material color scheme.
+ */
+@ExperimentalTvMaterial3Api
+fun lightColorScheme(
+ primary: Color = ColorLightTokens.Primary,
+ onPrimary: Color = ColorLightTokens.OnPrimary,
+ primaryContainer: Color = ColorLightTokens.PrimaryContainer,
+ onPrimaryContainer: Color = ColorLightTokens.OnPrimaryContainer,
+ inversePrimary: Color = ColorLightTokens.InversePrimary,
+ secondary: Color = ColorLightTokens.Secondary,
+ onSecondary: Color = ColorLightTokens.OnSecondary,
+ secondaryContainer: Color = ColorLightTokens.SecondaryContainer,
+ onSecondaryContainer: Color = ColorLightTokens.OnSecondaryContainer,
+ tertiary: Color = ColorLightTokens.Tertiary,
+ onTertiary: Color = ColorLightTokens.OnTertiary,
+ tertiaryContainer: Color = ColorLightTokens.TertiaryContainer,
+ onTertiaryContainer: Color = ColorLightTokens.OnTertiaryContainer,
+ background: Color = ColorLightTokens.Background,
+ onBackground: Color = ColorLightTokens.OnBackground,
+ surface: Color = ColorLightTokens.Surface,
+ onSurface: Color = ColorLightTokens.OnSurface,
+ surfaceVariant: Color = ColorLightTokens.SurfaceVariant,
+ onSurfaceVariant: Color = ColorLightTokens.OnSurfaceVariant,
+ surfaceTint: Color = primary,
+ inverseSurface: Color = ColorLightTokens.InverseSurface,
+ inverseOnSurface: Color = ColorLightTokens.InverseOnSurface,
+ error: Color = ColorLightTokens.Error,
+ onError: Color = ColorLightTokens.OnError,
+ errorContainer: Color = ColorLightTokens.ErrorContainer,
+ onErrorContainer: Color = ColorLightTokens.OnErrorContainer,
+ outline: Color = ColorLightTokens.Outline,
+ outlineVariant: Color = ColorLightTokens.OutlineVariant,
+ scrim: Color = ColorLightTokens.Scrim
+): ColorScheme =
+ ColorScheme(
+ primary = primary,
+ >
+ primaryContainer = primaryContainer,
+ >
+ inversePrimary = inversePrimary,
+ secondary = secondary,
+ >
+ secondaryContainer = secondaryContainer,
+ >
+ tertiary = tertiary,
+ >
+ tertiaryContainer = tertiaryContainer,
+ >
+ background = background,
+ >
+ surface = surface,
+ >
+ surfaceVariant = surfaceVariant,
+ >
+ surfaceTint = surfaceTint,
+ inverseSurface = inverseSurface,
+ inverseOnSurface = inverseOnSurface,
+ error = error,
+ >
+ errorContainer = errorContainer,
+ >
+ outline = outline,
+ outlineVariant = outlineVariant,
+ scrim = scrim
+ )
+
+/**
+ * A color scheme holds all the named color parameters for a [MaterialTheme].
+ *
+ * Color schemes are designed to be harmonious, ensure accessible text, and distinguish UI
+ * elements and surfaces from one another. There are two built-in baseline schemes,
+ * [lightColorScheme] and a [darkColorScheme], that can be used as-is or customized.
+ *
+ * The Material color system and custom schemes provide default values for color as a starting point
+ * for customization.
+ *
+ * To learn more about colors, see [Material Design colors](https://m3.material.io/styles/color/overview).
+ *
+ * @property primary The primary color is the color displayed most frequently across your app’s
+ * screens and components.
+ * @property onPrimary Color used for text and icons displayed on top of the primary color.
+ * @property primaryContainer The preferred tonal color of containers.
+ * @property onPrimaryContainer The color (and state variants) that should be used for content on
+ * top of [primaryContainer].
+ * @property inversePrimary Color to be used as a "primary" color in places where the inverse color
+ * scheme is needed, such as the button on a SnackBar.
+ * @property secondary The secondary color provides more ways to accent and distinguish your
+ * product. Secondary colors are best for:
+ * - Floating action buttons
+ * - Selection controls, like checkboxes and radio buttons
+ * - Highlighting selected text
+ * - Links and headlines
+ * @property onSecondary Color used for text and icons displayed on top of the secondary color.
+ * @property secondaryContainer A tonal color to be used in containers.
+ * @property onSecondaryContainer The color (and state variants) that should be used for content on
+ * top of [secondaryContainer].
+ * @property tertiary The tertiary color that can be used to balance primary and secondary
+ * colors, or bring heightened attention to an element such as an input field.
+ * @property onTertiary Color used for text and icons displayed on top of the tertiary color.
+ * @property tertiaryContainer A tonal color to be used in containers.
+ * @property onTertiaryContainer The color (and state variants) that should be used for content on
+ * top of [tertiaryContainer].
+ * @property background The background color that appears behind scrollable content.
+ * @property onBackground Color used for text and icons displayed on top of the background color.
+ * @property surface The surface color that affect surfaces of components, such as cards, sheets,
+ * and menus.
+ * @property onSurface Color used for text and icons displayed on top of the surface color.
+ * @property surfaceVariant Another option for a color with similar uses of [surface].
+ * @property onSurfaceVariant The color (and state variants) that can be used for content on top of
+ * [surface].
+ * @property surfaceTint This color will be used by components that apply tonal elevation and is
+ * applied on top of [surface]. The higher the elevation the more this color is used.
+ * @property inverseSurface A color that contrasts sharply with [surface]. Useful for surfaces that
+ * sit on top of other surfaces with [surface] color.
+ * @property inverseOnSurface A color that contrasts well with [inverseSurface]. Useful for content
+ * that sits on top of containers that are [inverseSurface].
+ * @property error The error color is used to indicate errors in components, such as invalid text in
+ * a text field.
+ * @property onError Color used for text and icons displayed on top of the error color.
+ * @property errorContainer The preferred tonal color of error containers.
+ * @property onErrorContainer The color (and state variants) that should be used for content on
+ * top of [errorContainer].
+ * @property outline Subtle color used for boundaries. Outline color role adds contrast for
+ * accessibility purposes.
+ * @property outlineVariant Utility color used for boundaries for decorative elements when strong
+ * contrast is not required.
+ * @property scrim Color of a scrim that obscures content.
+ */
+@ExperimentalTvMaterial3Api
+@Stable
+class ColorScheme(
+ primary: Color,
+ onPrimary: Color,
+ primaryContainer: Color,
+ onPrimaryContainer: Color,
+ inversePrimary: Color,
+ secondary: Color,
+ onSecondary: Color,
+ secondaryContainer: Color,
+ onSecondaryContainer: Color,
+ tertiary: Color,
+ onTertiary: Color,
+ tertiaryContainer: Color,
+ onTertiaryContainer: Color,
+ background: Color,
+ onBackground: Color,
+ surface: Color,
+ onSurface: Color,
+ surfaceVariant: Color,
+ onSurfaceVariant: Color,
+ surfaceTint: Color,
+ inverseSurface: Color,
+ inverseOnSurface: Color,
+ error: Color,
+ onError: Color,
+ errorContainer: Color,
+ onErrorContainer: Color,
+ outline: Color,
+ outlineVariant: Color,
+ scrim: Color
+) {
+ var primary by mutableStateOf(primary, structuralEqualityPolicy())
+ internal set
+ var onPrimary by mutableStateOf(onPrimary, structuralEqualityPolicy())
+ internal set
+ var primaryContainer by mutableStateOf(primaryContainer, structuralEqualityPolicy())
+ internal set
+ var onPrimaryContainer by mutableStateOf(onPrimaryContainer, structuralEqualityPolicy())
+ internal set
+ var inversePrimary by mutableStateOf(inversePrimary, structuralEqualityPolicy())
+ internal set
+ var secondary by mutableStateOf(secondary, structuralEqualityPolicy())
+ internal set
+ var onSecondary by mutableStateOf(onSecondary, structuralEqualityPolicy())
+ internal set
+ var secondaryContainer by mutableStateOf(secondaryContainer, structuralEqualityPolicy())
+ internal set
+ var onSecondaryContainer by mutableStateOf(onSecondaryContainer, structuralEqualityPolicy())
+ internal set
+ var tertiary by mutableStateOf(tertiary, structuralEqualityPolicy())
+ internal set
+ var onTertiary by mutableStateOf(onTertiary, structuralEqualityPolicy())
+ internal set
+ var tertiaryContainer by mutableStateOf(tertiaryContainer, structuralEqualityPolicy())
+ internal set
+ var onTertiaryContainer by mutableStateOf(onTertiaryContainer, structuralEqualityPolicy())
+ internal set
+ var background by mutableStateOf(background, structuralEqualityPolicy())
+ internal set
+ var onBackground by mutableStateOf(onBackground, structuralEqualityPolicy())
+ internal set
+ var surface by mutableStateOf(surface, structuralEqualityPolicy())
+ internal set
+ var onSurface by mutableStateOf(onSurface, structuralEqualityPolicy())
+ internal set
+ var surfaceVariant by mutableStateOf(surfaceVariant, structuralEqualityPolicy())
+ internal set
+ var onSurfaceVariant by mutableStateOf(onSurfaceVariant, structuralEqualityPolicy())
+ internal set
+ var surfaceTint by mutableStateOf(surfaceTint, structuralEqualityPolicy())
+ internal set
+ var inverseSurface by mutableStateOf(inverseSurface, structuralEqualityPolicy())
+ internal set
+ var inverseOnSurface by mutableStateOf(inverseOnSurface, structuralEqualityPolicy())
+ internal set
+ var error by mutableStateOf(error, structuralEqualityPolicy())
+ internal set
+ var onError by mutableStateOf(onError, structuralEqualityPolicy())
+ internal set
+ var errorContainer by mutableStateOf(errorContainer, structuralEqualityPolicy())
+ internal set
+ var onErrorContainer by mutableStateOf(onErrorContainer, structuralEqualityPolicy())
+ internal set
+ var outline by mutableStateOf(outline, structuralEqualityPolicy())
+ internal set
+ var outlineVariant by mutableStateOf(outlineVariant, structuralEqualityPolicy())
+ internal set
+ var scrim by mutableStateOf(scrim, structuralEqualityPolicy())
+ internal set
+
+ /** Returns a copy of this ColorScheme, optionally overriding some of the values. */
+ fun copy(
+ primary: Color = this.primary,
+ onPrimary: Color = this.onPrimary,
+ primaryContainer: Color = this.primaryContainer,
+ onPrimaryContainer: Color = this.onPrimaryContainer,
+ inversePrimary: Color = this.inversePrimary,
+ secondary: Color = this.secondary,
+ onSecondary: Color = this.onSecondary,
+ secondaryContainer: Color = this.secondaryContainer,
+ onSecondaryContainer: Color = this.onSecondaryContainer,
+ tertiary: Color = this.tertiary,
+ onTertiary: Color = this.onTertiary,
+ tertiaryContainer: Color = this.tertiaryContainer,
+ onTertiaryContainer: Color = this.onTertiaryContainer,
+ background: Color = this.background,
+ onBackground: Color = this.onBackground,
+ surface: Color = this.surface,
+ onSurface: Color = this.onSurface,
+ surfaceVariant: Color = this.surfaceVariant,
+ onSurfaceVariant: Color = this.onSurfaceVariant,
+ surfaceTint: Color = this.surfaceTint,
+ inverseSurface: Color = this.inverseSurface,
+ inverseOnSurface: Color = this.inverseOnSurface,
+ error: Color = this.error,
+ onError: Color = this.onError,
+ errorContainer: Color = this.errorContainer,
+ onErrorContainer: Color = this.onErrorContainer,
+ outline: Color = this.outline,
+ outlineVariant: Color = this.outlineVariant,
+ scrim: Color = this.scrim
+ ): ColorScheme =
+ ColorScheme(
+ primary = primary,
+ >
+ primaryContainer = primaryContainer,
+ >
+ inversePrimary = inversePrimary,
+ secondary = secondary,
+ >
+ secondaryContainer = secondaryContainer,
+ >
+ tertiary = tertiary,
+ >
+ tertiaryContainer = tertiaryContainer,
+ >
+ background = background,
+ >
+ surface = surface,
+ >
+ surfaceVariant = surfaceVariant,
+ >
+ surfaceTint = surfaceTint,
+ inverseSurface = inverseSurface,
+ inverseOnSurface = inverseOnSurface,
+ error = error,
+ >
+ errorContainer = errorContainer,
+ >
+ outline = outline,
+ outlineVariant = outlineVariant,
+ scrim = scrim
+ )
+
+ override fun toString(): String {
+ return "ColorScheme(" +
+ "primary=$primary" +
+ " +
+ "primaryContainer=$primaryContainer" +
+ " +
+ "inversePrimary=$inversePrimary" +
+ "secondary=$secondary" +
+ " +
+ "secondaryContainer=$secondaryContainer" +
+ " +
+ "tertiary=$tertiary" +
+ " +
+ "tertiaryContainer=$tertiaryContainer" +
+ " +
+ "background=$background" +
+ " +
+ "surface=$surface" +
+ " +
+ "surfaceVariant=$surfaceVariant" +
+ " +
+ "surfaceTint=$surfaceTint" +
+ "inverseSurface=$inverseSurface" +
+ "inverseOnSurface=$inverseOnSurface" +
+ "error=$error" +
+ " +
+ "errorContainer=$errorContainer" +
+ " +
+ "outline=$outline" +
+ "outlineVariant=$outlineVariant" +
+ "scrim=$scrim" +
+ ")"
+ }
+}
+
+/**
+ * Returns a dark Material color scheme.
+ */
+@ExperimentalTvMaterial3Api
+fun darkColorScheme(
+ primary: Color = ColorDarkTokens.Primary,
+ onPrimary: Color = ColorDarkTokens.OnPrimary,
+ primaryContainer: Color = ColorDarkTokens.PrimaryContainer,
+ onPrimaryContainer: Color = ColorDarkTokens.OnPrimaryContainer,
+ inversePrimary: Color = ColorDarkTokens.InversePrimary,
+ secondary: Color = ColorDarkTokens.Secondary,
+ onSecondary: Color = ColorDarkTokens.OnSecondary,
+ secondaryContainer: Color = ColorDarkTokens.SecondaryContainer,
+ onSecondaryContainer: Color = ColorDarkTokens.OnSecondaryContainer,
+ tertiary: Color = ColorDarkTokens.Tertiary,
+ onTertiary: Color = ColorDarkTokens.OnTertiary,
+ tertiaryContainer: Color = ColorDarkTokens.TertiaryContainer,
+ onTertiaryContainer: Color = ColorDarkTokens.OnTertiaryContainer,
+ background: Color = ColorDarkTokens.Background,
+ onBackground: Color = ColorDarkTokens.OnBackground,
+ surface: Color = ColorDarkTokens.Surface,
+ onSurface: Color = ColorDarkTokens.OnSurface,
+ surfaceVariant: Color = ColorDarkTokens.SurfaceVariant,
+ onSurfaceVariant: Color = ColorDarkTokens.OnSurfaceVariant,
+ surfaceTint: Color = primary,
+ inverseSurface: Color = ColorDarkTokens.InverseSurface,
+ inverseOnSurface: Color = ColorDarkTokens.InverseOnSurface,
+ error: Color = ColorDarkTokens.Error,
+ onError: Color = ColorDarkTokens.OnError,
+ errorContainer: Color = ColorDarkTokens.ErrorContainer,
+ onErrorContainer: Color = ColorDarkTokens.OnErrorContainer,
+ outline: Color = ColorDarkTokens.Outline,
+ outlineVariant: Color = ColorDarkTokens.OutlineVariant,
+ scrim: Color = ColorDarkTokens.Scrim
+): ColorScheme =
+ ColorScheme(
+ primary = primary,
+ >
+ primaryContainer = primaryContainer,
+ >
+ inversePrimary = inversePrimary,
+ secondary = secondary,
+ >
+ secondaryContainer = secondaryContainer,
+ >
+ tertiary = tertiary,
+ >
+ tertiaryContainer = tertiaryContainer,
+ >
+ background = background,
+ >
+ surface = surface,
+ >
+ surfaceVariant = surfaceVariant,
+ >
+ surfaceTint = surfaceTint,
+ inverseSurface = inverseSurface,
+ inverseOnSurface = inverseOnSurface,
+ error = error,
+ >
+ errorContainer = errorContainer,
+ >
+ outline = outline,
+ outlineVariant = outlineVariant,
+ scrim = scrim
+ )
+
+/**
+ * The Material color system contains pairs of colors that are typically used for the background and
+ * content color inside a component. For example, a Button typically uses `primary` for its
+ * background, and `onPrimary` for the color of its content (usually text or iconography).
+ *
+ * This function tries to match the provided [backgroundColor] to a 'background' color in this
+ * [ColorScheme], and then will return the corresponding color used for content. For example, when
+ * [backgroundColor] is [ColorScheme.primary], this will return [ColorScheme.onPrimary].
+ *
+ * If [backgroundColor] does not match a background color in the theme, this will return
+ * [Color.Unspecified].
+ *
+ * @return the matching content color for [backgroundColor]. If [backgroundColor] is not present in
+ * the theme's [ColorScheme], then returns [Color.Unspecified].
+ *
+ * @see contentColorFor
+ */
+@ExperimentalTvMaterial3Api
+fun ColorScheme.contentColorFor(backgroundColor: Color): Color =
+ when (backgroundColor) {
+ primary -> onPrimary
+ secondary -> onSecondary
+ tertiary -> onTertiary
+ background -> onBackground
+ error -> onError
+ surface -> onSurface
+ surfaceVariant -> onSurfaceVariant
+ primaryContainer -> onPrimaryContainer
+ secondaryContainer -> onSecondaryContainer
+ tertiaryContainer -> onTertiaryContainer
+ errorContainer -> onErrorContainer
+ inverseSurface -> inverseOnSurface
+ else -> Color.Unspecified
+ }
+
+/**
+ * The Material color system contains pairs of colors that are typically used for the background and
+ * content color inside a component. For example, a Button typically uses `primary` for its
+ * background, and `onPrimary` for the color of its content (usually text or iconography).
+ *
+ * This function tries to match the provided [backgroundColor] to a 'background' color in this
+ * [ColorScheme], and then will return the corresponding color used for content. For example, when
+ * [backgroundColor] is [ColorScheme.primary], this will return [ColorScheme.onPrimary].
+ *
+ * If [backgroundColor] does not match a background color in the theme, this will return the current
+ * value of [LocalContentColor] as a best-effort color.
+ *
+ * @return the matching content color for [backgroundColor]. If [backgroundColor] is not present in
+ * the theme's [ColorScheme], then returns the current value of [LocalContentColor].
+ *
+ * @see ColorScheme.contentColorFor
+ */
+@Composable
+@ReadOnlyComposable
+@ExperimentalTvMaterial3Api
+fun contentColorFor(backgroundColor: Color) =
+ MaterialTheme.colorScheme.contentColorFor(backgroundColor).takeOrElse {
+ LocalContentColor.current
+ }
+
+/**
+ * Returns the new background [Color] to use, representing the original background [color] with an
+ * overlay corresponding to [elevation] applied. The overlay will only be applied to
+ * [ColorScheme.surface].
+ */
+@OptIn(ExperimentalTvMaterial3Api::class)
+internal fun ColorScheme.applyTonalElevation(backgroundColor: Color, elevation: Dp): Color {
+ return if (backgroundColor == surface) {
+ surfaceColorAtElevation(elevation)
+ } else {
+ backgroundColor
+ }
+}
+
+/**
+ * Computes the surface tonal color at different elevation levels e.g. surface1 through surface5.
+ *
+ * @param elevation Elevation value used to compute alpha of the color overlay layer.
+ *
+ * @return the [ColorScheme.surface] color with an alpha of the [ColorScheme.surfaceTint] color
+ * overlaid on top of it.
+
+ */
+@ExperimentalTvMaterial3Api
+fun ColorScheme.surfaceColorAtElevation(
+ elevation: Dp
+): Color {
+ if (elevation == 0.dp) return surface
+ val alpha = ((4.5f * ln(elevation.value + 1)) + 2f) / 100f
+ return surfaceTint.copy(alpha = alpha).compositeOver(surface)
+}
+
+/**
+ * Updates the internal values of a given [ColorScheme] with values from the [other]
+ * [ColorScheme].
+ * This allows efficiently updating a subset of [ColorScheme], without recomposing every
+ * composable that consumes values from [LocalColorScheme].
+ *
+ * Because [ColorScheme] is very wide-reaching, and used by many expensive composables in the
+ * hierarchy, providing a new value to [LocalColorScheme] causes every composable consuming
+ * [LocalColorScheme] to recompose, which is prohibitively expensive in cases such as animating one
+ * color in the theme. Instead, [ColorScheme] is internally backed by [mutableStateOf], and this
+ * function mutates the internal state of [this] to match values in [other]. This means that any
+ * changes will mutate the internal state of [this], and only cause composables that are reading the
+ * specific changed value to recompose.
+ */
+@OptIn(ExperimentalTvMaterial3Api::class)
+internal fun ColorScheme.updateColorSchemeFrom(other: ColorScheme) {
+ primary = other.primary
+ >
+ primaryContainer = other.primaryContainer
+ >
+ inversePrimary = other.inversePrimary
+ secondary = other.secondary
+ >
+ secondaryContainer = other.secondaryContainer
+ >
+ tertiary = other.tertiary
+ >
+ tertiaryContainer = other.tertiaryContainer
+ >
+ background = other.background
+ >
+ surface = other.surface
+ >
+ surfaceVariant = other.surfaceVariant
+ >
+ surfaceTint = other.surfaceTint
+ inverseSurface = other.inverseSurface
+ inverseOnSurface = other.inverseOnSurface
+ error = other.error
+ >
+ errorContainer = other.errorContainer
+ >
+ outline = other.outline
+ outlineVariant = other.outlineVariant
+ scrim = other.scrim
+}
+
+/**
+ * Helper function for component color tokens. Here is an example on how to use component color
+ * tokens:
+ * ``MaterialTheme.colorScheme.fromToken(ExtendedFabBranded.BrandedContainerColor)``
+ */
+@OptIn(ExperimentalTvMaterial3Api::class)
+internal fun ColorScheme.fromToken(value: ColorSchemeKeyTokens): Color {
+ return when (value) {
+ ColorSchemeKeyTokens.Background -> background
+ ColorSchemeKeyTokens.Error -> error
+ ColorSchemeKeyTokens.ErrorContainer -> errorContainer
+ ColorSchemeKeyTokens.InverseOnSurface -> inverseOnSurface
+ ColorSchemeKeyTokens.InversePrimary -> inversePrimary
+ ColorSchemeKeyTokens.InverseSurface -> inverseSurface
+ ColorSchemeKeyTokens.OnBackground -> onBackground
+ ColorSchemeKeyTokens.OnError -> onError
+ ColorSchemeKeyTokens.OnErrorContainer -> onErrorContainer
+ ColorSchemeKeyTokens.OnPrimary -> onPrimary
+ ColorSchemeKeyTokens.OnPrimaryContainer -> onPrimaryContainer
+ ColorSchemeKeyTokens.OnSecondary -> onSecondary
+ ColorSchemeKeyTokens.OnSecondaryContainer -> onSecondaryContainer
+ ColorSchemeKeyTokens.OnSurface -> onSurface
+ ColorSchemeKeyTokens.OnSurfaceVariant -> onSurfaceVariant
+ ColorSchemeKeyTokens.SurfaceTint -> surfaceTint
+ ColorSchemeKeyTokens.OnTertiary -> onTertiary
+ ColorSchemeKeyTokens.OnTertiaryContainer -> onTertiaryContainer
+ ColorSchemeKeyTokens.Outline -> outline
+ ColorSchemeKeyTokens.OutlineVariant -> outlineVariant
+ ColorSchemeKeyTokens.Primary -> primary
+ ColorSchemeKeyTokens.PrimaryContainer -> primaryContainer
+ ColorSchemeKeyTokens.Scrim -> scrim
+ ColorSchemeKeyTokens.Secondary -> secondary
+ ColorSchemeKeyTokens.SecondaryContainer -> secondaryContainer
+ ColorSchemeKeyTokens.Surface -> surface
+ ColorSchemeKeyTokens.SurfaceVariant -> surfaceVariant
+ ColorSchemeKeyTokens.Tertiary -> tertiary
+ ColorSchemeKeyTokens.TertiaryContainer -> tertiaryContainer
+ }
+}
+
+/**
+ * CompositionLocal used to pass [ColorScheme] down the tree.
+ *
+ * Setting the value here is typically done as part of [MaterialTheme], which will automatically
+ * handle efficiently updating any changed colors without causing unnecessary recompositions, using
+ * [ColorScheme.updateColorSchemeFrom]. To retrieve the current value of this CompositionLocal, use
+ * [MaterialTheme.colorScheme].
+ */
+@OptIn(ExperimentalTvMaterial3Api::class)
+internal val LocalColorScheme = staticCompositionLocalOf { lightColorScheme() }
+
+/**
+ * A low level of alpha used to represent disabled components, such as text in a disabled Button.
+ */
+internal const val DisabledAlpha = 0.38f
+
+/** Converts a color token key to the local color scheme provided by the theme */
+@ReadOnlyComposable
+@Composable
+@OptIn(ExperimentalTvMaterial3Api::class)
+internal fun ColorSchemeKeyTokens.toColor(): Color {
+ return MaterialTheme.colorScheme.fromToken(this)
+}
diff --git a/tv/tv-material/src/main/java/androidx/tv/material/ContentColor.kt b/tv/tv-material/src/main/java/androidx/tv/material3/ContentColor.kt
similarity index 94%
rename from tv/tv-material/src/main/java/androidx/tv/material/ContentColor.kt
rename to tv/tv-material/src/main/java/androidx/tv/material3/ContentColor.kt
index f1b11f5..261dc24 100644
--- a/tv/tv-material/src/main/java/androidx/tv/material/ContentColor.kt
+++ b/tv/tv-material/src/main/java/androidx/tv/material3/ContentColor.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2023 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.tv.material
+package androidx.tv.material3
import androidx.compose.runtime.compositionLocalOf
import androidx.compose.ui.graphics.Color
diff --git a/tv/tv-material/src/main/java/androidx/tv/material/ExperimentalTvMaterialApi.kt b/tv/tv-material/src/main/java/androidx/tv/material3/ExperimentalTvMaterial3Api.kt
similarity index 84%
rename from tv/tv-material/src/main/java/androidx/tv/material/ExperimentalTvMaterialApi.kt
rename to tv/tv-material/src/main/java/androidx/tv/material3/ExperimentalTvMaterial3Api.kt
index ebac64e..006ab10 100644
--- a/tv/tv-material/src/main/java/androidx/tv/material/ExperimentalTvMaterialApi.kt
+++ b/tv/tv-material/src/main/java/androidx/tv/material3/ExperimentalTvMaterial3Api.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2023 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package androidx.tv.material
+package androidx.tv.material3
@RequiresOptIn(
"This tv-material API is experimental and likely to change or be removed in the future."
)
@Retention(AnnotationRetention.BINARY)
-annotation class ExperimentalTvMaterialApi
\ No newline at end of file
+annotation class ExperimentalTvMaterial3Api
\ No newline at end of file
diff --git a/tv/tv-material/src/main/java/androidx/tv/material/immersivelist/ImmersiveList.kt b/tv/tv-material/src/main/java/androidx/tv/material3/ImmersiveList.kt
similarity index 89%
rename from tv/tv-material/src/main/java/androidx/tv/material/immersivelist/ImmersiveList.kt
rename to tv/tv-material/src/main/java/androidx/tv/material3/ImmersiveList.kt
index e750f38..7a5631b 100644
--- a/tv/tv-material/src/main/java/androidx/tv/material/immersivelist/ImmersiveList.kt
+++ b/tv/tv-material/src/main/java/androidx/tv/material3/ImmersiveList.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2023 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.tv.material.immersivelist
+package androidx.tv.material3
import androidx.compose.animation.AnimatedContentScope
import androidx.compose.animation.AnimatedVisibilityScope
@@ -26,7 +26,6 @@
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.animation.with
-import androidx.compose.foundation.focusable
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.BoxScope
import androidx.compose.runtime.Composable
@@ -41,8 +40,6 @@
import androidx.compose.ui.focus.FocusDirection
import androidx.compose.ui.focus.onFocusChanged
import androidx.compose.ui.platform.LocalFocusManager
-import androidx.tv.material.ExperimentalTvMaterialApi
-import androidx.tv.material.bringIntoViewIfChildrenAreFocused
/**
* Immersive List consists of a list with multiple items and a background that displays content
@@ -51,6 +48,8 @@
* To display the background only when the list is in focus, use
* [ImmersiveListBackgroundScope.AnimatedVisibility].
*
+ * @sample androidx.tv.samples.SampleImmersiveList
+ *
* @param background Composable defining the background to be displayed for a given item's
* index. `listHasFocus` argument can be used to hide the background when the list is not in focus
* @param modifier applied to Immersive List.
@@ -59,7 +58,7 @@
*/
@Suppress("IllegalExperimentalApiUsage")
@OptIn(ExperimentalComposeUiApi::class)
-@ExperimentalTvMaterialApi
+@ExperimentalTvMaterial3Api
@Composable
fun ImmersiveList(
background:
@@ -85,7 +84,7 @@
}
}
-@ExperimentalTvMaterialApi
+@ExperimentalTvMaterial3Api
object ImmersiveListDefaults {
/**
* Default transition used to bring the background content into view
@@ -99,7 +98,7 @@
}
@Immutable
-@ExperimentalTvMaterialApi
+@ExperimentalTvMaterial3Api
public class ImmersiveListBackgroundScope internal constructor(boxScope: BoxScope) : BoxScope
by boxScope {
@@ -113,6 +112,7 @@
* @param modifier modifier for the Layout created to contain the [content]
* @param enter EnterTransition(s) used for the appearing animation, fading in by default
* @param exit ExitTransition(s) used for the disappearing animation, fading out by default
+ * @param label helps differentiate from other animations in Android Studio
* @param content Content to appear or disappear based on the value of [visible]
*
* @link androidx.compose.animation.AnimatedVisibility
@@ -149,6 +149,8 @@
* @param modifier modifier for the Layout created to contain the [content]
* @param transitionSpec defines the EnterTransition(s) and ExitTransition(s) used to display
* and remove the content, fading in and fading out by default
+ * @param contentAlignment specifies how the background content should be aligned in the
+ * container
* @param content Content to appear or disappear based on the value of [targetState]
*
* @link androidx.compose.animation.AnimatedContent
@@ -179,16 +181,22 @@
}
@Immutable
-@ExperimentalTvMaterialApi
+@ExperimentalTvMaterial3Api
public class ImmersiveListScope internal constructor(private val onFocused: (Int) -> Unit) {
/**
* Modifier to be added to each of the items of the list within ImmersiveList to inform the
- * ImmersiveList of the index of the item in focus.
+ * ImmersiveList of the index of the item in focus
*
- * @param index index of the item within the list.
+ * > **NOTE**: This modifier needs to be paired with either the "focusable" or the "clickable"
+ * modifier for it to work
+ *
+ * @param index index of the item within the list
*/
- fun Modifier.focusableItem(index: Int): Modifier {
- return onFocusChanged { if (it.hasFocus || it.isFocused) { onFocused(index) } }
- .focusable()
+ fun Modifier.immersiveListItem(index: Int): Modifier {
+ return onFocusChanged {
+ if (it.isFocused) {
+ onFocused(index)
+ }
+ }
}
}
diff --git a/tv/tv-material/src/main/java/androidx/tv/material3/MaterialTheme.kt b/tv/tv-material/src/main/java/androidx/tv/material3/MaterialTheme.kt
new file mode 100644
index 0000000..71ec11d
--- /dev/null
+++ b/tv/tv-material/src/main/java/androidx/tv/material3/MaterialTheme.kt
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.tv.material3
+
+import androidx.compose.foundation.text.selection.LocalTextSelectionColors
+import androidx.compose.foundation.text.selection.TextSelectionColors
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.ReadOnlyComposable
+import androidx.compose.runtime.remember
+
+/**
+ * Material Theming refers to the customization of your Material Design app to better reflect your
+ * product’s brand.
+ *
+ * Material components such as Button and Checkbox use values provided here when retrieving
+ * default values.
+ *
+ * All values may be set by providing this component with the [colorScheme][ColorScheme],
+ * [typography][Typography] attributes. Use this to configure the overall
+ * theme of elements within this MaterialTheme.
+ *
+ * Any values that are not set will inherit the current value from the theme, falling back to the
+ * defaults if there is no parent MaterialTheme. This allows using a MaterialTheme at the top
+ * of your application, and then separate MaterialTheme(s) for different screens / parts of your
+ * UI, overriding only the parts of the theme definition that need to change.
+ *
+ * @param colorScheme A complete definition of the Material Color theme for this hierarchy
+ * @param shapes A set of corner shapes to be used as this hierarchy's shape system
+ * @param typography A set of text styles to be used as this hierarchy's typography system
+ * @param content The composable content that will be displayed with this theme
+ */
+@ExperimentalTvMaterial3Api
+@Composable
+fun MaterialTheme(
+ colorScheme: ColorScheme = MaterialTheme.colorScheme,
+ shapes: Shapes = MaterialTheme.shapes,
+ typography: Typography = MaterialTheme.typography,
+ content: @Composable () -> Unit
+) {
+ val rememberedColorScheme = remember {
+ // Explicitly creating a new object here so we don't mutate the initial [colorScheme]
+ // provided, and overwrite the values set in it.
+ colorScheme.copy()
+ }.apply {
+ updateColorSchemeFrom(colorScheme)
+ }
+ val selectionColors = rememberTextSelectionColors(rememberedColorScheme)
+ CompositionLocalProvider(
+ LocalColorScheme provides rememberedColorScheme,
+ LocalShapes provides shapes,
+ LocalTextSelectionColors provides selectionColors,
+ LocalTypography provides typography
+ ) {
+ ProvideTextStyle(value = typography.bodyLarge, content = content)
+ }
+}
+
+/**
+ * Contains functions to access the current theme values provided at the call site's position in
+ * the hierarchy.
+ */
+object MaterialTheme {
+ /**
+ * Retrieves the current [ColorScheme] at the call site's position in the hierarchy.
+ */
+ @ExperimentalTvMaterial3Api
+ val colorScheme: ColorScheme
+ @Composable
+ @ReadOnlyComposable
+ @SuppressWarnings("HiddenTypeParameter", "UnavailableSymbol")
+ get() = LocalColorScheme.current
+
+ /**
+ * Retrieves the current [Typography] at the call site's position in the hierarchy.
+ */
+ val typography: Typography
+ @Composable
+ @ReadOnlyComposable
+ get() = LocalTypography.current
+
+ /**
+ * Retrieves the current [Shapes] at the call site's position in the hierarchy.
+ */
+ val shapes: Shapes
+ @Composable
+ @ReadOnlyComposable
+ get() = LocalShapes.current
+}
+
+@OptIn(ExperimentalTvMaterial3Api::class)
+@Composable
+/*@VisibleForTesting*/
+internal fun rememberTextSelectionColors(colorScheme: ColorScheme): TextSelectionColors {
+ val primaryColor = colorScheme.primary
+ return remember(primaryColor) {
+ TextSelectionColors(
+ handleColor = primaryColor,
+ backgroundColor = primaryColor.copy(alpha = TextSelectionBackgroundOpacity)
+ )
+ }
+}
+
+/*@VisibleForTesting*/
+internal const val TextSelectionBackgroundOpacity = 0.4f
diff --git a/tv/tv-material/src/main/java/androidx/tv/material3/Shapes.kt b/tv/tv-material/src/main/java/androidx/tv/material3/Shapes.kt
new file mode 100644
index 0000000..9398128
--- /dev/null
+++ b/tv/tv-material/src/main/java/androidx/tv/material3/Shapes.kt
@@ -0,0 +1,180 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.tv.material3
+
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.CornerBasedShape
+import androidx.compose.foundation.shape.CornerSize
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.unit.dp
+import androidx.tv.material3.tokens.ShapeKeyTokens
+import androidx.tv.material3.tokens.ShapeTokens
+
+/**
+ * Material surfaces can be displayed in different shapes. Shapes direct attention, identify
+ * components, communicate state, and express brand.
+ *
+ * The shape scale defines the style of container corners, offering a range of roundedness from
+ * square to fully circular.
+ *
+ * There are different sizes of shapes:
+ * - Extra Small
+ * - Small
+ * - Medium
+ * - Large
+ * - Extra Large
+ *
+ * You can customize the shape system for all components in the [MaterialTheme] or you can do it
+ * on a per component basis.
+ *
+ * You can change the shape that a component has by overriding the shape parameter for that
+ * component. For example, by default, buttons use the shape style “full.” If your product requires
+ * a smaller amount of roundedness, you can override the shape parameter with a different shape
+ * value like MaterialTheme.shapes.small.
+ *
+ * To learn more about shapes, see [Material Design shapes](https://m3.material.io/styles/shape/overview).
+ *
+ * @param extraSmall A shape style with 4 same-sized corners whose size are bigger than
+ * [RectangleShape] and smaller than [Shapes.small]. By default autocomplete menu, select menu,
+ * snackbars, standard menu, and text fields use this shape.
+ * @param small A shape style with 4 same-sized corners whose size are bigger than
+ * [Shapes.extraSmall] and smaller than [Shapes.medium]. By default chips use this shape.
+ * @param medium A shape style with 4 same-sized corners whose size are bigger than [Shapes.small]
+ * and smaller than [Shapes.large]. By default cards and small FABs use this shape.
+ * @param large A shape style with 4 same-sized corners whose size are bigger than [Shapes.medium]
+ * and smaller than [Shapes.extraLarge]. By default extended FABs, FABs, and navigation drawers use
+ * this shape.
+ * @param extraLarge A shape style with 4 same-sized corners whose size are bigger than
+ * [Shapes.large] and smaller than [CircleShape]. By default large FABs use this shape.
+ */
+@Immutable
+class Shapes(
+ // Shapes None and Full are omitted as None is a RectangleShape and Full is a CircleShape.
+ val extraSmall: CornerBasedShape = ShapeDefaults.ExtraSmall,
+ val small: CornerBasedShape = ShapeDefaults.Small,
+ val medium: CornerBasedShape = ShapeDefaults.Medium,
+ val large: CornerBasedShape = ShapeDefaults.Large,
+ val extraLarge: CornerBasedShape = ShapeDefaults.ExtraLarge
+) {
+ /** Returns a copy of this Shapes, optionally overriding some of the values. */
+ fun copy(
+ extraSmall: CornerBasedShape = this.extraSmall,
+ small: CornerBasedShape = this.small,
+ medium: CornerBasedShape = this.medium,
+ large: CornerBasedShape = this.large,
+ extraLarge: CornerBasedShape = this.extraLarge
+ ): Shapes = Shapes(
+ extraSmall = extraSmall,
+ small = small,
+ medium = medium,
+ large = large,
+ extraLarge = extraLarge
+ )
+
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (other !is Shapes) return false
+ if (extraSmall != other.extraSmall) return false
+ if (small != other.small) return false
+ if (medium != other.medium) return false
+ if (large != other.large) return false
+ if (extraLarge != other.extraLarge) return false
+ return true
+ }
+
+ override fun hashCode(): Int {
+ var result = extraSmall.hashCode()
+ result = 31 * result + small.hashCode()
+ result = 31 * result + medium.hashCode()
+ result = 31 * result + large.hashCode()
+ result = 31 * result + extraLarge.hashCode()
+ return result
+ }
+
+ override fun toString(): String {
+ return "Shapes(" +
+ "extraSmall=$extraSmall, " +
+ "small=$small, " +
+ "medium=$medium, " +
+ "large=$large, " +
+ "extraLarge=$extraLarge)"
+ }
+}
+
+/**
+ * Contains the default values used by [Shapes]
+ */
+object ShapeDefaults {
+ /** Extra small sized corner shape */
+ val ExtraSmall: CornerBasedShape = ShapeTokens.CornerExtraSmall
+
+ /** Small sized corner shape */
+ val Small: CornerBasedShape = ShapeTokens.CornerSmall
+
+ /** Medium sized corner shape */
+ val Medium: CornerBasedShape = ShapeTokens.CornerMedium
+
+ /** Large sized corner shape */
+ val Large: CornerBasedShape = ShapeTokens.CornerLarge
+
+ /** Extra large sized corner shape */
+ val ExtraLarge: CornerBasedShape = ShapeTokens.CornerExtraLarge
+}
+
+/** Helper function for component shape tokens. Used to grab the top values of a shape parameter. */
+internal fun CornerBasedShape.top(): CornerBasedShape {
+ return copy(bottomStart = CornerSize(0.0.dp), bottomEnd = CornerSize(0.0.dp))
+}
+
+/** Helper function for component shape tokens. Used to grab the end values of a shape parameter. */
+internal fun CornerBasedShape.end(): CornerBasedShape {
+ return copy(topStart = CornerSize(0.0.dp), bottomStart = CornerSize(0.0.dp))
+}
+
+/**
+ * Helper function for component shape tokens. Here is an example on how to use component color
+ * tokens:
+ * ``MaterialTheme.shapes.fromToken(FabPrimarySmallTokens.ContainerShape)``
+ */
+internal fun Shapes.fromToken(value: ShapeKeyTokens): Shape {
+ return when (value) {
+ ShapeKeyTokens.CornerExtraLarge -> extraLarge
+ ShapeKeyTokens.CornerExtraLargeTop -> extraLarge.top()
+ ShapeKeyTokens.CornerExtraSmall -> extraSmall
+ ShapeKeyTokens.CornerExtraSmallTop -> extraSmall.top()
+ ShapeKeyTokens.CornerFull -> CircleShape
+ ShapeKeyTokens.CornerLarge -> large
+ ShapeKeyTokens.CornerLargeEnd -> large.end()
+ ShapeKeyTokens.CornerLargeTop -> large.top()
+ ShapeKeyTokens.CornerMedium -> medium
+ ShapeKeyTokens.CornerNone -> RectangleShape
+ ShapeKeyTokens.CornerSmall -> small
+ }
+}
+
+/** Converts a shape token key to the local shape provided by the theme */
+@Composable
+internal fun ShapeKeyTokens.toShape(): Shape {
+ return MaterialTheme.shapes.fromToken(this)
+}
+
+/** CompositionLocal used to specify the default shapes for the surfaces. */
+internal val LocalShapes = staticCompositionLocalOf { Shapes() }
diff --git a/tv/tv-material/src/main/java/androidx/tv/material/Tab.kt b/tv/tv-material/src/main/java/androidx/tv/material3/Tab.kt
similarity index 99%
rename from tv/tv-material/src/main/java/androidx/tv/material/Tab.kt
rename to tv/tv-material/src/main/java/androidx/tv/material3/Tab.kt
index 48b306e..792f0c9 100644
--- a/tv/tv-material/src/main/java/androidx/tv/material/Tab.kt
+++ b/tv/tv-material/src/main/java/androidx/tv/material3/Tab.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.tv.material
+package androidx.tv.material3
import androidx.compose.animation.animateColorAsState
import androidx.compose.foundation.clickable
diff --git a/tv/tv-material/src/main/java/androidx/tv/material/TabRow.kt b/tv/tv-material/src/main/java/androidx/tv/material3/TabRow.kt
similarity index 99%
rename from tv/tv-material/src/main/java/androidx/tv/material/TabRow.kt
rename to tv/tv-material/src/main/java/androidx/tv/material3/TabRow.kt
index 64f0c77..d07a6a7 100644
--- a/tv/tv-material/src/main/java/androidx/tv/material/TabRow.kt
+++ b/tv/tv-material/src/main/java/androidx/tv/material3/TabRow.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.tv.material
+package androidx.tv.material3
import androidx.compose.animation.animateColorAsState
import androidx.compose.animation.core.animateDpAsState
diff --git a/tv/tv-material/src/main/java/androidx/tv/material3/Text.kt b/tv/tv-material/src/main/java/androidx/tv/material3/Text.kt
new file mode 100644
index 0000000..cd7aaec
--- /dev/null
+++ b/tv/tv-material/src/main/java/androidx/tv/material3/Text.kt
@@ -0,0 +1,261 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.tv.material3
+
+import androidx.compose.foundation.text.BasicText
+import androidx.compose.foundation.text.InlineTextContent
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.compositionLocalOf
+import androidx.compose.runtime.structuralEqualityPolicy
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.takeOrElse
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.Paragraph
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.TextUnit
+
+/**
+ * High level element that displays text and provides semantics / accessibility information.
+ *
+ * The default [style] uses the [LocalTextStyle] provided by the [MaterialTheme] / components. If
+ * you are setting your own style, you may want to consider first retrieving [LocalTextStyle],
+ * and using [TextStyle.copy] to keep any theme defined attributes, only modifying the specific
+ * attributes you want to override.
+ *
+ * For ease of use, commonly used parameters from [TextStyle] are also present here. The order of
+ * precedence is as follows:
+ * - If a parameter is explicitly set here (i.e, it is _not_ `null` or [TextUnit.Unspecified]),
+ * then this parameter will always be used.
+ * - If a parameter is _not_ set, (`null` or [TextUnit.Unspecified]), then the corresponding value
+ * from [style] will be used instead.
+ *
+ * Additionally, for [color], if [color] is not set, and [style] does not have a color, then
+ * [LocalContentColor] will be used.
+ *
+ * @param text the text to be displayed
+ * @param modifier the [Modifier] to be applied to this layout node
+ * @param color [Color] to apply to the text. If [Color.Unspecified], and [style] has no color set,
+ * this will be [LocalContentColor].
+ * @param fontSize the size of glyphs to use when painting the text. See [TextStyle.fontSize].
+ * @param fontStyle the typeface variant to use when drawing the letters (e.g., italic).
+ * See [TextStyle.fontStyle].
+ * @param fontWeight the typeface thickness to use when painting the text (e.g., [FontWeight.Bold]).
+ * @param fontFamily the font family to be used when rendering the text. See [TextStyle.fontFamily].
+ * @param letterSpacing the amount of space to add between each letter.
+ * See [TextStyle.letterSpacing].
+ * @param textDecoration the decorations to paint on the text (e.g., an underline).
+ * See [TextStyle.textDecoration].
+ * @param textAlign the alignment of the text within the lines of the paragraph.
+ * See [TextStyle.textAlign].
+ * @param lineHeight line height for the [Paragraph] in [TextUnit] unit, e.g. SP or EM.
+ * See [TextStyle.lineHeight].
+ * @param overflow how visual overflow should be handled.
+ * @param softWrap whether the text should break at soft line breaks. If false, the glyphs in the
+ * text will be positioned as if there was unlimited horizontal space. If [softWrap] is false,
+ * [overflow] and TextAlign may have unexpected effects.
+ * @param maxLines an optional maximum number of lines for the text to span, wrapping if
+ * necessary. If the text exceeds the given number of lines, it will be truncated according to
+ * [overflow] and [softWrap]. If it is not null, then it must be greater than zero.
+ * @param onTextLayout callback that is executed when a new text layout is calculated. A
+ * [TextLayoutResult] object that callback provides contains paragraph information, size of the
+ * text, baselines and other details. The callback can be used to add additional decoration or
+ * functionality to the text. For example, to draw selection around the text.
+ * @param style style configuration for the text such as color, font, line height etc.
+ */
+@Composable
+fun Text(
+ text: String,
+ modifier: Modifier = Modifier,
+ color: Color = Color.Unspecified,
+ fontSize: TextUnit = TextUnit.Unspecified,
+ fontStyle: FontStyle? = null,
+ fontWeight: FontWeight? = null,
+ fontFamily: FontFamily? = null,
+ letterSpacing: TextUnit = TextUnit.Unspecified,
+ textDecoration: TextDecoration? = null,
+ textAlign: TextAlign? = null,
+ lineHeight: TextUnit = TextUnit.Unspecified,
+ overflow: TextOverflow = TextOverflow.Clip,
+ softWrap: Boolean = true,
+ maxLines: Int = Int.MAX_VALUE,
+ onTextLayout: (TextLayoutResult) -> Unit = {},
+ style: TextStyle = LocalTextStyle.current
+) {
+ val textColor = color.takeOrElse {
+ style.color.takeOrElse {
+ LocalContentColor.current
+ }
+ }
+ // NOTE(text-perf-review): It might be worthwhile writing a bespoke merge implementation that
+ // will avoid reallocating if all of the options here are the defaults
+ val mergedStyle = style.merge(
+ TextStyle(
+ color = textColor,
+ fontSize = fontSize,
+ fontWeight = fontWeight,
+ textAlign = textAlign,
+ lineHeight = lineHeight,
+ fontFamily = fontFamily,
+ textDecoration = textDecoration,
+ fontStyle = fontStyle,
+ letterSpacing = letterSpacing
+ )
+ )
+ BasicText(
+ text,
+ modifier,
+ mergedStyle,
+ onTextLayout,
+ overflow,
+ softWrap,
+ maxLines
+ )
+}
+
+/**
+ * High level element that displays text and provides semantics / accessibility information.
+ *
+ * The default [style] uses the [LocalTextStyle] provided by the [MaterialTheme] / components. If
+ * you are setting your own style, you may want to consider first retrieving [LocalTextStyle],
+ * and using [TextStyle.copy] to keep any theme defined attributes, only modifying the specific
+ * attributes you want to override.
+ *
+ * For ease of use, commonly used parameters from [TextStyle] are also present here. The order of
+ * precedence is as follows:
+ * - If a parameter is explicitly set here (i.e, it is _not_ `null` or [TextUnit.Unspecified]),
+ * then this parameter will always be used.
+ * - If a parameter is _not_ set, (`null` or [TextUnit.Unspecified]), then the corresponding value
+ * from [style] will be used instead.
+ *
+ * Additionally, for [color], if [color] is not set, and [style] does not have a color, then
+ * [LocalContentColor] will be used.
+ *
+ * @param text the text to be displayed
+ * @param modifier the [Modifier] to be applied to this layout node
+ * @param color [Color] to apply to the text. If [Color.Unspecified], and [style] has no color set,
+ * this will be [LocalContentColor].
+ * @param fontSize the size of glyphs to use when painting the text. See [TextStyle.fontSize].
+ * @param fontStyle the typeface variant to use when drawing the letters (e.g., italic).
+ * See [TextStyle.fontStyle].
+ * @param fontWeight the typeface thickness to use when painting the text (e.g., [FontWeight.Bold]).
+ * @param fontFamily the font family to be used when rendering the text. See [TextStyle.fontFamily].
+ * @param letterSpacing the amount of space to add between each letter.
+ * See [TextStyle.letterSpacing].
+ * @param textDecoration the decorations to paint on the text (e.g., an underline).
+ * See [TextStyle.textDecoration].
+ * @param textAlign the alignment of the text within the lines of the paragraph.
+ * See [TextStyle.textAlign].
+ * @param lineHeight line height for the [Paragraph] in [TextUnit] unit, e.g. SP or EM.
+ * See [TextStyle.lineHeight].
+ * @param overflow how visual overflow should be handled.
+ * @param softWrap whether the text should break at soft line breaks. If false, the glyphs in the
+ * text will be positioned as if there was unlimited horizontal space. If [softWrap] is false,
+ * [overflow] and TextAlign may have unexpected effects.
+ * @param maxLines an optional maximum number of lines for the text to span, wrapping if
+ * necessary. If the text exceeds the given number of lines, it will be truncated according to
+ * [overflow] and [softWrap]. If it is not null, then it must be greater than zero.
+ * @param inlineContent a map storing composables that replaces certain ranges of the text, used to
+ * insert composables into text layout. See [InlineTextContent].
+ * @param onTextLayout callback that is executed when a new text layout is calculated. A
+ * [TextLayoutResult] object that callback provides contains paragraph information, size of the
+ * text, baselines and other details. The callback can be used to add additional decoration or
+ * functionality to the text. For example, to draw selection around the text.
+ * @param style style configuration for the text such as color, font, line height etc.
+ */
+@Composable
+fun Text(
+ text: AnnotatedString,
+ modifier: Modifier = Modifier,
+ color: Color = Color.Unspecified,
+ fontSize: TextUnit = TextUnit.Unspecified,
+ fontStyle: FontStyle? = null,
+ fontWeight: FontWeight? = null,
+ fontFamily: FontFamily? = null,
+ letterSpacing: TextUnit = TextUnit.Unspecified,
+ textDecoration: TextDecoration? = null,
+ textAlign: TextAlign? = null,
+ lineHeight: TextUnit = TextUnit.Unspecified,
+ overflow: TextOverflow = TextOverflow.Clip,
+ softWrap: Boolean = true,
+ maxLines: Int = Int.MAX_VALUE,
+ inlineContent: Map<String, InlineTextContent> = mapOf(),
+ onTextLayout: (TextLayoutResult) -> Unit = {},
+ style: TextStyle = LocalTextStyle.current
+) {
+ val textColor = color.takeOrElse {
+ style.color.takeOrElse {
+ LocalContentColor.current
+ }
+ }
+ // NOTE(text-perf-review): It might be worthwhile writing a bespoke merge implementation that
+ // will avoid reallocating if all of the options here are the defaults
+ val mergedStyle = style.merge(
+ TextStyle(
+ color = textColor,
+ fontSize = fontSize,
+ fontWeight = fontWeight,
+ textAlign = textAlign,
+ lineHeight = lineHeight,
+ fontFamily = fontFamily,
+ textDecoration = textDecoration,
+ fontStyle = fontStyle,
+ letterSpacing = letterSpacing
+ )
+ )
+ BasicText(
+ text = text,
+ modifier = modifier,
+ style = mergedStyle,
+ >
+ overflow = overflow,
+ softWrap = softWrap,
+ maxLines = maxLines,
+ inlineContent = inlineContent
+ )
+}
+
+/**
+ * CompositionLocal containing the preferred [TextStyle] that will be used by [Text] components by
+ * default. To set the value for this CompositionLocal, see [ProvideTextStyle] which will merge any
+ * missing [TextStyle] properties with the existing [TextStyle] set in this CompositionLocal.
+ *
+ * @see ProvideTextStyle
+ */
+val LocalTextStyle = compositionLocalOf(structuralEqualityPolicy()) { TextStyle.Default }
+
+// TODO(b/156598010): remove this and replace with fold definition on the backing CompositionLocal
+/**
+ * This function is used to set the current value of [LocalTextStyle], merging the given style
+ * with the current style values for any missing attributes. Any [Text] components included in
+ * this component's [content] will be styled with this style unless styled explicitly.
+ *
+ * @see LocalTextStyle
+ */
+@Composable
+fun ProvideTextStyle(value: TextStyle, content: @Composable () -> Unit) {
+ val mergedStyle = LocalTextStyle.current.merge(value)
+ CompositionLocalProvider(LocalTextStyle provides mergedStyle, content = content)
+}
diff --git a/tv/tv-material/src/main/java/androidx/tv/material3/Typography.kt b/tv/tv-material/src/main/java/androidx/tv/material3/Typography.kt
new file mode 100644
index 0000000..014694b
--- /dev/null
+++ b/tv/tv-material/src/main/java/androidx/tv/material3/Typography.kt
@@ -0,0 +1,208 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.tv.material3
+
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.ui.text.TextStyle
+import androidx.tv.material3.tokens.TypographyKeyTokens
+import androidx.tv.material3.tokens.TypographyTokens
+
+/**
+ * The Material Design type scale includes a range of contrasting styles that support the needs of
+ * your product and its content.
+ *
+ * Use typography to make writing legible and beautiful. Material's default type scale includes
+ * contrasting and flexible styles to support a wide range of use cases.
+ *
+ * The type scale is a combination of thirteen styles that are supported by the type system. It
+ * contains reusable categories of text, each with an intended application and meaning.
+ *
+ * To learn more about typography, see [Material Design typography](https://m3.material.io/styles/typography/overview).
+ *
+ * @property displayLarge displayLarge is the largest display text.
+ * @property displayMedium displayMedium is the second largest display text.
+ * @property displaySmall displaySmall is the smallest display text.
+ * @property headlineLarge headlineLarge is the largest headline, reserved for short, important text
+ * or numerals. For headlines, you can choose an expressive font, such as a display, handwritten, or
+ * script style. These unconventional font designs have details and intricacy that help attract the
+ * eye.
+ * @property headlineMedium headlineMedium is the second largest headline, reserved for short,
+ * important text or numerals. For headlines, you can choose an expressive font, such as a display,
+ * handwritten, or script style. These unconventional font designs have details and intricacy that
+ * help attract the eye.
+ * @property headlineSmall headlineSmall is the smallest headline, reserved for short, important
+ * text or numerals. For headlines, you can choose an expressive font, such as a display,
+ * handwritten, or script style. These unconventional font designs have details and intricacy that
+ * help attract the eye.
+ * @property titleLarge titleLarge is the largest title, and is typically reserved for
+ * medium-emphasis text that is shorter in length. Serif or sans serif typefaces work well for
+ * subtitles.
+ * @property titleMedium titleMedium is the second largest title, and is typically reserved for
+ * medium-emphasis text that is shorter in length. Serif or sans serif typefaces work well for
+ * subtitles.
+ * @property titleSmall titleSmall is the smallest title, and is typically reserved for
+ * medium-emphasis text that is shorter in length. Serif or sans serif typefaces work well for
+ * subtitles.
+ * @property bodyLarge bodyLarge is the largest body, and is typically used for long-form writing as
+ * it works well for small text sizes. For longer sections of text, a serif or sans serif typeface
+ * is recommended.
+ * @property bodyMedium bodyMedium is the second largest body, and is typically used for long-form
+ * writing as it works well for small text sizes. For longer sections of text, a serif or sans serif
+ * typeface is recommended.
+ * @property bodySmall bodySmall is the smallest body, and is typically used for long-form writing
+ * as it works well for small text sizes. For longer sections of text, a serif or sans serif
+ * typeface is recommended.
+ * @property labelLarge labelLarge text is a call to action used in different types of buttons (such
+ * as text, outlined and contained buttons) and in tabs, dialogs, and cards. Button text is
+ * typically sans serif, using all caps text.
+ * @property labelMedium labelMedium is one of the smallest font sizes. It is used sparingly to
+ * annotate imagery or to introduce a headline.
+ * @property labelSmall labelSmall is one of the smallest font sizes. It is used sparingly to
+ * annotate imagery or to introduce a headline.
+ */
+@Immutable
+class Typography(
+ val displayLarge: TextStyle = TypographyTokens.DisplayLarge,
+ val displayMedium: TextStyle = TypographyTokens.DisplayMedium,
+ val displaySmall: TextStyle = TypographyTokens.DisplaySmall,
+ val headlineLarge: TextStyle = TypographyTokens.HeadlineLarge,
+ val headlineMedium: TextStyle = TypographyTokens.HeadlineMedium,
+ val headlineSmall: TextStyle = TypographyTokens.HeadlineSmall,
+ val titleLarge: TextStyle = TypographyTokens.TitleLarge,
+ val titleMedium: TextStyle = TypographyTokens.TitleMedium,
+ val titleSmall: TextStyle = TypographyTokens.TitleSmall,
+ val bodyLarge: TextStyle = TypographyTokens.BodyLarge,
+ val bodyMedium: TextStyle = TypographyTokens.BodyMedium,
+ val bodySmall: TextStyle = TypographyTokens.BodySmall,
+ val labelLarge: TextStyle = TypographyTokens.LabelLarge,
+ val labelMedium: TextStyle = TypographyTokens.LabelMedium,
+ val labelSmall: TextStyle = TypographyTokens.LabelSmall
+) {
+
+ /** Returns a copy of this Typography, optionally overriding some of the values. */
+ fun copy(
+ displayLarge: TextStyle = this.displayLarge,
+ displayMedium: TextStyle = this.displayMedium,
+ displaySmall: TextStyle = this.displaySmall,
+ headlineLarge: TextStyle = this.headlineLarge,
+ headlineMedium: TextStyle = this.headlineMedium,
+ headlineSmall: TextStyle = this.headlineSmall,
+ titleLarge: TextStyle = this.titleLarge,
+ titleMedium: TextStyle = this.titleMedium,
+ titleSmall: TextStyle = this.titleSmall,
+ bodyLarge: TextStyle = this.bodyLarge,
+ bodyMedium: TextStyle = this.bodyMedium,
+ bodySmall: TextStyle = this.bodySmall,
+ labelLarge: TextStyle = this.labelLarge,
+ labelMedium: TextStyle = this.labelMedium,
+ labelSmall: TextStyle = this.labelSmall
+ ): Typography =
+ Typography(
+ displayLarge = displayLarge,
+ displayMedium = displayMedium,
+ displaySmall = displaySmall,
+ headlineLarge = headlineLarge,
+ headlineMedium = headlineMedium,
+ headlineSmall = headlineSmall,
+ titleLarge = titleLarge,
+ titleMedium = titleMedium,
+ titleSmall = titleSmall,
+ bodyLarge = bodyLarge,
+ bodyMedium = bodyMedium,
+ bodySmall = bodySmall,
+ labelLarge = labelLarge,
+ labelMedium = labelMedium,
+ labelSmall = labelSmall
+ )
+
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (other !is Typography) return false
+
+ if (displayLarge != other.displayLarge) return false
+ if (displayMedium != other.displayMedium) return false
+ if (displaySmall != other.displaySmall) return false
+ if (headlineLarge != other.headlineLarge) return false
+ if (headlineMedium != other.headlineMedium) return false
+ if (headlineSmall != other.headlineSmall) return false
+ if (titleLarge != other.titleLarge) return false
+ if (titleMedium != other.titleMedium) return false
+ if (titleSmall != other.titleSmall) return false
+ if (bodyLarge != other.bodyLarge) return false
+ if (bodyMedium != other.bodyMedium) return false
+ if (bodySmall != other.bodySmall) return false
+ if (labelLarge != other.labelLarge) return false
+ if (labelMedium != other.labelMedium) return false
+ if (labelSmall != other.labelSmall) return false
+ return true
+ }
+
+ override fun hashCode(): Int {
+ var result = displayLarge.hashCode()
+ result = 31 * result + displayMedium.hashCode()
+ result = 31 * result + displaySmall.hashCode()
+ result = 31 * result + headlineLarge.hashCode()
+ result = 31 * result + headlineMedium.hashCode()
+ result = 31 * result + headlineSmall.hashCode()
+ result = 31 * result + titleLarge.hashCode()
+ result = 31 * result + titleMedium.hashCode()
+ result = 31 * result + titleSmall.hashCode()
+ result = 31 * result + bodyLarge.hashCode()
+ result = 31 * result + bodyMedium.hashCode()
+ result = 31 * result + bodySmall.hashCode()
+ result = 31 * result + labelLarge.hashCode()
+ result = 31 * result + labelMedium.hashCode()
+ result = 31 * result + labelSmall.hashCode()
+ return result
+ }
+
+ override fun toString(): String {
+ return "Typography(displayLarge=$displayLarge, displayMedium=$displayMedium," +
+ "displaySmall=$displaySmall, " +
+ "headlineLarge=$headlineLarge, headlineMedium=$headlineMedium," +
+ " headlineSmall=$headlineSmall, " +
+ "titleLarge=$titleLarge, titleMedium=$titleMedium, titleSmall=$titleSmall, " +
+ "bodyLarge=$bodyLarge, bodyMedium=$bodyMedium, bodySmall=$bodySmall, " +
+ "labelLarge=$labelLarge, labelMedium=$labelMedium, labelSmall=$labelSmall)"
+ }
+}
+
+/**
+ * Helper function for component typography tokens.
+ */
+internal fun Typography.fromToken(value: TypographyKeyTokens): TextStyle {
+ return when (value) {
+ TypographyKeyTokens.DisplayLarge -> displayLarge
+ TypographyKeyTokens.DisplayMedium -> displayMedium
+ TypographyKeyTokens.DisplaySmall -> displaySmall
+ TypographyKeyTokens.HeadlineLarge -> headlineLarge
+ TypographyKeyTokens.HeadlineMedium -> headlineMedium
+ TypographyKeyTokens.HeadlineSmall -> headlineSmall
+ TypographyKeyTokens.TitleLarge -> titleLarge
+ TypographyKeyTokens.TitleMedium -> titleMedium
+ TypographyKeyTokens.TitleSmall -> titleSmall
+ TypographyKeyTokens.BodyLarge -> bodyLarge
+ TypographyKeyTokens.BodyMedium -> bodyMedium
+ TypographyKeyTokens.BodySmall -> bodySmall
+ TypographyKeyTokens.LabelLarge -> labelLarge
+ TypographyKeyTokens.LabelMedium -> labelMedium
+ TypographyKeyTokens.LabelSmall -> labelSmall
+ }
+}
+
+internal val LocalTypography = staticCompositionLocalOf { Typography() }
diff --git a/tv/tv-material/src/main/java/androidx/tv/material3/tokens/ColorDarkTokens.kt b/tv/tv-material/src/main/java/androidx/tv/material3/tokens/ColorDarkTokens.kt
new file mode 100644
index 0000000..460f41e
--- /dev/null
+++ b/tv/tv-material/src/main/java/androidx/tv/material3/tokens/ColorDarkTokens.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+// VERSION: v0_001 (Inspired by androidx.compose.material3.tokens v0_126)
+
+package androidx.tv.material3.tokens
+
+internal object ColorDarkTokens {
+ val Background = PaletteTokens.Neutral10
+ val Error = PaletteTokens.Error80
+ val ErrorContainer = PaletteTokens.Error30
+ val InverseOnSurface = PaletteTokens.Neutral20
+ val InversePrimary = PaletteTokens.Primary40
+ val InverseSurface = PaletteTokens.Neutral90
+ val >
+ val >
+ val >
+ val >
+ val >
+ val >
+ val >
+ val >
+ val >
+ val >
+ val >
+ val Outline = PaletteTokens.NeutralVariant60
+ val OutlineVariant = PaletteTokens.NeutralVariant30
+ val Primary = PaletteTokens.Primary80
+ val PrimaryContainer = PaletteTokens.Primary30
+ val Scrim = PaletteTokens.Neutral0
+ val Secondary = PaletteTokens.Secondary80
+ val SecondaryContainer = PaletteTokens.Secondary30
+ val Surface = PaletteTokens.Neutral10
+ val SurfaceTint = Primary
+ val SurfaceVariant = PaletteTokens.NeutralVariant30
+ val Tertiary = PaletteTokens.Tertiary80
+ val TertiaryContainer = PaletteTokens.Tertiary30
+}
diff --git a/tv/tv-material/src/main/java/androidx/tv/material3/tokens/ColorLightTokens.kt b/tv/tv-material/src/main/java/androidx/tv/material3/tokens/ColorLightTokens.kt
new file mode 100644
index 0000000..261c8d8
--- /dev/null
+++ b/tv/tv-material/src/main/java/androidx/tv/material3/tokens/ColorLightTokens.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+// VERSION: v0_001 (Inspired by androidx.compose.material3.tokens v0_103)
+
+package androidx.tv.material3.tokens
+
+internal object ColorLightTokens {
+ val Background = PaletteTokens.Neutral99
+ val Error = PaletteTokens.Error40
+ val ErrorContainer = PaletteTokens.Error90
+ val InverseOnSurface = PaletteTokens.Neutral95
+ val InversePrimary = PaletteTokens.Primary80
+ val InverseSurface = PaletteTokens.Neutral20
+ val >
+ val >
+ val >
+ val >
+ val >
+ val >
+ val >
+ val >
+ val >
+ val >
+ val >
+ val Outline = PaletteTokens.NeutralVariant50
+ val OutlineVariant = PaletteTokens.NeutralVariant80
+ val Primary = PaletteTokens.Primary40
+ val PrimaryContainer = PaletteTokens.Primary90
+ val Scrim = PaletteTokens.Neutral0
+ val Secondary = PaletteTokens.Secondary40
+ val SecondaryContainer = PaletteTokens.Secondary90
+ val Surface = PaletteTokens.Neutral99
+ val SurfaceTint = Primary
+ val SurfaceVariant = PaletteTokens.NeutralVariant90
+ val Tertiary = PaletteTokens.Tertiary40
+ val TertiaryContainer = PaletteTokens.Tertiary90
+}
diff --git a/tv/tv-material/src/main/java/androidx/tv/material3/tokens/ColorSchemeKeyTokens.kt b/tv/tv-material/src/main/java/androidx/tv/material3/tokens/ColorSchemeKeyTokens.kt
new file mode 100644
index 0000000..ccc622a
--- /dev/null
+++ b/tv/tv-material/src/main/java/androidx/tv/material3/tokens/ColorSchemeKeyTokens.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+// VERSION: v0_001 (Inspired by androidx.compose.material3.tokens v0_103)
+
+package androidx.tv.material3.tokens
+
+internal enum class ColorSchemeKeyTokens {
+ Background,
+ Error,
+ ErrorContainer,
+ InverseOnSurface,
+ InversePrimary,
+ InverseSurface,
+ OnBackground,
+ OnError,
+ OnErrorContainer,
+ OnPrimary,
+ OnPrimaryContainer,
+ OnSecondary,
+ OnSecondaryContainer,
+ OnSurface,
+ OnSurfaceVariant,
+ OnTertiary,
+ OnTertiaryContainer,
+ Outline,
+ OutlineVariant,
+ Primary,
+ PrimaryContainer,
+ Scrim,
+ Secondary,
+ SecondaryContainer,
+ Surface,
+ SurfaceTint,
+ SurfaceVariant,
+ Tertiary,
+ TertiaryContainer,
+}
diff --git a/tv/tv-material/src/main/java/androidx/tv/material/ExperimentalTvMaterialApi.kt b/tv/tv-material/src/main/java/androidx/tv/material3/tokens/Elevation.kt
similarity index 60%
copy from tv/tv-material/src/main/java/androidx/tv/material/ExperimentalTvMaterialApi.kt
copy to tv/tv-material/src/main/java/androidx/tv/material3/tokens/Elevation.kt
index ebac64e..fef575f 100644
--- a/tv/tv-material/src/main/java/androidx/tv/material/ExperimentalTvMaterialApi.kt
+++ b/tv/tv-material/src/main/java/androidx/tv/material3/tokens/Elevation.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2023 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,11 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_001 (Inspired by androidx.compose.material3.tokens v0_103)
-package androidx.tv.material
+package androidx.tv.material3.tokens
-@RequiresOptIn(
- "This tv-material API is experimental and likely to change or be removed in the future."
-)
-@Retention(AnnotationRetention.BINARY)
-annotation class ExperimentalTvMaterialApi
\ No newline at end of file
+import androidx.compose.ui.unit.dp
+
+internal object Elevation {
+ val Level0 = 0.0.dp
+ val Level1 = 1.0.dp
+ val Level2 = 3.0.dp
+ val Level3 = 6.0.dp
+ val Level4 = 8.0.dp
+ val Level5 = 12.0.dp
+}
diff --git a/tv/tv-material/src/main/java/androidx/tv/material3/tokens/PaletteTokens.kt b/tv/tv-material/src/main/java/androidx/tv/material3/tokens/PaletteTokens.kt
new file mode 100644
index 0000000..419b2bb
--- /dev/null
+++ b/tv/tv-material/src/main/java/androidx/tv/material3/tokens/PaletteTokens.kt
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+// VERSION: v0_001 (Inspired by androidx.compose.material3.tokens v0_103)
+
+package androidx.tv.material3.tokens
+
+import androidx.compose.ui.graphics.Color
+
+internal object PaletteTokens {
+ val Black = Color(red = 0, green = 0, blue = 0)
+ val Error0 = Color(red = 0, green = 0, blue = 0)
+ val Error10 = Color(red = 65, green = 14, blue = 11)
+ val Error100 = Color(red = 255, green = 255, blue = 255)
+ val Error20 = Color(red = 96, green = 20, blue = 16)
+ val Error30 = Color(red = 140, green = 29, blue = 24)
+ val Error40 = Color(red = 179, green = 38, blue = 30)
+ val Error50 = Color(red = 220, green = 54, blue = 46)
+ val Error60 = Color(red = 228, green = 105, blue = 98)
+ val Error70 = Color(red = 236, green = 146, blue = 142)
+ val Error80 = Color(red = 242, green = 184, blue = 181)
+ val Error90 = Color(red = 249, green = 222, blue = 220)
+ val Error95 = Color(red = 252, green = 238, blue = 238)
+ val Error99 = Color(red = 255, green = 251, blue = 249)
+ val Neutral0 = Color(red = 0, green = 0, blue = 0)
+ val Neutral10 = Color(red = 28, green = 27, blue = 31)
+ val Neutral100 = Color(red = 255, green = 255, blue = 255)
+ val Neutral20 = Color(red = 49, green = 48, blue = 51)
+ val Neutral30 = Color(red = 72, green = 70, blue = 73)
+ val Neutral40 = Color(red = 96, green = 93, blue = 98)
+ val Neutral50 = Color(red = 120, green = 117, blue = 121)
+ val Neutral60 = Color(red = 147, green = 144, blue = 148)
+ val Neutral70 = Color(red = 174, green = 170, blue = 174)
+ val Neutral80 = Color(red = 201, green = 197, blue = 202)
+ val Neutral90 = Color(red = 230, green = 225, blue = 229)
+ val Neutral95 = Color(red = 244, green = 239, blue = 244)
+ val Neutral99 = Color(red = 255, green = 251, blue = 254)
+ val NeutralVariant0 = Color(red = 0, green = 0, blue = 0)
+ val NeutralVariant10 = Color(red = 29, green = 26, blue = 34)
+ val NeutralVariant100 = Color(red = 255, green = 255, blue = 255)
+ val NeutralVariant20 = Color(red = 50, green = 47, blue = 55)
+ val NeutralVariant30 = Color(red = 73, green = 69, blue = 79)
+ val NeutralVariant40 = Color(red = 96, green = 93, blue = 102)
+ val NeutralVariant50 = Color(red = 121, green = 116, blue = 126)
+ val NeutralVariant60 = Color(red = 147, green = 143, blue = 153)
+ val NeutralVariant70 = Color(red = 174, green = 169, blue = 180)
+ val NeutralVariant80 = Color(red = 202, green = 196, blue = 208)
+ val NeutralVariant90 = Color(red = 231, green = 224, blue = 236)
+ val NeutralVariant95 = Color(red = 245, green = 238, blue = 250)
+ val NeutralVariant99 = Color(red = 255, green = 251, blue = 254)
+ val Primary0 = Color(red = 0, green = 0, blue = 0)
+ val Primary10 = Color(red = 33, green = 0, blue = 93)
+ val Primary100 = Color(red = 255, green = 255, blue = 255)
+ val Primary20 = Color(red = 56, green = 30, blue = 114)
+ val Primary30 = Color(red = 79, green = 55, blue = 139)
+ val Primary40 = Color(red = 103, green = 80, blue = 164)
+ val Primary50 = Color(red = 127, green = 103, blue = 190)
+ val Primary60 = Color(red = 154, green = 130, blue = 219)
+ val Primary70 = Color(red = 182, green = 157, blue = 248)
+ val Primary80 = Color(red = 208, green = 188, blue = 255)
+ val Primary90 = Color(red = 234, green = 221, blue = 255)
+ val Primary95 = Color(red = 246, green = 237, blue = 255)
+ val Primary99 = Color(red = 255, green = 251, blue = 254)
+ val Secondary0 = Color(red = 0, green = 0, blue = 0)
+ val Secondary10 = Color(red = 29, green = 25, blue = 43)
+ val Secondary100 = Color(red = 255, green = 255, blue = 255)
+ val Secondary20 = Color(red = 51, green = 45, blue = 65)
+ val Secondary30 = Color(red = 74, green = 68, blue = 88)
+ val Secondary40 = Color(red = 98, green = 91, blue = 113)
+ val Secondary50 = Color(red = 122, green = 114, blue = 137)
+ val Secondary60 = Color(red = 149, green = 141, blue = 165)
+ val Secondary70 = Color(red = 176, green = 167, blue = 192)
+ val Secondary80 = Color(red = 204, green = 194, blue = 220)
+ val Secondary90 = Color(red = 232, green = 222, blue = 248)
+ val Secondary95 = Color(red = 246, green = 237, blue = 255)
+ val Secondary99 = Color(red = 255, green = 251, blue = 254)
+ val Tertiary0 = Color(red = 0, green = 0, blue = 0)
+ val Tertiary10 = Color(red = 49, green = 17, blue = 29)
+ val Tertiary100 = Color(red = 255, green = 255, blue = 255)
+ val Tertiary20 = Color(red = 73, green = 37, blue = 50)
+ val Tertiary30 = Color(red = 99, green = 59, blue = 72)
+ val Tertiary40 = Color(red = 125, green = 82, blue = 96)
+ val Tertiary50 = Color(red = 152, green = 105, blue = 119)
+ val Tertiary60 = Color(red = 181, green = 131, blue = 146)
+ val Tertiary70 = Color(red = 210, green = 157, blue = 172)
+ val Tertiary80 = Color(red = 239, green = 184, blue = 200)
+ val Tertiary90 = Color(red = 255, green = 216, blue = 228)
+ val Tertiary95 = Color(red = 255, green = 236, blue = 241)
+ val Tertiary99 = Color(red = 255, green = 251, blue = 250)
+ val White = Color(red = 255, green = 255, blue = 255)
+}
diff --git a/tv/tv-material/src/main/java/androidx/tv/material3/tokens/ShapeKeyTokens.kt b/tv/tv-material/src/main/java/androidx/tv/material3/tokens/ShapeKeyTokens.kt
new file mode 100644
index 0000000..43ef4de
--- /dev/null
+++ b/tv/tv-material/src/main/java/androidx/tv/material3/tokens/ShapeKeyTokens.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+// VERSION: v0_001 (Inspired by androidx.compose.material3.tokens v0_103)
+
+package androidx.tv.material3.tokens
+
+internal enum class ShapeKeyTokens {
+ CornerExtraLarge,
+ CornerExtraLargeTop,
+ CornerExtraSmall,
+ CornerExtraSmallTop,
+ CornerFull,
+ CornerLarge,
+ CornerLargeEnd,
+ CornerLargeTop,
+ CornerMedium,
+ CornerNone,
+ CornerSmall,
+}
diff --git a/tv/tv-material/src/main/java/androidx/tv/material3/tokens/ShapeTokens.kt b/tv/tv-material/src/main/java/androidx/tv/material3/tokens/ShapeTokens.kt
new file mode 100644
index 0000000..c027d0b
--- /dev/null
+++ b/tv/tv-material/src/main/java/androidx/tv/material3/tokens/ShapeTokens.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+// VERSION: v0_001 (Inspired by androidx.compose.material3.tokens v0_103)
+
+package androidx.tv.material3.tokens
+
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.unit.dp
+
+internal object ShapeTokens {
+ val CornerExtraLarge = RoundedCornerShape(28.0.dp)
+ val CornerExtraLargeTop =
+ RoundedCornerShape(
+ topStart = 28.0.dp,
+ topEnd = 28.0.dp,
+ bottomEnd = 0.0.dp,
+ bottomStart = 0.0.dp
+ )
+ val CornerExtraSmall = RoundedCornerShape(4.0.dp)
+ val CornerExtraSmallTop = RoundedCornerShape(
+ topStart = 4.0.dp,
+ topEnd = 4.0.dp,
+ bottomEnd = 0.0.dp,
+ bottomStart = 0.0.dp
+ )
+ val CornerFull = CircleShape
+ val CornerLarge = RoundedCornerShape(16.0.dp)
+ val CornerLargeEnd =
+ RoundedCornerShape(
+ topStart = 0.0.dp,
+ topEnd = 16.0.dp,
+ bottomEnd = 16.0.dp,
+ bottomStart = 0.0.dp
+ )
+ val CornerLargeTop =
+ RoundedCornerShape(
+ topStart = 16.0.dp,
+ topEnd = 16.0.dp,
+ bottomEnd = 0.0.dp,
+ bottomStart = 0.0.dp
+ )
+ val CornerMedium = RoundedCornerShape(12.0.dp)
+ val CornerNone = RectangleShape
+ val CornerSmall = RoundedCornerShape(8.0.dp)
+}
diff --git a/tv/tv-material/src/main/java/androidx/tv/material3/tokens/TypeScaleTokens.kt b/tv/tv-material/src/main/java/androidx/tv/material3/tokens/TypeScaleTokens.kt
new file mode 100644
index 0000000..7091c76
--- /dev/null
+++ b/tv/tv-material/src/main/java/androidx/tv/material3/tokens/TypeScaleTokens.kt
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+// VERSION: v0_001 (Inspired by androidx.compose.material3.tokens v0_103)
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+package androidx.tv.material3.tokens
+
+import androidx.compose.ui.unit.sp
+
+internal object TypeScaleTokens {
+ val BodyLargeFont = TypefaceTokens.Plain
+ val BodyLargeLineHeight = 24.0.sp
+ val BodyLargeSize = 16.sp
+ val BodyLargeTracking = 0.5.sp
+ val BodyLargeWeight = TypefaceTokens.WeightRegular
+ val BodyMediumFont = TypefaceTokens.Plain
+ val BodyMediumLineHeight = 20.0.sp
+ val BodyMediumSize = 14.sp
+ val BodyMediumTracking = 0.2.sp
+ val BodyMediumWeight = TypefaceTokens.WeightRegular
+ val BodySmallFont = TypefaceTokens.Plain
+ val BodySmallLineHeight = 16.0.sp
+ val BodySmallSize = 12.sp
+ val BodySmallTracking = 0.4.sp
+ val BodySmallWeight = TypefaceTokens.WeightRegular
+ val DisplayLargeFont = TypefaceTokens.Brand
+ val DisplayLargeLineHeight = 64.0.sp
+ val DisplayLargeSize = 57.sp
+ val DisplayLargeTracking = -0.2.sp
+ val DisplayLargeWeight = TypefaceTokens.WeightRegular
+ val DisplayMediumFont = TypefaceTokens.Brand
+ val DisplayMediumLineHeight = 52.0.sp
+ val DisplayMediumSize = 45.sp
+ val DisplayMediumTracking = 0.0.sp
+ val DisplayMediumWeight = TypefaceTokens.WeightRegular
+ val DisplaySmallFont = TypefaceTokens.Brand
+ val DisplaySmallLineHeight = 44.0.sp
+ val DisplaySmallSize = 36.sp
+ val DisplaySmallTracking = 0.0.sp
+ val DisplaySmallWeight = TypefaceTokens.WeightRegular
+ val HeadlineLargeFont = TypefaceTokens.Brand
+ val HeadlineLargeLineHeight = 40.0.sp
+ val HeadlineLargeSize = 32.sp
+ val HeadlineLargeTracking = 0.0.sp
+ val HeadlineLargeWeight = TypefaceTokens.WeightRegular
+ val HeadlineMediumFont = TypefaceTokens.Brand
+ val HeadlineMediumLineHeight = 36.0.sp
+ val HeadlineMediumSize = 28.sp
+ val HeadlineMediumTracking = 0.0.sp
+ val HeadlineMediumWeight = TypefaceTokens.WeightRegular
+ val HeadlineSmallFont = TypefaceTokens.Brand
+ val HeadlineSmallLineHeight = 32.0.sp
+ val HeadlineSmallSize = 24.sp
+ val HeadlineSmallTracking = 0.0.sp
+ val HeadlineSmallWeight = TypefaceTokens.WeightRegular
+ val LabelLargeFont = TypefaceTokens.Plain
+ val LabelLargeLineHeight = 20.0.sp
+ val LabelLargeSize = 14.sp
+ val LabelLargeTracking = 0.1.sp
+ val LabelLargeWeight = TypefaceTokens.WeightMedium
+ val LabelMediumFont = TypefaceTokens.Plain
+ val LabelMediumLineHeight = 16.0.sp
+ val LabelMediumSize = 12.sp
+ val LabelMediumTracking = 0.5.sp
+ val LabelMediumWeight = TypefaceTokens.WeightMedium
+ val LabelSmallFont = TypefaceTokens.Plain
+ val LabelSmallLineHeight = 16.0.sp
+ val LabelSmallSize = 11.sp
+ val LabelSmallTracking = 0.5.sp
+ val LabelSmallWeight = TypefaceTokens.WeightMedium
+ val TitleLargeFont = TypefaceTokens.Brand
+ val TitleLargeLineHeight = 28.0.sp
+ val TitleLargeSize = 22.sp
+ val TitleLargeTracking = 0.0.sp
+ val TitleLargeWeight = TypefaceTokens.WeightRegular
+ val TitleMediumFont = TypefaceTokens.Plain
+ val TitleMediumLineHeight = 24.0.sp
+ val TitleMediumSize = 16.sp
+ val TitleMediumTracking = 0.2.sp
+ val TitleMediumWeight = TypefaceTokens.WeightMedium
+ val TitleSmallFont = TypefaceTokens.Plain
+ val TitleSmallLineHeight = 20.0.sp
+ val TitleSmallSize = 14.sp
+ val TitleSmallTracking = 0.1.sp
+ val TitleSmallWeight = TypefaceTokens.WeightMedium
+}
diff --git a/tv/tv-material/src/main/java/androidx/tv/material3/tokens/TypefaceTokens.kt b/tv/tv-material/src/main/java/androidx/tv/material3/tokens/TypefaceTokens.kt
new file mode 100644
index 0000000..7d0084f
--- /dev/null
+++ b/tv/tv-material/src/main/java/androidx/tv/material3/tokens/TypefaceTokens.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+// VERSION: v0_001 (Inspired by androidx.compose.material3.tokens v0_103)
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+package androidx.tv.material3.tokens
+
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+
+internal object TypefaceTokens {
+ val Brand = FontFamily.SansSerif
+ val Plain = FontFamily.SansSerif
+ val WeightBold = FontWeight.Bold
+ val WeightMedium = FontWeight.Medium
+ val WeightRegular = FontWeight.Normal
+}
diff --git a/tv/tv-material/src/main/java/androidx/tv/material3/tokens/TypographyKeyTokens.kt b/tv/tv-material/src/main/java/androidx/tv/material3/tokens/TypographyKeyTokens.kt
new file mode 100644
index 0000000..a913a5a
--- /dev/null
+++ b/tv/tv-material/src/main/java/androidx/tv/material3/tokens/TypographyKeyTokens.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+// VERSION: v0_001 (Inspired by androidx.compose.material3.tokens v0_103)
+
+package androidx.tv.material3.tokens
+
+internal enum class TypographyKeyTokens {
+ BodyLarge,
+ BodyMedium,
+ BodySmall,
+ DisplayLarge,
+ DisplayMedium,
+ DisplaySmall,
+ HeadlineLarge,
+ HeadlineMedium,
+ HeadlineSmall,
+ LabelLarge,
+ LabelMedium,
+ LabelSmall,
+ TitleLarge,
+ TitleMedium,
+ TitleSmall,
+}
diff --git a/tv/tv-material/src/main/java/androidx/tv/material3/tokens/TypographyTokens.kt b/tv/tv-material/src/main/java/androidx/tv/material3/tokens/TypographyTokens.kt
new file mode 100644
index 0000000..c7b5519
--- /dev/null
+++ b/tv/tv-material/src/main/java/androidx/tv/material3/tokens/TypographyTokens.kt
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+// VERSION: v0_001 (Inspired by androidx.compose.material3.tokens v0_103)
+
+package androidx.tv.material3.tokens
+
+import androidx.compose.ui.text.TextStyle
+
+internal object TypographyTokens {
+ val BodyLarge =
+ TextStyle(
+ fontFamily = TypeScaleTokens.BodyLargeFont,
+ fontWeight = TypeScaleTokens.BodyLargeWeight,
+ fontSize = TypeScaleTokens.BodyLargeSize,
+ lineHeight = TypeScaleTokens.BodyLargeLineHeight,
+ letterSpacing = TypeScaleTokens.BodyLargeTracking
+ )
+ val BodyMedium =
+ TextStyle(
+ fontFamily = TypeScaleTokens.BodyMediumFont,
+ fontWeight = TypeScaleTokens.BodyMediumWeight,
+ fontSize = TypeScaleTokens.BodyMediumSize,
+ lineHeight = TypeScaleTokens.BodyMediumLineHeight,
+ letterSpacing = TypeScaleTokens.BodyMediumTracking
+ )
+ val BodySmall =
+ TextStyle(
+ fontFamily = TypeScaleTokens.BodySmallFont,
+ fontWeight = TypeScaleTokens.BodySmallWeight,
+ fontSize = TypeScaleTokens.BodySmallSize,
+ lineHeight = TypeScaleTokens.BodySmallLineHeight,
+ letterSpacing = TypeScaleTokens.BodySmallTracking
+ )
+ val DisplayLarge =
+ TextStyle(
+ fontFamily = TypeScaleTokens.DisplayLargeFont,
+ fontWeight = TypeScaleTokens.DisplayLargeWeight,
+ fontSize = TypeScaleTokens.DisplayLargeSize,
+ lineHeight = TypeScaleTokens.DisplayLargeLineHeight,
+ letterSpacing = TypeScaleTokens.DisplayLargeTracking
+ )
+ val DisplayMedium =
+ TextStyle(
+ fontFamily = TypeScaleTokens.DisplayMediumFont,
+ fontWeight = TypeScaleTokens.DisplayMediumWeight,
+ fontSize = TypeScaleTokens.DisplayMediumSize,
+ lineHeight = TypeScaleTokens.DisplayMediumLineHeight,
+ letterSpacing = TypeScaleTokens.DisplayMediumTracking
+ )
+ val DisplaySmall =
+ TextStyle(
+ fontFamily = TypeScaleTokens.DisplaySmallFont,
+ fontWeight = TypeScaleTokens.DisplaySmallWeight,
+ fontSize = TypeScaleTokens.DisplaySmallSize,
+ lineHeight = TypeScaleTokens.DisplaySmallLineHeight,
+ letterSpacing = TypeScaleTokens.DisplaySmallTracking
+ )
+ val HeadlineLarge =
+ TextStyle(
+ fontFamily = TypeScaleTokens.HeadlineLargeFont,
+ fontWeight = TypeScaleTokens.HeadlineLargeWeight,
+ fontSize = TypeScaleTokens.HeadlineLargeSize,
+ lineHeight = TypeScaleTokens.HeadlineLargeLineHeight,
+ letterSpacing = TypeScaleTokens.HeadlineLargeTracking
+ )
+ val HeadlineMedium =
+ TextStyle(
+ fontFamily = TypeScaleTokens.HeadlineMediumFont,
+ fontWeight = TypeScaleTokens.HeadlineMediumWeight,
+ fontSize = TypeScaleTokens.HeadlineMediumSize,
+ lineHeight = TypeScaleTokens.HeadlineMediumLineHeight,
+ letterSpacing = TypeScaleTokens.HeadlineMediumTracking
+ )
+ val HeadlineSmall =
+ TextStyle(
+ fontFamily = TypeScaleTokens.HeadlineSmallFont,
+ fontWeight = TypeScaleTokens.HeadlineSmallWeight,
+ fontSize = TypeScaleTokens.HeadlineSmallSize,
+ lineHeight = TypeScaleTokens.HeadlineSmallLineHeight,
+ letterSpacing = TypeScaleTokens.HeadlineSmallTracking
+ )
+ val LabelLarge =
+ TextStyle(
+ fontFamily = TypeScaleTokens.LabelLargeFont,
+ fontWeight = TypeScaleTokens.LabelLargeWeight,
+ fontSize = TypeScaleTokens.LabelLargeSize,
+ lineHeight = TypeScaleTokens.LabelLargeLineHeight,
+ letterSpacing = TypeScaleTokens.LabelLargeTracking
+ )
+ val LabelMedium =
+ TextStyle(
+ fontFamily = TypeScaleTokens.LabelMediumFont,
+ fontWeight = TypeScaleTokens.LabelMediumWeight,
+ fontSize = TypeScaleTokens.LabelMediumSize,
+ lineHeight = TypeScaleTokens.LabelMediumLineHeight,
+ letterSpacing = TypeScaleTokens.LabelMediumTracking
+ )
+ val LabelSmall =
+ TextStyle(
+ fontFamily = TypeScaleTokens.LabelSmallFont,
+ fontWeight = TypeScaleTokens.LabelSmallWeight,
+ fontSize = TypeScaleTokens.LabelSmallSize,
+ lineHeight = TypeScaleTokens.LabelSmallLineHeight,
+ letterSpacing = TypeScaleTokens.LabelSmallTracking
+ )
+ val TitleLarge =
+ TextStyle(
+ fontFamily = TypeScaleTokens.TitleLargeFont,
+ fontWeight = TypeScaleTokens.TitleLargeWeight,
+ fontSize = TypeScaleTokens.TitleLargeSize,
+ lineHeight = TypeScaleTokens.TitleLargeLineHeight,
+ letterSpacing = TypeScaleTokens.TitleLargeTracking
+ )
+ val TitleMedium =
+ TextStyle(
+ fontFamily = TypeScaleTokens.TitleMediumFont,
+ fontWeight = TypeScaleTokens.TitleMediumWeight,
+ fontSize = TypeScaleTokens.TitleMediumSize,
+ lineHeight = TypeScaleTokens.TitleMediumLineHeight,
+ letterSpacing = TypeScaleTokens.TitleMediumTracking
+ )
+ val TitleSmall =
+ TextStyle(
+ fontFamily = TypeScaleTokens.TitleSmallFont,
+ fontWeight = TypeScaleTokens.TitleSmallWeight,
+ fontSize = TypeScaleTokens.TitleSmallSize,
+ lineHeight = TypeScaleTokens.TitleSmallLineHeight,
+ letterSpacing = TypeScaleTokens.TitleSmallTracking
+ )
+}
diff --git a/wear/compose/compose-foundation/api/current.txt b/wear/compose/compose-foundation/api/current.txt
index 60ca06a..9f9bb95 100644
--- a/wear/compose/compose-foundation/api/current.txt
+++ b/wear/compose/compose-foundation/api/current.txt
@@ -182,3 +182,145 @@
}
+package androidx.wear.compose.foundation.lazy {
+
+ @androidx.compose.runtime.Immutable public final class AutoCenteringParams {
+ ctor public AutoCenteringParams(optional int itemIndex, optional int itemOffset);
+ }
+
+ public final class ScalingLazyColumnDefaults {
+ method public androidx.wear.compose.foundation.lazy.ScalingParams scalingParams(optional float edgeScale, optional float edgeAlpha, optional float minElementHeight, optional float maxElementHeight, optional float minTransitionArea, optional float maxTransitionArea, optional androidx.compose.animation.core.Easing scaleInterpolator, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Constraints,java.lang.Integer> viewportVerticalOffsetResolver);
+ method @androidx.compose.runtime.Composable public androidx.compose.foundation.gestures.FlingBehavior snapFlingBehavior(androidx.wear.compose.foundation.lazy.ScalingLazyListState state, optional float snapOffset, optional androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decay);
+ field public static final androidx.wear.compose.foundation.lazy.ScalingLazyColumnDefaults INSTANCE;
+ }
+
+ public final class ScalingLazyColumnKt {
+ method @androidx.compose.runtime.Composable public static void ScalingLazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.foundation.lazy.ScalingLazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, optional androidx.wear.compose.foundation.lazy.ScalingParams scalingParams, optional int anchorType, optional androidx.wear.compose.foundation.lazy.AutoCenteringParams? autoCentering, kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.lazy.ScalingLazyListScope,kotlin.Unit> content);
+ method public static inline <T> void items(androidx.wear.compose.foundation.lazy.ScalingLazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.foundation.lazy.ScalingLazyListItemScope,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void items(androidx.wear.compose.foundation.lazy.ScalingLazyListScope, T![] items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.foundation.lazy.ScalingLazyListItemScope,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void itemsIndexed(androidx.wear.compose.foundation.lazy.ScalingLazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.wear.compose.foundation.lazy.ScalingLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void itemsIndexed(androidx.wear.compose.foundation.lazy.ScalingLazyListScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.wear.compose.foundation.lazy.ScalingLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ }
+
+ public final class ScalingLazyColumnMeasureKt {
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class ScalingLazyListAnchorType {
+ field public static final androidx.wear.compose.foundation.lazy.ScalingLazyListAnchorType.Companion Companion;
+ }
+
+ public static final class ScalingLazyListAnchorType.Companion {
+ method public int getItemCenter();
+ method public int getItemStart();
+ property public final int ItemCenter;
+ property public final int ItemStart;
+ }
+
+ public sealed interface ScalingLazyListItemInfo {
+ method public float getAlpha();
+ method public int getIndex();
+ method public Object getKey();
+ method public int getOffset();
+ method public float getScale();
+ method public int getSize();
+ method public int getUnadjustedOffset();
+ method public int getUnadjustedSize();
+ property public abstract float alpha;
+ property public abstract int index;
+ property public abstract Object key;
+ property public abstract int offset;
+ property public abstract float scale;
+ property public abstract int size;
+ property public abstract int unadjustedOffset;
+ property public abstract int unadjustedSize;
+ }
+
+ @androidx.compose.runtime.Stable @androidx.wear.compose.foundation.lazy.ScalingLazyScopeMarker public sealed interface ScalingLazyListItemScope {
+ method public androidx.compose.ui.Modifier fillParentMaxHeight(androidx.compose.ui.Modifier, optional float fraction);
+ method public androidx.compose.ui.Modifier fillParentMaxSize(androidx.compose.ui.Modifier, optional float fraction);
+ method public androidx.compose.ui.Modifier fillParentMaxWidth(androidx.compose.ui.Modifier, optional float fraction);
+ }
+
+ public sealed interface ScalingLazyListLayoutInfo {
+ method public int getAfterAutoCenteringPadding();
+ method public int getAfterContentPadding();
+ method public int getAnchorType();
+ method public int getBeforeAutoCenteringPadding();
+ method public int getBeforeContentPadding();
+ method public androidx.compose.foundation.gestures.Orientation getOrientation();
+ method public boolean getReverseLayout();
+ method public int getTotalItemsCount();
+ method public int getViewportEndOffset();
+ method public long getViewportSize();
+ method public int getViewportStartOffset();
+ method public java.util.List<androidx.wear.compose.foundation.lazy.ScalingLazyListItemInfo> getVisibleItemsInfo();
+ property public abstract int afterAutoCenteringPadding;
+ property public abstract int afterContentPadding;
+ property public abstract int anchorType;
+ property public abstract int beforeAutoCenteringPadding;
+ property public abstract int beforeContentPadding;
+ property public abstract androidx.compose.foundation.gestures.Orientation orientation;
+ property public abstract boolean reverseLayout;
+ property public abstract int totalItemsCount;
+ property public abstract int viewportEndOffset;
+ property public abstract long viewportSize;
+ property public abstract int viewportStartOffset;
+ property public abstract java.util.List<androidx.wear.compose.foundation.lazy.ScalingLazyListItemInfo> visibleItemsInfo;
+ }
+
+ @androidx.wear.compose.foundation.lazy.ScalingLazyScopeMarker public sealed interface ScalingLazyListScope {
+ method public void item(optional Object? key, kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.lazy.ScalingLazyListItemScope,kotlin.Unit> content);
+ method public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.foundation.lazy.ScalingLazyListItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
+ }
+
+ @androidx.compose.runtime.Stable public final class ScalingLazyListState implements androidx.compose.foundation.gestures.ScrollableState {
+ ctor public ScalingLazyListState(optional int initialCenterItemIndex, optional int initialCenterItemScrollOffset);
+ method public suspend Object? animateScrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public float dispatchRawDelta(float delta);
+ method public int getCenterItemIndex();
+ method public int getCenterItemScrollOffset();
+ method public androidx.wear.compose.foundation.lazy.ScalingLazyListLayoutInfo getLayoutInfo();
+ method public boolean isScrollInProgress();
+ method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public suspend Object? scrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public boolean canScrollBackward;
+ property public boolean canScrollForward;
+ property public final int centerItemIndex;
+ property public final int centerItemScrollOffset;
+ property public boolean isScrollInProgress;
+ property public final androidx.wear.compose.foundation.lazy.ScalingLazyListLayoutInfo layoutInfo;
+ field public static final androidx.wear.compose.foundation.lazy.ScalingLazyListState.Companion Companion;
+ }
+
+ public static final class ScalingLazyListState.Companion {
+ method public androidx.compose.runtime.saveable.Saver<androidx.wear.compose.foundation.lazy.ScalingLazyListState,java.lang.Object> getSaver();
+ property public final androidx.compose.runtime.saveable.Saver<androidx.wear.compose.foundation.lazy.ScalingLazyListState,java.lang.Object> Saver;
+ }
+
+ public final class ScalingLazyListStateKt {
+ method @androidx.compose.runtime.Composable public static androidx.wear.compose.foundation.lazy.ScalingLazyListState rememberScalingLazyListState(optional int initialCenterItemIndex, optional int initialCenterItemScrollOffset);
+ }
+
+ @kotlin.DslMarker public @interface ScalingLazyScopeMarker {
+ }
+
+ @androidx.compose.runtime.Stable public interface ScalingParams {
+ method public float getEdgeAlpha();
+ method public float getEdgeScale();
+ method public float getMaxElementHeight();
+ method public float getMaxTransitionArea();
+ method public float getMinElementHeight();
+ method public float getMinTransitionArea();
+ method public androidx.compose.animation.core.Easing getScaleInterpolator();
+ method public int resolveViewportVerticalOffset(long viewportConstraints);
+ property public abstract float edgeAlpha;
+ property public abstract float edgeScale;
+ property public abstract float maxElementHeight;
+ property public abstract float maxTransitionArea;
+ property public abstract float minElementHeight;
+ property public abstract float minTransitionArea;
+ property public abstract androidx.compose.animation.core.Easing scaleInterpolator;
+ }
+
+}
+
diff --git a/wear/compose/compose-foundation/api/public_plus_experimental_current.txt b/wear/compose/compose-foundation/api/public_plus_experimental_current.txt
index 60ca06a..9f9bb95 100644
--- a/wear/compose/compose-foundation/api/public_plus_experimental_current.txt
+++ b/wear/compose/compose-foundation/api/public_plus_experimental_current.txt
@@ -182,3 +182,145 @@
}
+package androidx.wear.compose.foundation.lazy {
+
+ @androidx.compose.runtime.Immutable public final class AutoCenteringParams {
+ ctor public AutoCenteringParams(optional int itemIndex, optional int itemOffset);
+ }
+
+ public final class ScalingLazyColumnDefaults {
+ method public androidx.wear.compose.foundation.lazy.ScalingParams scalingParams(optional float edgeScale, optional float edgeAlpha, optional float minElementHeight, optional float maxElementHeight, optional float minTransitionArea, optional float maxTransitionArea, optional androidx.compose.animation.core.Easing scaleInterpolator, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Constraints,java.lang.Integer> viewportVerticalOffsetResolver);
+ method @androidx.compose.runtime.Composable public androidx.compose.foundation.gestures.FlingBehavior snapFlingBehavior(androidx.wear.compose.foundation.lazy.ScalingLazyListState state, optional float snapOffset, optional androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decay);
+ field public static final androidx.wear.compose.foundation.lazy.ScalingLazyColumnDefaults INSTANCE;
+ }
+
+ public final class ScalingLazyColumnKt {
+ method @androidx.compose.runtime.Composable public static void ScalingLazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.foundation.lazy.ScalingLazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, optional androidx.wear.compose.foundation.lazy.ScalingParams scalingParams, optional int anchorType, optional androidx.wear.compose.foundation.lazy.AutoCenteringParams? autoCentering, kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.lazy.ScalingLazyListScope,kotlin.Unit> content);
+ method public static inline <T> void items(androidx.wear.compose.foundation.lazy.ScalingLazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.foundation.lazy.ScalingLazyListItemScope,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void items(androidx.wear.compose.foundation.lazy.ScalingLazyListScope, T![] items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.foundation.lazy.ScalingLazyListItemScope,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void itemsIndexed(androidx.wear.compose.foundation.lazy.ScalingLazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.wear.compose.foundation.lazy.ScalingLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void itemsIndexed(androidx.wear.compose.foundation.lazy.ScalingLazyListScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.wear.compose.foundation.lazy.ScalingLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ }
+
+ public final class ScalingLazyColumnMeasureKt {
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class ScalingLazyListAnchorType {
+ field public static final androidx.wear.compose.foundation.lazy.ScalingLazyListAnchorType.Companion Companion;
+ }
+
+ public static final class ScalingLazyListAnchorType.Companion {
+ method public int getItemCenter();
+ method public int getItemStart();
+ property public final int ItemCenter;
+ property public final int ItemStart;
+ }
+
+ public sealed interface ScalingLazyListItemInfo {
+ method public float getAlpha();
+ method public int getIndex();
+ method public Object getKey();
+ method public int getOffset();
+ method public float getScale();
+ method public int getSize();
+ method public int getUnadjustedOffset();
+ method public int getUnadjustedSize();
+ property public abstract float alpha;
+ property public abstract int index;
+ property public abstract Object key;
+ property public abstract int offset;
+ property public abstract float scale;
+ property public abstract int size;
+ property public abstract int unadjustedOffset;
+ property public abstract int unadjustedSize;
+ }
+
+ @androidx.compose.runtime.Stable @androidx.wear.compose.foundation.lazy.ScalingLazyScopeMarker public sealed interface ScalingLazyListItemScope {
+ method public androidx.compose.ui.Modifier fillParentMaxHeight(androidx.compose.ui.Modifier, optional float fraction);
+ method public androidx.compose.ui.Modifier fillParentMaxSize(androidx.compose.ui.Modifier, optional float fraction);
+ method public androidx.compose.ui.Modifier fillParentMaxWidth(androidx.compose.ui.Modifier, optional float fraction);
+ }
+
+ public sealed interface ScalingLazyListLayoutInfo {
+ method public int getAfterAutoCenteringPadding();
+ method public int getAfterContentPadding();
+ method public int getAnchorType();
+ method public int getBeforeAutoCenteringPadding();
+ method public int getBeforeContentPadding();
+ method public androidx.compose.foundation.gestures.Orientation getOrientation();
+ method public boolean getReverseLayout();
+ method public int getTotalItemsCount();
+ method public int getViewportEndOffset();
+ method public long getViewportSize();
+ method public int getViewportStartOffset();
+ method public java.util.List<androidx.wear.compose.foundation.lazy.ScalingLazyListItemInfo> getVisibleItemsInfo();
+ property public abstract int afterAutoCenteringPadding;
+ property public abstract int afterContentPadding;
+ property public abstract int anchorType;
+ property public abstract int beforeAutoCenteringPadding;
+ property public abstract int beforeContentPadding;
+ property public abstract androidx.compose.foundation.gestures.Orientation orientation;
+ property public abstract boolean reverseLayout;
+ property public abstract int totalItemsCount;
+ property public abstract int viewportEndOffset;
+ property public abstract long viewportSize;
+ property public abstract int viewportStartOffset;
+ property public abstract java.util.List<androidx.wear.compose.foundation.lazy.ScalingLazyListItemInfo> visibleItemsInfo;
+ }
+
+ @androidx.wear.compose.foundation.lazy.ScalingLazyScopeMarker public sealed interface ScalingLazyListScope {
+ method public void item(optional Object? key, kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.lazy.ScalingLazyListItemScope,kotlin.Unit> content);
+ method public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.foundation.lazy.ScalingLazyListItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
+ }
+
+ @androidx.compose.runtime.Stable public final class ScalingLazyListState implements androidx.compose.foundation.gestures.ScrollableState {
+ ctor public ScalingLazyListState(optional int initialCenterItemIndex, optional int initialCenterItemScrollOffset);
+ method public suspend Object? animateScrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public float dispatchRawDelta(float delta);
+ method public int getCenterItemIndex();
+ method public int getCenterItemScrollOffset();
+ method public androidx.wear.compose.foundation.lazy.ScalingLazyListLayoutInfo getLayoutInfo();
+ method public boolean isScrollInProgress();
+ method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public suspend Object? scrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public boolean canScrollBackward;
+ property public boolean canScrollForward;
+ property public final int centerItemIndex;
+ property public final int centerItemScrollOffset;
+ property public boolean isScrollInProgress;
+ property public final androidx.wear.compose.foundation.lazy.ScalingLazyListLayoutInfo layoutInfo;
+ field public static final androidx.wear.compose.foundation.lazy.ScalingLazyListState.Companion Companion;
+ }
+
+ public static final class ScalingLazyListState.Companion {
+ method public androidx.compose.runtime.saveable.Saver<androidx.wear.compose.foundation.lazy.ScalingLazyListState,java.lang.Object> getSaver();
+ property public final androidx.compose.runtime.saveable.Saver<androidx.wear.compose.foundation.lazy.ScalingLazyListState,java.lang.Object> Saver;
+ }
+
+ public final class ScalingLazyListStateKt {
+ method @androidx.compose.runtime.Composable public static androidx.wear.compose.foundation.lazy.ScalingLazyListState rememberScalingLazyListState(optional int initialCenterItemIndex, optional int initialCenterItemScrollOffset);
+ }
+
+ @kotlin.DslMarker public @interface ScalingLazyScopeMarker {
+ }
+
+ @androidx.compose.runtime.Stable public interface ScalingParams {
+ method public float getEdgeAlpha();
+ method public float getEdgeScale();
+ method public float getMaxElementHeight();
+ method public float getMaxTransitionArea();
+ method public float getMinElementHeight();
+ method public float getMinTransitionArea();
+ method public androidx.compose.animation.core.Easing getScaleInterpolator();
+ method public int resolveViewportVerticalOffset(long viewportConstraints);
+ property public abstract float edgeAlpha;
+ property public abstract float edgeScale;
+ property public abstract float maxElementHeight;
+ property public abstract float maxTransitionArea;
+ property public abstract float minElementHeight;
+ property public abstract float minTransitionArea;
+ property public abstract androidx.compose.animation.core.Easing scaleInterpolator;
+ }
+
+}
+
diff --git a/wear/compose/compose-foundation/api/restricted_current.txt b/wear/compose/compose-foundation/api/restricted_current.txt
index 60ca06a..9f9bb95 100644
--- a/wear/compose/compose-foundation/api/restricted_current.txt
+++ b/wear/compose/compose-foundation/api/restricted_current.txt
@@ -182,3 +182,145 @@
}
+package androidx.wear.compose.foundation.lazy {
+
+ @androidx.compose.runtime.Immutable public final class AutoCenteringParams {
+ ctor public AutoCenteringParams(optional int itemIndex, optional int itemOffset);
+ }
+
+ public final class ScalingLazyColumnDefaults {
+ method public androidx.wear.compose.foundation.lazy.ScalingParams scalingParams(optional float edgeScale, optional float edgeAlpha, optional float minElementHeight, optional float maxElementHeight, optional float minTransitionArea, optional float maxTransitionArea, optional androidx.compose.animation.core.Easing scaleInterpolator, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Constraints,java.lang.Integer> viewportVerticalOffsetResolver);
+ method @androidx.compose.runtime.Composable public androidx.compose.foundation.gestures.FlingBehavior snapFlingBehavior(androidx.wear.compose.foundation.lazy.ScalingLazyListState state, optional float snapOffset, optional androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decay);
+ field public static final androidx.wear.compose.foundation.lazy.ScalingLazyColumnDefaults INSTANCE;
+ }
+
+ public final class ScalingLazyColumnKt {
+ method @androidx.compose.runtime.Composable public static void ScalingLazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.foundation.lazy.ScalingLazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, optional androidx.wear.compose.foundation.lazy.ScalingParams scalingParams, optional int anchorType, optional androidx.wear.compose.foundation.lazy.AutoCenteringParams? autoCentering, kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.lazy.ScalingLazyListScope,kotlin.Unit> content);
+ method public static inline <T> void items(androidx.wear.compose.foundation.lazy.ScalingLazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.foundation.lazy.ScalingLazyListItemScope,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void items(androidx.wear.compose.foundation.lazy.ScalingLazyListScope, T![] items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.foundation.lazy.ScalingLazyListItemScope,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void itemsIndexed(androidx.wear.compose.foundation.lazy.ScalingLazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.wear.compose.foundation.lazy.ScalingLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ method public static inline <T> void itemsIndexed(androidx.wear.compose.foundation.lazy.ScalingLazyListScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.wear.compose.foundation.lazy.ScalingLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ }
+
+ public final class ScalingLazyColumnMeasureKt {
+ }
+
+ @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class ScalingLazyListAnchorType {
+ field public static final androidx.wear.compose.foundation.lazy.ScalingLazyListAnchorType.Companion Companion;
+ }
+
+ public static final class ScalingLazyListAnchorType.Companion {
+ method public int getItemCenter();
+ method public int getItemStart();
+ property public final int ItemCenter;
+ property public final int ItemStart;
+ }
+
+ public sealed interface ScalingLazyListItemInfo {
+ method public float getAlpha();
+ method public int getIndex();
+ method public Object getKey();
+ method public int getOffset();
+ method public float getScale();
+ method public int getSize();
+ method public int getUnadjustedOffset();
+ method public int getUnadjustedSize();
+ property public abstract float alpha;
+ property public abstract int index;
+ property public abstract Object key;
+ property public abstract int offset;
+ property public abstract float scale;
+ property public abstract int size;
+ property public abstract int unadjustedOffset;
+ property public abstract int unadjustedSize;
+ }
+
+ @androidx.compose.runtime.Stable @androidx.wear.compose.foundation.lazy.ScalingLazyScopeMarker public sealed interface ScalingLazyListItemScope {
+ method public androidx.compose.ui.Modifier fillParentMaxHeight(androidx.compose.ui.Modifier, optional float fraction);
+ method public androidx.compose.ui.Modifier fillParentMaxSize(androidx.compose.ui.Modifier, optional float fraction);
+ method public androidx.compose.ui.Modifier fillParentMaxWidth(androidx.compose.ui.Modifier, optional float fraction);
+ }
+
+ public sealed interface ScalingLazyListLayoutInfo {
+ method public int getAfterAutoCenteringPadding();
+ method public int getAfterContentPadding();
+ method public int getAnchorType();
+ method public int getBeforeAutoCenteringPadding();
+ method public int getBeforeContentPadding();
+ method public androidx.compose.foundation.gestures.Orientation getOrientation();
+ method public boolean getReverseLayout();
+ method public int getTotalItemsCount();
+ method public int getViewportEndOffset();
+ method public long getViewportSize();
+ method public int getViewportStartOffset();
+ method public java.util.List<androidx.wear.compose.foundation.lazy.ScalingLazyListItemInfo> getVisibleItemsInfo();
+ property public abstract int afterAutoCenteringPadding;
+ property public abstract int afterContentPadding;
+ property public abstract int anchorType;
+ property public abstract int beforeAutoCenteringPadding;
+ property public abstract int beforeContentPadding;
+ property public abstract androidx.compose.foundation.gestures.Orientation orientation;
+ property public abstract boolean reverseLayout;
+ property public abstract int totalItemsCount;
+ property public abstract int viewportEndOffset;
+ property public abstract long viewportSize;
+ property public abstract int viewportStartOffset;
+ property public abstract java.util.List<androidx.wear.compose.foundation.lazy.ScalingLazyListItemInfo> visibleItemsInfo;
+ }
+
+ @androidx.wear.compose.foundation.lazy.ScalingLazyScopeMarker public sealed interface ScalingLazyListScope {
+ method public void item(optional Object? key, kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.lazy.ScalingLazyListItemScope,kotlin.Unit> content);
+ method public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.foundation.lazy.ScalingLazyListItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
+ }
+
+ @androidx.compose.runtime.Stable public final class ScalingLazyListState implements androidx.compose.foundation.gestures.ScrollableState {
+ ctor public ScalingLazyListState(optional int initialCenterItemIndex, optional int initialCenterItemScrollOffset);
+ method public suspend Object? animateScrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public float dispatchRawDelta(float delta);
+ method public int getCenterItemIndex();
+ method public int getCenterItemScrollOffset();
+ method public androidx.wear.compose.foundation.lazy.ScalingLazyListLayoutInfo getLayoutInfo();
+ method public boolean isScrollInProgress();
+ method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public suspend Object? scrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ property public boolean canScrollBackward;
+ property public boolean canScrollForward;
+ property public final int centerItemIndex;
+ property public final int centerItemScrollOffset;
+ property public boolean isScrollInProgress;
+ property public final androidx.wear.compose.foundation.lazy.ScalingLazyListLayoutInfo layoutInfo;
+ field public static final androidx.wear.compose.foundation.lazy.ScalingLazyListState.Companion Companion;
+ }
+
+ public static final class ScalingLazyListState.Companion {
+ method public androidx.compose.runtime.saveable.Saver<androidx.wear.compose.foundation.lazy.ScalingLazyListState,java.lang.Object> getSaver();
+ property public final androidx.compose.runtime.saveable.Saver<androidx.wear.compose.foundation.lazy.ScalingLazyListState,java.lang.Object> Saver;
+ }
+
+ public final class ScalingLazyListStateKt {
+ method @androidx.compose.runtime.Composable public static androidx.wear.compose.foundation.lazy.ScalingLazyListState rememberScalingLazyListState(optional int initialCenterItemIndex, optional int initialCenterItemScrollOffset);
+ }
+
+ @kotlin.DslMarker public @interface ScalingLazyScopeMarker {
+ }
+
+ @androidx.compose.runtime.Stable public interface ScalingParams {
+ method public float getEdgeAlpha();
+ method public float getEdgeScale();
+ method public float getMaxElementHeight();
+ method public float getMaxTransitionArea();
+ method public float getMinElementHeight();
+ method public float getMinTransitionArea();
+ method public androidx.compose.animation.core.Easing getScaleInterpolator();
+ method public int resolveViewportVerticalOffset(long viewportConstraints);
+ property public abstract float edgeAlpha;
+ property public abstract float edgeScale;
+ property public abstract float maxElementHeight;
+ property public abstract float maxTransitionArea;
+ property public abstract float minElementHeight;
+ property public abstract float minTransitionArea;
+ property public abstract androidx.compose.animation.core.Easing scaleInterpolator;
+ }
+
+}
+
diff --git a/wear/compose/compose-foundation/benchmark/benchmark-proguard-rules.pro b/wear/compose/compose-foundation/benchmark/benchmark-proguard-rules.pro
new file mode 100644
index 0000000..e4061d2
--- /dev/null
+++ b/wear/compose/compose-foundation/benchmark/benchmark-proguard-rules.pro
@@ -0,0 +1,37 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
+
+-dontobfuscate
+
+-ignorewarnings
+
+-keepattributes *Annotation*
+
+-dontnote junit.framework.**
+-dontnote junit.runner.**
+
+-dontwarn androidx.test.**
+-dontwarn org.junit.**
+-dontwarn org.hamcrest.**
+-dontwarn com.squareup.javawriter.JavaWriter
+
+-keepclasseswithmembers @org.junit.runner.RunWith public class *
\ No newline at end of file
diff --git a/wear/compose/compose-foundation/benchmark/build.gradle b/wear/compose/compose-foundation/benchmark/build.gradle
new file mode 100644
index 0000000..516348d
--- /dev/null
+++ b/wear/compose/compose-foundation/benchmark/build.gradle
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import androidx.build.LibraryType
+
+plugins {
+ id("AndroidXPlugin")
+ id("com.android.library")
+ id("AndroidXComposePlugin")
+ id("org.jetbrains.kotlin.android")
+ id("androidx.benchmark")
+}
+
+android {
+ defaultConfig {
+ minSdkVersion 25
+ }
+ buildTypes.all {
+ consumerProguardFiles "benchmark-proguard-rules.pro"
+ }
+ namespace "androidx.wear.compose.foundation.benchmark"
+}
+
+dependencies {
+
+ androidTestImplementation project(":benchmark:benchmark-junit4")
+ androidTestImplementation project(":compose:runtime:runtime")
+ androidTestImplementation project(":compose:ui:ui-text:ui-text-benchmark")
+ androidTestImplementation project(":compose:foundation:foundation")
+ androidTestImplementation project(":compose:runtime:runtime")
+ androidTestImplementation project(":compose:benchmark-utils")
+ androidTestImplementation project(":wear:compose:compose-foundation")
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.junit)
+ androidTestImplementation(libs.kotlinStdlib)
+ androidTestImplementation(libs.kotlinReflect)
+ androidTestImplementation(libs.kotlinTestCommon)
+ androidTestImplementation(libs.truth)
+}
+androidx {
+ type = LibraryType.INTERNAL_TEST_LIBRARY
+}
diff --git a/wear/compose/compose-foundation/benchmark/src/androidTest/AndroidManifest.xml b/wear/compose/compose-foundation/benchmark/src/androidTest/AndroidManifest.xml
new file mode 100644
index 0000000..39f7fc3
--- /dev/null
+++ b/wear/compose/compose-foundation/benchmark/src/androidTest/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<manifest />
\ No newline at end of file
diff --git a/wear/compose/compose-foundation/benchmark/src/androidTest/java/androidx/wear/compose/foundation/benchmark/ScalingLazyColumnBenchmark.kt b/wear/compose/compose-foundation/benchmark/src/androidTest/java/androidx/wear/compose/foundation/benchmark/ScalingLazyColumnBenchmark.kt
new file mode 100644
index 0000000..c7fc419
--- /dev/null
+++ b/wear/compose/compose-foundation/benchmark/src/androidTest/java/androidx/wear/compose/foundation/benchmark/ScalingLazyColumnBenchmark.kt
@@ -0,0 +1,233 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.wear.compose.foundation.benchmark
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.requiredSize
+import androidx.compose.foundation.text.BasicText
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.compose.testutils.ComposeTestCase
+import androidx.compose.testutils.LayeredComposeTestCase
+import androidx.compose.testutils.assertNoPendingChanges
+import androidx.compose.testutils.benchmark.ComposeBenchmarkRule
+import androidx.compose.testutils.benchmark.benchmarkDrawPerf
+import androidx.compose.testutils.benchmark.benchmarkFirstCompose
+import androidx.compose.testutils.benchmark.benchmarkLayoutPerf
+import androidx.compose.testutils.benchmark.recomposeUntilNoChangesPending
+import androidx.compose.testutils.doFramesUntilNoChangesPending
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
+import androidx.wear.compose.foundation.lazy.ScalingLazyColumn
+import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState
+import org.junit.Assert
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Benchmark for Wear Compose ScalingLazyColumn.
+ */
+@LargeTest
+@RunWith(AndroidJUnit4::class)
+class ScalingLazyColumnBenchmark {
+
+ @get:Rule
+ val benchmarkRule = ComposeBenchmarkRule()
+
+ private val scalingLazyColumnCaseFactory = { ScalingLazyColumnTestCase() }
+
+ @Test
+ fun first_compose() {
+ benchmarkRule.benchmarkFirstCompose(scalingLazyColumnCaseFactory)
+ }
+
+ @Test
+ fun first_measure() {
+ benchmarkRule.benchmarkFirstScalingLazyColumnMeasure(scalingLazyColumnCaseFactory)
+ }
+
+ @Test
+ fun first_layout() {
+ benchmarkRule.benchmarkFirstScalingLazyColumnLayout(scalingLazyColumnCaseFactory)
+ }
+
+ @Test
+ fun first_draw() {
+ benchmarkRule.benchmarkFirstScalingLazyColumnDraw(scalingLazyColumnCaseFactory)
+ }
+
+ @Test
+ fun layout() {
+ benchmarkRule.benchmarkLayoutPerf(scalingLazyColumnCaseFactory)
+ }
+
+ @Test
+ fun draw() {
+ benchmarkRule.benchmarkDrawPerf(scalingLazyColumnCaseFactory)
+ }
+}
+
+internal class ScalingLazyColumnTestCase : LayeredComposeTestCase() {
+ private var itemSizeDp: Dp = 10.dp
+ private var defaultItemSpacingDp: Dp = 4.dp
+
+ @Composable
+ override fun MeasuredContent() {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState(),
+ modifier = Modifier.requiredSize(
+ itemSizeDp * 3.5f + defaultItemSpacingDp * 2.5f
+ ),
+ ) {
+ items(10) { it ->
+ Box(Modifier.requiredSize(itemSizeDp)) {
+ BasicText(text = "Item $it",
+ Modifier
+ .background(Color.White)
+ .padding(2.dp),
+ TextStyle(
+ color = Color.Black,
+ fontSize = 16.sp,
+ )
+ )
+ }
+ }
+ }
+ }
+}
+
+// TODO (b/210654937): Should be able to get rid of this workaround in the future once able to call
+// LaunchedEffect directly on underlying LazyColumn rather than via a 2-stage initialization via
+// onGloballyPositioned().
+fun ComposeBenchmarkRule.benchmarkFirstScalingLazyColumnMeasure(
+ caseFactory: () -> LayeredComposeTestCase
+) {
+ runBenchmarkFor(LayeredCaseAdapter.of(caseFactory)) {
+ measureRepeated {
+ runWithTimingDisabled {
+ doFramesUntilNoChangesPending()
+ // Add the content to benchmark
+ getTestCase().addMeasuredContent()
+ recomposeUntilNoChangesPending()
+ requestLayout()
+ }
+
+ measure()
+ recomposeUntilNoChangesPending()
+
+ runWithTimingDisabled {
+ assertNoPendingChanges()
+ disposeContent()
+ }
+ }
+ }
+}
+
+// TODO (b/210654937): Should be able to get rid of this workaround in the future once able to call
+// LaunchedEffect directly on underlying LazyColumn rather than via a 2-stage initialization via
+// onGloballyPositioned().
+fun ComposeBenchmarkRule.benchmarkFirstScalingLazyColumnLayout(
+ caseFactory: () -> LayeredComposeTestCase
+) {
+ runBenchmarkFor(LayeredCaseAdapter.of(caseFactory)) {
+ measureRepeated {
+ runWithTimingDisabled {
+ doFramesUntilNoChangesPending()
+ // Add the content to benchmark
+ getTestCase().addMeasuredContent()
+ recomposeUntilNoChangesPending()
+ requestLayout()
+ measure()
+ }
+
+ layout()
+ recomposeUntilNoChangesPending()
+
+ runWithTimingDisabled {
+ assertNoPendingChanges()
+ disposeContent()
+ }
+ }
+ }
+}
+
+// TODO (b/210654937): Should be able to get rid of this workaround in the future once able to call
+// LaunchedEffect directly on underlying LazyColumn rather than via a 2-stage initialization via
+// onGloballyPositioned().
+fun ComposeBenchmarkRule.benchmarkFirstScalingLazyColumnDraw(
+ caseFactory: () -> LayeredComposeTestCase
+) {
+ runBenchmarkFor(LayeredCaseAdapter.of(caseFactory)) {
+ measureRepeated {
+ runWithTimingDisabled {
+ doFramesUntilNoChangesPending()
+ // Add the content to benchmark
+ getTestCase().addMeasuredContent()
+ recomposeUntilNoChangesPending()
+ requestLayout()
+ measure()
+ layout()
+ drawPrepare()
+ }
+
+ draw()
+ drawFinish()
+ recomposeUntilNoChangesPending()
+
+ runWithTimingDisabled {
+ assertNoPendingChanges()
+ disposeContent()
+ }
+ }
+ }
+}
+
+private class LayeredCaseAdapter(private val innerCase: LayeredComposeTestCase) : ComposeTestCase {
+
+ companion object {
+ fun of(caseFactory: () -> LayeredComposeTestCase): () -> LayeredCaseAdapter = {
+ LayeredCaseAdapter(caseFactory())
+ }
+ }
+
+ var isComposed by mutableStateOf(false)
+
+ @Composable
+ override fun Content() {
+ innerCase.ContentWrappers {
+ if (isComposed) {
+ innerCase.MeasuredContent()
+ }
+ }
+ }
+
+ fun addMeasuredContent() {
+ Assert.assertTrue(!isComposed)
+ isComposed = true
+ }
+}
\ No newline at end of file
diff --git a/wear/compose/compose-foundation/benchmark/src/main/AndroidManifest.xml b/wear/compose/compose-foundation/benchmark/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..490f800
--- /dev/null
+++ b/wear/compose/compose-foundation/benchmark/src/main/AndroidManifest.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+ <application/>
+</manifest>
\ No newline at end of file
diff --git a/wear/compose/compose-foundation/build.gradle b/wear/compose/compose-foundation/build.gradle
index a2ff8da..5a85f33 100644
--- a/wear/compose/compose-foundation/build.gradle
+++ b/wear/compose/compose-foundation/build.gradle
@@ -46,6 +46,7 @@
androidTestImplementation(project(":compose:test-utils"))
androidTestImplementation(libs.testRunner)
androidTestImplementation(libs.kotlinTest)
+ androidTestImplementation(libs.truth)
samples(project(":wear:compose:compose-foundation-samples"))
}
diff --git a/wear/compose/compose-foundation/samples/build.gradle b/wear/compose/compose-foundation/samples/build.gradle
index 5cd0e39..e1bc9aa 100644
--- a/wear/compose/compose-foundation/samples/build.gradle
+++ b/wear/compose/compose-foundation/samples/build.gradle
@@ -34,6 +34,7 @@
implementation(project(":compose:ui:ui"))
implementation(project(":compose:ui:ui-text"))
implementation(project(":wear:compose:compose-foundation"))
+ implementation(project(":wear:compose:compose-material"))
}
android {
diff --git a/wear/compose/compose-foundation/samples/src/main/java/androidx/wear/compose/foundation/samples/ScalingLazyColumnSample.kt b/wear/compose/compose-foundation/samples/src/main/java/androidx/wear/compose/foundation/samples/ScalingLazyColumnSample.kt
new file mode 100644
index 0000000..b6b06ce
--- /dev/null
+++ b/wear/compose/compose-foundation/samples/src/main/java/androidx/wear/compose/foundation/samples/ScalingLazyColumnSample.kt
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.wear.compose.foundation.samples
+
+import androidx.annotation.Sampled
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.dp
+import androidx.wear.compose.foundation.lazy.AutoCenteringParams
+import androidx.wear.compose.foundation.lazy.ScalingLazyColumn
+import androidx.wear.compose.foundation.lazy.ScalingLazyColumnDefaults
+import androidx.wear.compose.foundation.lazy.ScalingLazyListAnchorType
+import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState
+import androidx.wear.compose.material.Chip
+import androidx.wear.compose.material.ChipDefaults
+import androidx.wear.compose.material.ListHeader
+import androidx.wear.compose.material.Text
+import kotlinx.coroutines.launch
+
+@Sampled
+@Composable
+fun SimpleScalingLazyColumn() {
+ ScalingLazyColumn(
+ modifier = Modifier.fillMaxWidth()
+ ) {
+ item {
+ ListHeader {
+ Text(text = "List Header")
+ }
+ }
+ items(20) {
+ Chip(
+ },
+ label = { Text("List item $it") },
+ colors = ChipDefaults.secondaryChipColors()
+ )
+ }
+ }
+}
+
+@Sampled
+@Composable
+fun SimpleScalingLazyColumnWithSnap() {
+ val state = rememberScalingLazyListState()
+ ScalingLazyColumn(
+ modifier = Modifier.fillMaxWidth(),
+ state = state,
+ flingBehavior = ScalingLazyColumnDefaults.snapFlingBehavior(state = state)
+ ) {
+ item {
+ ListHeader {
+ Text(text = "List Header")
+ }
+ }
+ items(20) {
+ Chip(
+ },
+ label = { Text("List item $it") },
+ colors = ChipDefaults.secondaryChipColors()
+ )
+ }
+ }
+}
+
+@Sampled
+@Composable
+fun ScalingLazyColumnEdgeAnchoredAndAnimatedScrollTo() {
+ val coroutineScope = rememberCoroutineScope()
+ val itemSpacing = 6.dp
+ // Line up the gap between the items on the center-line
+ val scrollOffset = with(LocalDensity.current) {
+ -(itemSpacing / 2).roundToPx()
+ }
+ val state = rememberScalingLazyListState(
+ initialCenterItemIndex = 1,
+ initialCenterItemScrollOffset = scrollOffset
+ )
+
+ ScalingLazyColumn(
+ modifier = Modifier.fillMaxWidth(),
+ anchorType = ScalingLazyListAnchorType.ItemStart,
+ verticalArrangement = Arrangement.spacedBy(itemSpacing),
+ state = state,
+ autoCentering = AutoCenteringParams(itemOffset = scrollOffset)
+ ) {
+ item {
+ ListHeader {
+ Text(text = "List Header")
+ }
+ }
+ items(20) {
+ Chip(
+ >
+ coroutineScope.launch {
+ // Add +1 to allow for the ListHeader
+ state.animateScrollToItem(it + 1, scrollOffset)
+ }
+ },
+ label = { Text("List item $it") },
+ colors = ChipDefaults.secondaryChipColors()
+ )
+ }
+ }
+}
+
+@Sampled
+@Composable
+fun SimpleScalingLazyColumnWithContentPadding() {
+ ScalingLazyColumn(
+ modifier = Modifier.fillMaxWidth(),
+ contentPadding = PaddingValues(top = 20.dp, bottom = 20.dp),
+ autoCentering = null
+ ) {
+ item {
+ ListHeader {
+ Text(text = "List Header")
+ }
+ }
+ items(20) {
+ Chip(
+ },
+ label = { Text("List item $it") },
+ colors = ChipDefaults.secondaryChipColors()
+ )
+ }
+ }
+}
diff --git a/wear/compose/compose-foundation/src/androidAndroidTest/kotlin/androidx/wear/compose/foundation/CurvedLayoutTest.kt b/wear/compose/compose-foundation/src/androidAndroidTest/kotlin/androidx/wear/compose/foundation/CurvedLayoutTest.kt
index 34fa6cf..02cf6cc 100644
--- a/wear/compose/compose-foundation/src/androidAndroidTest/kotlin/androidx/wear/compose/foundation/CurvedLayoutTest.kt
+++ b/wear/compose/compose-foundation/src/androidAndroidTest/kotlin/androidx/wear/compose/foundation/CurvedLayoutTest.kt
@@ -414,8 +414,6 @@
}
}
-internal const val TEST_TAG = "test-item"
-
fun checkAngle(expected: Float, actual: Float) {
var d = abs(expected - actual)
d = min(d, 360 - d)
diff --git a/tv/tv-material/src/main/java/androidx/tv/material/ExperimentalTvMaterialApi.kt b/wear/compose/compose-foundation/src/androidAndroidTest/kotlin/androidx/wear/compose/foundation/FoundationTest.kt
similarity index 72%
copy from tv/tv-material/src/main/java/androidx/tv/material/ExperimentalTvMaterialApi.kt
copy to wear/compose/compose-foundation/src/androidAndroidTest/kotlin/androidx/wear/compose/foundation/FoundationTest.kt
index ebac64e..4590238 100644
--- a/tv/tv-material/src/main/java/androidx/tv/material/ExperimentalTvMaterialApi.kt
+++ b/wear/compose/compose-foundation/src/androidAndroidTest/kotlin/androidx/wear/compose/foundation/FoundationTest.kt
@@ -14,10 +14,6 @@
* limitations under the License.
*/
-package androidx.tv.material
+package androidx.wear.compose.foundation
-@RequiresOptIn(
- "This tv-material API is experimental and likely to change or be removed in the future."
-)
-@Retention(AnnotationRetention.BINARY)
-annotation class ExperimentalTvMaterialApi
\ No newline at end of file
+internal const val TEST_TAG = "test-item"
diff --git a/wear/compose/compose-foundation/src/androidAndroidTest/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyColumnIndexedTest.kt b/wear/compose/compose-foundation/src/androidAndroidTest/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyColumnIndexedTest.kt
new file mode 100644
index 0000000..9246678
--- /dev/null
+++ b/wear/compose/compose-foundation/src/androidAndroidTest/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyColumnIndexedTest.kt
@@ -0,0 +1,157 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.wear.compose.foundation.lazy
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.requiredHeight
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.text.BasicText
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsNotDisplayed
+import androidx.compose.ui.test.assertTopPositionInRootIsEqualTo
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.unit.dp
+import org.junit.Rule
+import org.junit.Test
+
+class ScalingLazyColumnIndexedTest {
+
+ @get:Rule
+ val rule = createComposeRule()
+
+ @Test
+ fun scalingLazyColumnShowsIndexedItems() {
+ lateinit var state: ScalingLazyListState
+ val items = (1..4).map { it.toString() }
+ val viewPortHeight = 100.dp
+ val itemHeight = 51.dp
+ val itemWidth = 50.dp
+ val gapBetweenItems = 2.dp
+
+ rule.setContent {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState(initialCenterItemIndex = 0)
+ .also { state = it },
+ modifier = Modifier.height(viewPortHeight),
+ verticalArrangement = Arrangement.spacedBy(gapBetweenItems),
+ scalingParams = ScalingLazyColumnDefaults.scalingParams(
+ edgeScale = 1.0f,
+ // Create some extra composables to check that extraPadding works.
+ viewportVerticalOffsetResolver = { (it.maxHeight / 10f).toInt() }
+ )
+ ) {
+ itemsIndexed(items) { index, item ->
+ Spacer(
+ Modifier.height(itemHeight).width(itemWidth)
+ .testTag("$index-$item")
+ )
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ // Fully visible
+ rule.onNodeWithTag("0-1")
+ .assertIsDisplayed()
+
+ // Partially visible
+ rule.onNodeWithTag("1-2")
+ .assertIsDisplayed()
+
+ // Will have been composed but should not be visible
+ rule.onNodeWithTag("2-3")
+ .assertIsNotDisplayed()
+
+ // Should not have been composed
+ rule.onNodeWithTag("3-4")
+ .assertDoesNotExist()
+ }
+
+ @Test
+ fun columnWithIndexesComposedWithCorrectIndexAndItem() {
+ lateinit var state: ScalingLazyListState
+ val items = (0..1).map { it.toString() }
+
+ rule.setContent {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState(initialCenterItemIndex = 0)
+ .also { state = it },
+ modifier = Modifier.height(200.dp),
+ autoCentering = null,
+ scalingParams = ScalingLazyColumnDefaults.scalingParams(edgeScale = 1.0f)
+ ) {
+ itemsIndexed(items) { index, item ->
+ BasicText(
+ "${index}x$item", Modifier.requiredHeight(100.dp)
+ )
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.onNodeWithText("0x0")
+ .assertTopPositionInRootIsEqualTo(0.dp)
+
+ rule.onNodeWithText("1x1")
+ .assertTopPositionInRootIsEqualTo(104.dp)
+ }
+
+ @Test
+ fun columnWithIndexesComposedWithCorrectIndexAndItemWithAutoCentering() {
+ lateinit var state: ScalingLazyListState
+ val items = (0..1).map { it.toString() }
+ val viewPortHeight = 100.dp
+ val itemHeight = 50.dp
+ val gapBetweenItems = 2.dp
+ rule.setContent {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState(initialCenterItemIndex = 0)
+ .also { state = it },
+ modifier = Modifier.height(viewPortHeight),
+ autoCentering = AutoCenteringParams(itemIndex = 0),
+ verticalArrangement = Arrangement.spacedBy(gapBetweenItems),
+ // No scaling as we are doing maths with expected item sizes
+ scalingParams = ScalingLazyColumnDefaults.scalingParams(edgeScale = 1.0f)
+ ) {
+ itemsIndexed(items) { index, item ->
+ BasicText(
+ "${index}x$item", Modifier.requiredHeight(itemHeight)
+ )
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ // Check that first item is in the center of the viewport
+ val firstItemStart = viewPortHeight / 2f - itemHeight / 2f
+ rule.onNodeWithText("0x0")
+ .assertTopPositionInRootIsEqualTo(firstItemStart)
+
+ // And that the second item is item height + gap between items below it
+ rule.onNodeWithText("1x1")
+ .assertTopPositionInRootIsEqualTo(firstItemStart + itemHeight + gapBetweenItems)
+ }
+}
diff --git a/wear/compose/compose-foundation/src/androidAndroidTest/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyColumnTest.kt b/wear/compose/compose-foundation/src/androidAndroidTest/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyColumnTest.kt
new file mode 100644
index 0000000..9eb2282
--- /dev/null
+++ b/wear/compose/compose-foundation/src/androidAndroidTest/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyColumnTest.kt
@@ -0,0 +1,977 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.wear.compose.foundation.lazy
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.requiredHeight
+import androidx.compose.foundation.layout.requiredSize
+import androidx.compose.foundation.layout.requiredWidth
+import androidx.compose.foundation.layout.size
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.testutils.WithTouchSlop
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.test.assertHeightIsEqualTo
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertWidthIsEqualTo
+import androidx.compose.ui.test.junit4.ComposeContentTestRule
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.performTouchInput
+import androidx.compose.ui.test.swipeDown
+import androidx.compose.ui.test.swipeUp
+import androidx.compose.ui.test.swipeWithVelocity
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.MediumTest
+import androidx.wear.compose.foundation.TEST_TAG
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import com.google.common.truth.Truth.assertThat
+import kotlin.math.roundToInt
+import kotlinx.coroutines.runBlocking
+
+@MediumTest
+@RunWith(AndroidJUnit4::class)
+// These tests are in addition to ScalingLazyListLayoutInfoTest which handles scroll events at an
+// absolute level and is designed to exercise scrolling through the UI directly.
+public class ScalingLazyColumnTest {
+ private val scalingLazyColumnTag = "scalingLazyColumnTag"
+ private val firstItemTag = "firstItemTag"
+
+ @get:Rule
+ val rule = createComposeRule()
+
+ private var itemSizePx: Int = 50
+ private var itemSizeDp: Dp = Dp.Infinity
+ private var defaultItemSpacingDp: Dp = 4.dp
+ private var defaultItemSpacingPx = Int.MAX_VALUE
+
+ @Before
+ fun before() {
+ with(rule.density) {
+ itemSizeDp = itemSizePx.toDp()
+ defaultItemSpacingPx = defaultItemSpacingDp.roundToPx()
+ }
+ }
+
+ @Test
+ fun initializationCorrectWithAutoCenteringAndNormalItemPaddingForZeroItemList() {
+ initializationCorrectWithAutoCenteringAndNormalItemPaddingForNItemList(0)
+ }
+
+ @Test
+ fun initializationCorrectWithAutoCenteringAndNormalItemPaddingForOneItemList() {
+ initializationCorrectWithAutoCenteringAndNormalItemPaddingForNItemList(1)
+ }
+
+ @Test
+ fun initializationCorrectWithAutoCenteringAndNormalItemPaddingForTwoItemList() {
+ initializationCorrectWithAutoCenteringAndNormalItemPaddingForNItemList(2)
+ }
+
+ @Test
+ fun initializationCorrectWithAutoCenteringAndNormalItemPaddingForThreeItemList() {
+ initializationCorrectWithAutoCenteringAndNormalItemPaddingForNItemList(3)
+ }
+
+ @Test
+ fun initializationCorrectWithAutoCenteringAndNormalItemPaddingForFourItemList() {
+ initializationCorrectWithAutoCenteringAndNormalItemPaddingForNItemList(4)
+ }
+
+ @Test
+ fun initializationCorrectWithAutoCenteringAndNormalItemPaddingForFiveItemList() {
+ initializationCorrectWithAutoCenteringAndNormalItemPaddingForNItemList(5)
+ }
+
+ private fun initializationCorrectWithAutoCenteringAndNormalItemPaddingForNItemList(
+ itemCount: Int
+ ) {
+ lateinit var state: ScalingLazyListState
+ val listSize = itemSizeDp * 3.5f
+ rule.setContent {
+ WithTouchSlop(0f) {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState().also { state = it },
+ modifier = Modifier.testTag(TEST_TAG).requiredSize(listSize),
+ ) {
+ items(itemCount) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+ }
+
+ rule.waitUntil { state.initialized.value }
+ }
+
+ @Test
+ fun initializationCorrectWithAutoCenteringAndCustomInterItemPadding() {
+ lateinit var state: ScalingLazyListState
+ val listSize = itemSizeDp * 3.5f
+ rule.setContent {
+ WithTouchSlop(0f) {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState().also { state = it },
+ modifier = Modifier.testTag(TEST_TAG).requiredSize(listSize),
+ scalingParams = ScalingLazyColumnDefaults.scalingParams(edgeScale = 1f),
+ // We want to arrange for the autoCentering spacer to be of size zero, but
+ // also for the gap between items to be needed.
+ verticalArrangement = Arrangement.spacedBy(itemSizeDp * 0.25f * 0.75f),
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+ }
+
+ rule.waitUntil { state.initialized.value }
+ }
+
+ @Test
+ fun initializationCorrectWithAutoCenteringAndLargeFirstItem() {
+ lateinit var state: ScalingLazyListState
+ val listSize = itemSizeDp * 3.5f
+ rule.setContent {
+ WithTouchSlop(0f) {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState().also { state = it },
+ modifier = Modifier.testTag(TEST_TAG).requiredSize(listSize),
+ scalingParams = ScalingLazyColumnDefaults.scalingParams(edgeScale = 1f),
+ ) {
+ item {
+ Box(Modifier.requiredSize(itemSizeDp * 2))
+ }
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+ }
+
+ rule.waitUntil { state.initialized.value }
+ }
+
+ @Test
+ fun autoCenteringCorrectSizeWithCenterAnchor() {
+ lateinit var state: ScalingLazyListState
+ val listSize = itemSizeDp * 3.5f
+ rule.setContent {
+ WithTouchSlop(0f) {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState().also { state = it },
+ modifier = Modifier.testTag(TEST_TAG).requiredSize(listSize),
+ anchorType = ScalingLazyListAnchorType.ItemCenter,
+ autoCentering = AutoCenteringParams(),
+ verticalArrangement = Arrangement.spacedBy(0.dp),
+ scalingParams = ScalingLazyColumnDefaults.scalingParams(
+ edgeScale = 0f,
+ minTransitionArea = 0.5f,
+ maxTransitionArea = 0.5f
+ )
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+ }
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.waitForIdle()
+
+ val listSizePx = with(rule.density) {
+ listSize.roundToPx()
+ }
+ rule.runOnIdle {
+ // Make sure that the edge items have been scaled
+ assertThat(state.layoutInfo.visibleItemsInfo.first().scale).isLessThan(1.0f)
+ // But that size of the Spacer is as expected - it should be half the viewport size
+ // rounded down minus half the size of the center item rounded down minus the full size
+ // of the 0th item
+ assertThat(state.lazyListState.layoutInfo.visibleItemsInfo.first().size)
+ .isEqualTo((listSizePx / 2) - (itemSizePx + itemSizePx / 2))
+ }
+ rule.onNodeWithTag(TEST_TAG).performTouchInput {
+ swipeUp()
+ }
+ rule.runOnIdle {
+ // Check that the last item has been scrolled into view
+ assertThat(state.lazyListState.layoutInfo.visibleItemsInfo.last().index)
+ .isEqualTo(state.lazyListState.layoutInfo.totalItemsCount - 1)
+ // And that size of the Spacer is as expected
+ assertThat(state.lazyListState.layoutInfo.visibleItemsInfo.last().size)
+ .isEqualTo(((listSizePx / 2f) - (itemSizePx / 2f)).roundToInt())
+ }
+ }
+
+ @Test
+ fun autoCenteringCorrectSizeWithStartAnchor() {
+ lateinit var state: ScalingLazyListState
+ val listSize = itemSizeDp * 3.5f
+ rule.setContent {
+ WithTouchSlop(0f) {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState().also { state = it },
+ modifier = Modifier.testTag(TEST_TAG).requiredSize(listSize),
+ anchorType = ScalingLazyListAnchorType.ItemStart,
+ autoCentering = AutoCenteringParams(),
+ verticalArrangement = Arrangement.spacedBy(0.dp),
+ scalingParams = ScalingLazyColumnDefaults.scalingParams(
+ edgeScale = 0f,
+ minTransitionArea = 0.5f,
+ maxTransitionArea = 0.5f
+ )
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+ }
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.waitForIdle()
+
+ val listSizePx = with(rule.density) {
+ listSize.roundToPx()
+ }
+
+ rule.runOnIdle {
+ // Make sure that the edge items have been scaled
+ assertThat(state.layoutInfo.visibleItemsInfo.first().scale).isLessThan(1.0f)
+ // But that size of the Spacer is as expected, it should be half the viewport size
+ // rounded down minus the size of zeroth item in the list
+ assertThat(state.lazyListState.layoutInfo.visibleItemsInfo.first().size)
+ .isEqualTo((listSizePx / 2) - itemSizePx)
+ }
+ rule.onNodeWithTag(TEST_TAG).performTouchInput {
+ swipeUp(endY = top)
+ }
+ rule.runOnIdle {
+ // Check that the last item has been scrolled into view
+ assertThat(state.lazyListState.layoutInfo.visibleItemsInfo.last().index)
+ .isEqualTo(state.lazyListState.layoutInfo.totalItemsCount - 1)
+ // And that size of the Spacer is as expected
+ assertThat(state.lazyListState.layoutInfo.visibleItemsInfo.last().size)
+ .isEqualTo(((listSizePx / 2f) - itemSizePx).roundToInt())
+ }
+ }
+
+ @Test
+ fun visibleItemsAreCorrectAfterScrolling() {
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ WithTouchSlop(0f) {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState().also { state = it },
+ modifier = Modifier.testTag(TEST_TAG).requiredSize(
+ itemSizeDp * 3.5f + defaultItemSpacingDp * 2.5f
+ ),
+ autoCentering = null
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+ }
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.waitForIdle()
+
+ state.layoutInfo.assertVisibleItems(count = 4, startIndex = 0)
+
+ rule.onNodeWithTag(TEST_TAG).performTouchInput {
+ swipeUp(endY = bottom - (itemSizePx.toFloat() + defaultItemSpacingPx.toFloat()))
+ }
+
+ rule.waitForIdle()
+ state.layoutInfo.assertVisibleItems(count = 4, startIndex = 1)
+ }
+
+ @Test
+ fun visibleItemsAreCorrectAfterAttemptedScrollWithUserScrollDisabled() {
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ WithTouchSlop(0f) {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState().also { state = it },
+ modifier = Modifier.testTag(TEST_TAG).requiredSize(
+ itemSizeDp * 3.5f + defaultItemSpacingDp * 2.5f
+ ),
+ autoCentering = null,
+ userScrollEnabled = false
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.waitForIdle()
+
+ state.layoutInfo.assertVisibleItems(count = 4, startIndex = 0)
+
+ rule.onNodeWithTag(TEST_TAG).performTouchInput {
+ swipeUp(endY = bottom - (itemSizePx.toFloat() + defaultItemSpacingPx.toFloat()))
+ }
+
+ rule.waitForIdle()
+ state.layoutInfo.assertVisibleItems(count = 4, startIndex = 0)
+ }
+
+ @Test
+ fun visibleItemsAreCorrectAfterScrollingWithAutoCentering() {
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ WithTouchSlop(0f) {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState(initialCenterItemIndex = 0)
+ .also { state = it },
+ modifier = Modifier.testTag(TEST_TAG).requiredSize(
+ itemSizeDp * 3.5f + defaultItemSpacingDp * 2.5f
+ ),
+ autoCentering = AutoCenteringParams(itemIndex = 0)
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+ }
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.waitForIdle()
+ state.layoutInfo.assertVisibleItems(count = 3, startIndex = 0)
+
+ rule.waitForIdle()
+ rule.onNodeWithTag(TEST_TAG).performTouchInput {
+ swipeUp(endY = bottom - (itemSizePx.toFloat() + defaultItemSpacingPx.toFloat()))
+ }
+
+ rule.waitForIdle()
+ state.layoutInfo.assertVisibleItems(count = 4, startIndex = 0)
+ }
+
+ @Test
+ fun visibleItemsAreCorrectAfterScrollingWithSnap() {
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ WithTouchSlop(0f) {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState(initialCenterItemIndex = 0)
+ .also { state = it },
+ modifier = Modifier.testTag(TEST_TAG).requiredSize(
+ itemSizeDp * 3.5f + defaultItemSpacingDp * 2.5f
+ ),
+ autoCentering = AutoCenteringParams(itemIndex = 0),
+ flingBehavior = ScalingLazyColumnDefaults.snapFlingBehavior(state)
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+ }
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.waitForIdle()
+
+ state.layoutInfo.assertVisibleItems(count = 3, startIndex = 0)
+
+ rule.waitForIdle()
+ rule.onNodeWithTag(TEST_TAG).performTouchInput {
+ // Swipe by an amount that is not a whole item + gap
+ swipeWithVelocity(
+ start = Offset(centerX, bottom),
+ end = Offset(centerX, bottom - (itemSizePx.toFloat())),
+ endVelocity = 1f, // Ensure it's not a fling.
+ )
+ }
+
+ rule.waitForIdle()
+ state.layoutInfo.assertVisibleItems(count = 4, startIndex = 0)
+ assertThat(state.centerItemIndex).isEqualTo(1)
+ assertThat(state.centerItemScrollOffset).isEqualTo(0)
+ }
+
+ @Test
+ fun visibleItemsAreCorrectAfterScrollingWithSnapAndOffset() {
+ lateinit var state: ScalingLazyListState
+ val snapOffset = 5.dp
+ var snapOffsetPx = 0
+ rule.setContent {
+ WithTouchSlop(0f) {
+ snapOffsetPx = with(LocalDensity.current) { snapOffset.roundToPx() }
+
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState(initialCenterItemIndex = 0)
+ .also { state = it },
+ modifier = Modifier.testTag(TEST_TAG).requiredSize(
+ itemSizeDp * 3.5f + defaultItemSpacingDp * 2.5f
+ ),
+ autoCentering = AutoCenteringParams(itemIndex = 0),
+ flingBehavior = ScalingLazyColumnDefaults.snapFlingBehavior(
+ state = state,
+ snapOffset = snapOffset
+ )
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+ }
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.waitForIdle()
+ state.layoutInfo.assertVisibleItems(count = 3, startIndex = 0)
+
+ rule.waitForIdle()
+ rule.onNodeWithTag(TEST_TAG).performTouchInput {
+ // Swipe by an amount that is not a whole item + gap
+ swipeWithVelocity(
+ start = Offset(centerX, bottom),
+ end = Offset(centerX, bottom - (itemSizePx.toFloat())),
+ endVelocity = 1f, // Ensure it's not a fling.
+ )
+ }
+
+ rule.waitForIdle()
+ state.layoutInfo.assertVisibleItems(count = 4, startIndex = 0)
+ assertThat(state.centerItemIndex).isEqualTo(1)
+ assertThat(state.centerItemScrollOffset).isEqualTo(snapOffsetPx)
+ }
+
+ @Test
+ fun visibleItemsAreCorrectAfterScrollingReverseLayout() {
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ WithTouchSlop(0f) {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState().also { state = it },
+ modifier = Modifier.testTag(TEST_TAG).requiredSize(
+ itemSizeDp * 3.5f + defaultItemSpacingDp * 2.5f
+ ),
+ reverseLayout = true,
+ autoCentering = null
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.onNodeWithTag(TEST_TAG).performTouchInput {
+ swipeDown(
+ startY = top,
+ endY = top + (itemSizePx.toFloat() + defaultItemSpacingPx.toFloat())
+ )
+ }
+ rule.waitForIdle()
+ state.layoutInfo.assertVisibleItems(count = 4, startIndex = 1)
+ }
+
+ @Test
+ fun visibleItemsAreCorrectAfterScrollNoScaling() {
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ WithTouchSlop(0f) {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState(initialCenterItemIndex = 0)
+ .also { state = it },
+ modifier = Modifier.testTag(TEST_TAG).requiredSize(
+ itemSizeDp * 3.5f + defaultItemSpacingDp * 2.5f
+ ),
+ scalingParams = ScalingLazyColumnDefaults.scalingParams(1.0f, 1.0f),
+ autoCentering = AutoCenteringParams(itemIndex = 0)
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp).testTag("Item:" + it))
+ }
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.waitForIdle()
+ rule.mainClock.autoAdvance = false
+ rule.onNodeWithTag(TEST_TAG).performTouchInput {
+ swipeUp(
+ startY = bottom,
+ endY = bottom - (itemSizePx.toFloat() + defaultItemSpacingPx.toFloat()),
+ )
+ }
+ rule.waitForIdle()
+ state.layoutInfo.assertVisibleItems(count = 4, startIndex = 0)
+ assertThat(state.centerItemIndex).isEqualTo(1)
+ }
+
+ @Test
+ fun visibleItemsAreCorrectAfterScrollNoScalingForReverseLayout() {
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ WithTouchSlop(0f) {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState(8).also { state = it },
+ modifier = Modifier.testTag(TEST_TAG).requiredSize(
+ itemSizeDp * 4f + defaultItemSpacingDp * 3f
+ ),
+ scalingParams = ScalingLazyColumnDefaults.scalingParams(1.0f, 1.0f),
+ reverseLayout = true
+ ) {
+ items(15) {
+ Box(Modifier.requiredSize(itemSizeDp).testTag("Item:" + it))
+ }
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.waitForIdle()
+ rule.mainClock.autoAdvance = false
+ rule.onNodeWithTag(TEST_TAG).performTouchInput {
+ swipeDown(
+ startY = top,
+ endY = top + (itemSizePx.toFloat() + defaultItemSpacingPx.toFloat())
+ )
+ }
+ rule.waitForIdle()
+ state.layoutInfo.assertVisibleItems(count = 5, startIndex = 7)
+ assertThat(state.centerItemIndex).isEqualTo(9)
+ assertThat(state.centerItemScrollOffset).isEqualTo(0)
+ }
+
+ @Composable
+ fun ObservingFun(
+ state: ScalingLazyListState,
+ currentInfo: StableRef<ScalingLazyListLayoutInfo?>
+ ) {
+ currentInfo.value = state.layoutInfo
+ }
+
+ @Test
+ fun visibleItemsAreObservableWhenWeScroll() {
+ lateinit var state: ScalingLazyListState
+ val currentInfo = StableRef<ScalingLazyListLayoutInfo?>(null)
+ rule.setContent {
+ WithTouchSlop(0f) {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState().also { state = it },
+ modifier = Modifier
+ .testTag(TEST_TAG)
+ .requiredSize(itemSizeDp * 3.5f + defaultItemSpacingDp * 2.5f),
+ autoCentering = null
+ ) {
+ items(6) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ ObservingFun(state, currentInfo)
+ }
+ }
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.waitForIdle()
+ rule.mainClock.autoAdvance = false
+ currentInfo.value = null
+ rule.onNodeWithTag(TEST_TAG).performTouchInput {
+ swipeUp(
+ startY = bottom,
+ endY = bottom - (itemSizePx.toFloat() + defaultItemSpacingPx.toFloat()),
+ )
+ }
+ rule.waitForIdle()
+ rule.mainClock.advanceTimeBy(milliseconds = 1000)
+ assertThat(currentInfo.value).isNotNull()
+ currentInfo.value!!.assertVisibleItems(count = 4, startIndex = 1)
+ }
+
+ fun ScalingLazyListLayoutInfo.assertVisibleItems(
+ count: Int,
+ startIndex: Int = 0,
+ unscaledSize: Int = itemSizePx,
+ spacing: Int = defaultItemSpacingPx,
+ anchorType: ScalingLazyListAnchorType = ScalingLazyListAnchorType.ItemCenter
+ ) {
+ assertThat(visibleItemsInfo.size).isEqualTo(count)
+ var currentIndex = startIndex
+ var previousEndOffset = -1
+ visibleItemsInfo.forEach {
+ assertThat(it.index).isEqualTo(currentIndex)
+ assertThat(it.size).isEqualTo((unscaledSize * it.scale).roundToInt())
+ currentIndex++
+ val startOffset = it.startOffset(anchorType).roundToInt()
+ if (previousEndOffset != -1) {
+ assertThat(spacing).isEqualTo(startOffset - previousEndOffset)
+ }
+ previousEndOffset = startOffset + it.size
+ }
+ }
+
+ @Test
+ fun itemFillingParentWidth() {
+ lateinit var state: ScalingLazyListState
+ rule.setContentWithTestViewConfiguration {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState(8).also { state = it },
+ modifier = Modifier.requiredSize(width = 100.dp, height = 150.dp),
+ contentPadding = PaddingValues(horizontal = 0.dp),
+ scalingParams = ScalingLazyColumnDefaults.scalingParams(1.0f, 1.0f)
+ ) {
+ items(listOf(0)) {
+ Spacer(
+ Modifier.fillParentMaxWidth().requiredHeight(50.dp).testTag(firstItemTag)
+ )
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.onNodeWithTag(firstItemTag)
+ .assertWidthIsEqualTo(100.dp)
+ .assertHeightIsEqualTo(50.dp)
+ }
+
+ @Test
+ fun itemFillingParentHeight() {
+ lateinit var state: ScalingLazyListState
+ rule.setContentWithTestViewConfiguration {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState(8).also { state = it },
+ modifier = Modifier.requiredSize(width = 100.dp, height = 150.dp),
+ scalingParams = ScalingLazyColumnDefaults.scalingParams(1.0f, 1.0f)
+ ) {
+ items(listOf(0)) {
+ Spacer(
+ Modifier.requiredWidth(50.dp).fillParentMaxHeight().testTag(firstItemTag)
+ )
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.onNodeWithTag(firstItemTag)
+ .assertWidthIsEqualTo(50.dp)
+ .assertHeightIsEqualTo(150.dp)
+ }
+
+ @Test
+ fun itemFillingParentSize() {
+ lateinit var state: ScalingLazyListState
+ rule.setContentWithTestViewConfiguration {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState(8).also { state = it },
+ modifier = Modifier.requiredSize(width = 100.dp, height = 150.dp),
+ contentPadding = PaddingValues(horizontal = 0.dp),
+ scalingParams = ScalingLazyColumnDefaults.scalingParams(1.0f, 1.0f)
+ ) {
+ items(listOf(0)) {
+ Spacer(Modifier.fillParentMaxSize().testTag(firstItemTag))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.onNodeWithTag(firstItemTag)
+ .assertWidthIsEqualTo(100.dp)
+ .assertHeightIsEqualTo(150.dp)
+ }
+
+ @Test
+ fun itemFillingParentWidthFraction() {
+ lateinit var state: ScalingLazyListState
+ rule.setContentWithTestViewConfiguration {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState(8).also { state = it },
+ modifier = Modifier.requiredSize(width = 100.dp, height = 150.dp),
+ contentPadding = PaddingValues(horizontal = 0.dp),
+ scalingParams = ScalingLazyColumnDefaults.scalingParams(1.0f, 1.0f)
+ ) {
+ items(listOf(0)) {
+ Spacer(
+ Modifier.fillParentMaxWidth(0.7f)
+ .requiredHeight(50.dp)
+ .testTag(firstItemTag)
+ )
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.onNodeWithTag(firstItemTag)
+ .assertWidthIsEqualTo(70.dp)
+ .assertHeightIsEqualTo(50.dp)
+ }
+
+ @Test
+ fun itemFillingParentHeightFraction() {
+ lateinit var state: ScalingLazyListState
+ rule.setContentWithTestViewConfiguration {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState(8).also { state = it },
+ modifier = Modifier.requiredSize(width = 100.dp, height = 150.dp)
+ ) {
+ items(listOf(0)) {
+ Spacer(
+ Modifier.requiredWidth(50.dp)
+ .fillParentMaxHeight(0.3f)
+ .testTag(firstItemTag)
+ )
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.onNodeWithTag(firstItemTag)
+ .assertWidthIsEqualTo(50.dp)
+ .assertHeightIsEqualTo(45.dp)
+ }
+
+ @Test
+ fun itemFillingParentSizeFraction() {
+ lateinit var state: ScalingLazyListState
+ rule.setContentWithTestViewConfiguration {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState(8).also { state = it },
+ modifier = Modifier.requiredSize(width = 100.dp, height = 150.dp),
+ contentPadding = PaddingValues(horizontal = 0.dp)
+ ) {
+ items(listOf(0)) {
+ Spacer(Modifier.fillParentMaxSize(0.5f).testTag(firstItemTag))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.onNodeWithTag(firstItemTag)
+ .assertWidthIsEqualTo(50.dp)
+ .assertHeightIsEqualTo(75.dp)
+ }
+
+ @Test
+ fun itemFillingParentSizeParentResized() {
+ lateinit var state: ScalingLazyListState
+ var parentSize by mutableStateOf(100.dp)
+ rule.setContentWithTestViewConfiguration {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState(8).also { state = it },
+ modifier = Modifier.requiredSize(parentSize),
+ contentPadding = PaddingValues(horizontal = 0.dp),
+ ) {
+ items(listOf(0)) {
+ Spacer(Modifier.fillParentMaxSize().testTag(firstItemTag))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.runOnIdle {
+ parentSize = 150.dp
+ }
+
+ rule.onNodeWithTag(firstItemTag)
+ .assertWidthIsEqualTo(150.dp)
+ .assertHeightIsEqualTo(150.dp)
+ }
+
+ @Test
+ fun listSizeFitsContentsIfNotSet() {
+ lateinit var state: ScalingLazyListState
+ var itemSize by mutableStateOf(100.dp)
+ rule.setContentWithTestViewConfiguration {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState(8).also { state = it },
+ modifier = Modifier.testTag(scalingLazyColumnTag),
+ contentPadding = PaddingValues(horizontal = 0.dp),
+ ) {
+ items(listOf(0)) {
+ Spacer(Modifier.size(itemSize).testTag(firstItemTag))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+
+ rule.onNodeWithTag(scalingLazyColumnTag)
+ .assertWidthIsEqualTo(itemSize)
+
+ rule.runOnIdle {
+ itemSize = 150.dp
+ }
+
+ rule.onNodeWithTag(scalingLazyColumnTag)
+ .assertWidthIsEqualTo(itemSize)
+
+ rule.runOnIdle {
+ itemSize = 50.dp
+ }
+
+ rule.onNodeWithTag(scalingLazyColumnTag)
+ .assertWidthIsEqualTo(itemSize)
+ }
+
+ @Test
+ fun listStateUsesInitialCenterItemIndex() {
+ val startIndexValue = 5
+ lateinit var state: ScalingLazyListState
+
+ rule.setContent {
+ state = rememberScalingLazyListState(initialCenterItemIndex = startIndexValue)
+ }
+
+ assertThat(state.centerItemIndex).isEqualTo(startIndexValue)
+ }
+
+ @Test
+ fun listStateUsesInitialCenterItemScrollOffset() {
+ val startScrollValue = 5
+ lateinit var state: ScalingLazyListState
+
+ rule.setContent {
+ state = rememberScalingLazyListState(initialCenterItemScrollOffset = startScrollValue)
+ }
+
+ assertThat(state.centerItemScrollOffset).isEqualTo(startScrollValue)
+ }
+
+ @Test
+ fun scrollToNotVisibleListWorks() {
+ lateinit var state: ScalingLazyListState
+ lateinit var showList: MutableState<Boolean>
+ rule.setContent {
+ showList = remember { mutableStateOf(true) }
+ state = rememberScalingLazyListState()
+ if (showList.value) {
+ ScalingLazyColumn(
+ state = state,
+ modifier = Modifier.testTag(TEST_TAG).requiredSize(
+ itemSizeDp * 3.5f + defaultItemSpacingDp * 2.5f
+ ),
+ autoCentering = AutoCenteringParams()
+ ) {
+ items(25) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ } else {
+ Box(modifier = Modifier.requiredSize(
+ itemSizeDp * 3.5f + defaultItemSpacingDp * 2.5f
+ ))
+ }
+ }
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+
+ rule.onNodeWithTag(TEST_TAG).assertExists()
+ rule.onNodeWithTag(TEST_TAG).assertIsDisplayed()
+
+ showList.value = false
+
+ rule.waitForIdle()
+ rule.onNodeWithTag(TEST_TAG).assertDoesNotExist()
+
+ rule.runOnIdle {
+ runBlocking {
+ state.scrollToItem(10)
+ }
+ }
+
+ rule.waitForIdle()
+ showList.value = true
+
+ rule.waitForIdle()
+ rule.onNodeWithTag(TEST_TAG).assertExists()
+
+ state.layoutInfo.assertVisibleItems(count = 5, startIndex = 8)
+ assertThat(state.centerItemIndex).isEqualTo(10)
+ assertThat(state.centerItemScrollOffset).isEqualTo(0)
+ }
+
+ @Test
+ fun scrollToNonExistentItemWorks() {
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ state = rememberScalingLazyListState()
+ ScalingLazyColumn(
+ state = state,
+ modifier = Modifier.testTag(TEST_TAG).requiredSize(
+ itemSizeDp * 3.5f + defaultItemSpacingDp * 2.5f
+ ),
+ autoCentering = AutoCenteringParams()
+ ) {
+ items(25) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+
+ rule.runOnIdle {
+ runBlocking {
+ state.scrollToItem(50)
+ }
+ }
+
+ state.layoutInfo.assertVisibleItems(count = 3, startIndex = 22)
+ assertThat(state.centerItemIndex).isEqualTo(24)
+ assertThat(state.centerItemScrollOffset).isEqualTo(0)
+ }
+}
+
+internal const val TestTouchSlop = 18f
+
+internal fun ComposeContentTestRule.setContentWithTestViewConfiguration(
+ composable: @Composable () -> Unit
+) {
+ this.setContent {
+ WithTouchSlop(TestTouchSlop, composable)
+ }
+}
diff --git a/wear/compose/compose-foundation/src/androidAndroidTest/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyListLayoutInfoTest.kt b/wear/compose/compose-foundation/src/androidAndroidTest/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyListLayoutInfoTest.kt
new file mode 100644
index 0000000..913c3ce7
--- /dev/null
+++ b/wear/compose/compose-foundation/src/androidAndroidTest/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyListLayoutInfoTest.kt
@@ -0,0 +1,1247 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.wear.compose.foundation.lazy
+
+import androidx.compose.foundation.gestures.Orientation
+import androidx.compose.foundation.gestures.animateScrollBy
+import androidx.compose.foundation.gestures.scrollBy
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.requiredSize
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Stable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.dp
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.MediumTest
+import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.math.roundToInt
+import org.junit.Ignore
+
+@MediumTest
+@RunWith(AndroidJUnit4::class)
+public class ScalingLazyListLayoutInfoTest {
+ @get:Rule
+ val rule = createComposeRule()
+
+ private var itemSizePx: Int = 50
+ private var itemSizeDp: Dp = Dp.Infinity
+ private var defaultItemSpacingDp: Dp = 4.dp
+ private var defaultItemSpacingPx = Int.MAX_VALUE
+
+ @Before
+ fun before() {
+ with(rule.density) {
+ itemSizeDp = itemSizePx.toDp()
+ defaultItemSpacingPx = defaultItemSpacingDp.roundToPx()
+ }
+ }
+
+ @Ignore("Awaiting fix for b/236217874")
+ @Test
+ fun visibleItemsAreCorrect() {
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState().also { state = it },
+ modifier = Modifier.requiredSize(
+ itemSizeDp * 3.5f + defaultItemSpacingDp * 2.5f
+ ),
+ autoCentering = AutoCenteringParams()
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.runOnIdle {
+ assertThat(state.centerItemIndex).isEqualTo(1)
+ assertThat(state.centerItemScrollOffset).isEqualTo(0)
+ state.layoutInfo.assertVisibleItems(count = 4)
+ }
+ }
+
+ @Test
+ fun centerItemIndexIsCorrectAfterScrolling() {
+ lateinit var state: ScalingLazyListState
+ var itemSpacingPx: Int = -1
+ val itemSpacingDp = 20.dp
+ var scope: CoroutineScope? = null
+ rule.setContent {
+ scope = rememberCoroutineScope()
+ itemSpacingPx = with(LocalDensity.current) { itemSpacingDp.roundToPx() }
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState().also { state = it },
+ modifier = Modifier.requiredSize(
+ itemSizeDp * 3.5f + itemSpacingDp * 2.5f
+ ),
+ verticalArrangement = Arrangement.spacedBy(itemSpacingDp),
+ autoCentering = AutoCenteringParams()
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.runOnIdle {
+ assertThat(state.centerItemIndex).isEqualTo(1)
+ assertThat(state.centerItemScrollOffset).isEqualTo(0)
+ state.layoutInfo.assertVisibleItems(count = 3, spacing = itemSpacingPx)
+ }
+
+ // Scroll so that the center item is just above the center line and check that it is still
+ // the correct center item
+ val scrollDistance = (itemSizePx / 2) + 1
+ scope!!.launch {
+ state.animateScrollBy(scrollDistance.toFloat())
+ }
+ rule.runOnIdle {
+ assertThat(state.centerItemIndex).isEqualTo(1)
+ assertThat(state.centerItemScrollOffset).isEqualTo(scrollDistance)
+ }
+ }
+
+ @Test
+ fun orientationIsCorrect() {
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState().also { state = it },
+ modifier = Modifier.requiredSize(
+ itemSizeDp * 3.5f + defaultItemSpacingDp * 2.5f
+ ),
+ autoCentering = AutoCenteringParams(),
+ contentPadding = PaddingValues(all = 0.dp)
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+
+ rule.runOnIdle {
+ assertThat(state.layoutInfo.orientation).isEqualTo(Orientation.Vertical)
+ }
+ }
+
+ @Test
+ fun reverseLayoutIsCorrectWhenNotReversed() {
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState().also { state = it },
+ modifier = Modifier.requiredSize(
+ itemSizeDp * 3.5f + defaultItemSpacingDp * 2.5f
+ ),
+ autoCentering = AutoCenteringParams(),
+ contentPadding = PaddingValues(all = 0.dp)
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+
+ rule.runOnIdle {
+ assertThat(state.layoutInfo.reverseLayout).isEqualTo(false)
+ }
+ }
+
+ @Test
+ fun reverseLayoutIsCorrectWhenReversed() {
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState().also { state = it },
+ modifier = Modifier.requiredSize(
+ itemSizeDp * 3.5f + defaultItemSpacingDp * 2.5f
+ ),
+ autoCentering = AutoCenteringParams(),
+ contentPadding = PaddingValues(all = 0.dp),
+ reverseLayout = true
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+
+ rule.runOnIdle {
+ assertThat(state.layoutInfo.reverseLayout).isEqualTo(true)
+ }
+ }
+
+ @Test
+ fun visibleItemsAreCorrectSetExplicitInitialItemIndex() {
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState(initialCenterItemIndex = 0)
+ .also { state = it },
+ modifier = Modifier.requiredSize(
+ itemSizeDp * 3.5f + defaultItemSpacingDp * 2.5f
+ ),
+ autoCentering = AutoCenteringParams(itemIndex = 0)
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.runOnIdle {
+ assertThat(state.centerItemIndex).isEqualTo(0)
+ assertThat(state.centerItemScrollOffset).isEqualTo(0)
+ state.layoutInfo.assertVisibleItems(count = 3)
+ }
+ }
+
+ @Test
+ fun visibleItemsAreCorrectNoAutoCentering() {
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState().also { state = it },
+ modifier = Modifier.requiredSize(
+ itemSizeDp * 3.5f + defaultItemSpacingDp * 2.5f
+ ),
+ autoCentering = null
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.runOnIdle {
+ state.layoutInfo.assertVisibleItems(count = 4)
+ }
+ }
+
+ @Test
+ fun visibleItemsAreCorrectForReverseLayout() {
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState().also { state = it },
+ modifier = Modifier.requiredSize(
+ itemSizeDp * 3.5f + defaultItemSpacingDp * 2.5f
+ ),
+ reverseLayout = true,
+ autoCentering = null
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.runOnIdle {
+ assertThat(state.centerItemIndex).isEqualTo(1)
+ state.layoutInfo.assertVisibleItems(count = 4)
+ }
+ }
+
+ @Test
+ fun visibleItemsAreCorrectForReverseLayoutWithAutoCentering() {
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState(initialCenterItemIndex = 0)
+ .also { state = it },
+ modifier = Modifier.requiredSize(
+ itemSizeDp * 3.5f + defaultItemSpacingDp * 2.5f
+ ),
+ reverseLayout = true,
+ autoCentering = AutoCenteringParams(itemIndex = 0)
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.runOnIdle {
+ assertThat(state.centerItemIndex).isEqualTo(0)
+ assertThat(state.centerItemScrollOffset).isEqualTo(0)
+ state.layoutInfo.assertVisibleItems(count = 3)
+ }
+ }
+
+ @Test
+ fun visibleItemsAreCorrectAfterScrolling() {
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState().also { state = it },
+ modifier = Modifier.requiredSize(
+ itemSizeDp * 3.5f + defaultItemSpacingDp * 2.5f
+ ),
+ autoCentering = null
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.runOnIdle {
+ runBlocking {
+ state.scrollBy(itemSizePx.toFloat() + defaultItemSpacingPx.toFloat())
+ }
+ state.layoutInfo.assertVisibleItems(count = 4, startIndex = 1)
+ }
+ }
+
+ @Test
+ fun itemsCorrectScrollPastStartEndAutoCenterItemZeroOddHeightViewportOddHeightItems() {
+ visibleItemsAreCorrectAfterScrollingPastEndOfItems(0, 41, false)
+ }
+
+ @Test
+ fun itemsCorrectScrollPastStartEndAutoCenterItemZeroOddHeightViewportEvenHeightItems() {
+ visibleItemsAreCorrectAfterScrollingPastEndOfItems(0, 40, false)
+ }
+
+ @Test
+ fun itemsCorrectScrollPastStartEndAutoCenterItemZeroEvenHeightViewportOddHeightItems() {
+ visibleItemsAreCorrectAfterScrollingPastEndOfItems(0, 41, true)
+ }
+
+ @Test
+ fun itemsCorrectScrollPastStartEndAutoCenterItemZeroEvenHeightViewportEvenHeightItems() {
+ visibleItemsAreCorrectAfterScrollingPastEndOfItems(0, 40, true)
+ }
+
+ @Test
+ fun itemsCorrectScrollPastStartEndAutoCenterItemOneOddHeightViewportOddHeightItems() {
+ visibleItemsAreCorrectAfterScrollingPastEndOfItems(1, 41, false)
+ }
+
+ @Test
+ fun itemsCorrectScrollPastStartEndAutoCenterItemOneOddHeightViewportEvenHeightItems() {
+ visibleItemsAreCorrectAfterScrollingPastEndOfItems(1, 40, false)
+ }
+
+ @Test
+ fun itemsCorrectScrollPastStartEndAutoCenterItemOneEvenHeightViewportOddHeightItems() {
+ visibleItemsAreCorrectAfterScrollingPastEndOfItems(1, 41, true)
+ }
+
+ @Test
+ fun itemsCorrectScrollPastStartEndAutoCenterItemOneEvenHeightViewportEvenHeightItems() {
+ visibleItemsAreCorrectAfterScrollingPastEndOfItems(1, 40, true)
+ }
+
+ private fun visibleItemsAreCorrectAfterScrollingPastEndOfItems(
+ autoCenterItem: Int,
+ localItemSizePx: Int,
+ viewPortSizeEven: Boolean
+ ) {
+ lateinit var state: ScalingLazyListState
+ lateinit var scope: CoroutineScope
+ rule.setContent {
+ with(LocalDensity.current) {
+ val viewportSizePx =
+ (((localItemSizePx * 4 + defaultItemSpacingPx * 3) / 2) * 2) +
+ if (viewPortSizeEven) 0 else 1
+ scope = rememberCoroutineScope()
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState(
+ initialCenterItemIndex = autoCenterItem
+ ).also { state = it },
+ modifier = Modifier.requiredSize(
+ viewportSizePx.toDp()
+ ),
+ autoCentering = AutoCenteringParams(itemIndex = autoCenterItem)
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(localItemSizePx.toDp()))
+ }
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ scope.launch {
+ state.animateScrollBy(localItemSizePx.toFloat() * 10)
+ }
+
+ rule.waitUntil { !state.isScrollInProgress }
+ assertThat(state.centerItemIndex).isEqualTo(4)
+ assertThat(state.centerItemScrollOffset).isEqualTo(0)
+
+ scope.launch {
+ state.animateScrollBy(- localItemSizePx.toFloat() * 10)
+ }
+
+ rule.waitUntil { !state.isScrollInProgress }
+ assertThat(state.centerItemIndex).isEqualTo(autoCenterItem)
+ assertThat(state.centerItemScrollOffset).isEqualTo(0)
+ }
+
+ @Test
+ fun largeItemLargerThanViewPortDoesNotGetScaled() {
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState().also { state = it },
+ modifier = Modifier.requiredSize(
+ itemSizeDp
+ ),
+ autoCentering = null
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp * 5))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.runOnIdle {
+ runBlocking {
+ state.scrollBy(itemSizePx.toFloat() + defaultItemSpacingPx.toFloat())
+ }
+ val firstItem = state.layoutInfo.visibleItemsInfo.first()
+ assertThat(firstItem.offset).isLessThan(0)
+ assertThat(firstItem.offset + firstItem.size).isGreaterThan(itemSizePx)
+ assertThat(state.layoutInfo.visibleItemsInfo.first().scale).isEqualTo(1.0f)
+ }
+ }
+
+ @Test
+ fun itemInsideScalingLinesDoesNotGetScaled() {
+ lateinit var state: ScalingLazyListState
+ val centerItemIndex = 2
+ rule.setContent {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState(centerItemIndex).also { state = it },
+ modifier = Modifier.requiredSize(
+ itemSizeDp * 3
+ ),
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.runOnIdle {
+ // Get the middle item on the screen
+ val centerScreenItem =
+ state.layoutInfo.visibleItemsInfo.find { it.index == centerItemIndex }
+ // and confirm its offset is 0
+ assertThat(centerScreenItem!!.offset).isEqualTo(0)
+ // And that it is not scaled
+ assertThat(centerScreenItem.scale).isEqualTo(1.0f)
+ }
+ }
+
+ @Test
+ fun itemOutsideScalingLinesDoesGetScaled() {
+ lateinit var state: ScalingLazyListState
+ val centerItemIndex = 2
+ rule.setContent {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState(centerItemIndex).also { state = it },
+ modifier = Modifier.requiredSize(
+ itemSizeDp * 4 + defaultItemSpacingDp * 3
+ ),
+ ) {
+ items(6) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.runOnIdle {
+ // Get the middle item on the screen
+ val edgeScreenItem =
+ state.layoutInfo.visibleItemsInfo.find { it.index == 0 }
+
+ // And that it is it scaled
+ assertThat(edgeScreenItem!!.scale).isLessThan(1.0f)
+ }
+ }
+
+ @Test
+ fun visibleItemsAreCorrectAfterScrollingReverseLayout() {
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState().also { state = it },
+ modifier = Modifier.requiredSize(
+ itemSizeDp * 3.5f + defaultItemSpacingDp * 2.5f
+ ),
+ reverseLayout = true,
+ autoCentering = null
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.runOnIdle {
+ runBlocking {
+ state.scrollBy(itemSizePx.toFloat() + defaultItemSpacingPx.toFloat())
+ }
+ state.layoutInfo.assertVisibleItems(count = 4, startIndex = 1)
+ }
+ }
+
+ @Test
+ fun visibleItemsAreCorrectCenterPivotNoOffset() {
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState(2).also { state = it },
+ modifier = Modifier.requiredSize(
+ itemSizeDp * 2f + defaultItemSpacingDp * 1f
+ ),
+ scalingParams = ScalingLazyColumnDefaults.scalingParams(1.0f, 1.0f)
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.runOnIdle {
+ state.layoutInfo.assertVisibleItems(count = 3, startIndex = 1)
+ assertThat(state.centerItemIndex).isEqualTo(2)
+ assertThat(state.centerItemScrollOffset).isEqualTo(0)
+ }
+ }
+
+ @Test
+ fun visibleItemsAreCorrectCenterPivotWithOffset() {
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState(2, -5).also { state = it },
+ modifier = Modifier.requiredSize(
+ itemSizeDp * 2f + defaultItemSpacingDp * 1f
+ ),
+ scalingParams = ScalingLazyColumnDefaults.scalingParams(1.0f, 1.0f)
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.runOnIdle {
+ state.layoutInfo.assertVisibleItems(count = 3, startIndex = 1)
+ assertThat(state.centerItemIndex).isEqualTo(2)
+ assertThat(state.centerItemScrollOffset).isEqualTo(-5)
+ }
+ }
+
+ @Test
+ fun visibleItemsAreCorrectCenterPivotNoOffsetReverseLayout() {
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState(2).also { state = it },
+ modifier = Modifier.requiredSize(
+ itemSizeDp * 2f + defaultItemSpacingDp * 1f
+ ),
+ scalingParams = ScalingLazyColumnDefaults.scalingParams(1.0f, 1.0f),
+ reverseLayout = true
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.runOnIdle {
+ state.layoutInfo.assertVisibleItems(count = 3, startIndex = 1)
+ assertThat(state.centerItemIndex).isEqualTo(2)
+ assertThat(state.centerItemScrollOffset).isEqualTo(0)
+ }
+ }
+
+ @Test
+ fun visibleItemsAreCorrectCenterPivotWithOffsetReverseLayout() {
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState(2, -5).also { state = it },
+ modifier = Modifier.requiredSize(
+ itemSizeDp * 2f + defaultItemSpacingDp * 1f
+ ),
+ scalingParams = ScalingLazyColumnDefaults.scalingParams(1.0f, 1.0f),
+ reverseLayout = true
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.runOnIdle {
+ state.layoutInfo.assertVisibleItems(count = 3, startIndex = 1)
+ assertThat(state.centerItemIndex).isEqualTo(2)
+ assertThat(state.centerItemScrollOffset).isEqualTo(-5)
+ }
+ }
+
+ @Test
+ fun visibleItemsAreCorrectNoScalingForReverseLayout() {
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState(8).also { state = it },
+ modifier = Modifier.requiredSize(
+ itemSizeDp * 4f + defaultItemSpacingDp * 3f
+ ),
+ scalingParams = ScalingLazyColumnDefaults.scalingParams(1.0f, 1.0f),
+ reverseLayout = true
+ ) {
+ items(15) {
+ Box(Modifier.requiredSize(itemSizeDp).testTag("Item:$it"))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.waitForIdle()
+
+ // Assert that items are being shown at the end of the parent as this is reverseLayout
+ rule.onNodeWithTag(testTag = "Item:8").assertIsDisplayed()
+
+ rule.runOnIdle {
+ state.layoutInfo.assertVisibleItems(count = 5, startIndex = 6)
+ }
+ }
+
+ @Test
+ fun visibleItemsAreCorrectAfterScrollNoScaling() {
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState(initialCenterItemIndex = 0)
+ .also { state = it },
+ modifier = Modifier.requiredSize(
+ itemSizeDp * 3.5f + defaultItemSpacingDp * 2.5f
+ ),
+ scalingParams = ScalingLazyColumnDefaults.scalingParams(1.0f, 1.0f),
+ autoCentering = AutoCenteringParams(itemIndex = 0)
+ ) {
+ items(5) {
+ Box(
+ Modifier
+ .requiredSize(itemSizeDp)
+ .testTag("Item:$it"))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.waitForIdle()
+
+ rule.onNodeWithTag(testTag = "Item:0").assertIsDisplayed()
+
+ val scrollAmount = (itemSizePx.toFloat() + defaultItemSpacingPx.toFloat()).roundToInt()
+ rule.runOnIdle {
+ assertThat(state.centerItemIndex).isEqualTo(0)
+ assertThat(state.centerItemScrollOffset).isEqualTo(0)
+
+ runBlocking {
+ state.scrollBy(scrollAmount.toFloat())
+ }
+ state.layoutInfo.assertVisibleItems(count = 4)
+ assertThat(state.layoutInfo.visibleItemsInfo.first().offset).isEqualTo(-scrollAmount)
+ }
+
+ rule.runOnIdle {
+ runBlocking {
+ state.scrollBy(-scrollAmount.toFloat())
+ }
+ state.layoutInfo.assertVisibleItems(count = 3)
+ assertThat(state.layoutInfo.visibleItemsInfo.first().offset).isEqualTo(0)
+ }
+ }
+
+ @Test
+ fun visibleItemsAreCorrectAfterScrollNoScalingForReverseLayout() {
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState(8).also { state = it },
+ modifier = Modifier.requiredSize(
+ itemSizeDp * 4f + defaultItemSpacingDp * 3f
+ ),
+ scalingParams = ScalingLazyColumnDefaults.scalingParams(1.0f, 1.0f),
+ reverseLayout = true
+ ) {
+ items(15) {
+ Box(Modifier.requiredSize(itemSizeDp).testTag("Item:$it"))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.waitForIdle()
+
+ rule.onNodeWithTag(testTag = "Item:8").assertIsDisplayed()
+
+ val scrollAmount = (itemSizePx.toFloat() + defaultItemSpacingPx.toFloat()).roundToInt()
+ rule.runOnIdle {
+ state.layoutInfo.assertVisibleItems(count = 5, startIndex = 6)
+ assertThat(state.centerItemIndex).isEqualTo(8)
+ assertThat(state.centerItemScrollOffset).isEqualTo(0)
+
+ runBlocking {
+ state.scrollBy(scrollAmount.toFloat())
+ }
+ state.layoutInfo.assertVisibleItems(count = 5, startIndex = 7)
+ }
+
+ rule.runOnIdle {
+ runBlocking {
+ state.scrollBy(-scrollAmount.toFloat())
+ }
+ state.layoutInfo.assertVisibleItems(count = 5, startIndex = 6)
+ }
+ }
+
+ @Test
+ fun visibleItemsAreCorrectAfterDispatchRawDeltaScrollNoScaling() {
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState(initialCenterItemIndex = 0)
+ .also { state = it },
+ modifier = Modifier.requiredSize(
+ itemSizeDp * 3.5f + defaultItemSpacingDp * 2.5f
+ ),
+ scalingParams = ScalingLazyColumnDefaults.scalingParams(1.0f, 1.0f),
+ autoCentering = AutoCenteringParams(itemIndex = 0)
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ val scrollAmount = itemSizePx.toFloat() + defaultItemSpacingPx.toFloat()
+ rule.runOnIdle {
+ runBlocking {
+ state.dispatchRawDelta(scrollAmount)
+ }
+ state.layoutInfo.assertVisibleItems(count = 4, startIndex = 0)
+ assertThat(state.layoutInfo.visibleItemsInfo.first().offset)
+ .isEqualTo(-scrollAmount.roundToInt())
+ }
+
+ rule.runOnIdle {
+ runBlocking {
+ state.dispatchRawDelta(-scrollAmount)
+ }
+ state.layoutInfo.assertVisibleItems(count = 3, startIndex = 0)
+ assertThat(state.layoutInfo.visibleItemsInfo.first().offset).isEqualTo(0)
+ }
+ }
+
+ @Test
+ fun visibleItemsAreCorrectAfterDispatchRawDeltaScrollNoScalingForReverseLayout() {
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState().also { state = it },
+ modifier = Modifier.requiredSize(
+ itemSizeDp * 3.5f + defaultItemSpacingDp * 2.5f
+ ),
+ scalingParams = ScalingLazyColumnDefaults.scalingParams(1.0f, 1.0f),
+ reverseLayout = true,
+ autoCentering = null
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ val firstItemOffset = state.layoutInfo.visibleItemsInfo.first().offset
+ rule.runOnIdle {
+ runBlocking {
+ state.dispatchRawDelta(itemSizePx.toFloat() + defaultItemSpacingPx.toFloat())
+ }
+ state.layoutInfo.assertVisibleItems(count = 4, startIndex = 1)
+ assertThat(state.layoutInfo.visibleItemsInfo.first().offset).isEqualTo(firstItemOffset)
+ }
+
+ rule.runOnIdle {
+ runBlocking {
+ state.dispatchRawDelta(-(itemSizePx.toFloat() + defaultItemSpacingPx.toFloat()))
+ }
+ state.layoutInfo.assertVisibleItems(count = 4, startIndex = 0)
+ assertThat(state.layoutInfo.visibleItemsInfo.first().offset).isEqualTo(firstItemOffset)
+ }
+ }
+
+ @Test
+ fun visibleItemsAreCorrectWithCustomSpacing() {
+ lateinit var state: ScalingLazyListState
+ val spacing: Dp = 10.dp
+ rule.setContent {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState().also { state = it },
+ modifier = Modifier.requiredSize(itemSizeDp * 3.5f + spacing * 2.5f),
+ verticalArrangement = Arrangement.spacedBy(spacing),
+ autoCentering = null
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.runOnIdle {
+ val spacingPx = with(rule.density) {
+ spacing.roundToPx()
+ }
+ state.layoutInfo.assertVisibleItems(
+ count = 4,
+ spacing = spacingPx
+ )
+ }
+ }
+
+ @Composable
+ fun ObservingFun(
+ state: ScalingLazyListState,
+ currentInfo: StableRef<ScalingLazyListLayoutInfo?>
+ ) {
+ currentInfo.value = state.layoutInfo
+ }
+
+ @Test
+ fun visibleItemsAreObservableWhenWeScroll() {
+ lateinit var state: ScalingLazyListState
+ val currentInfo = StableRef<ScalingLazyListLayoutInfo?>(null)
+ rule.setContent {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState().also { state = it },
+ modifier = Modifier.requiredSize(itemSizeDp * 3.5f + defaultItemSpacingDp * 2.5f),
+ autoCentering = null
+ ) {
+ items(6) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ ObservingFun(state, currentInfo)
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.runOnIdle {
+ // empty it here and scrolling should invoke observingFun again
+ currentInfo.value = null
+ runBlocking {
+ state.scrollBy(itemSizePx.toFloat() + defaultItemSpacingPx.toFloat())
+ }
+ }
+
+ rule.runOnIdle {
+ assertThat(currentInfo.value).isNotNull()
+ currentInfo.value!!.assertVisibleItems(count = 4, startIndex = 1)
+ }
+ }
+
+ @Test
+ fun visibleItemsAreObservableWhenWeDispatchRawDeltaScroll() {
+ lateinit var state: ScalingLazyListState
+ val currentInfo = StableRef<ScalingLazyListLayoutInfo?>(null)
+ rule.setContent {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState().also { state = it },
+ modifier = Modifier.requiredSize(itemSizeDp * 3.5f + defaultItemSpacingDp * 2.5f),
+ autoCentering = null
+ ) {
+ items(6) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ ObservingFun(state, currentInfo)
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.runOnIdle {
+ // empty it here and scrolling should invoke observingFun again
+ currentInfo.value = null
+ runBlocking {
+ state.dispatchRawDelta(itemSizePx.toFloat() + defaultItemSpacingPx.toFloat())
+ }
+ }
+
+ rule.runOnIdle {
+ assertThat(currentInfo.value).isNotNull()
+ currentInfo.value!!.assertVisibleItems(count = 4, startIndex = 1)
+ }
+ }
+
+ @Composable
+ fun ObservingIsScrollInProgressTrueFun(
+ state: ScalingLazyListState,
+ currentInfo: StableRef<Boolean?>
+ ) {
+ // If isScrollInProgress is ever true record it - otherwise leave the value as null
+ if (state.isScrollInProgress) {
+ currentInfo.value = true
+ }
+ }
+
+ @Test
+ fun isScrollInProgressIsObservableWhenWeScroll() {
+ lateinit var state: ScalingLazyListState
+ lateinit var scope: CoroutineScope
+ val currentInfo = StableRef<Boolean?>(null)
+ rule.setContent {
+ scope = rememberCoroutineScope()
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState().also { state = it },
+ modifier = Modifier.requiredSize(itemSizeDp * 3.5f + defaultItemSpacingDp * 2.5f)
+ ) {
+ items(6) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ ObservingIsScrollInProgressTrueFun(state, currentInfo)
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ scope.launch {
+ // empty it here and scrolling should invoke observingFun again
+ currentInfo.value = null
+ state.animateScrollBy(itemSizePx.toFloat() + defaultItemSpacingPx.toFloat())
+ }
+
+ rule.runOnIdle {
+ assertThat(currentInfo.value).isNotNull()
+ assertThat(currentInfo.value).isTrue()
+ }
+ }
+
+ @Composable
+ fun ObservingCentralItemIndexFun(
+ state: ScalingLazyListState,
+ currentInfo: StableRef<Int?>
+ ) {
+ currentInfo.value = state.centerItemIndex
+ }
+
+ @Test
+ fun isCentralListItemIndexObservableWhenWeScroll() {
+ lateinit var state: ScalingLazyListState
+ lateinit var scope: CoroutineScope
+ val currentInfo = StableRef<Int?>(null)
+ rule.setContent {
+ scope = rememberCoroutineScope()
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState().also { state = it },
+ modifier = Modifier.requiredSize(itemSizeDp * 3.5f + defaultItemSpacingDp * 2.5f),
+ autoCentering = null
+ ) {
+ items(6) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ ObservingCentralItemIndexFun(state, currentInfo)
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ scope.launch {
+ // empty it here and scrolling should invoke observingFun again
+ currentInfo.value = null
+ state.animateScrollBy(itemSizePx.toFloat() + defaultItemSpacingPx.toFloat())
+ }
+
+ rule.runOnIdle {
+ assertThat(currentInfo.value).isNotNull()
+ assertThat(currentInfo.value).isEqualTo(2)
+ }
+ }
+
+ @Test
+ fun visibleItemsAreObservableWhenResize() {
+ lateinit var state: ScalingLazyListState
+ var size by mutableStateOf(itemSizeDp * 2)
+ var currentInfo: ScalingLazyListLayoutInfo? = null
+ @Composable
+ fun observingFun() {
+ currentInfo = state.layoutInfo
+ }
+ rule.setContent {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState().also { state = it }
+ ) {
+ item {
+ Box(Modifier.requiredSize(size))
+ }
+ }
+ observingFun()
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.runOnIdle {
+ assertThat(currentInfo).isNotNull()
+ currentInfo!!.assertVisibleItems(count = 1, unscaledSize = itemSizePx * 2)
+ currentInfo = null
+ size = itemSizeDp
+ }
+
+ rule.runOnIdle {
+ assertThat(currentInfo).isNotNull()
+ currentInfo!!.assertVisibleItems(count = 1, unscaledSize = itemSizePx)
+ }
+ }
+
+ @Test
+ fun viewportOffsetsAndSizeAreCorrect() {
+ val sizePx = 45
+ val sizeDp = with(rule.density) { sizePx.toDp() }
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ ScalingLazyColumn(
+ Modifier.requiredSize(sizeDp),
+ state = rememberScalingLazyListState().also { state = it }
+ ) {
+ items(4) {
+ Box(Modifier.requiredSize(sizeDp))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.runOnIdle {
+ assertThat(state.layoutInfo.viewportStartOffset).isEqualTo(0)
+ assertThat(state.layoutInfo.viewportEndOffset).isEqualTo(sizePx)
+ assertThat(state.layoutInfo.viewportSize).isEqualTo(IntSize(sizePx, sizePx))
+ assertThat(state.layoutInfo.beforeContentPadding).isEqualTo(0)
+ assertThat(state.layoutInfo.afterContentPadding).isEqualTo(0)
+ assertThat(state.layoutInfo.beforeAutoCenteringPadding).isEqualTo(0)
+ assertThat(state.layoutInfo.afterAutoCenteringPadding).isEqualTo(0)
+ }
+ }
+
+ @Test
+ fun viewportOffsetsAndSizeAreCorrectWithContentPadding() {
+ val sizePx = 45
+ val startPaddingPx = 10
+ val endPaddingPx = 15
+ val sizeDp = with(rule.density) { sizePx.toDp() }
+ val topPaddingDp = with(rule.density) { startPaddingPx.toDp() }
+ val bottomPaddingDp = with(rule.density) { endPaddingPx.toDp() }
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ ScalingLazyColumn(
+ Modifier.requiredSize(sizeDp),
+ contentPadding = PaddingValues(top = topPaddingDp, bottom = bottomPaddingDp),
+ state = rememberScalingLazyListState().also { state = it }
+ ) {
+ items(4) {
+ Box(Modifier.requiredSize(sizeDp))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.runOnIdle {
+ assertThat(state.layoutInfo.viewportStartOffset).isEqualTo(-startPaddingPx)
+ assertThat(state.layoutInfo.viewportEndOffset).isEqualTo(sizePx - startPaddingPx)
+ assertThat(state.layoutInfo.viewportSize).isEqualTo(IntSize(sizePx, sizePx))
+ assertThat(state.layoutInfo.beforeContentPadding).isEqualTo(10)
+ assertThat(state.layoutInfo.afterContentPadding).isEqualTo(15)
+ assertThat(state.layoutInfo.beforeAutoCenteringPadding).isEqualTo(0)
+ assertThat(state.layoutInfo.afterAutoCenteringPadding).isEqualTo(0)
+ }
+ }
+
+ @Test
+ fun viewportOffsetsAreCorrectWithAutoCentering() {
+ val itemSizePx = 45
+ val itemSizeDp = with(rule.density) { itemSizePx.toDp() }
+ val viewPortSizePx = itemSizePx * 4
+ val viewPortSizeDp = with(rule.density) { viewPortSizePx.toDp() }
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ ScalingLazyColumn(
+ Modifier.requiredSize(viewPortSizeDp),
+ state = rememberScalingLazyListState(
+ initialCenterItemIndex = 0
+ ).also { state = it },
+ autoCentering = AutoCenteringParams()
+ ) {
+ items(7) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.runOnIdle {
+ assertThat(state.layoutInfo.viewportStartOffset).isEqualTo(0)
+ assertThat(state.layoutInfo.viewportEndOffset).isEqualTo(viewPortSizePx)
+ assertThat(state.layoutInfo.beforeContentPadding).isEqualTo(0)
+ assertThat(state.layoutInfo.afterContentPadding).isEqualTo(0)
+ assertThat(state.layoutInfo.beforeAutoCenteringPadding).isGreaterThan(0)
+ assertThat(state.layoutInfo.afterAutoCenteringPadding).isEqualTo(0)
+
+ runBlocking {
+ state.scrollToItem(3)
+ }
+ assertThat(state.layoutInfo.beforeAutoCenteringPadding).isEqualTo(0)
+ assertThat(state.layoutInfo.afterAutoCenteringPadding).isEqualTo(0)
+
+ runBlocking {
+ state.scrollToItem(5)
+ }
+ assertThat(state.layoutInfo.beforeAutoCenteringPadding).isEqualTo(0)
+ assertThat(state.layoutInfo.afterAutoCenteringPadding).isGreaterThan(0)
+ }
+ }
+
+ @Test
+ fun totalCountIsCorrect() {
+ var count by mutableStateOf(10)
+ lateinit var state: ScalingLazyListState
+ rule.setContent {
+ ScalingLazyColumn(
+ state = rememberScalingLazyListState().also { state = it }
+ ) {
+ items(count) {
+ Box(Modifier.requiredSize(10.dp))
+ }
+ }
+ }
+
+ // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
+ rule.waitUntil { state.initialized.value }
+ rule.runOnIdle {
+ assertThat(state.layoutInfo.totalItemsCount).isEqualTo(10)
+ count = 20
+ }
+
+ rule.runOnIdle {
+ assertThat(state.layoutInfo.totalItemsCount).isEqualTo(20)
+ }
+ }
+
+ private fun ScalingLazyListLayoutInfo.assertVisibleItems(
+ count: Int,
+ startIndex: Int = 0,
+ unscaledSize: Int = itemSizePx,
+ spacing: Int = defaultItemSpacingPx,
+ anchorType: ScalingLazyListAnchorType = ScalingLazyListAnchorType.ItemCenter
+ ) {
+ assertThat(visibleItemsInfo.size).isEqualTo(count)
+ var currentIndex = startIndex
+ var previousEndOffset = -1
+ visibleItemsInfo.forEach {
+ assertThat(it.index).isEqualTo(currentIndex)
+ assertThat(it.size).isEqualTo((unscaledSize * it.scale).roundToInt())
+ currentIndex++
+ val startOffset = it.startOffset(anchorType).roundToInt()
+ if (previousEndOffset != -1) {
+ assertThat(spacing).isEqualTo(startOffset - previousEndOffset)
+ }
+ previousEndOffset = startOffset + it.size
+ }
+ }
+}
+
+@Stable
+public class StableRef<T>(var value: T)
\ No newline at end of file
diff --git a/wear/compose/compose-foundation/src/commonMain/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyColumn.kt b/wear/compose/compose-foundation/src/commonMain/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyColumn.kt
new file mode 100644
index 0000000..a03e3d5
--- /dev/null
+++ b/wear/compose/compose-foundation/src/commonMain/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyColumn.kt
@@ -0,0 +1,739 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.wear.compose.foundation.lazy
+
+import androidx.annotation.RestrictTo
+import androidx.compose.animation.core.CubicBezierEasing
+import androidx.compose.animation.core.DecayAnimationSpec
+import androidx.compose.animation.core.Easing
+import androidx.compose.animation.core.exponentialDecay
+import androidx.compose.foundation.gestures.FlingBehavior
+import androidx.compose.foundation.gestures.ScrollableDefaults
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.calculateEndPadding
+import androidx.compose.foundation.layout.calculateStartPadding
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListScope
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.Stable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clipToBounds
+import androidx.compose.ui.graphics.TransformOrigin
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.layout.layout
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.platform.LocalLayoutDirection
+import androidx.compose.ui.unit.Constraints
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.LayoutDirection
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.offset
+
+/**
+ * Receiver scope which is used by [ScalingLazyColumn].
+ */
+@ScalingLazyScopeMarker
+public sealed interface ScalingLazyListScope {
+ /**
+ * Adds a single item.
+ *
+ * @param key a stable and unique key representing the item. Using the same key
+ * for multiple items in the list is not allowed. Type of the key should be saveable
+ * via Bundle on Android. If null is passed the position in the list will represent the key.
+ * When you specify the key the scroll position will be maintained based on the key, which
+ * means if you add/remove items before the current visible item the item with the given key
+ * will be kept as the first visible one.
+ * @param content the content of the item
+ */
+ fun item(key: Any? = null, content: @Composable ScalingLazyListItemScope.() -> Unit)
+
+ /**
+ * Adds a [count] of items.
+ *
+ * @param count the items count
+ * @param key a factory of stable and unique keys representing the item. Using the same key
+ * for multiple items in the list is not allowed. Type of the key should be saveable
+ * via Bundle on Android. If null is passed the position in the list will represent the key.
+ * When you specify the key the scroll position will be maintained based on the key, which
+ * means if you add/remove items before the current visible item the item with the given key
+ * will be kept as the first visible one.
+ * @param itemContent the content displayed by a single item
+ */
+ fun items(
+ count: Int,
+ key: ((index: Int) -> Any)? = null,
+ itemContent: @Composable ScalingLazyListItemScope.(index: Int) -> Unit
+ )
+}
+
+/**
+ * Adds a list of items.
+ *
+ * @param items the data list
+ * @param key a factory of stable and unique keys representing the item. Using the same key
+ * for multiple items in the list is not allowed. Type of the key should be saveable
+ * via Bundle on Android. If null is passed the position in the list will represent the key.
+ * When you specify the key the scroll position will be maintained based on the key, which
+ * means if you add/remove items before the current visible item the item with the given key
+ * will be kept as the first visible one.
+ * @param itemContent the content displayed by a single item
+ */
+inline fun <T> ScalingLazyListScope.items(
+ items: List<T>,
+ noinline key: ((item: T) -> Any)? = null,
+ crossinline itemContent: @Composable ScalingLazyListItemScope.(item: T) -> Unit
+) = items(items.size, if (key != null) { index: Int -> key(items[index]) } else null) {
+ itemContent(items[it])
+}
+
+/**
+ * Adds a list of items where the content of an item is aware of its index.
+ *
+ * @param items the data list
+ * @param key a factory of stable and unique keys representing the item. Using the same key
+ * for multiple items in the list is not allowed. Type of the key should be saveable
+ * via Bundle on Android. If null is passed the position in the list will represent the key.
+ * When you specify the key the scroll position will be maintained based on the key, which
+ * means if you add/remove items before the current visible item the item with the given key
+ * will be kept as the first visible one.
+ * @param itemContent the content displayed by a single item
+ */
+inline fun <T> ScalingLazyListScope.itemsIndexed(
+ items: List<T>,
+ noinline key: ((index: Int, item: T) -> Any)? = null,
+ crossinline itemContent: @Composable ScalingLazyListItemScope.(index: Int, item: T) -> Unit
+) = items(items.size, if (key != null) { index: Int -> key(index, items[index]) } else null) {
+ itemContent(it, items[it])
+}
+
+/**
+ * Adds an array of items.
+ *
+ * @param items the data array
+ * @param key a factory of stable and unique keys representing the item. Using the same key
+ * for multiple items in the list is not allowed. Type of the key should be saveable
+ * via Bundle on Android. If null is passed the position in the list will represent the key.
+ * When you specify the key the scroll position will be maintained based on the key, which
+ * means if you add/remove items before the current visible item the item with the given key
+ * will be kept as the first visible one.
+ * @param itemContent the content displayed by a single item
+ */
+inline fun <T> ScalingLazyListScope.items(
+ items: Array<T>,
+ noinline key: ((item: T) -> Any)? = null,
+ crossinline itemContent: @Composable ScalingLazyListItemScope.(item: T) -> Unit
+) = items(items.size, if (key != null) { index: Int -> key(items[index]) } else null) {
+ itemContent(items[it])
+}
+
+/**
+ * Adds an array of items where the content of an item is aware of its index.
+ *
+ * @param items the data array
+ * @param key a factory of stable and unique keys representing the item. Using the same key
+ * for multiple items in the list is not allowed. Type of the key should be saveable
+ * via Bundle on Android. If null is passed the position in the list will represent the key.
+ * When you specify the key the scroll position will be maintained based on the key, which
+ * means if you add/remove items before the current visible item the item with the given key
+ * will be kept as the first visible one.
+ * @param itemContent the content displayed by a single item
+ */
+public inline fun <T> ScalingLazyListScope.itemsIndexed(
+ items: Array<T>,
+ noinline key: ((index: Int, item: T) -> Any)? = null,
+ crossinline itemContent: @Composable ScalingLazyListItemScope.(index: Int, item: T) -> Unit
+) = items(items.size, if (key != null) { index: Int -> key(index, items[index]) } else null) {
+ itemContent(it, items[it])
+}
+
+@Immutable
+@kotlin.jvm.JvmInline
+public value class ScalingLazyListAnchorType internal constructor(internal val type: Int) {
+
+ companion object {
+ /**
+ * Place the center of the item on (or as close to) the center line of the viewport
+ */
+ val ItemCenter = ScalingLazyListAnchorType(0)
+
+ /**
+ * Place the start (edge) of the item on, or as close to as possible, the center line of the
+ * viewport. For normal layout this will be the top edge of the item, for reverseLayout it
+ * will be the bottom edge.
+ */
+ val ItemStart = ScalingLazyListAnchorType(1)
+ }
+
+ override fun toString(): String {
+ return when (this) {
+ ItemStart -> "ScalingLazyListAnchorType.ItemStart"
+ else -> "ScalingLazyListAnchorType.ItemCenter"
+ }
+ }
+}
+
+/**
+ * Parameters to determine which list item and offset to calculate auto-centering spacing for. The
+ * default values are [itemIndex] = 1 and [itemOffset] = 0. This will provide sufficient padding for
+ * the second item (index = 1) in the list being centerable. This is to match the Wear UX
+ * guidelines that a typical list will have a ListHeader item as the first item in the list
+ * (index = 0) and that this should not be scrollable into the middle of the viewport, instead the
+ * first list item that a user can interact with (index = 1) would be the first that would be in the
+ * center.
+ *
+ * If your use case is different and you want all list items to be able to be scrolled to the
+ * viewport middle, including the first item in the list then set [itemIndex] = 0.
+ *
+ * The higher the value for [itemIndex] you provide the less auto centering padding will be
+ * provided as the amount of padding needed to allow that item to be centered will reduce.
+ * Even for a list of short items setting [itemIndex] above 3 or 4 is likely
+ * to result in no auto-centering padding being provided as items with index 3 or 4 will probably
+ * already be naturally scrollable to the center of the viewport.
+ *
+ * [itemOffset] allows adjustment of the items position relative the [ScalingLazyColumn]s
+ * [ScalingLazyListAnchorType]. This can be useful if you need fine grained control over item
+ * positioning and spacing, e.g. If you are lining up the gaps between two items on the viewport
+ * center line where you would want to set the offset to half the distance between listItems in
+ * pixels.
+ *
+ * See also [rememberScalingLazyListState] where similar fields are provided to allow control over
+ * the initially selected centered item index and offset. By default these match the auto centering
+ * defaults meaning that the second item (index = 1) will be the item scrolled to the viewport
+ * center.
+ *
+ * @param itemIndex Which list item index to enable auto-centering from. Space (padding) will be
+ * added such that items with index [itemIndex] or greater will be able to be scrolled to the center
+ * of the viewport. If the developer wants to add additional space to allow other list items to also
+ * be scrollable to the center they can use contentPadding on the ScalingLazyColumn. If the
+ * developer wants custom control over position and spacing they can switch off autoCentering
+ * and provide contentPadding.
+ *
+ * @param itemOffset What offset, if any, to apply when calculating space for auto-centering
+ * the [itemIndex] item. E.g. itemOffset can be used if the developer wants to align the viewport
+ * center in the gap between two list items.
+ *
+ * For an example of a [ScalingLazyColumn] with an explicit itemOffset see:
+ * @sample androidx.wear.compose.foundation.samples.ScalingLazyColumnEdgeAnchoredAndAnimatedScrollTo
+ */
+@Immutable
+public class AutoCenteringParams(
+ // @IntRange(from = 0)
+ internal val itemIndex: Int = 1,
+ internal val itemOffset: Int = 0,
+) {
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ return (other is AutoCenteringParams) &&
+ itemIndex == other.itemIndex &&
+ itemOffset == other.itemOffset
+ }
+
+ override fun hashCode(): Int {
+ var result = itemIndex
+ result = 31 * result + itemOffset
+ return result
+ }
+}
+
+/**
+ * A scrolling scaling/fisheye list component that forms a key part of the Wear Material Design
+ * language. Provides scaling and transparency effects to the content items.
+ *
+ * [ScalingLazyColumn] is designed to be able to handle potentially large numbers of content
+ * items. Content items are only materialized and composed when needed.
+ *
+ * If scaling/fisheye functionality is not required then a [LazyColumn] should be considered
+ * instead to avoid any overhead of measuring and calculating scaling and transparency effects for
+ * the content items.
+ *
+ * Example of a [ScalingLazyColumn] with default parameters:
+ * @sample androidx.wear.compose.foundation.samples.SimpleScalingLazyColumn
+ *
+ * Example of a [ScalingLazyColumn] using [ScalingLazyListAnchorType.ItemStart] anchoring, in this
+ * configuration the edge of list items is aligned to the center of the screen. Also this example
+ * shows scrolling to a clicked list item with [ScalingLazyListState.animateScrollToItem]:
+ * @sample androidx.wear.compose.foundation.samples.ScalingLazyColumnEdgeAnchoredAndAnimatedScrollTo
+ *
+ * Example of a [ScalingLazyColumn] with snap of items to the viewport center:
+ * @sample androidx.wear.compose.foundation.samples.SimpleScalingLazyColumnWithSnap
+ *
+ * Example of a [ScalingLazyColumn] where [autoCentering] has been disabled and explicit
+ * [contentPadding] provided to ensure there is space above the first and below the last list item
+ * to allow them to be scrolled into view on circular screens:
+ * @sample androidx.wear.compose.foundation.samples.SimpleScalingLazyColumnWithContentPadding
+ *
+ * For more information, see the
+ * [Lists](https://developer.android.com/training/wearables/components/lists)
+ * guide.
+ *
+ * @param modifier The modifier to be applied to the component
+ * @param state The state of the component
+ * @param contentPadding The padding to apply around the contents
+ * @param reverseLayout reverse the direction of scrolling and layout, when `true` items will be
+ * composed from the bottom to the top
+ * @param verticalArrangement The vertical arrangement of the layout's children. This allows us
+ * to add spacing between items and specify the arrangement of the items when we have not enough
+ * of them to fill the whole minimum size
+ * @param horizontalAlignment the horizontal alignment applied to the items
+ * @param flingBehavior Logic describing fling behavior. If snapping is required use
+ * [ScalingLazyColumnDefaults.snapFlingBehavior].
+ * @param userScrollEnabled whether the scrolling via the user gestures or accessibility actions
+ * is allowed. You can still scroll programmatically using the state even when it is disabled.
+ * @param scalingParams The parameters to configure the scaling and transparency effects for the
+ * component
+ * @param anchorType How to anchor list items to the center-line of the viewport
+ * @param autoCentering AutoCenteringParams parameter to control whether space/padding should be
+ * automatically added to make sure that list items can be scrolled into the center of the viewport
+ * (based on their [anchorType]). If non-null then space will be added before the first list item,
+ * if needed, to ensure that items with indexes greater than or equal to the itemIndex (offset by
+ * itemOffset pixels) will be able to be scrolled to the center of the viewport. Similarly space
+ * will be added at the end of the list to ensure that items can be scrolled up to the center. If
+ * null no automatic space will be added and instead the developer can use [contentPadding] to
+ * manually arrange the items.
+ * @param content The content of the [ScalingLazyColumn]
+ */
+@Composable
+public fun ScalingLazyColumn(
+ modifier: Modifier = Modifier,
+ state: ScalingLazyListState = rememberScalingLazyListState(),
+ contentPadding: PaddingValues = PaddingValues(horizontal = 10.dp),
+ reverseLayout: Boolean = false,
+ verticalArrangement: Arrangement.Vertical =
+ Arrangement.spacedBy(
+ space = 4.dp,
+ alignment = if (!reverseLayout) Alignment.Top else Alignment.Bottom
+ ),
+ horizontalAlignment: Alignment.Horizontal = Alignment.CenterHorizontally,
+ flingBehavior: FlingBehavior = ScrollableDefaults.flingBehavior(),
+ userScrollEnabled: Boolean = true,
+ scalingParams: ScalingParams = ScalingLazyColumnDefaults.scalingParams(),
+ anchorType: ScalingLazyListAnchorType = ScalingLazyListAnchorType.ItemCenter,
+ autoCentering: AutoCenteringParams? = AutoCenteringParams(),
+ content: ScalingLazyListScope.() -> Unit
+) {
+ var initialized by remember { mutableStateOf(false) }
+ BoxWithConstraints(modifier = modifier, propagateMinConstraints = true) {
+ val density = LocalDensity.current
+ val layoutDirection = LocalLayoutDirection.current
+ val extraPaddingInPixels = scalingParams.resolveViewportVerticalOffset(constraints)
+
+ with(density) {
+ val extraPadding = extraPaddingInPixels.toDp()
+ val combinedPaddingValues = CombinedPaddingValues(
+ contentPadding = contentPadding,
+ extraPadding = extraPadding
+ )
+
+ val beforeContentPaddingInPx =
+ if (reverseLayout) contentPadding.calculateBottomPadding().roundToPx()
+ else contentPadding.calculateTopPadding().roundToPx()
+
+ val afterContentPaddingInPx =
+ if (reverseLayout) contentPadding.calculateTopPadding().roundToPx()
+ else contentPadding.calculateBottomPadding().roundToPx()
+
+ val itemScope =
+ ScalingLazyListItemScopeImpl(
+ density = density,
+ constraints = constraints.offset(
+ horizontal = -(
+ contentPadding.calculateStartPadding(layoutDirection) +
+ contentPadding.calculateEndPadding(layoutDirection)
+ ).toPx().toInt(),
+ vertical = -(
+ contentPadding.calculateTopPadding() +
+ contentPadding.calculateBottomPadding()
+ ).roundToPx()
+ )
+ )
+
+ // Set up transient state
+ state.scalingParams.value = scalingParams
+ state.extraPaddingPx.value = extraPaddingInPixels
+ state.beforeContentPaddingPx.value = beforeContentPaddingInPx
+ state.afterContentPaddingPx.value = afterContentPaddingInPx
+ state.viewportHeightPx.value = constraints.maxHeight
+ state.gapBetweenItemsPx.value =
+ verticalArrangement.spacing.roundToPx()
+ state.anchorType.value = anchorType
+ state.autoCentering.value = autoCentering
+ state.reverseLayout.value = reverseLayout
+ state.localInspectionMode.value = LocalInspectionMode.current
+
+ LazyColumn(
+ modifier = Modifier
+ .clipToBounds()
+ .verticalNegativePadding(extraPadding)
+ .onGloballyPositioned {
+ val layoutInfo = state.layoutInfo
+ if (!initialized &&
+ layoutInfo is DefaultScalingLazyListLayoutInfo &&
+ layoutInfo.readyForInitialScroll
+ ) {
+ initialized = true
+ }
+ },
+ horizontalAlignment = horizontalAlignment,
+ contentPadding = combinedPaddingValues,
+ reverseLayout = reverseLayout,
+ verticalArrangement = verticalArrangement,
+ state = state.lazyListState,
+ flingBehavior = flingBehavior,
+ userScrollEnabled = userScrollEnabled,
+ ) {
+ val scope = ScalingLazyListScopeImpl(
+ state = state,
+ scope = this,
+ itemScope = itemScope
+ )
+ // Only add spacers if autoCentering == true as we have to consider the impact of
+ // vertical spacing between items.
+ if (autoCentering != null) {
+ item {
+ Spacer(
+ modifier = Modifier.height(state.topAutoCenteringItemSizePx.toDp())
+ )
+ }
+ }
+ scope.content()
+ if (autoCentering != null) {
+ item {
+ Spacer(
+ modifier = Modifier.height(state.bottomAutoCenteringItemSizePx.toDp())
+ )
+ }
+ }
+ }
+ if (initialized) {
+ LaunchedEffect(state) {
+ state.scrollToInitialItem()
+ }
+ }
+ }
+ }
+}
+
+/**
+ * Contains the default values used by [ScalingLazyColumn]
+ */
+public object ScalingLazyColumnDefaults {
+ /**
+ * Creates a [ScalingParams] that represents the scaling and alpha properties for a
+ * [ScalingLazyColumn].
+ *
+ * Items in the ScalingLazyColumn have scaling and alpha effects applied to them depending on
+ * their position in the viewport. The closer to the edge (top or bottom) of the viewport that
+ * they are the greater the down scaling and transparency that is applied. Note that scaling and
+ * transparency effects are applied from the center of the viewport (full size and normal
+ * transparency) towards the edge (items can be smaller and more transparent).
+ *
+ * Deciding how much scaling and alpha to apply is based on the position and size of the item
+ * and on a series of properties that are used to determine the transition area for each item.
+ *
+ * The transition area is defined by the edge of the screen and a transition line which is
+ * calculated for each item in the list. The items transition line is based upon its size with
+ * the potential for larger list items to start their transition earlier (closer to the center)
+ * than smaller items.
+ *
+ * [minTransitionArea] and [maxTransitionArea] are both in the range [0f..1f] and are
+ * the fraction of the distance between the edge of the viewport and the center of
+ * the viewport. E.g. a value of 0.2f for minTransitionArea and 0.75f for maxTransitionArea
+ * determines that all transition lines will fall between 1/5th (20%) and 3/4s (75%) of the
+ * distance between the viewport edge and center.
+ *
+ * The size of the each item is used to determine where within the transition area range
+ * minTransitionArea..maxTransitionArea the actual transition line will be. [minElementHeight]
+ * and [maxElementHeight] are used along with the item height (as a fraction of the viewport
+ * height in the range [0f..1f]) to find the transition line. So if the items size is 0.25f
+ * (25%) of way between minElementSize..maxElementSize then the transition line will be 0.25f
+ * (25%) of the way between minTransitionArea..maxTransitionArea.
+ *
+ * A list item smaller than minElementHeight is rounded up to minElementHeight and larger than
+ * maxElementHeight is rounded down to maxElementHeight. Whereabouts the items height sits
+ * between minElementHeight..maxElementHeight is then used to determine where the transition
+ * line sits between minTransitionArea..maxTransition area.
+ *
+ * If an item is smaller than or equal to minElementSize its transition line with be at
+ * minTransitionArea and if it is larger than or equal to maxElementSize its transition line
+ * will be at maxTransitionArea.
+ *
+ * For example, if we take the default values for minTransitionArea = 0.2f and
+ * maxTransitionArea = 0.6f and minElementSize = 0.2f and maxElementSize= 0.8f then an item
+ * with a height of 0.4f (40%) of the viewport height is one third of way between
+ * minElementSize and maxElementSize, (0.4f - 0.2f) / (0.8f - 0.2f) = 0.33f. So its transition
+ * line would be one third of way between 0.2f and 0.6f, transition line = 0.2f + (0.6f -
+ * 0.2f) * 0.33f = 0.33f.
+ *
+ * Once the position of the transition line is established we now have a transition area
+ * for the item, e.g. in the example above the item will start/finish its transitions when it
+ * is 0.33f (33%) of the distance from the edge of the viewport and will start/finish its
+ * transitions at the viewport edge.
+ *
+ * The scaleInterpolator is used to determine how much of the scaling and alpha to apply
+ * as the item transits through the transition area.
+ *
+ * The edge of the item furthest from the edge of the screen is used as a scaling trigger
+ * point for each item.
+ *
+ * @param edgeScale What fraction of the full size of the item to scale it by when most
+ * scaled, e.g. at the edge of the viewport. A value between [0f,1f], so a value of 0.2f
+ * means to scale an item to 20% of its normal size.
+ *
+ * @param edgeAlpha What fraction of the full transparency of the item to draw it with
+ * when closest to the edge of the screen. A value between [0f,1f], so a value of
+ * 0.2f means to set the alpha of an item to 20% of its normal value.
+ *
+ * @param minElementHeight The minimum element height as a ratio of the viewport size to use
+ * for determining the transition point within ([minTransitionArea], [maxTransitionArea])
+ * that a given content item will start to be transitioned. Items smaller than
+ * [minElementHeight] will be treated as if [minElementHeight]. Must be less than or equal to
+ * [maxElementHeight].
+ *
+ * @param maxElementHeight The maximum element height as a ratio of the viewport size to use
+ * for determining the transition point within ([minTransitionArea], [maxTransitionArea])
+ * that a given content item will start to be transitioned. Items larger than [maxElementHeight]
+ * will be treated as if [maxElementHeight]. Must be greater than or equal to
+ * [minElementHeight].
+ *
+ * @param minTransitionArea The lower bound of the transition line area, closest to the
+ * edge of the viewport. Defined as a fraction (value between 0f..1f) of the distance between
+ * the viewport edge and viewport center line. Must be less than or equal to
+ * [maxTransitionArea].
+ *
+ * @param maxTransitionArea The upper bound of the transition line area, closest to the
+ * center of the viewport. The fraction (value between 0f..1f) of the distance
+ * between the viewport edge and viewport center line. Must be greater
+ * than or equal to [minTransitionArea].
+ *
+ * @param scaleInterpolator An interpolator to use to determine how to apply scaling as a
+ * item transitions across the scaling transition area.
+ *
+ * @param viewportVerticalOffsetResolver The additional padding to consider above and below the
+ * viewport of a [ScalingLazyColumn] when considering which items to draw in the viewport. If
+ * set to 0 then no additional padding will be provided and only the items which would appear
+ * in the viewport before any scaling is applied will be considered for drawing, this may
+ * leave blank space at the top and bottom of the viewport where the next available item
+ * could have been drawn once other items have been scaled down in size. The larger this
+ * value is set to will allow for more content items to be considered for drawing in the
+ * viewport, however there is a performance cost associated with materializing items that are
+ * subsequently not drawn. The higher/more extreme the scaling parameters that are applied to
+ * the [ScalingLazyColumn] the more padding may be needed to ensure there are always enough
+ * content items available to be rendered. By default will be 5% of the maxHeight of the
+ * viewport above and below the content.
+ */
+ fun scalingParams(
+ edgeScale: Float = 0.7f,
+ edgeAlpha: Float = 0.5f,
+ minElementHeight: Float = 0.2f,
+ maxElementHeight: Float = 0.6f,
+ minTransitionArea: Float = 0.35f,
+ maxTransitionArea: Float = 0.55f,
+ scaleInterpolator: Easing = CubicBezierEasing(0.3f, 0f, 0.7f, 1f),
+ viewportVerticalOffsetResolver: (Constraints) -> Int = { (it.maxHeight / 20f).toInt() }
+ ): ScalingParams = DefaultScalingParams(
+ edgeScale = edgeScale,
+ edgeAlpha = edgeAlpha,
+ minElementHeight = minElementHeight,
+ maxElementHeight = maxElementHeight,
+ minTransitionArea = minTransitionArea,
+ maxTransitionArea = maxTransitionArea,
+ scaleInterpolator = scaleInterpolator,
+ viewportVerticalOffsetResolver = viewportVerticalOffsetResolver
+ )
+
+ /**
+ * Create and remember a [FlingBehavior] that will represent natural fling curve with snap to
+ * central item as the fling decays.
+ *
+ * @param state the state of the [ScalingLazyColumn]
+ * @param snapOffset an optional offset to be applied when snapping the item. After the snap the
+ * snapped items offset will be [snapOffset].
+ * @param decay the decay to use
+ */
+ @Composable
+ public fun snapFlingBehavior(
+ state: ScalingLazyListState,
+ snapOffset: Dp = 0.dp,
+ decay: DecayAnimationSpec<Float> = exponentialDecay()
+ ): FlingBehavior {
+ val snapOffsetPx = with(LocalDensity.current) { snapOffset.roundToPx() }
+ return remember(state, snapOffset, decay) {
+ ScalingLazyColumnSnapFlingBehavior(
+ state = state,
+ snapOffset = snapOffsetPx,
+ decay = decay
+ )
+ }
+ }
+}
+
+private class ScalingLazyListScopeImpl(
+ private val state: ScalingLazyListState,
+ private val scope: LazyListScope,
+ private val itemScope: ScalingLazyListItemScope
+) : ScalingLazyListScope {
+
+ private var currentStartIndex = 0
+
+ override fun item(key: Any?, content: @Composable (ScalingLazyListItemScope.() -> Unit)) {
+ val startIndex = currentStartIndex
+ scope.item(key = key) {
+ ScalingLazyColumnItemWrapper(
+ startIndex,
+ state,
+ itemScope,
+ content
+ )
+ }
+ currentStartIndex++
+ }
+
+ override fun items(
+ count: Int,
+ key: ((index: Int) -> Any)?,
+ itemContent: @Composable (ScalingLazyListItemScope.(index: Int) -> Unit)
+ ) {
+ val startIndex = currentStartIndex
+ scope.items(count = count, key = key) {
+ ScalingLazyColumnItemWrapper(
+ startIndex + it,
+ state = state,
+ itemScope = itemScope
+ ) {
+ itemContent(it)
+ }
+ }
+ currentStartIndex += count
+ }
+}
+
+@Composable
+private fun ScalingLazyColumnItemWrapper(
+ index: Int,
+ state: ScalingLazyListState,
+ itemScope: ScalingLazyListItemScope,
+ content: @Composable (ScalingLazyListItemScope.() -> Unit)
+) {
+ Box(
+ modifier = Modifier.graphicsLayer {
+ val reverseLayout = state.reverseLayout.value!!
+ val anchorType = state.anchorType.value!!
+ val items = state.layoutInfo.internalVisibleItemInfo()
+ val currentItem = items.find { it.index == index }
+ if (currentItem != null) {
+ alpha = currentItem.alpha
+ scaleX = currentItem.scale
+ scaleY = currentItem.scale
+ // Calculate how much to adjust/translate the position of the list item by
+ // determining the different between the unadjusted start position based on the
+ // underlying LazyList layout and the start position adjusted to take into account
+ // scaling of the list items. Items further from the middle of the visible viewport
+ // will be subject to more adjustment.
+ if (currentItem.scale > 0f) {
+ val offsetAdjust = currentItem.startOffset(anchorType) -
+ currentItem.unadjustedStartOffset(anchorType)
+ translationY = if (reverseLayout) -offsetAdjust else offsetAdjust
+ transformOrigin = TransformOrigin(
+ pivotFractionX = 0.5f,
+ pivotFractionY = if (reverseLayout) 1.0f else 0.0f
+ )
+ }
+ }
+ }
+ ) {
+ itemScope.content()
+ }
+}
+
+/** @hide **/
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+@Immutable
+public class CombinedPaddingValues(
+ @Stable
+ val contentPadding: PaddingValues,
+ @Stable
+ val extraPadding: Dp
+) : PaddingValues {
+ override fun calculateLeftPadding(layoutDirection: LayoutDirection): Dp =
+ contentPadding.calculateLeftPadding(layoutDirection)
+
+ override fun calculateTopPadding(): Dp =
+ contentPadding.calculateTopPadding() + extraPadding
+
+ override fun calculateRightPadding(layoutDirection: LayoutDirection): Dp =
+ contentPadding.calculateRightPadding(layoutDirection)
+
+ override fun calculateBottomPadding(): Dp =
+ contentPadding.calculateBottomPadding() + extraPadding
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (other == null) return false
+ if (this::class != other::class) return false
+
+ other as CombinedPaddingValues
+
+ if (contentPadding != other.contentPadding) return false
+ if (extraPadding != other.extraPadding) return false
+
+ return true
+ }
+
+ override fun hashCode(): Int {
+ var result = contentPadding.hashCode()
+ result = 31 * result + extraPadding.hashCode()
+ return result
+ }
+
+ override fun toString(): String {
+ return "CombinedPaddingValuesImpl(contentPadding=$contentPadding, " +
+ "extraPadding=$extraPadding)"
+ }
+}
+
+/** @hide **/
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public fun Modifier.verticalNegativePadding(
+ extraPadding: Dp,
+) = layout { measurable, constraints ->
+ require(constraints.hasBoundedWidth)
+ require(constraints.hasBoundedHeight)
+ val topAndBottomPadding = (extraPadding * 2).roundToPx()
+ val placeable = measurable.measure(
+ constraints.copy(
+ minHeight = constraints.minHeight + topAndBottomPadding,
+ maxHeight = constraints.maxHeight + topAndBottomPadding
+ )
+ )
+
+ layout(placeable.measuredWidth, constraints.maxHeight) {
+ placeable.place(0, -extraPadding.roundToPx())
+ }
+}
diff --git a/wear/compose/compose-foundation/src/commonMain/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyColumnMeasure.kt b/wear/compose/compose-foundation/src/commonMain/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyColumnMeasure.kt
new file mode 100644
index 0000000..40e7a6a
--- /dev/null
+++ b/wear/compose/compose-foundation/src/commonMain/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyColumnMeasure.kt
@@ -0,0 +1,517 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.wear.compose.foundation.lazy
+
+import androidx.annotation.RestrictTo
+import androidx.compose.animation.core.Easing
+import androidx.compose.foundation.gestures.Orientation
+import androidx.compose.foundation.lazy.LazyListItemInfo
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.Stable
+import androidx.compose.ui.unit.Constraints
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.util.lerp
+import kotlin.math.min
+import kotlin.math.roundToInt
+
+/**
+ * Parameters to control the scaling of the contents of a [ScalingLazyColumn].
+ *
+ * Items in the ScalingLazyColumn have scaling and alpha effects applied to them depending on
+ * their position in the viewport. The closer to the edge (top or bottom) of the viewport that
+ * they are the greater the down scaling and transparency that is applied. Note that scaling and
+ * transparency effects are applied from the center of the viewport (nearest to full size and normal
+ * transparency) towards the edge (items can be smaller and more transparent).
+ *
+ * Deciding how much scaling and alpha to apply is based on the position and size of the item
+ * and on a series of properties that are used to determine the transition area for each item.
+ *
+ * The transition area is defined by the edge of the screen and a transition line which is
+ * calculated for each item in the list. There are two symmetrical transition lines/areas one at the
+ * top of the viewport and one at the bottom.
+ *
+ * The items transition line is based upon its size with the potential for larger list items to
+ * start their transition earlier (further from the edge they are transitioning towards) than
+ * smaller items.
+ *
+ * It is possible for the transition line to be closer to the edge that the list item is moving away
+ * from, i.e. the opposite side of the center line of the viewport. This may seem counter-intuitive
+ * at first as it means that the transition lines can appear inverted. But as the two transition
+ * lines interact with the opposite edges of the list item top with bottom, bottom with top it is
+ * often desirable to have inverted transition lines for large list items.
+ *
+ * [minTransitionArea] and [maxTransitionArea] are both in the range [0f..1f] and are
+ * the fraction of the distance between the edges of the viewport. E.g. a value of 0.2f for
+ * minTransitionArea and 0.75f for maxTransitionArea determines that all transition lines will fall
+ * between 1/5th (20%) and 3/4s (75%) of the height of the viewport.
+ *
+ * The size of the each item is used to determine where within the transition area range
+ * minTransitionArea..maxTransitionArea the actual transition line will be. [minElementHeight]
+ * and [maxElementHeight] are used along with the item height (as a fraction of the viewport
+ * height in the range [0f..1f]) to find the transition line. So if the items size is 0.25f
+ * (25%) of way between minElementSize..maxElementSize then the transition line will be 0.25f
+ * (25%) of the way between minTransitionArea..maxTransitionArea.
+ *
+ * A list item smaller than minElementHeight is rounded up to minElementHeight and larger than
+ * maxElementHeight is rounded down to maxElementHeight. Whereabouts the items height sits
+ * between minElementHeight..maxElementHeight is then used to determine where the transition
+ * line sits between minTransitionArea..maxTransition area.
+ *
+ * If an item is smaller than or equal to minElementSize its transition line with be at
+ * minTransitionArea and if it is larger than or equal to maxElementSize its transition line
+ * will be at maxTransitionArea.
+ *
+ * For example, if we take the default values for minTransitionArea = 0.2f and
+ * maxTransitionArea = 0.6f and minElementSize = 0.2f and maxElementSize= 0.8f then an item
+ * with a height of 0.4f (40%) of the viewport height is one third of way between
+ * minElementSize and maxElementSize, (0.4f - 0.2f) / (0.8f - 0.2f) = 0.33f. So its transition
+ * line would be one third of way between 0.2f and 0.6f, transition line = 0.2f + (0.6f -
+ * 0.2f) * 0.33f = 0.33f.
+ *
+ * Once the position of the transition line is established we now have a transition area
+ * for the item, e.g. in the example above the item will start/finish its transitions when it
+ * is 0.33f (33%) of the distance from the edge of the viewport and will start/finish its
+ * transitions at the viewport edge.
+ *
+ * The scaleInterpolator is used to determine how much of the scaling and alpha to apply
+ * as the item transits through the transition area.
+ *
+ * The edge of the item furthest from the edge of the screen is used as a scaling trigger
+ * point for each item.
+ */
+@Stable
+public interface ScalingParams {
+ /**
+ * What fraction of the full size of the item to scale it by when most
+ * scaled, e.g. at the edge of the viewport. A value between [0f,1f], so a value of 0.2f
+ * means to scale an item to 20% of its normal size.
+ */
+// @FloatRange(
+// fromInclusive = true, from = 0.0, toInclusive = true, to = 1.0
+// )
+ val edgeScale: Float
+
+ /**
+ * What fraction of the full transparency of the item to draw it with
+ * when closest to the edge of the screen. A value between [0f,1f], so a value of
+ * 0.2f means to set the alpha of an item to 20% of its normal value.
+ */
+// @FloatRange(
+// fromInclusive = true, from = 0.0, toInclusive = true, to = 1.0
+// )
+ val edgeAlpha: Float
+
+ /**
+ * The maximum element height as a ratio of the viewport size to use
+ * for determining the transition point within ([minTransitionArea], [maxTransitionArea])
+ * that a given content item will start to be transitioned. Items larger than [maxElementHeight]
+ * will be treated as if [maxElementHeight]. Must be greater than or equal to
+ * [minElementHeight].
+ */
+// @FloatRange(
+// fromInclusive = true, from = 0.0, toInclusive = true, to = 1.0
+// )
+ val minElementHeight: Float
+
+ /**
+ * The maximum element height as a ratio of the viewport size to use
+ * for determining the transition point within ([minTransitionArea], [maxTransitionArea])
+ * that a given content item will start to be transitioned. Items larger than [maxElementHeight]
+ * will be treated as if [maxElementHeight]. Must be greater than or equal to
+ * [minElementHeight].
+ */
+// @FloatRange(
+// fromInclusive = true, from = 0.0, toInclusive = true, to = 1.0
+// )
+ val maxElementHeight: Float
+
+ /**
+ * The lower bound of the transition line area, closest to the edge of the viewport. Defined as
+ * a fraction (value between 0f..1f) of the distance between the viewport edges. Must be less
+ * than or equal to [maxTransitionArea].
+ *
+ * For transition lines a value of 0f means that the transition line is at the viewport edge,
+ * e.g. no transition, a value of 0.25f means that the transition line is 25% of the screen size
+ * away from the viewport edge. A value of .5f or greater will place the transition line in the
+ * other half of the screen to the edge that the item is transitioning towards.
+ *
+ * [minTransitionArea] and [maxTransitionArea] provide an area in which transition lines for all
+ * list items exist. Depending on the size of the list item the specific point in the area is
+ * calculated.
+ */
+// @FloatRange(
+// fromInclusive = true, from = 0.0, toInclusive = true, to = 1.0
+// )
+ val minTransitionArea: Float
+
+ /**
+ * The upper bound of the transition line area, closest to the
+ * center of the viewport. The fraction (value between 0f..1f) of the distance
+ * between the viewport edges. Must be greater than or equal to [minTransitionArea].
+ *
+ * For transition lines a value of 0f means that the transition line is at the viewport edge,
+ * e.g. no transition, a value of 0.25f means that the transition line is 25% of the screen size
+ * away from the viewport edge. A value of .5f or greater will place the transition line in the
+ * other half of the screen to the edge that the item is transitioning towards.
+ *
+ * [minTransitionArea] and [maxTransitionArea] provide an area in which transition lines for all
+ * list items exist. Depending on the size of the list item the specific point in the area is
+ * calculated.
+ */
+// @FloatRange(
+// fromInclusive = true, from = 0.0, toInclusive = true, to = 1.0
+// )
+ val maxTransitionArea: Float
+
+ /**
+ * An interpolator to use to determine how to apply scaling as a item transitions across the
+ * scaling transition area.
+ */
+ val scaleInterpolator: Easing
+
+ /**
+ * The additional padding to consider above and below the
+ * viewport of a [ScalingLazyColumn] when considering which items to draw in the viewport. If
+ * set to 0 then no additional padding will be provided and only the items which would appear
+ * in the viewport before any scaling is applied will be considered for drawing, this may
+ * leave blank space at the top and bottom of the viewport where the next available item
+ * could have been drawn once other items have been scaled down in size. The larger this
+ * value is set to will allow for more content items to be considered for drawing in the
+ * viewport, however there is a performance cost associated with materializing items that are
+ * subsequently not drawn. The higher/more extreme the scaling parameters that are applied to
+ * the [ScalingLazyColumn] the more padding may be needed to ensure there are always enough
+ * content items available to be rendered. By default will be 20% of the maxHeight of the
+ * viewport above and below the content.
+ *
+ * @param viewportConstraints the viewports constraints
+ */
+ public fun resolveViewportVerticalOffset(viewportConstraints: Constraints): Int
+}
+
+@Stable
+internal class DefaultScalingParams(
+ override val edgeScale: Float,
+ override val edgeAlpha: Float,
+ override val minElementHeight: Float,
+ override val maxElementHeight: Float,
+ override val minTransitionArea: Float,
+ override val maxTransitionArea: Float,
+ override val scaleInterpolator: Easing,
+ val viewportVerticalOffsetResolver: (Constraints) -> Int,
+) : ScalingParams {
+
+ init {
+ check(
+ minElementHeight <= maxElementHeight
+ ) { "minElementHeight must be less than or equal to maxElementHeight" }
+ check(
+ minTransitionArea <= maxTransitionArea
+ ) { "minTransitionArea must be less than or equal to maxTransitionArea" }
+ }
+
+ override fun resolveViewportVerticalOffset(viewportConstraints: Constraints): Int {
+ return viewportVerticalOffsetResolver(viewportConstraints)
+ }
+
+ override fun toString(): String {
+ return "ScalingParams(edgeScale=$edgeScale, edgeAlpha=$edgeAlpha, " +
+ "minElementHeight=$minElementHeight, maxElementHeight=$maxElementHeight, " +
+ "minTransitionArea=$minTransitionArea, maxTransitionArea=$maxTransitionArea)"
+ }
+
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (other == null) return false
+ if (this::class != other::class) return false
+
+ other as DefaultScalingParams
+
+ if (edgeScale != other.edgeScale) return false
+ if (edgeAlpha != other.edgeAlpha) return false
+ if (minElementHeight != other.minElementHeight) return false
+ if (maxElementHeight != other.maxElementHeight) return false
+ if (minTransitionArea != other.minTransitionArea) return false
+ if (maxTransitionArea != other.maxTransitionArea) return false
+ if (scaleInterpolator != other.scaleInterpolator) return false
+ if (viewportVerticalOffsetResolver != other.viewportVerticalOffsetResolver) return false
+
+ return true
+ }
+
+ override fun hashCode(): Int {
+ var result = edgeScale.hashCode()
+ result = 31 * result + edgeAlpha.hashCode()
+ result = 31 * result + minElementHeight.hashCode()
+ result = 31 * result + maxElementHeight.hashCode()
+ result = 31 * result + minTransitionArea.hashCode()
+ result = 31 * result + maxTransitionArea.hashCode()
+ result = 31 * result + scaleInterpolator.hashCode()
+ result = 31 * result + viewportVerticalOffsetResolver.hashCode()
+ return result
+ }
+}
+
+/**
+ * Calculate the scale and alpha to apply for an item based on the start and end position of the
+ * component's viewport in pixels and top and bottom position of the item, also in pixels.
+ *
+ * Firstly work out if the component is above or below the viewport's center-line which determines
+ * whether the item's top or bottom will be used as the trigger for scaling/alpha.
+ *
+ * Uses the scalingParams to determine where the scaling transition line is for the component.
+ *
+ * Then determines if the component is inside the scaling area, and if so what scaling/alpha effects
+ * to apply.
+ *
+ * @param viewPortStartPx The start position of the component's viewport in pixels
+ * @param viewPortEndPx The end position of the component's viewport in pixels
+ * @param itemTopPx The top of the content item in pixels.
+ * @param itemBottomPx The bottom of the content item in pixels.
+ * @param scalingParams The parameters that determine where the item's scaling transition line
+ * is, how scaling and transparency to apply.
+ */
+internal fun calculateScaleAndAlpha(
+ viewPortStartPx: Int,
+ viewPortEndPx: Int,
+ itemTopPx: Int,
+ itemBottomPx: Int,
+ scalingParams: ScalingParams,
+): ScaleAndAlpha {
+ var scaleToApply = 1.0f
+ var alphaToApply = 1.0f
+
+ val itemHeightPx = (itemBottomPx - itemTopPx).toFloat()
+ val viewPortHeightPx = (viewPortEndPx - viewPortStartPx).toFloat()
+
+ if (viewPortHeightPx > 0) {
+ val itemEdgeDistanceFromViewPortEdge =
+ min(viewPortEndPx - itemTopPx, itemBottomPx - viewPortStartPx)
+ val itemEdgeAsFractionOfViewPort = itemEdgeDistanceFromViewPortEdge / viewPortHeightPx
+ val heightAsFractionOfViewPort = itemHeightPx / viewPortHeightPx
+
+ // Work out the scaling line based on size, this is a value between 0.0..1.0
+ val sizeRatio =
+ inverseLerp(scalingParams.minElementHeight, scalingParams.maxElementHeight,
+ heightAsFractionOfViewPort)
+
+ val scalingLineAsFractionOfViewPort =
+ lerp(scalingParams.minTransitionArea, scalingParams.maxTransitionArea, sizeRatio)
+
+ if (itemEdgeAsFractionOfViewPort < scalingLineAsFractionOfViewPort) {
+ // We are scaling
+ val scalingProgressRaw = 1f - itemEdgeAsFractionOfViewPort /
+ scalingLineAsFractionOfViewPort
+ val scalingInterpolated = scalingParams.scaleInterpolator.transform(scalingProgressRaw)
+
+ scaleToApply = lerp(1.0f, scalingParams.edgeScale, scalingInterpolated)
+ alphaToApply = lerp(1.0f, scalingParams.edgeAlpha, scalingInterpolated)
+ }
+ }
+ return ScaleAndAlpha(scaleToApply, alphaToApply)
+}
+
+/**
+ * Create a [ScalingLazyListItemInfo] given an unscaled start and end position for an item.
+ *
+ * @param itemStart the x-axis position of a list item. The x-axis position takes into account
+ * any adjustment to the original position based on the scaling of other list items.
+ * @param item the original item info used to provide the pre-scaling position and size
+ * information for the item.
+ * @param verticalAdjustment the amount of vertical adjustment to apply to item positions to
+ * allow for content padding in order to determine the adjusted position of the item within the
+ * viewport in order to correctly calculate the scaling to apply.
+ * @param viewportHeightPx the height of the viewport in pixels
+ * @param viewportCenterLinePx the center line of the viewport in pixels
+ * @param scalingParams the scaling params to use for determining the scaled size of the item
+ * @param beforeContentPaddingPx the number of pixels of padding before the first item
+ * @param anchorType the type of pivot to use for the center item when calculating position and
+ * offset
+ * @param visible a flag to determine whether the list items should be visible or transparent.
+ * Items are normally visible, but can be drawn transparently when the list is not yet initialized,
+ * unless we are in preview (LocalInspectionModel) mode.
+ */
+internal fun calculateItemInfo(
+ itemStart: Int,
+ item: LazyListItemInfo,
+ verticalAdjustment: Int,
+ viewportHeightPx: Int,
+ viewportCenterLinePx: Int,
+ scalingParams: ScalingParams,
+ beforeContentPaddingPx: Int,
+ anchorType: ScalingLazyListAnchorType,
+ autoCentering: AutoCenteringParams?,
+ visible: Boolean
+): ScalingLazyListItemInfo {
+ val adjustedItemStart = itemStart - verticalAdjustment
+ val adjustedItemEnd = itemStart + item.size - verticalAdjustment
+
+ val scaleAndAlpha = calculateScaleAndAlpha(
+ viewPortStartPx = 0, viewPortEndPx = viewportHeightPx, itemTopPx = adjustedItemStart,
+ itemBottomPx = adjustedItemEnd, scalingParams = scalingParams
+ )
+
+ val isAboveLine = (adjustedItemEnd + adjustedItemStart) < viewportHeightPx
+ val scaledHeight = (item.size * scaleAndAlpha.scale).roundToInt()
+ val scaledItemTop = if (!isAboveLine) {
+ itemStart
+ } else {
+ itemStart + item.size - scaledHeight
+ }
+
+ val offset = convertToCenterOffset(
+ anchorType = anchorType,
+ itemScrollOffset = scaledItemTop,
+ viewportCenterLinePx = viewportCenterLinePx,
+ beforeContentPaddingInPx = beforeContentPaddingPx,
+ itemSizeInPx = scaledHeight
+ )
+ val unadjustedOffset = convertToCenterOffset(
+ anchorType = anchorType,
+ itemScrollOffset = item.offset,
+ viewportCenterLinePx = viewportCenterLinePx,
+ beforeContentPaddingInPx = beforeContentPaddingPx,
+ itemSizeInPx = item.size
+ )
+ return DefaultScalingLazyListItemInfo(
+ // Adjust index to take into account the Spacer before the first list item
+ index = if (autoCentering != null) item.index - 1 else item.index,
+ key = item.key,
+ unadjustedOffset = unadjustedOffset,
+ offset = offset,
+ size = scaledHeight,
+ scale = scaleAndAlpha.scale,
+ alpha = if (visible) scaleAndAlpha.alpha else 0f,
+ unadjustedSize = item.size
+ )
+}
+
+internal class DefaultScalingLazyListLayoutInfo(
+ internal val internalVisibleItemsInfo: List<ScalingLazyListItemInfo>,
+ override val viewportStartOffset: Int,
+ override val viewportEndOffset: Int,
+ override val totalItemsCount: Int,
+ val centerItemIndex: Int,
+ val centerItemScrollOffset: Int,
+ override val reverseLayout: Boolean,
+ override val orientation: Orientation,
+ override val viewportSize: IntSize,
+ override val beforeContentPadding: Int,
+ override val afterContentPadding: Int,
+ override val beforeAutoCenteringPadding: Int,
+ override val afterAutoCenteringPadding: Int,
+ // Flag to indicate that we are ready to handle scrolling as the list becomes visible. This is
+ // used to either move to the initialCenterItemIndex/Offset or complete any
+ // scrollTo/animatedScrollTo calls that were incomplete due to the component not being visible.
+ internal val readyForInitialScroll: Boolean,
+ // Flag to indicate that initialization is complete and initial scroll index and offset have
+ // been set.
+ internal val initialized: Boolean,
+ override val anchorType: ScalingLazyListAnchorType,
+) : ScalingLazyListLayoutInfo {
+ override val visibleItemsInfo: List<ScalingLazyListItemInfo>
+ // Do not report visible items until initialization is complete and the items are
+ // actually visible and correctly positioned.
+ get() = if (initialized) internalVisibleItemsInfo else emptyList()
+}
+
+internal class DefaultScalingLazyListItemInfo(
+ override val index: Int,
+ override val key: Any,
+ override val unadjustedOffset: Int,
+ override val offset: Int,
+ override val size: Int,
+ override val scale: Float,
+ override val alpha: Float,
+ override val unadjustedSize: Int
+) : ScalingLazyListItemInfo {
+ override fun toString(): String {
+ return "DefaultScalingLazyListItemInfo(index=$index, key=$key, " +
+ "unadjustedOffset=$unadjustedOffset, offset=$offset, size=$size, " +
+ "unadjustedSize=$unadjustedSize, scale=$scale, alpha=$alpha)"
+ }
+}
+
+/** @hide **/
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+@Immutable
+public data class ScaleAndAlpha(
+ val scale: Float,
+ val alpha: Float
+
+) {
+ companion object {
+ internal val noScaling = ScaleAndAlpha(1.0f, 1.0f)
+ }
+}
+
+/**
+ * Calculate the offset from the viewport center line of the Start|Center of an items unadjusted
+ * or scaled size. The for items with an height that is an odd number and that have
+ * ScalingLazyListAnchorType.Center the offset will be rounded down. E.g. An item which is 19 pixels
+ * in height will have a center offset of 9 pixes.
+ *
+ * @param anchorType the anchor type of the ScalingLazyColumn
+ * @param itemScrollOffset the LazyListItemInfo offset of the item
+ * @param viewportCenterLinePx the value to use as the center line of the viewport
+ * @param beforeContentPaddingInPx any content padding that has been applied before the contents
+ * @param itemSizeInPx the size of the item
+ */
+internal fun convertToCenterOffset(
+ anchorType: ScalingLazyListAnchorType,
+ itemScrollOffset: Int,
+ viewportCenterLinePx: Int,
+ beforeContentPaddingInPx: Int,
+ itemSizeInPx: Int
+): Int {
+ return itemScrollOffset - viewportCenterLinePx + beforeContentPaddingInPx +
+ if (anchorType == ScalingLazyListAnchorType.ItemStart) {
+ 0
+ } else {
+ itemSizeInPx / 2
+ }
+}
+
+/**
+ * Find the start offset of the list item w.r.t. the
+ */
+internal fun ScalingLazyListItemInfo.startOffset(anchorType: ScalingLazyListAnchorType) =
+ offset - if (anchorType == ScalingLazyListAnchorType.ItemCenter) {
+ (size / 2f)
+ } else {
+ 0f
+ }
+
+/**
+ * Find the start position of the list item from its unadjusted offset w.r.t. the ScalingLazyColumn
+ * center of viewport offset = 0 coordinate model.
+ */
+internal fun ScalingLazyListItemInfo.unadjustedStartOffset(anchorType: ScalingLazyListAnchorType) =
+ unadjustedOffset - if (anchorType == ScalingLazyListAnchorType.ItemCenter) {
+ (unadjustedSize / 2f)
+ } else {
+ 0f
+ }
+
+/**
+ * Inverse linearly interpolate, return what fraction (0f..1f) that [value] is between [start] and
+ * [stop]. Returns 0f if value =< start and 1f if value >= stop.
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public fun inverseLerp(start: Float, stop: Float, value: Float): Float {
+ return ((value - start) / (stop - start)).coerceIn(0f, 1f)
+}
\ No newline at end of file
diff --git a/wear/compose/compose-foundation/src/commonMain/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyColumnSnapFlingBehavior.kt b/wear/compose/compose-foundation/src/commonMain/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyColumnSnapFlingBehavior.kt
new file mode 100644
index 0000000..0d57a82
--- /dev/null
+++ b/wear/compose/compose-foundation/src/commonMain/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyColumnSnapFlingBehavior.kt
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.wear.compose.foundation.lazy
+
+import androidx.compose.animation.core.AnimationState
+import androidx.compose.animation.core.CubicBezierEasing
+import androidx.compose.animation.core.DecayAnimationSpec
+import androidx.compose.animation.core.animateDecay
+import androidx.compose.animation.core.animateTo
+import androidx.compose.animation.core.calculateTargetValue
+import androidx.compose.animation.core.exponentialDecay
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.gestures.FlingBehavior
+import androidx.compose.foundation.gestures.ScrollScope
+import androidx.compose.ui.util.lerp
+import kotlin.math.abs
+import kotlin.math.roundToInt
+import kotlin.math.sqrt
+
+internal class ScalingLazyColumnSnapFlingBehavior(
+ val state: ScalingLazyListState,
+ val snapOffset: Int = 0,
+ val decay: DecayAnimationSpec<Float> = exponentialDecay()
+) : FlingBehavior {
+
+ override suspend fun ScrollScope.performFling(initialVelocity: Float): Float {
+ val animationState = AnimationState(
+ initialValue = 0f,
+ initialVelocity = initialVelocity,
+ )
+
+ var lastValue = 0f
+ val visibleItemsInfo = state.layoutInfo.visibleItemsInfo
+ val isAFling = abs(initialVelocity) > 1f && visibleItemsInfo.size > 1
+ val finalTarget = if (isAFling) {
+ // Target we will land on given initialVelocity & decay
+ val decayTarget = decay.calculateTargetValue(0f, initialVelocity)
+ var endOfListReached = false
+
+ animationState.animateDecay(decay) {
+ val delta = value - lastValue
+ val consumed = scrollBy(delta)
+ lastValue = value
+
+ // When we are "slow" enough, switch from decay to the final snap.
+ if (abs(velocity) < SNAP_SPEED_THRESHOLD) cancelAnimation()
+
+ // If we can't consume the scroll, also stop.
+ if (abs(delta - consumed) > 0.1f) {
+ endOfListReached = true
+ cancelAnimation()
+ }
+ }
+
+ if (endOfListReached) {
+ // We couldn't scroll as much as we wanted, likely we reached the end of the list,
+ // Snap to the current item and finish.
+ scrollBy((snapOffset - state.centerItemScrollOffset).toFloat())
+ return animationState.velocity
+ } else {
+ // Now that scrolling slowed down, adjust the animation to land in the item closest
+ // to the original target. Note that the target may be off-screen, in that case we
+ // will land on the last visible item in that direction.
+ (state.layoutInfo.visibleItemsInfo
+ .map { animationState.value + it.unadjustedOffset + snapOffset }
+ .minByOrNull { abs(it - decayTarget) } ?: decayTarget)
+ }
+ } else {
+ // Not a fling, just snap to the current item.
+ (snapOffset - state.centerItemScrollOffset).toFloat()
+ }
+
+ // We have a velocity (animationState.velocity), and a target (finalTarget),
+ // Construct a cubic bezier with the given initial velocity, and ending at 0 speed,
+ // unless that will mean that we need to accelerate and decelerate.
+ // We can also control the inertia of these speeds, i.e. how much it will accelerate/
+ // decelerate at the beginning and end.
+ val distance = finalTarget - animationState.value
+
+ // If the distance to fling is zero, nothing to do (and must avoid divide-by-zero below).
+ if (distance != 0.0f) {
+ val initialSpeed = animationState.velocity
+
+ // Inertia of the initial speed.
+ val initialInertia = 0.5f
+
+ // Compute how much time we want to spend on the final snap, depending on the speed
+ val finalSnapDuration = lerp(
+ FINAL_SNAP_DURATION_MIN, FINAL_SNAP_DURATION_MAX,
+ abs(initialSpeed) / SNAP_SPEED_THRESHOLD
+ )
+
+ // Initial control point. Has slope (velocity) adjustedSpeed and magnitude (inertia)
+ // initialInertia
+ val adjustedSpeed = initialSpeed * finalSnapDuration / distance
+ val easingX0 = initialInertia / sqrt(1f + adjustedSpeed * adjustedSpeed)
+ val easingY0 = easingX0 * adjustedSpeed
+
+ // Final control point. Has slope 0, unless that will make us accelerate then decelerate,
+ // in that case we set the slope to 1.
+ val easingX1 = 0.8f
+ val easingY1 = if (easingX0 > easingY0) 0.8f else 1f
+
+ animationState.animateTo(
+ finalTarget, tween(
+ (finalSnapDuration * 1000).roundToInt(),
+ easing = CubicBezierEasing(easingX0, easingY0, easingX1, easingY1)
+ )
+ ) {
+ scrollBy(value - lastValue)
+ lastValue = value
+ }
+ }
+
+ return animationState.velocity
+ }
+
+ // Speed, in pixels per second, to switch between decay and final snap.
+ private val SNAP_SPEED_THRESHOLD = 1200
+
+ // Minimum duration for the final snap after the fling, in seconds, used when the initial speed
+ // is 0
+ private val FINAL_SNAP_DURATION_MIN = .1f
+
+ // Maximum duration for the final snap after the fling, in seconds, used when the speed is
+ // SNAP_SPEED_THRESHOLD
+ private val FINAL_SNAP_DURATION_MAX = .35f
+}
\ No newline at end of file
diff --git a/wear/compose/compose-foundation/src/commonMain/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyListItemInfo.kt b/wear/compose/compose-foundation/src/commonMain/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyListItemInfo.kt
new file mode 100644
index 0000000..b70ee81
--- /dev/null
+++ b/wear/compose/compose-foundation/src/commonMain/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyListItemInfo.kt
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.wear.compose.foundation.lazy
+
+/**
+ * Contains useful information about an individual item in a [ScalingLazyColumn].
+ *
+ * @see ScalingLazyListLayoutInfo
+ */
+public sealed interface ScalingLazyListItemInfo {
+ /**
+ * The index of the item in the list.
+ */
+ val index: Int
+
+ /**
+ * The key of the item which was passed to the item() or items() function.
+ */
+ val key: Any
+
+ /**
+ * The main axis offset of the item before adjustment for scaling of the items in the viewport.
+ *
+ * The offset is relative to the center-line of the viewport of the lazy list container and
+ * takes the [ScalingLazyListAnchorType] into account.
+ *
+ * For [ScalingLazyListAnchorType.ItemCenter] the offset is from the center of the list item to
+ * the center-line of the viewport.
+ *
+ * For [ScalingLazyListAnchorType.ItemStart] if is the offset
+ * between the start (edge) of the item and the center-line of the viewport, for normal layout
+ * this will be the top edge of the item, for reverseLayout it will be the bottom edge.
+ */
+ val unadjustedOffset: Int
+
+ /**
+ * The main axis offset of the item after adjustment for scaling of the items in the viewport.
+ *
+ * The offset is relative to the center-line of the viewport of the lazy list container and
+ * takes the [ScalingLazyListAnchorType] into account.
+ *
+ * For [ScalingLazyListAnchorType.ItemCenter] the offset is from the center of the list item to
+ * the center-line of the viewport.
+ *
+ * For [ScalingLazyListAnchorType.ItemStart] if is the offset
+ * between the start (edge) of the item and the center-line of the viewport, for normal layout
+ * this will be the top edge of the item, for reverseLayout it will be the bottom edge.
+ *
+ * A positive value indicates that the item's anchor point is below the viewport center-line, a
+ * negative value indicates that the item anchor point is above the viewport center-line.
+ */
+ val offset: Int
+
+ /**
+ * The scaled/adjusted main axis size of the item. Note that if you emit multiple layouts in the
+ * composable slot for the item then this size will be calculated as the sum of their sizes.
+ */
+ val size: Int
+
+ /**
+ * How much scaling has been applied to the item, between 0 and 1
+ */
+ val scale: Float
+
+ /**
+ * How much alpha has been applied to the item, between 0 and 1
+ */
+ val alpha: Float
+
+ /**
+ * The original (before scaling) size of the list item
+ */
+ val unadjustedSize: Int
+}
diff --git a/wear/compose/compose-foundation/src/commonMain/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyListItemScope.kt b/wear/compose/compose-foundation/src/commonMain/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyListItemScope.kt
new file mode 100644
index 0000000..042e928
--- /dev/null
+++ b/wear/compose/compose-foundation/src/commonMain/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyListItemScope.kt
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.wear.compose.foundation.lazy
+
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.runtime.Stable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.Constraints
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.Dp
+
+/**
+ * Receiver scope being used by the item content parameter of ScalingLazyColumn.
+ */
+@Stable
+@ScalingLazyScopeMarker
+public sealed interface ScalingLazyListItemScope {
+ /**
+ * Have the content fill the [Constraints.maxWidth] and [Constraints.maxHeight] of the parent
+ * measurement constraints by setting the [minimum width][Constraints.minWidth] to be equal to
+ * the [maximum width][Constraints.maxWidth] multiplied by [fraction] and the [minimum
+ * height][Constraints.minHeight] to be equal to the [maximum height][Constraints.maxHeight]
+ * multiplied by [fraction]. Note that, by default, the [fraction] is 1, so the modifier will
+ * make the content fill the whole available space. [fraction] must be between `0` and `1`.
+ *
+ * Regular [Modifier.fillMaxSize] can't work inside the scrolling layouts as the items are
+ * measured with [Constraints.Infinity] as the constraints for the main axis.
+ */
+ fun Modifier.fillParentMaxSize(
+ /*@FloatRange(from = 0.0, to = 1.0)*/
+ fraction: Float = 1f
+ ): Modifier
+
+ /**
+ * Have the content fill the [Constraints.maxWidth] of the parent measurement constraints
+ * by setting the [minimum width][Constraints.minWidth] to be equal to the
+ * [maximum width][Constraints.maxWidth] multiplied by [fraction]. Note that, by default, the
+ * [fraction] is 1, so the modifier will make the content fill the whole parent width.
+ * [fraction] must be between `0` and `1`.
+ *
+ * Regular [Modifier.fillMaxWidth] can't work inside the scrolling horizontally layouts as the
+ * items are measured with [Constraints.Infinity] as the constraints for the main axis.
+ */
+ fun Modifier.fillParentMaxWidth(
+ /*@FloatRange(from = 0.0, to = 1.0)*/
+ fraction: Float = 1f
+ ): Modifier
+
+ /**
+ * Have the content fill the [Constraints.maxHeight] of the incoming measurement constraints
+ * by setting the [minimum height][Constraints.minHeight] to be equal to the
+ * [maximum height][Constraints.maxHeight] multiplied by [fraction]. Note that, by default, the
+ * [fraction] is 1, so the modifier will make the content fill the whole parent height.
+ * [fraction] must be between `0` and `1`.
+ *
+ * Regular [Modifier.fillMaxHeight] can't work inside the scrolling vertically layouts as the
+ * items are measured with [Constraints.Infinity] as the constraints for the main axis.
+ */
+ fun Modifier.fillParentMaxHeight(
+ /*@FloatRange(from = 0.0, to = 1.0)*/
+ fraction: Float = 1f
+ ): Modifier
+}
+
+internal data class ScalingLazyListItemScopeImpl(
+ val density: Density,
+ val constraints: Constraints
+) : ScalingLazyListItemScope {
+ private val maxWidth: Dp = with(density) { constraints.maxWidth.toDp() }
+ private val maxHeight: Dp = with(density) { constraints.maxHeight.toDp() }
+
+ override fun Modifier.fillParentMaxSize(fraction: Float) = size(
+ maxWidth * fraction,
+ maxHeight * fraction
+ )
+
+ override fun Modifier.fillParentMaxWidth(fraction: Float) =
+ width(maxWidth * fraction)
+
+ override fun Modifier.fillParentMaxHeight(fraction: Float) =
+ height(maxHeight * fraction)
+}
diff --git a/wear/compose/compose-foundation/src/commonMain/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyListLayoutInfo.kt b/wear/compose/compose-foundation/src/commonMain/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyListLayoutInfo.kt
new file mode 100644
index 0000000..dc2ccd6
--- /dev/null
+++ b/wear/compose/compose-foundation/src/commonMain/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyListLayoutInfo.kt
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.wear.compose.foundation.lazy
+
+import androidx.compose.foundation.gestures.Orientation
+import androidx.compose.ui.unit.IntSize
+
+/**
+ * Contains useful information about the currently displayed layout state of [ScalingLazyColumn].
+ * For example you can get the list of currently displayed item.
+ *
+ * Use [ScalingLazyListState.layoutInfo] to retrieve this
+ */
+public sealed interface ScalingLazyListLayoutInfo {
+ /**
+ * The list of [ScalingLazyListItemInfo] representing all the currently visible items.
+ */
+ val visibleItemsInfo: List<ScalingLazyListItemInfo>
+
+ /**
+ * The start offset of the layout's viewport in pixels. You can think of it as a minimum offset
+ * which would be visible. Usually it is 0, but it can be negative if non-zero
+ * [beforeContentPadding] was applied as the content displayed in the content padding area is
+ * still visible.
+ *
+ * You can use it to understand what items from [visibleItemsInfo] are fully visible.
+ */
+ val viewportStartOffset: Int
+
+ /**
+ * The end offset of the layout's viewport in pixels. You can think of it as a maximum offset
+ * which would be visible. It is the size of the scaling lazy list layout minus
+ * [beforeContentPadding].
+ *
+ * You can use it to understand what items from [visibleItemsInfo] are fully visible.
+ */
+ val viewportEndOffset: Int
+
+ /**
+ * The total count of items passed to [ScalingLazyColumn].
+ */
+ val totalItemsCount: Int
+
+ /**
+ * The size of the viewport in pixels. It is the scaling lazy list layout size including all the
+ * content paddings.
+ */
+ val viewportSize: IntSize
+
+ /**
+ * The orientation of the scaling lazy list.
+ */
+ val orientation: Orientation
+
+ /**
+ * True if the direction of scrolling and layout is reversed.
+ */
+ val reverseLayout: Boolean
+
+ /**
+ * The content padding in pixels applied before the first item in the direction of scrolling.
+ * For example it is a top content padding for ScalingLazyColumn with reverseLayout set to
+ * false.
+ */
+ val beforeContentPadding: Int
+
+ /**
+ * The content padding in pixels applied after the last item in the direction of scrolling.
+ * For example it is a bottom content padding for ScalingLazyColumn with reverseLayout set to
+ * false.
+ */
+ val afterContentPadding: Int
+
+ /**
+ * The auto centering padding in pixels applied before the first item in the direction of
+ * scrolling. For example it is a top auto centering padding for ScalingLazyColumn with
+ * reverseLayout set to false.
+ */
+ val beforeAutoCenteringPadding: Int
+
+ /**
+ * The auto centering padding in pixels applied after the last item in the direction of
+ * scrolling. For example it is a bottom auto centering padding for ScalingLazyColumn with
+ * reverseLayout set to false.
+ */
+ val afterAutoCenteringPadding: Int
+
+ /**
+ * How to anchor list items to the center-line of the viewport
+ */
+ val anchorType: ScalingLazyListAnchorType
+}
\ No newline at end of file
diff --git a/wear/compose/compose-foundation/src/commonMain/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyListState.kt b/wear/compose/compose-foundation/src/commonMain/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyListState.kt
new file mode 100644
index 0000000..fd00b16
--- /dev/null
+++ b/wear/compose/compose-foundation/src/commonMain/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyListState.kt
@@ -0,0 +1,710 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.wear.compose.foundation.lazy
+
+import androidx.compose.foundation.MutatePriority
+import androidx.compose.foundation.gestures.Orientation
+import androidx.compose.foundation.gestures.ScrollScope
+import androidx.compose.foundation.gestures.ScrollableState
+import androidx.compose.foundation.lazy.LazyListItemInfo
+import androidx.compose.foundation.lazy.LazyListLayoutInfo
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Stable
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.Saver
+import androidx.compose.runtime.saveable.listSaver
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.ui.unit.IntSize
+import kotlin.math.roundToInt
+
+/**
+ * Creates a [ScalingLazyListState] that is remembered across compositions.
+ *
+ * @param initialCenterItemIndex the initial value for [ScalingLazyListState.centerItemIndex],
+ * defaults to 1. This will place the 2nd list item (index == 1) in the center of the viewport and
+ * the first item (index == 0) before it.
+ *
+ * @param initialCenterItemScrollOffset the initial value for
+ * [ScalingLazyListState.centerItemScrollOffset] in pixels
+ */
+@Composable
+public fun rememberScalingLazyListState(
+ initialCenterItemIndex: Int = 1,
+ initialCenterItemScrollOffset: Int = 0
+): ScalingLazyListState {
+ return rememberSaveable(saver = ScalingLazyListState.Saver) {
+ ScalingLazyListState(
+ initialCenterItemIndex,
+ initialCenterItemScrollOffset
+ )
+ }
+}
+
+/**
+ * A state object that can be hoisted to control and observe scrolling.
+ *
+ * In most cases, this will be created via [rememberScalingLazyListState].
+ *
+ * @param initialCenterItemIndex the initial value for [ScalingLazyListState.centerItemIndex],
+ * defaults to 1. This will place the 2nd list item (index == 1) in the center of the viewport and
+ * the first item (index == 0) before it.
+ *
+ * If the developer wants custom control over position and spacing they can switch off autoCentering
+ * and provide contentPadding.
+ *
+ * @param initialCenterItemScrollOffset the initial value for
+ * [ScalingLazyListState.centerItemScrollOffset]
+ *
+ * Note that it is not always possible for the values provided by [initialCenterItemIndex] and
+ * [initialCenterItemScrollOffset] to be honored, e.g. If [initialCenterItemIndex] is set to a value
+ * larger than the number of items initially in the list, or to an index that can not be placed in
+ * the middle of the screen due to the contentPadding or autoCentering properties provided to the
+ * [ScalingLazyColumn]. After the [ScalingLazyColumn] is initially drawn the actual values for the
+ * [centerItemIndex] and [centerItemScrollOffset] can be read from the state.
+ */
+@Stable
+class ScalingLazyListState constructor(
+ private var initialCenterItemIndex: Int = 1,
+ private var initialCenterItemScrollOffset: Int = 0
+) : ScrollableState {
+
+ internal var lazyListState: LazyListState = LazyListState(0, 0)
+ internal val extraPaddingPx = mutableStateOf<Int?>(null)
+ internal val beforeContentPaddingPx = mutableStateOf<Int?>(null)
+ internal val afterContentPaddingPx = mutableStateOf<Int?>(null)
+ internal val scalingParams = mutableStateOf<ScalingParams?>(null)
+ internal val gapBetweenItemsPx = mutableStateOf<Int?>(null)
+ internal val viewportHeightPx = mutableStateOf<Int?>(null)
+ internal val reverseLayout = mutableStateOf<Boolean?>(null)
+ internal val anchorType = mutableStateOf<ScalingLazyListAnchorType?>(null)
+ internal val autoCentering = mutableStateOf<AutoCenteringParams?>(null)
+ internal val initialized = mutableStateOf<Boolean>(false)
+ internal val localInspectionMode = mutableStateOf<Boolean>(false)
+
+ // The following three are used together when there is a post-initialization incomplete scroll
+ // to finish next time the ScalingLazyColumn is visible
+ private val incompleteScrollItem = mutableStateOf<Int?>(null)
+ private val incompleteScrollOffset = mutableStateOf<Int?>(null)
+ private val incompleteScrollAnimated = mutableStateOf(false)
+
+ /**
+ * The index of the item positioned closest to the viewport center
+ */
+ public val centerItemIndex: Int
+ get() =
+ (layoutInfo as? DefaultScalingLazyListLayoutInfo)?.let {
+ if (it.initialized) it.centerItemIndex else null
+ } ?: initialCenterItemIndex
+
+ internal val topAutoCenteringItemSizePx: Int by derivedStateOf {
+ if (extraPaddingPx.value == null || scalingParams.value == null ||
+ gapBetweenItemsPx.value == null || viewportHeightPx.value == null ||
+ anchorType.value == null || reverseLayout.value == null ||
+ beforeContentPaddingPx.value == null || autoCentering.value == null ||
+ autoCentering.value == null
+ ) {
+ 0
+ } else {
+ (layoutInfo.beforeAutoCenteringPadding - gapBetweenItemsPx.value!!).coerceAtLeast(0)
+ }
+ }
+
+ internal val bottomAutoCenteringItemSizePx: Int by derivedStateOf {
+ if (extraPaddingPx.value == null || scalingParams.value == null ||
+ gapBetweenItemsPx.value == null || viewportHeightPx.value == null ||
+ anchorType.value == null || reverseLayout.value == null ||
+ beforeContentPaddingPx.value == null || autoCentering.value == null ||
+ layoutInfo.internalVisibleItemInfo().isEmpty()
+ ) {
+ 0
+ } else {
+ (layoutInfo.afterAutoCenteringPadding - gapBetweenItemsPx.value!!).coerceAtLeast(0)
+ }
+ }
+
+ /**
+ * The offset of the item closest to the viewport center. Depending on the
+ * [ScalingLazyListAnchorType] of the [ScalingLazyColumn] the offset will be relative to either
+ * the items Edge or Center.
+ *
+ * A positive value indicates that the center item's anchor point is above the viewport
+ * center-line, a negative value indicates that the center item anchor point is below the
+ * viewport center-line.
+ */
+ public val centerItemScrollOffset: Int
+ get() =
+ (layoutInfo as? DefaultScalingLazyListLayoutInfo)?.let {
+ if (it.initialized) it.centerItemScrollOffset else null
+ } ?: initialCenterItemScrollOffset
+
+ /**
+ * The object of [ScalingLazyListLayoutInfo] calculated during the last layout pass. For
+ * example, you can use it to calculate what items are currently visible.
+ */
+ public val layoutInfo: ScalingLazyListLayoutInfo by derivedStateOf {
+ if (extraPaddingPx.value == null || scalingParams.value == null ||
+ gapBetweenItemsPx.value == null || viewportHeightPx.value == null ||
+ anchorType.value == null || reverseLayout.value == null ||
+ beforeContentPaddingPx.value == null
+ ) {
+ EmptyScalingLazyListLayoutInfo
+ } else {
+ val visibleItemsInfo = mutableListOf<ScalingLazyListItemInfo>()
+ val viewportHeightPx = viewportHeightPx.value!!
+ var newCenterItemIndex = 0
+ var newCenterItemScrollOffset = 0
+ val visible = initialized.value || localInspectionMode.value
+
+ // The verticalAdjustment is used to allow for the extraPadding that the
+ // ScalingLazyColumn employs to ensure that there are sufficient list items composed
+ // by the underlying LazyList even when there is extreme scaling being applied that
+ // could result in additional list items be eligible to be drawn.
+ // It is important to adjust for this extra space when working out the viewport
+ // center-line based coordinate system of the ScalingLazyList.
+ val verticalAdjustment =
+ lazyListState.layoutInfo.viewportStartOffset + extraPaddingPx.value!!
+
+ // Find the item in the middle of the viewport
+ val centralItemArrayIndex =
+ findItemNearestCenter(verticalAdjustment)
+ if (centralItemArrayIndex != null) {
+ val originalVisibleItemsInfo = lazyListState.layoutInfo.visibleItemsInfo
+ val centralItem = originalVisibleItemsInfo[centralItemArrayIndex]
+
+ // Place the center item
+ val centerItemInfo: ScalingLazyListItemInfo = calculateItemInfo(
+ centralItem.offset,
+ centralItem,
+ verticalAdjustment,
+ viewportHeightPx,
+ viewportCenterLinePx(),
+ scalingParams.value!!,
+ beforeContentPaddingPx.value!!,
+ anchorType.value!!,
+ autoCentering.value,
+ visible
+ )
+ visibleItemsInfo.add(
+ centerItemInfo
+ )
+
+ newCenterItemIndex = centerItemInfo.index
+ newCenterItemScrollOffset = -centerItemInfo.offset
+
+ // Find the adjusted position of the central item in the coordinate system of the
+ // underlying LazyColumn by adjusting for any scaling
+ val centralItemAdjustedUnderlyingOffset =
+ centralItem.offset + ((centerItemInfo.startOffset(anchorType.value!!) -
+ centerItemInfo.unadjustedStartOffset(anchorType.value!!))).roundToInt()
+
+ // Go Up
+ // nextItemBottomNoPadding uses the coordinate system of the underlying LazyList. It
+ // keeps track of the top of the next potential list item that is a candidate to be
+ // drawn in the viewport as we walk up the list items from the center. Going up
+ // involved making offset smaller/negative as the coordinate system of the LazyList
+ // starts at the top of the viewport. Note that the start of the lazy list
+ // coordinates starts at '- start content padding in pixels' and goes beyond the
+ // last visible list items to include the end content padding in pixels.
+
+ // centralItem.offset is a startOffset in the coordinate system of the
+ // underlying lazy list.
+ var nextItemBottomNoPadding =
+ centralItemAdjustedUnderlyingOffset - gapBetweenItemsPx.value!!
+
+ (centralItemArrayIndex - 1 downTo 0).forEach { ix ->
+ if (nextItemBottomNoPadding >= verticalAdjustment) {
+ val currentItem =
+ lazyListState.layoutInfo.visibleItemsInfo[ix]
+ if (!discardAutoCenteringListItem(currentItem)) {
+ val itemInfo = calculateItemInfo(
+ nextItemBottomNoPadding - currentItem.size,
+ currentItem,
+ verticalAdjustment,
+ viewportHeightPx,
+ viewportCenterLinePx(),
+ scalingParams.value!!,
+ beforeContentPaddingPx.value!!,
+ anchorType.value!!,
+ autoCentering.value,
+ visible
+ )
+ visibleItemsInfo.add(0, itemInfo)
+ nextItemBottomNoPadding =
+ nextItemBottomNoPadding - itemInfo.size - gapBetweenItemsPx.value!!
+ }
+ } else {
+ return@forEach
+ }
+ }
+
+ // Go Down
+ // nextItemTopNoPadding uses the coordinate system of the underlying LazyList. It
+ // keeps track of the top of the next potential list item that is a candidate to be
+ // drawn in the viewport as we walk down the list items from the center.
+ var nextItemTopNoPadding =
+ centralItemAdjustedUnderlyingOffset + centerItemInfo.size +
+ gapBetweenItemsPx.value!!
+
+ (((centralItemArrayIndex + 1) until
+ originalVisibleItemsInfo.size)).forEach { ix ->
+ if ((nextItemTopNoPadding - viewportHeightPx) <= verticalAdjustment) {
+ val currentItem =
+ lazyListState.layoutInfo.visibleItemsInfo[ix]
+ if (!discardAutoCenteringListItem(currentItem)) {
+ val itemInfo = calculateItemInfo(
+ nextItemTopNoPadding,
+ currentItem,
+ verticalAdjustment,
+ viewportHeightPx,
+ viewportCenterLinePx(),
+ scalingParams.value!!,
+ beforeContentPaddingPx.value!!,
+ anchorType.value!!,
+ autoCentering.value,
+ visible
+ )
+
+ visibleItemsInfo.add(itemInfo)
+ nextItemTopNoPadding += itemInfo.size + gapBetweenItemsPx.value!!
+ }
+ } else {
+ return@forEach
+ }
+ }
+ }
+ val totalItemsCount =
+ if (autoCentering.value != null) {
+ (lazyListState.layoutInfo.totalItemsCount - 2).coerceAtLeast(0)
+ } else {
+ lazyListState.layoutInfo.totalItemsCount
+ }
+
+ // Decide if we are ready for the 2nd stage of initialization
+ // 1. We are not yet initialized and
+
+ val readyForInitialScroll =
+ if (! initialized.value) {
+ // 1. autoCentering is off or
+ // 2. The list has no items or
+ // 3. the before content autoCentering Spacer has been sized.
+ // NOTE: It is possible, if the first real item in the list is large, that the size
+ // of the Spacer is 0.
+ autoCentering.value == null || (
+ lazyListState.layoutInfo.visibleItemsInfo.size >= 2 && (
+ // or Empty list (other than the 2 spacers)
+ lazyListState.layoutInfo.visibleItemsInfo.size == 2 ||
+ // or first item is correctly size
+ topSpacerIsCorrectlySized(
+ lazyListState.layoutInfo.visibleItemsInfo,
+ lazyListState.layoutInfo.totalItemsCount
+ )
+ )
+ )
+ } else {
+ // We are already initialized and have an incomplete scroll to finish
+ incompleteScrollItem.value != null
+ }
+
+ DefaultScalingLazyListLayoutInfo(
+ internalVisibleItemsInfo = visibleItemsInfo,
+ totalItemsCount = totalItemsCount,
+ viewportStartOffset = lazyListState.layoutInfo.viewportStartOffset +
+ extraPaddingPx.value!!,
+ viewportEndOffset = lazyListState.layoutInfo.viewportEndOffset -
+ extraPaddingPx.value!!,
+ centerItemIndex = if (initialized.value) newCenterItemIndex else 0,
+ centerItemScrollOffset = if (initialized.value) newCenterItemScrollOffset else 0,
+ reverseLayout = reverseLayout.value!!,
+ orientation = lazyListState.layoutInfo.orientation,
+ viewportSize = IntSize(
+ width = lazyListState.layoutInfo.viewportSize.width,
+ height = lazyListState.layoutInfo.viewportSize.height -
+ extraPaddingPx.value!! * 2
+ ),
+ beforeContentPadding = beforeContentPaddingPx.value!!,
+ afterContentPadding = afterContentPaddingPx.value!!,
+ beforeAutoCenteringPadding = calculateTopAutoCenteringPaddingPx(visibleItemsInfo,
+ totalItemsCount),
+ afterAutoCenteringPadding = calculateBottomAutoCenteringPaddingPx(visibleItemsInfo,
+ totalItemsCount),
+ readyForInitialScroll = readyForInitialScroll,
+ initialized = initialized.value,
+ anchorType = anchorType.value!!,
+ )
+ }
+ }
+
+ private fun findItemNearestCenter(
+ verticalAdjustment: Int
+ ): Int? {
+ var result: Int? = null
+ // Find the item in the middle of the viewport
+ for (i in lazyListState.layoutInfo.visibleItemsInfo.indices) {
+ val item = lazyListState.layoutInfo.visibleItemsInfo[i]
+ if (! discardAutoCenteringListItem(item)) {
+ val rawItemStart = item.offset - verticalAdjustment
+ val rawItemEnd = rawItemStart + item.size + gapBetweenItemsPx.value!! / 2f
+ result = i
+ if (rawItemEnd > viewportCenterLinePx()) {
+ break
+ }
+ }
+ }
+ return result
+ }
+
+ companion object {
+ /**
+ * The default [Saver] implementation for [ScalingLazyListState].
+ */
+ val Saver = listSaver<ScalingLazyListState, Int>(
+ save = {
+ listOf(
+ it.centerItemIndex,
+ it.centerItemScrollOffset,
+ )
+ },
+ restore = {
+ val scalingLazyColumnState = ScalingLazyListState(it[0], it[1])
+ scalingLazyColumnState
+ }
+ )
+ }
+
+ override val isScrollInProgress: Boolean
+ get() {
+ return lazyListState.isScrollInProgress
+ }
+
+ override fun dispatchRawDelta(delta: Float): Float {
+ return lazyListState.dispatchRawDelta(delta)
+ }
+
+ override suspend fun scroll(
+ scrollPriority: MutatePriority,
+ block: suspend ScrollScope.() -> Unit
+ ) {
+ lazyListState.scroll(scrollPriority = scrollPriority, block = block)
+ }
+
+ override val canScrollForward: Boolean
+ get() = lazyListState.canScrollForward
+
+ override val canScrollBackward: Boolean
+ get() = lazyListState.canScrollBackward
+ /**
+ * Instantly brings the item at [index] to the center of the viewport and positions it based on
+ * the [anchorType] and applies the [scrollOffset] pixels.
+ *
+ * @param index the index to which to scroll. Must be non-negative.
+ * @param scrollOffset the offset that the item should end up after the scroll. Note that
+ * positive offset refers to forward scroll, so in a top-to-bottom list, positive offset will
+ * scroll the item further upward (taking it partly offscreen).
+ */
+ public suspend fun scrollToItem(
+ /*@IntRange(from = 0)*/
+ index: Int,
+ /*@IntRange(from = 0)*/
+ scrollOffset: Int = 0
+ ) {
+ return scrollToItem(false, index, scrollOffset)
+ }
+
+ /**
+ * Brings the item at [index] to the center of the viewport and positions it based on
+ * the [anchorType] and applies the [scrollOffset] pixels.
+ *
+ * @param animated whether to animate the scroll
+ * @param index the index to which to scroll. Must be non-negative.
+ * @param scrollOffset the offset that the item should end up after the scroll. Note that
+ * positive offset refers to forward scroll, so in a top-to-bottom list, positive offset will
+ * scroll the item further upward (taking it partly offscreen).
+ */
+ internal suspend fun scrollToItem(
+ animated: Boolean,
+ /*@IntRange(from = 0)*/
+ index: Int,
+ /*@IntRange(from = 0)*/
+ scrollOffset: Int,
+ ) {
+ if (!initialized.value) {
+ // We can't scroll yet, save to do it when we can (on the first composition).
+ initialCenterItemIndex = index
+ initialCenterItemScrollOffset = scrollOffset
+ return
+ }
+
+ // Find the underlying LazyList index taking into account the Spacer added before
+ // the first ScalingLazyColumn list item when autoCentering
+ val targetIndex = index.coerceAtMost(layoutInfo.totalItemsCount)
+ val lazyListStateIndex = targetIndex + if (autoCentering.value != null) 1 else 0
+
+ val offsetToCenterOfViewport =
+ beforeContentPaddingPx.value!! - viewportCenterLinePx()
+ if (anchorType.value == ScalingLazyListAnchorType.ItemStart) {
+ val offset = offsetToCenterOfViewport + scrollOffset
+ return lazyListState.scrollToItem(animated, lazyListStateIndex, offset)
+ } else {
+ var item = lazyListState.layoutInfo.findItemInfoWithIndex(lazyListStateIndex)
+ if (item == null) {
+ val estimatedUnadjustedHeight = layoutInfo.averageUnadjustedItemSize()
+ val estimatedOffset =
+ offsetToCenterOfViewport + (estimatedUnadjustedHeight / 2) + scrollOffset
+
+ // Scroll the item into the middle of the viewport so that we know it is visible
+ lazyListState.scrollToItem(animated, lazyListStateIndex, estimatedOffset)
+ // Now we know that the item is visible find it and fine tune our position
+ item = lazyListState.layoutInfo.findItemInfoWithIndex(lazyListStateIndex)
+ }
+ if (item != null) {
+ // Decide if the item is in the right place
+ if (centerItemIndex != index || centerItemScrollOffset != scrollOffset) {
+ val offset = offsetToCenterOfViewport + (item.size / 2) + scrollOffset
+ return lazyListState.scrollToItem(animated, lazyListStateIndex, offset)
+ }
+ } else {
+ // The scroll has failed - this should only happen if the list is not currently
+ // visible
+ incompleteScrollItem.value = targetIndex
+ incompleteScrollOffset.value = scrollOffset
+ incompleteScrollAnimated.value = animated
+ }
+ }
+ return
+ }
+
+ internal suspend fun scrollToInitialItem() {
+ // First time initialization
+ if (!initialized.value) {
+ initialized.value = true
+ scrollToItem(initialCenterItemIndex, initialCenterItemScrollOffset)
+ }
+ // Check whether we are becoming visible after an incomplete scrollTo/animatedScrollTo
+ if (incompleteScrollItem.value != null) {
+ val animated = incompleteScrollAnimated.value
+ val targetIndex = incompleteScrollItem.value!!
+ val targetOffset = incompleteScrollOffset.value!!
+ // Reset the incomplete scroll indicator
+ incompleteScrollItem.value = null
+ scrollToItem(animated, targetIndex, targetOffset)
+ }
+ return
+ }
+
+ /**
+ * Animate (smooth scroll) the given item at [index] to the center of the viewport and position
+ * it based on the [anchorType] and applies the [scrollOffset] pixels.
+ *
+ * @param index the index to which to scroll. Must be non-negative.
+ * @param scrollOffset the offset that the item should end up after the scroll (same as
+ * [scrollToItem]) - note that positive offset refers to forward scroll, so in a
+ * top-to-bottom list, positive offset will scroll the item further upward (taking it partly
+ * offscreen)
+ */
+ public suspend fun animateScrollToItem(
+ /*@IntRange(from = 0)*/
+ index: Int,
+ /*@IntRange(from = 0)*/
+ scrollOffset: Int = 0
+ ) {
+ return scrollToItem(true, index, scrollOffset)
+ }
+
+ private fun discardAutoCenteringListItem(item: LazyListItemInfo): Boolean =
+ autoCentering.value != null &&
+ (item.index == 0 || item.index == lazyListState.layoutInfo.totalItemsCount - 1)
+
+ /**
+ * Calculate the amount of top padding needed (if any) to make sure that the
+ * [AutoCenteringParams.itemIndex] item can be placed in the center of the viewport at
+ * [AutoCenteringParams.itemOffset]
+ */
+ private fun calculateTopAutoCenteringPaddingPx(
+ visibleItems: List<ScalingLazyListItemInfo>,
+ totalItemCount: Int
+ ): Int {
+ if (autoCentering.value == null ||
+ (visibleItems.isNotEmpty() && visibleItems.first().index != 0)) return 0
+
+ // Work out the index we want to find - if there are less items in the list than would be
+ // needed to make initialItemIndex be visible then use the last visible item
+ val itemIndexToFind = autoCentering.value!!.itemIndex.coerceAtMost(totalItemCount - 1)
+
+ // Find the initialCenterItem, if it is null that means it is not in view - therefore
+ // we have more than enough content before it to make sure it can be scrolled to the center
+ // of the viewport
+ val initialCenterItem =
+ visibleItems.find { it.index == itemIndexToFind }
+
+ // Determine how much space we actually need
+ var spaceNeeded = spaceNeeded(initialCenterItem)
+
+ if (spaceNeeded > 0f) {
+ // Now see how much content we already have
+ visibleItems.map {
+ if (it.index < itemIndexToFind) {
+ // Reduce the space needed
+ spaceNeeded = spaceNeeded - gapBetweenItemsPx.value!! - it.unadjustedSize
+ }
+ }
+ }
+ return (spaceNeeded + gapBetweenItemsPx.value!!).coerceAtLeast(0)
+ }
+
+ /**
+ * Determine if the top Spacer component in the underlying LazyColumn has the correct size. We
+ * need to be sure that it has the correct size before we do scrollToInitialItem in order to
+ * make sure that the initial scroll will be successful.
+ */
+ private fun topSpacerIsCorrectlySized(
+ visibleItems: List<LazyListItemInfo>,
+ totalItemCount: Int
+ ): Boolean {
+ // If the top items has a non-zero size we know that it has been correctly inflated.
+ if (lazyListState.layoutInfo.visibleItemsInfo.first().size > 0) return true
+
+ // Work out the index we want to find - if there are less items in the list than would be
+ // needed to make initialItemIndex be visible then use the last visible item. The -2 is to
+ // allow for the spacers, i.e. an underlying list of size 3 has 2 spacers in index 0 and 2
+ // and one real item in underlying lazy column index 1.
+ val itemIndexToFind = (autoCentering.value!!.itemIndex + 1).coerceAtMost(totalItemCount - 2)
+
+ // Find the initialCenterItem, if it is null that means it is not in view - therefore
+ // we have more than enough content before it to make sure it can be scrolled to the center
+ // of the viewport
+ val initialCenterItem =
+ visibleItems.find { it.index == itemIndexToFind }
+
+ // Determine how much space we actually need
+ var spaceNeeded = spaceNeeded(initialCenterItem)
+
+ if (spaceNeeded > 0f) {
+ // Now see how much content we already have
+ visibleItems.map {
+ if (it.index != 0 && it.index < itemIndexToFind) {
+ // Reduce the space needed
+ spaceNeeded = spaceNeeded - gapBetweenItemsPx.value!! - it.size
+ }
+ }
+ }
+ // Finally if the remaining space needed is less that the gap between items then we do not
+ // need to add any additional space so the spacer being size zero is correct. Otherwise we
+ // need to wait for it to be inflated.
+ return spaceNeeded < gapBetweenItemsPx.value!!
+ }
+
+ private fun spaceNeeded(item: ScalingLazyListItemInfo?) =
+ viewportCenterLinePx() - gapBetweenItemsPx.value!! - autoCentering.value!!.itemOffset -
+ (item?.unadjustedItemSizeAboveOffsetPoint() ?: 0)
+
+ private fun spaceNeeded(item: LazyListItemInfo?) =
+ viewportCenterLinePx() - gapBetweenItemsPx.value!! - autoCentering.value!!.itemOffset -
+ (item?.itemSizeAboveOffsetPoint() ?: 0)
+
+ private fun calculateBottomAutoCenteringPaddingPx(
+ visibleItemsInfo: List<ScalingLazyListItemInfo>,
+ totalItemsCount: Int
+ ) = if (autoCentering.value != null && visibleItemsInfo.isNotEmpty() &&
+ visibleItemsInfo.last().index == totalItemsCount - 1
+ ) {
+ // Round any fractional part up for the bottom spacer as we round down toward zero
+ // for the viewport center line and item heights working from the top of the
+ // viewport and then add 1 pixel if needed (for an odd height viewport) at the end
+ // spacer
+ viewportHeightPx.value!! - viewportCenterLinePx() -
+ visibleItemsInfo.last().unadjustedItemSizeBelowOffsetPoint()
+ } else {
+ 0
+ }
+
+ /**
+ * Calculate the center line of the viewport. This is half of the viewport height rounded down
+ * to the nearest int. This means that for a viewport with an odd number of pixels in height we
+ * will have the area above the viewport being one pixel smaller, e.g. a 199 pixel high
+ * viewport will be treated as having 99 pixels above and 100 pixels below the center line.
+ */
+ private fun viewportCenterLinePx(): Int = viewportHeightPx.value!! / 2
+
+ /**
+ * How much of the items unscaled size would be above the point on the item that represents the
+ * offset point. For an edge anchored item the offset point is the top of the item. For a center
+ * anchored item the offset point is floor(height/2).
+ */
+ private fun ScalingLazyListItemInfo.unadjustedItemSizeAboveOffsetPoint() =
+ if (anchorType.value == ScalingLazyListAnchorType.ItemStart) {
+ 0
+ } else {
+ this.unadjustedSize / 2
+ }
+
+ /**
+ * How much of the items size would be above the point on the item that represents the
+ * offset point. For an edge anchored item the offset point is the top of the item. For a center
+ * anchored item the offset point is floor(height/2).
+ */
+ private fun LazyListItemInfo.itemSizeAboveOffsetPoint() =
+ if (anchorType.value == ScalingLazyListAnchorType.ItemStart) {
+ 0
+ } else {
+ this.size / 2
+ }
+
+ /**
+ * How much of the items size would be below the point on the item that represents the
+ * offset point. For an edge anchored item the offset point is the top of the item. For a center
+ * anchored item the offset point is floor(height/2).
+ */
+ private fun ScalingLazyListItemInfo.unadjustedItemSizeBelowOffsetPoint() =
+ this.unadjustedSize - unadjustedItemSizeAboveOffsetPoint()
+}
+
+private fun LazyListLayoutInfo.findItemInfoWithIndex(index: Int): LazyListItemInfo? {
+ return this.visibleItemsInfo.find { it.index == index }
+}
+
+private suspend fun LazyListState.scrollToItem(animated: Boolean, index: Int, offset: Int) {
+ if (animated) animateScrollToItem(index, offset) else scrollToItem(index, offset)
+}
+
+private fun ScalingLazyListLayoutInfo.averageUnadjustedItemSize(): Int {
+ var totalSize = 0
+ visibleItemsInfo.forEach { totalSize += it.unadjustedSize }
+ return if (visibleItemsInfo.isNotEmpty())
+ (totalSize.toFloat() / visibleItemsInfo.size).roundToInt()
+ else 0
+}
+
+private object EmptyScalingLazyListLayoutInfo : ScalingLazyListLayoutInfo {
+ override val visibleItemsInfo = emptyList<ScalingLazyListItemInfo>()
+ override val viewportStartOffset = 0
+ override val viewportEndOffset = 0
+ override val totalItemsCount = 0
+ override val viewportSize = IntSize.Zero
+ override val orientation = Orientation.Vertical
+ override val reverseLayout = false
+ override val beforeContentPadding = 0
+ override val afterContentPadding = 0
+ override val beforeAutoCenteringPadding = 0
+ override val afterAutoCenteringPadding = 0
+ override val anchorType: ScalingLazyListAnchorType = ScalingLazyListAnchorType.ItemCenter
+}
+
+internal fun ScalingLazyListLayoutInfo.internalVisibleItemInfo() =
+ (this as? DefaultScalingLazyListLayoutInfo)?.internalVisibleItemsInfo ?: emptyList()
diff --git a/tv/tv-material/src/main/java/androidx/tv/material/ExperimentalTvMaterialApi.kt b/wear/compose/compose-foundation/src/commonMain/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyScopeMarker.kt
similarity index 72%
copy from tv/tv-material/src/main/java/androidx/tv/material/ExperimentalTvMaterialApi.kt
copy to wear/compose/compose-foundation/src/commonMain/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyScopeMarker.kt
index ebac64e..c0f85f7 100644
--- a/tv/tv-material/src/main/java/androidx/tv/material/ExperimentalTvMaterialApi.kt
+++ b/wear/compose/compose-foundation/src/commonMain/kotlin/androidx/wear/compose/foundation/lazy/ScalingLazyScopeMarker.kt
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package androidx.tv.material
+package androidx.wear.compose.foundation.lazy
-@RequiresOptIn(
- "This tv-material API is experimental and likely to change or be removed in the future."
-)
-@Retention(AnnotationRetention.BINARY)
-annotation class ExperimentalTvMaterialApi
\ No newline at end of file
+/**
+ * DSL marker used to distinguish between lazy layout scope and the item scope.
+ */
+@DslMarker
+annotation class ScalingLazyScopeMarker
diff --git a/wear/compose/compose-material/api/current.ignore b/wear/compose/compose-material/api/current.ignore
index 82c32a0..05e58f9 100644
--- a/wear/compose/compose-material/api/current.ignore
+++ b/wear/compose/compose-material/api/current.ignore
@@ -1,7 +1,3 @@
// Baseline format: 1.0
ChangedValue: androidx.wear.compose.material.TimeTextDefaults#TimeFormat12Hours:
Field androidx.wear.compose.material.TimeTextDefaults.TimeFormat12Hours has changed value from h:mm a to h:mm
-
-
-InvalidNullConversion: androidx.wear.compose.material.PickerKt#Picker(androidx.wear.compose.material.PickerState, String, androidx.compose.ui.Modifier, boolean, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,? extends kotlin.Unit>, kotlin.jvm.functions.Function0<? extends kotlin.Unit>, androidx.wear.compose.material.ScalingParams, float, float, long, androidx.compose.foundation.gestures.FlingBehavior, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.PickerScope,? super java.lang.Integer,? extends kotlin.Unit>) parameter #1:
- Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter contentDescription in androidx.wear.compose.material.PickerKt.Picker(androidx.wear.compose.material.PickerState state, String contentDescription, androidx.compose.ui.Modifier modifier, boolean readOnly, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,? extends kotlin.Unit> readOnlyLabel, kotlin.jvm.functions.Function0<? extends kotlin.Unit> onSelected, androidx.wear.compose.material.ScalingParams scalingParams, float separation, float gradientRatio, long gradientColor, androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.PickerScope,? super java.lang.Integer,? extends kotlin.Unit> option)
diff --git a/wear/compose/compose-material/api/current.txt b/wear/compose/compose-material/api/current.txt
index f728567..029a1e9 100644
--- a/wear/compose/compose-material/api/current.txt
+++ b/wear/compose/compose-material/api/current.txt
@@ -4,8 +4,8 @@
public final class AnimationKt {
}
- @androidx.compose.runtime.Immutable public final class AutoCenteringParams {
- ctor public AutoCenteringParams(optional int itemIndex, optional int itemOffset);
+ @Deprecated @androidx.compose.runtime.Immutable public final class AutoCenteringParams {
+ ctor @Deprecated public AutoCenteringParams(optional int itemIndex, optional int itemOffset);
}
@androidx.compose.runtime.Stable public interface ButtonBorder {
@@ -262,17 +262,19 @@
}
public final class PickerDefaults {
+ method public androidx.wear.compose.foundation.lazy.ScalingParams defaultScalingParams(optional float edgeScale, optional float edgeAlpha, optional float minElementHeight, optional float maxElementHeight, optional float minTransitionArea, optional float maxTransitionArea, optional androidx.compose.animation.core.Easing scaleInterpolator, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Constraints,java.lang.Integer> viewportVerticalOffsetResolver);
method @androidx.compose.runtime.Composable public androidx.compose.foundation.gestures.FlingBehavior flingBehavior(androidx.wear.compose.material.PickerState state, optional androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decay);
method public float getDefaultGradientRatio();
- method public androidx.wear.compose.material.ScalingParams scalingParams(optional float edgeScale, optional float edgeAlpha, optional float minElementHeight, optional float maxElementHeight, optional float minTransitionArea, optional float maxTransitionArea, optional androidx.compose.animation.core.Easing scaleInterpolator, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Constraints,java.lang.Integer> viewportVerticalOffsetResolver);
+ method @Deprecated public androidx.wear.compose.material.ScalingParams scalingParams(optional float edgeScale, optional float edgeAlpha, optional float minElementHeight, optional float maxElementHeight, optional float minTransitionArea, optional float maxTransitionArea, optional androidx.compose.animation.core.Easing scaleInterpolator, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Constraints,java.lang.Integer> viewportVerticalOffsetResolver);
property public final float DefaultGradientRatio;
field public static final androidx.wear.compose.material.PickerDefaults INSTANCE;
}
public final class PickerKt {
- method @androidx.compose.runtime.Composable public static void Picker(androidx.wear.compose.material.PickerState state, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional boolean readOnly, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>? readOnlyLabel, optional kotlin.jvm.functions.Function0<kotlin.Unit> onSelected, optional androidx.wear.compose.material.ScalingParams scalingParams, optional float separation, optional float gradientRatio, optional long gradientColor, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.PickerScope,? super java.lang.Integer,kotlin.Unit> option);
+ method @androidx.compose.runtime.Composable public static void Picker(androidx.wear.compose.material.PickerState state, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional boolean readOnly, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>? readOnlyLabel, optional kotlin.jvm.functions.Function0<kotlin.Unit> onSelected, optional androidx.wear.compose.foundation.lazy.ScalingParams scalingParams, optional float separation, optional float gradientRatio, optional long gradientColor, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.PickerScope,? super java.lang.Integer,kotlin.Unit> option);
method @Deprecated @androidx.compose.runtime.Composable public static void Picker(androidx.wear.compose.material.PickerState state, optional androidx.compose.ui.Modifier modifier, optional boolean readOnly, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>? readOnlyLabel, optional androidx.wear.compose.material.ScalingParams scalingParams, optional float separation, optional float gradientRatio, optional long gradientColor, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.PickerScope,? super java.lang.Integer,kotlin.Unit> option);
- method @Deprecated @androidx.compose.runtime.Composable public static void Picker(androidx.wear.compose.material.PickerState state, String contentDescription, optional androidx.compose.ui.Modifier modifier, optional boolean readOnly, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,? extends kotlin.Unit>? readOnlyLabel, optional kotlin.jvm.functions.Function0<? extends kotlin.Unit> onSelected, optional androidx.wear.compose.material.ScalingParams scalingParams, optional float separation, optional float gradientRatio, optional long gradientColor, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.PickerScope,? super java.lang.Integer,? extends kotlin.Unit> option);
+ method @Deprecated @androidx.compose.runtime.Composable public static void Picker(androidx.wear.compose.material.PickerState state, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional boolean readOnly, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,? extends kotlin.Unit>? readOnlyLabel, optional kotlin.jvm.functions.Function0<? extends kotlin.Unit> onSelected, optional androidx.wear.compose.material.ScalingParams scalingParams, optional float separation, optional float gradientRatio, optional long gradientColor, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.PickerScope,? super java.lang.Integer,? extends kotlin.Unit> option);
+ method @Deprecated @androidx.compose.runtime.Composable public static void Picker(androidx.wear.compose.material.PickerState state, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional boolean readOnly, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,? extends kotlin.Unit>? readOnlyLabel, optional kotlin.jvm.functions.Function0<? extends kotlin.Unit> onSelected, optional androidx.wear.compose.material.ScalingParams scalingParams, optional float separation, optional float gradientRatio, optional long gradientColor, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.PickerScope,? super java.lang.Integer,? extends kotlin.Unit> option);
method @androidx.compose.runtime.Composable public static androidx.wear.compose.material.PickerState rememberPickerState(int initialNumberOfOptions, optional int initiallySelectedOption, optional boolean repeatItems);
}
@@ -325,7 +327,8 @@
public final class PositionIndicatorKt {
method @androidx.compose.runtime.Composable public static void PositionIndicator(androidx.compose.foundation.ScrollState scrollState, optional androidx.compose.ui.Modifier modifier, optional boolean reverseDirection);
- method @androidx.compose.runtime.Composable public static void PositionIndicator(androidx.wear.compose.material.ScalingLazyListState scalingLazyListState, optional androidx.compose.ui.Modifier modifier, optional boolean reverseDirection);
+ method @androidx.compose.runtime.Composable public static void PositionIndicator(androidx.wear.compose.foundation.lazy.ScalingLazyListState scalingLazyListState, optional androidx.compose.ui.Modifier modifier, optional boolean reverseDirection);
+ method @Deprecated @androidx.compose.runtime.Composable public static void PositionIndicator(androidx.wear.compose.material.ScalingLazyListState scalingLazyListState, optional androidx.compose.ui.Modifier modifier, optional boolean reverseDirection);
method @androidx.compose.runtime.Composable public static void PositionIndicator(androidx.compose.foundation.lazy.LazyListState lazyListState, optional androidx.compose.ui.Modifier modifier, optional boolean reverseDirection);
method @androidx.compose.runtime.Composable public static void PositionIndicator(kotlin.jvm.functions.Function0<java.lang.Float> value, optional androidx.compose.ui.Modifier modifier, optional kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> range, optional long color, optional boolean reverseDirection, optional int position);
method @androidx.compose.runtime.Composable public static void PositionIndicator(androidx.wear.compose.material.PositionIndicatorState state, float indicatorHeight, float indicatorWidth, float paddingHorizontal, optional androidx.compose.ui.Modifier modifier, optional long background, optional long color, optional boolean reverseDirection, optional int position);
@@ -384,43 +387,43 @@
method @androidx.compose.runtime.Composable public static void Scaffold(optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? vignette, optional kotlin.jvm.functions.Function0<kotlin.Unit>? positionIndicator, optional kotlin.jvm.functions.Function0<kotlin.Unit>? pageIndicator, optional kotlin.jvm.functions.Function0<kotlin.Unit>? timeText, kotlin.jvm.functions.Function0<kotlin.Unit> content);
}
- public final class ScalingLazyColumnDefaults {
- method public androidx.wear.compose.material.ScalingParams scalingParams(optional float edgeScale, optional float edgeAlpha, optional float minElementHeight, optional float maxElementHeight, optional float minTransitionArea, optional float maxTransitionArea, optional androidx.compose.animation.core.Easing scaleInterpolator, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Constraints,java.lang.Integer> viewportVerticalOffsetResolver);
- method @androidx.compose.runtime.Composable public androidx.compose.foundation.gestures.FlingBehavior snapFlingBehavior(androidx.wear.compose.material.ScalingLazyListState state, optional float snapOffset, optional androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decay);
- field public static final androidx.wear.compose.material.ScalingLazyColumnDefaults INSTANCE;
+ @Deprecated public final class ScalingLazyColumnDefaults {
+ method @Deprecated public androidx.wear.compose.material.ScalingParams scalingParams(optional float edgeScale, optional float edgeAlpha, optional float minElementHeight, optional float maxElementHeight, optional float minTransitionArea, optional float maxTransitionArea, optional androidx.compose.animation.core.Easing scaleInterpolator, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Constraints,java.lang.Integer> viewportVerticalOffsetResolver);
+ method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.foundation.gestures.FlingBehavior snapFlingBehavior(androidx.wear.compose.material.ScalingLazyListState state, optional float snapOffset, optional androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decay);
+ field @Deprecated public static final androidx.wear.compose.material.ScalingLazyColumnDefaults INSTANCE;
}
public final class ScalingLazyColumnKt {
- method @androidx.compose.runtime.Composable public static void ScalingLazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.material.ScalingLazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, optional androidx.wear.compose.material.ScalingParams scalingParams, optional int anchorType, optional androidx.wear.compose.material.AutoCenteringParams? autoCentering, kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.ScalingLazyListScope,kotlin.Unit> content);
- method public static inline <T> void items(androidx.wear.compose.material.ScalingLazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super T,kotlin.Unit> itemContent);
- method public static inline <T> void items(androidx.wear.compose.material.ScalingLazyListScope, T![] items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super T,kotlin.Unit> itemContent);
- method public static inline <T> void itemsIndexed(androidx.wear.compose.material.ScalingLazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
- method public static inline <T> void itemsIndexed(androidx.wear.compose.material.ScalingLazyListScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ method @Deprecated @androidx.compose.runtime.Composable public static void ScalingLazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.material.ScalingLazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, optional androidx.wear.compose.material.ScalingParams scalingParams, optional int anchorType, optional androidx.wear.compose.material.AutoCenteringParams? autoCentering, kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.ScalingLazyListScope,kotlin.Unit> content);
+ method @Deprecated public static inline <T> void items(androidx.wear.compose.material.ScalingLazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super T,kotlin.Unit> itemContent);
+ method @Deprecated public static inline <T> void items(androidx.wear.compose.material.ScalingLazyListScope, T![] items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super T,kotlin.Unit> itemContent);
+ method @Deprecated public static inline <T> void itemsIndexed(androidx.wear.compose.material.ScalingLazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ method @Deprecated public static inline <T> void itemsIndexed(androidx.wear.compose.material.ScalingLazyListScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
}
public final class ScalingLazyColumnMeasureKt {
}
- @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class ScalingLazyListAnchorType {
- field public static final androidx.wear.compose.material.ScalingLazyListAnchorType.Companion Companion;
+ @Deprecated @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class ScalingLazyListAnchorType {
+ field @Deprecated public static final androidx.wear.compose.material.ScalingLazyListAnchorType.Companion Companion;
}
- public static final class ScalingLazyListAnchorType.Companion {
- method public int getItemCenter();
- method public int getItemStart();
+ @Deprecated public static final class ScalingLazyListAnchorType.Companion {
+ method @Deprecated public int getItemCenter();
+ method @Deprecated public int getItemStart();
property public final int ItemCenter;
property public final int ItemStart;
}
- public sealed interface ScalingLazyListItemInfo {
- method public float getAlpha();
- method public int getIndex();
- method public Object getKey();
- method public int getOffset();
- method public float getScale();
- method public int getSize();
- method public int getUnadjustedOffset();
- method public int getUnadjustedSize();
+ @Deprecated public sealed interface ScalingLazyListItemInfo {
+ method @Deprecated public float getAlpha();
+ method @Deprecated public int getIndex();
+ method @Deprecated public Object getKey();
+ method @Deprecated public int getOffset();
+ method @Deprecated public float getScale();
+ method @Deprecated public int getSize();
+ method @Deprecated public int getUnadjustedOffset();
+ method @Deprecated public int getUnadjustedSize();
property public abstract float alpha;
property public abstract int index;
property public abstract Object key;
@@ -431,24 +434,24 @@
property public abstract int unadjustedSize;
}
- @androidx.compose.runtime.Stable @androidx.wear.compose.material.ScalingLazyScopeMarker public sealed interface ScalingLazyListItemScope {
- method public androidx.compose.ui.Modifier fillParentMaxHeight(androidx.compose.ui.Modifier, optional float fraction);
- method public androidx.compose.ui.Modifier fillParentMaxSize(androidx.compose.ui.Modifier, optional float fraction);
- method public androidx.compose.ui.Modifier fillParentMaxWidth(androidx.compose.ui.Modifier, optional float fraction);
+ @Deprecated @androidx.compose.runtime.Stable @androidx.wear.compose.material.ScalingLazyScopeMarker public sealed interface ScalingLazyListItemScope {
+ method @Deprecated public androidx.compose.ui.Modifier fillParentMaxHeight(androidx.compose.ui.Modifier, optional float fraction);
+ method @Deprecated public androidx.compose.ui.Modifier fillParentMaxSize(androidx.compose.ui.Modifier, optional float fraction);
+ method @Deprecated public androidx.compose.ui.Modifier fillParentMaxWidth(androidx.compose.ui.Modifier, optional float fraction);
}
- public sealed interface ScalingLazyListLayoutInfo {
- method public int getAfterAutoCenteringPadding();
- method public int getAfterContentPadding();
- method public int getBeforeAutoCenteringPadding();
- method public int getBeforeContentPadding();
- method public androidx.compose.foundation.gestures.Orientation getOrientation();
- method public boolean getReverseLayout();
- method public int getTotalItemsCount();
- method public int getViewportEndOffset();
- method public long getViewportSize();
- method public int getViewportStartOffset();
- method public java.util.List<androidx.wear.compose.material.ScalingLazyListItemInfo> getVisibleItemsInfo();
+ @Deprecated public sealed interface ScalingLazyListLayoutInfo {
+ method @Deprecated public int getAfterAutoCenteringPadding();
+ method @Deprecated public int getAfterContentPadding();
+ method @Deprecated public int getBeforeAutoCenteringPadding();
+ method @Deprecated public int getBeforeContentPadding();
+ method @Deprecated public androidx.compose.foundation.gestures.Orientation getOrientation();
+ method @Deprecated public boolean getReverseLayout();
+ method @Deprecated public int getTotalItemsCount();
+ method @Deprecated public int getViewportEndOffset();
+ method @Deprecated public long getViewportSize();
+ method @Deprecated public int getViewportStartOffset();
+ method @Deprecated public java.util.List<androidx.wear.compose.material.ScalingLazyListItemInfo> getVisibleItemsInfo();
property public abstract int afterAutoCenteringPadding;
property public abstract int afterContentPadding;
property public abstract int beforeAutoCenteringPadding;
@@ -462,51 +465,51 @@
property public abstract java.util.List<androidx.wear.compose.material.ScalingLazyListItemInfo> visibleItemsInfo;
}
- @androidx.wear.compose.material.ScalingLazyScopeMarker public sealed interface ScalingLazyListScope {
- method public void item(optional Object? key, kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.ScalingLazyListItemScope,kotlin.Unit> content);
- method public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
+ @Deprecated @androidx.wear.compose.material.ScalingLazyScopeMarker public sealed interface ScalingLazyListScope {
+ method @Deprecated public void item(optional Object? key, kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.ScalingLazyListItemScope,kotlin.Unit> content);
+ method @Deprecated public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
}
- @androidx.compose.runtime.Stable public final class ScalingLazyListState implements androidx.compose.foundation.gestures.ScrollableState {
- ctor public ScalingLazyListState(optional int initialCenterItemIndex, optional int initialCenterItemScrollOffset);
- method public suspend Object? animateScrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
- method public float dispatchRawDelta(float delta);
- method public int getCenterItemIndex();
- method public int getCenterItemScrollOffset();
- method public androidx.wear.compose.material.ScalingLazyListLayoutInfo getLayoutInfo();
- method public boolean isScrollInProgress();
- method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
- method public suspend Object? scrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ @Deprecated @androidx.compose.runtime.Stable public final class ScalingLazyListState implements androidx.compose.foundation.gestures.ScrollableState {
+ ctor @Deprecated public ScalingLazyListState(optional int initialCenterItemIndex, optional int initialCenterItemScrollOffset);
+ method @Deprecated public suspend Object? animateScrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @Deprecated public float dispatchRawDelta(float delta);
+ method @Deprecated public int getCenterItemIndex();
+ method @Deprecated public int getCenterItemScrollOffset();
+ method @Deprecated public androidx.wear.compose.material.ScalingLazyListLayoutInfo getLayoutInfo();
+ method @Deprecated public boolean isScrollInProgress();
+ method @Deprecated public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @Deprecated public suspend Object? scrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
property public boolean canScrollBackward;
property public boolean canScrollForward;
property public final int centerItemIndex;
property public final int centerItemScrollOffset;
property public boolean isScrollInProgress;
property public final androidx.wear.compose.material.ScalingLazyListLayoutInfo layoutInfo;
- field public static final androidx.wear.compose.material.ScalingLazyListState.Companion Companion;
+ field @Deprecated public static final androidx.wear.compose.material.ScalingLazyListState.Companion Companion;
}
- public static final class ScalingLazyListState.Companion {
- method public androidx.compose.runtime.saveable.Saver<androidx.wear.compose.material.ScalingLazyListState,java.lang.Object> getSaver();
+ @Deprecated public static final class ScalingLazyListState.Companion {
+ method @Deprecated public androidx.compose.runtime.saveable.Saver<androidx.wear.compose.material.ScalingLazyListState,java.lang.Object> getSaver();
property public final androidx.compose.runtime.saveable.Saver<androidx.wear.compose.material.ScalingLazyListState,java.lang.Object> Saver;
}
public final class ScalingLazyListStateKt {
- method @androidx.compose.runtime.Composable public static androidx.wear.compose.material.ScalingLazyListState rememberScalingLazyListState(optional int initialCenterItemIndex, optional int initialCenterItemScrollOffset);
+ method @Deprecated @androidx.compose.runtime.Composable public static androidx.wear.compose.material.ScalingLazyListState rememberScalingLazyListState(optional int initialCenterItemIndex, optional int initialCenterItemScrollOffset);
}
- @kotlin.DslMarker public @interface ScalingLazyScopeMarker {
+ @Deprecated @kotlin.DslMarker public @interface ScalingLazyScopeMarker {
}
- @androidx.compose.runtime.Stable public interface ScalingParams {
- method public float getEdgeAlpha();
- method public float getEdgeScale();
- method public float getMaxElementHeight();
- method public float getMaxTransitionArea();
- method public float getMinElementHeight();
- method public float getMinTransitionArea();
- method public androidx.compose.animation.core.Easing getScaleInterpolator();
- method public int resolveViewportVerticalOffset(long viewportConstraints);
+ @Deprecated @androidx.compose.runtime.Stable public interface ScalingParams {
+ method @Deprecated public float getEdgeAlpha();
+ method @Deprecated public float getEdgeScale();
+ method @Deprecated public float getMaxElementHeight();
+ method @Deprecated public float getMaxTransitionArea();
+ method @Deprecated public float getMinElementHeight();
+ method @Deprecated public float getMinTransitionArea();
+ method @Deprecated public androidx.compose.animation.core.Easing getScaleInterpolator();
+ method @Deprecated public int resolveViewportVerticalOffset(long viewportConstraints);
property public abstract float edgeAlpha;
property public abstract float edgeScale;
property public abstract float maxElementHeight;
@@ -519,7 +522,8 @@
public final class ScrollAwayKt {
method public static androidx.compose.ui.Modifier scrollAway(androidx.compose.ui.Modifier, androidx.compose.foundation.ScrollState scrollState, optional float offset);
method public static androidx.compose.ui.Modifier scrollAway(androidx.compose.ui.Modifier, androidx.compose.foundation.lazy.LazyListState scrollState, optional int itemIndex, optional float offset);
- method public static androidx.compose.ui.Modifier scrollAway(androidx.compose.ui.Modifier, androidx.wear.compose.material.ScalingLazyListState scrollState, optional int itemIndex, optional float offset);
+ method public static androidx.compose.ui.Modifier scrollAway(androidx.compose.ui.Modifier, androidx.wear.compose.foundation.lazy.ScalingLazyListState scrollState, optional int itemIndex, optional float offset);
+ method @Deprecated public static androidx.compose.ui.Modifier scrollAway(androidx.compose.ui.Modifier, androidx.wear.compose.material.ScalingLazyListState scrollState, optional int itemIndex, optional float offset);
}
@androidx.compose.runtime.Immutable public final class Shapes {
@@ -783,13 +787,17 @@
}
public final class DialogKt {
- method @androidx.compose.runtime.Composable public static void Alert(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> title, kotlin.jvm.functions.Function0<kotlin.Unit> negativeButton, kotlin.jvm.functions.Function0<kotlin.Unit> positiveButton, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? icon, optional androidx.wear.compose.material.ScalingLazyListState scrollState, optional long backgroundColor, optional long contentColor, optional long titleColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? content);
- method @androidx.compose.runtime.Composable public static void Alert(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? icon, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? message, optional androidx.wear.compose.material.ScalingLazyListState scrollState, optional long backgroundColor, optional long titleColor, optional long messageColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.ScalingLazyListScope,kotlin.Unit> content);
- method @androidx.compose.runtime.Composable public static void Confirmation(kotlin.jvm.functions.Function0<kotlin.Unit> onTimeout, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? icon, optional androidx.wear.compose.material.ScalingLazyListState scrollState, optional long durationMillis, optional long backgroundColor, optional long contentColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Alert(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> title, kotlin.jvm.functions.Function0<kotlin.Unit> negativeButton, kotlin.jvm.functions.Function0<kotlin.Unit> positiveButton, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? icon, optional androidx.wear.compose.foundation.lazy.ScalingLazyListState scrollState, optional long backgroundColor, optional long contentColor, optional long titleColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? content);
+ method @androidx.compose.runtime.Composable public static void Alert(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? icon, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? message, optional androidx.wear.compose.foundation.lazy.ScalingLazyListState scrollState, optional long backgroundColor, optional long titleColor, optional long messageColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.lazy.ScalingLazyListScope,kotlin.Unit> content);
+ method @Deprecated @androidx.compose.runtime.Composable public static void Alert(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,? extends kotlin.Unit> title, kotlin.jvm.functions.Function0<? extends kotlin.Unit> negativeButton, kotlin.jvm.functions.Function0<? extends kotlin.Unit> positiveButton, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,? extends kotlin.Unit>? icon, optional androidx.wear.compose.material.ScalingLazyListState scrollState, optional long backgroundColor, optional long contentColor, optional long titleColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,? extends kotlin.Unit>? content);
+ method @Deprecated @androidx.compose.runtime.Composable public static void Alert(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,? extends kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,? extends kotlin.Unit>? icon, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,? extends kotlin.Unit>? message, optional androidx.wear.compose.material.ScalingLazyListState scrollState, optional long backgroundColor, optional long titleColor, optional long messageColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.ScalingLazyListScope,? extends kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Confirmation(kotlin.jvm.functions.Function0<kotlin.Unit> onTimeout, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? icon, optional androidx.wear.compose.foundation.lazy.ScalingLazyListState scrollState, optional long durationMillis, optional long backgroundColor, optional long contentColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ method @Deprecated @androidx.compose.runtime.Composable public static void Confirmation(kotlin.jvm.functions.Function0<? extends kotlin.Unit> onTimeout, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,? extends kotlin.Unit>? icon, optional androidx.wear.compose.material.ScalingLazyListState scrollState, optional long durationMillis, optional long backgroundColor, optional long contentColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,? extends kotlin.Unit> content);
}
public final class Dialog_androidKt {
- method @androidx.compose.runtime.Composable public static void Dialog(boolean showDialog, kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.material.ScalingLazyListState? scrollState, optional androidx.compose.ui.window.DialogProperties properties, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Dialog(boolean showDialog, kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.foundation.lazy.ScalingLazyListState? scrollState, optional androidx.compose.ui.window.DialogProperties properties, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @Deprecated @androidx.compose.runtime.Composable public static void Dialog(boolean showDialog, kotlin.jvm.functions.Function0<? extends kotlin.Unit> onDismissRequest, optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.material.ScalingLazyListState? scrollState, optional androidx.compose.ui.window.DialogProperties properties, kotlin.jvm.functions.Function0<? extends kotlin.Unit> content);
}
}
diff --git a/wear/compose/compose-material/api/public_plus_experimental_current.txt b/wear/compose/compose-material/api/public_plus_experimental_current.txt
index 09bb7fd..244f8e6 100644
--- a/wear/compose/compose-material/api/public_plus_experimental_current.txt
+++ b/wear/compose/compose-material/api/public_plus_experimental_current.txt
@@ -4,8 +4,8 @@
public final class AnimationKt {
}
- @androidx.compose.runtime.Immutable public final class AutoCenteringParams {
- ctor public AutoCenteringParams(optional int itemIndex, optional int itemOffset);
+ @Deprecated @androidx.compose.runtime.Immutable public final class AutoCenteringParams {
+ ctor @Deprecated public AutoCenteringParams(optional int itemIndex, optional int itemOffset);
}
@androidx.compose.runtime.Stable public interface ButtonBorder {
@@ -278,17 +278,19 @@
}
public final class PickerDefaults {
+ method public androidx.wear.compose.foundation.lazy.ScalingParams defaultScalingParams(optional float edgeScale, optional float edgeAlpha, optional float minElementHeight, optional float maxElementHeight, optional float minTransitionArea, optional float maxTransitionArea, optional androidx.compose.animation.core.Easing scaleInterpolator, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Constraints,java.lang.Integer> viewportVerticalOffsetResolver);
method @androidx.compose.runtime.Composable public androidx.compose.foundation.gestures.FlingBehavior flingBehavior(androidx.wear.compose.material.PickerState state, optional androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decay);
method public float getDefaultGradientRatio();
- method public androidx.wear.compose.material.ScalingParams scalingParams(optional float edgeScale, optional float edgeAlpha, optional float minElementHeight, optional float maxElementHeight, optional float minTransitionArea, optional float maxTransitionArea, optional androidx.compose.animation.core.Easing scaleInterpolator, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Constraints,java.lang.Integer> viewportVerticalOffsetResolver);
+ method @Deprecated public androidx.wear.compose.material.ScalingParams scalingParams(optional float edgeScale, optional float edgeAlpha, optional float minElementHeight, optional float maxElementHeight, optional float minTransitionArea, optional float maxTransitionArea, optional androidx.compose.animation.core.Easing scaleInterpolator, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Constraints,java.lang.Integer> viewportVerticalOffsetResolver);
property public final float DefaultGradientRatio;
field public static final androidx.wear.compose.material.PickerDefaults INSTANCE;
}
public final class PickerKt {
- method @androidx.compose.runtime.Composable public static void Picker(androidx.wear.compose.material.PickerState state, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional boolean readOnly, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>? readOnlyLabel, optional kotlin.jvm.functions.Function0<kotlin.Unit> onSelected, optional androidx.wear.compose.material.ScalingParams scalingParams, optional float separation, optional float gradientRatio, optional long gradientColor, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.PickerScope,? super java.lang.Integer,kotlin.Unit> option);
+ method @androidx.compose.runtime.Composable public static void Picker(androidx.wear.compose.material.PickerState state, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional boolean readOnly, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>? readOnlyLabel, optional kotlin.jvm.functions.Function0<kotlin.Unit> onSelected, optional androidx.wear.compose.foundation.lazy.ScalingParams scalingParams, optional float separation, optional float gradientRatio, optional long gradientColor, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.PickerScope,? super java.lang.Integer,kotlin.Unit> option);
method @Deprecated @androidx.compose.runtime.Composable public static void Picker(androidx.wear.compose.material.PickerState state, optional androidx.compose.ui.Modifier modifier, optional boolean readOnly, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>? readOnlyLabel, optional androidx.wear.compose.material.ScalingParams scalingParams, optional float separation, optional float gradientRatio, optional long gradientColor, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.PickerScope,? super java.lang.Integer,kotlin.Unit> option);
- method @Deprecated @androidx.compose.runtime.Composable public static void Picker(androidx.wear.compose.material.PickerState state, String contentDescription, optional androidx.compose.ui.Modifier modifier, optional boolean readOnly, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,? extends kotlin.Unit>? readOnlyLabel, optional kotlin.jvm.functions.Function0<? extends kotlin.Unit> onSelected, optional androidx.wear.compose.material.ScalingParams scalingParams, optional float separation, optional float gradientRatio, optional long gradientColor, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.PickerScope,? super java.lang.Integer,? extends kotlin.Unit> option);
+ method @Deprecated @androidx.compose.runtime.Composable public static void Picker(androidx.wear.compose.material.PickerState state, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional boolean readOnly, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,? extends kotlin.Unit>? readOnlyLabel, optional kotlin.jvm.functions.Function0<? extends kotlin.Unit> onSelected, optional androidx.wear.compose.material.ScalingParams scalingParams, optional float separation, optional float gradientRatio, optional long gradientColor, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.PickerScope,? super java.lang.Integer,? extends kotlin.Unit> option);
+ method @Deprecated @androidx.compose.runtime.Composable public static void Picker(androidx.wear.compose.material.PickerState state, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional boolean readOnly, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,? extends kotlin.Unit>? readOnlyLabel, optional kotlin.jvm.functions.Function0<? extends kotlin.Unit> onSelected, optional androidx.wear.compose.material.ScalingParams scalingParams, optional float separation, optional float gradientRatio, optional long gradientColor, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.PickerScope,? super java.lang.Integer,? extends kotlin.Unit> option);
method @androidx.compose.runtime.Composable public static androidx.wear.compose.material.PickerState rememberPickerState(int initialNumberOfOptions, optional int initiallySelectedOption, optional boolean repeatItems);
}
@@ -362,7 +364,8 @@
public final class PositionIndicatorKt {
method @androidx.compose.runtime.Composable public static void PositionIndicator(androidx.compose.foundation.ScrollState scrollState, optional androidx.compose.ui.Modifier modifier, optional boolean reverseDirection);
- method @androidx.compose.runtime.Composable public static void PositionIndicator(androidx.wear.compose.material.ScalingLazyListState scalingLazyListState, optional androidx.compose.ui.Modifier modifier, optional boolean reverseDirection);
+ method @androidx.compose.runtime.Composable public static void PositionIndicator(androidx.wear.compose.foundation.lazy.ScalingLazyListState scalingLazyListState, optional androidx.compose.ui.Modifier modifier, optional boolean reverseDirection);
+ method @Deprecated @androidx.compose.runtime.Composable public static void PositionIndicator(androidx.wear.compose.material.ScalingLazyListState scalingLazyListState, optional androidx.compose.ui.Modifier modifier, optional boolean reverseDirection);
method @androidx.compose.runtime.Composable public static void PositionIndicator(androidx.compose.foundation.lazy.LazyListState lazyListState, optional androidx.compose.ui.Modifier modifier, optional boolean reverseDirection);
method @androidx.compose.runtime.Composable public static void PositionIndicator(kotlin.jvm.functions.Function0<java.lang.Float> value, optional androidx.compose.ui.Modifier modifier, optional kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> range, optional long color, optional boolean reverseDirection, optional int position);
method @androidx.compose.runtime.Composable public static void PositionIndicator(androidx.wear.compose.material.PositionIndicatorState state, float indicatorHeight, float indicatorWidth, float paddingHorizontal, optional androidx.compose.ui.Modifier modifier, optional long background, optional long color, optional boolean reverseDirection, optional int position);
@@ -432,43 +435,43 @@
method @androidx.compose.runtime.Composable public static void Scaffold(optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? vignette, optional kotlin.jvm.functions.Function0<kotlin.Unit>? positionIndicator, optional kotlin.jvm.functions.Function0<kotlin.Unit>? pageIndicator, optional kotlin.jvm.functions.Function0<kotlin.Unit>? timeText, kotlin.jvm.functions.Function0<kotlin.Unit> content);
}
- public final class ScalingLazyColumnDefaults {
- method public androidx.wear.compose.material.ScalingParams scalingParams(optional float edgeScale, optional float edgeAlpha, optional float minElementHeight, optional float maxElementHeight, optional float minTransitionArea, optional float maxTransitionArea, optional androidx.compose.animation.core.Easing scaleInterpolator, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Constraints,java.lang.Integer> viewportVerticalOffsetResolver);
- method @androidx.compose.runtime.Composable public androidx.compose.foundation.gestures.FlingBehavior snapFlingBehavior(androidx.wear.compose.material.ScalingLazyListState state, optional float snapOffset, optional androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decay);
- field public static final androidx.wear.compose.material.ScalingLazyColumnDefaults INSTANCE;
+ @Deprecated public final class ScalingLazyColumnDefaults {
+ method @Deprecated public androidx.wear.compose.material.ScalingParams scalingParams(optional float edgeScale, optional float edgeAlpha, optional float minElementHeight, optional float maxElementHeight, optional float minTransitionArea, optional float maxTransitionArea, optional androidx.compose.animation.core.Easing scaleInterpolator, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Constraints,java.lang.Integer> viewportVerticalOffsetResolver);
+ method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.foundation.gestures.FlingBehavior snapFlingBehavior(androidx.wear.compose.material.ScalingLazyListState state, optional float snapOffset, optional androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decay);
+ field @Deprecated public static final androidx.wear.compose.material.ScalingLazyColumnDefaults INSTANCE;
}
public final class ScalingLazyColumnKt {
- method @androidx.compose.runtime.Composable public static void ScalingLazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.material.ScalingLazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, optional androidx.wear.compose.material.ScalingParams scalingParams, optional int anchorType, optional androidx.wear.compose.material.AutoCenteringParams? autoCentering, kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.ScalingLazyListScope,kotlin.Unit> content);
- method public static inline <T> void items(androidx.wear.compose.material.ScalingLazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super T,kotlin.Unit> itemContent);
- method public static inline <T> void items(androidx.wear.compose.material.ScalingLazyListScope, T![] items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super T,kotlin.Unit> itemContent);
- method public static inline <T> void itemsIndexed(androidx.wear.compose.material.ScalingLazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
- method public static inline <T> void itemsIndexed(androidx.wear.compose.material.ScalingLazyListScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ method @Deprecated @androidx.compose.runtime.Composable public static void ScalingLazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.material.ScalingLazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, optional androidx.wear.compose.material.ScalingParams scalingParams, optional int anchorType, optional androidx.wear.compose.material.AutoCenteringParams? autoCentering, kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.ScalingLazyListScope,kotlin.Unit> content);
+ method @Deprecated public static inline <T> void items(androidx.wear.compose.material.ScalingLazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super T,kotlin.Unit> itemContent);
+ method @Deprecated public static inline <T> void items(androidx.wear.compose.material.ScalingLazyListScope, T![] items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super T,kotlin.Unit> itemContent);
+ method @Deprecated public static inline <T> void itemsIndexed(androidx.wear.compose.material.ScalingLazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ method @Deprecated public static inline <T> void itemsIndexed(androidx.wear.compose.material.ScalingLazyListScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
}
public final class ScalingLazyColumnMeasureKt {
}
- @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class ScalingLazyListAnchorType {
- field public static final androidx.wear.compose.material.ScalingLazyListAnchorType.Companion Companion;
+ @Deprecated @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class ScalingLazyListAnchorType {
+ field @Deprecated public static final androidx.wear.compose.material.ScalingLazyListAnchorType.Companion Companion;
}
- public static final class ScalingLazyListAnchorType.Companion {
- method public int getItemCenter();
- method public int getItemStart();
+ @Deprecated public static final class ScalingLazyListAnchorType.Companion {
+ method @Deprecated public int getItemCenter();
+ method @Deprecated public int getItemStart();
property public final int ItemCenter;
property public final int ItemStart;
}
- public sealed interface ScalingLazyListItemInfo {
- method public float getAlpha();
- method public int getIndex();
- method public Object getKey();
- method public int getOffset();
- method public float getScale();
- method public int getSize();
- method public int getUnadjustedOffset();
- method public int getUnadjustedSize();
+ @Deprecated public sealed interface ScalingLazyListItemInfo {
+ method @Deprecated public float getAlpha();
+ method @Deprecated public int getIndex();
+ method @Deprecated public Object getKey();
+ method @Deprecated public int getOffset();
+ method @Deprecated public float getScale();
+ method @Deprecated public int getSize();
+ method @Deprecated public int getUnadjustedOffset();
+ method @Deprecated public int getUnadjustedSize();
property public abstract float alpha;
property public abstract int index;
property public abstract Object key;
@@ -479,24 +482,24 @@
property public abstract int unadjustedSize;
}
- @androidx.compose.runtime.Stable @androidx.wear.compose.material.ScalingLazyScopeMarker public sealed interface ScalingLazyListItemScope {
- method public androidx.compose.ui.Modifier fillParentMaxHeight(androidx.compose.ui.Modifier, optional float fraction);
- method public androidx.compose.ui.Modifier fillParentMaxSize(androidx.compose.ui.Modifier, optional float fraction);
- method public androidx.compose.ui.Modifier fillParentMaxWidth(androidx.compose.ui.Modifier, optional float fraction);
+ @Deprecated @androidx.compose.runtime.Stable @androidx.wear.compose.material.ScalingLazyScopeMarker public sealed interface ScalingLazyListItemScope {
+ method @Deprecated public androidx.compose.ui.Modifier fillParentMaxHeight(androidx.compose.ui.Modifier, optional float fraction);
+ method @Deprecated public androidx.compose.ui.Modifier fillParentMaxSize(androidx.compose.ui.Modifier, optional float fraction);
+ method @Deprecated public androidx.compose.ui.Modifier fillParentMaxWidth(androidx.compose.ui.Modifier, optional float fraction);
}
- public sealed interface ScalingLazyListLayoutInfo {
- method public int getAfterAutoCenteringPadding();
- method public int getAfterContentPadding();
- method public int getBeforeAutoCenteringPadding();
- method public int getBeforeContentPadding();
- method public androidx.compose.foundation.gestures.Orientation getOrientation();
- method public boolean getReverseLayout();
- method public int getTotalItemsCount();
- method public int getViewportEndOffset();
- method public long getViewportSize();
- method public int getViewportStartOffset();
- method public java.util.List<androidx.wear.compose.material.ScalingLazyListItemInfo> getVisibleItemsInfo();
+ @Deprecated public sealed interface ScalingLazyListLayoutInfo {
+ method @Deprecated public int getAfterAutoCenteringPadding();
+ method @Deprecated public int getAfterContentPadding();
+ method @Deprecated public int getBeforeAutoCenteringPadding();
+ method @Deprecated public int getBeforeContentPadding();
+ method @Deprecated public androidx.compose.foundation.gestures.Orientation getOrientation();
+ method @Deprecated public boolean getReverseLayout();
+ method @Deprecated public int getTotalItemsCount();
+ method @Deprecated public int getViewportEndOffset();
+ method @Deprecated public long getViewportSize();
+ method @Deprecated public int getViewportStartOffset();
+ method @Deprecated public java.util.List<androidx.wear.compose.material.ScalingLazyListItemInfo> getVisibleItemsInfo();
property public abstract int afterAutoCenteringPadding;
property public abstract int afterContentPadding;
property public abstract int beforeAutoCenteringPadding;
@@ -510,51 +513,51 @@
property public abstract java.util.List<androidx.wear.compose.material.ScalingLazyListItemInfo> visibleItemsInfo;
}
- @androidx.wear.compose.material.ScalingLazyScopeMarker public sealed interface ScalingLazyListScope {
- method public void item(optional Object? key, kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.ScalingLazyListItemScope,kotlin.Unit> content);
- method public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
+ @Deprecated @androidx.wear.compose.material.ScalingLazyScopeMarker public sealed interface ScalingLazyListScope {
+ method @Deprecated public void item(optional Object? key, kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.ScalingLazyListItemScope,kotlin.Unit> content);
+ method @Deprecated public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
}
- @androidx.compose.runtime.Stable public final class ScalingLazyListState implements androidx.compose.foundation.gestures.ScrollableState {
- ctor public ScalingLazyListState(optional int initialCenterItemIndex, optional int initialCenterItemScrollOffset);
- method public suspend Object? animateScrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
- method public float dispatchRawDelta(float delta);
- method public int getCenterItemIndex();
- method public int getCenterItemScrollOffset();
- method public androidx.wear.compose.material.ScalingLazyListLayoutInfo getLayoutInfo();
- method public boolean isScrollInProgress();
- method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
- method public suspend Object? scrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ @Deprecated @androidx.compose.runtime.Stable public final class ScalingLazyListState implements androidx.compose.foundation.gestures.ScrollableState {
+ ctor @Deprecated public ScalingLazyListState(optional int initialCenterItemIndex, optional int initialCenterItemScrollOffset);
+ method @Deprecated public suspend Object? animateScrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @Deprecated public float dispatchRawDelta(float delta);
+ method @Deprecated public int getCenterItemIndex();
+ method @Deprecated public int getCenterItemScrollOffset();
+ method @Deprecated public androidx.wear.compose.material.ScalingLazyListLayoutInfo getLayoutInfo();
+ method @Deprecated public boolean isScrollInProgress();
+ method @Deprecated public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @Deprecated public suspend Object? scrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
property public boolean canScrollBackward;
property public boolean canScrollForward;
property public final int centerItemIndex;
property public final int centerItemScrollOffset;
property public boolean isScrollInProgress;
property public final androidx.wear.compose.material.ScalingLazyListLayoutInfo layoutInfo;
- field public static final androidx.wear.compose.material.ScalingLazyListState.Companion Companion;
+ field @Deprecated public static final androidx.wear.compose.material.ScalingLazyListState.Companion Companion;
}
- public static final class ScalingLazyListState.Companion {
- method public androidx.compose.runtime.saveable.Saver<androidx.wear.compose.material.ScalingLazyListState,java.lang.Object> getSaver();
+ @Deprecated public static final class ScalingLazyListState.Companion {
+ method @Deprecated public androidx.compose.runtime.saveable.Saver<androidx.wear.compose.material.ScalingLazyListState,java.lang.Object> getSaver();
property public final androidx.compose.runtime.saveable.Saver<androidx.wear.compose.material.ScalingLazyListState,java.lang.Object> Saver;
}
public final class ScalingLazyListStateKt {
- method @androidx.compose.runtime.Composable public static androidx.wear.compose.material.ScalingLazyListState rememberScalingLazyListState(optional int initialCenterItemIndex, optional int initialCenterItemScrollOffset);
+ method @Deprecated @androidx.compose.runtime.Composable public static androidx.wear.compose.material.ScalingLazyListState rememberScalingLazyListState(optional int initialCenterItemIndex, optional int initialCenterItemScrollOffset);
}
- @kotlin.DslMarker public @interface ScalingLazyScopeMarker {
+ @Deprecated @kotlin.DslMarker public @interface ScalingLazyScopeMarker {
}
- @androidx.compose.runtime.Stable public interface ScalingParams {
- method public float getEdgeAlpha();
- method public float getEdgeScale();
- method public float getMaxElementHeight();
- method public float getMaxTransitionArea();
- method public float getMinElementHeight();
- method public float getMinTransitionArea();
- method public androidx.compose.animation.core.Easing getScaleInterpolator();
- method public int resolveViewportVerticalOffset(long viewportConstraints);
+ @Deprecated @androidx.compose.runtime.Stable public interface ScalingParams {
+ method @Deprecated public float getEdgeAlpha();
+ method @Deprecated public float getEdgeScale();
+ method @Deprecated public float getMaxElementHeight();
+ method @Deprecated public float getMaxTransitionArea();
+ method @Deprecated public float getMinElementHeight();
+ method @Deprecated public float getMinTransitionArea();
+ method @Deprecated public androidx.compose.animation.core.Easing getScaleInterpolator();
+ method @Deprecated public int resolveViewportVerticalOffset(long viewportConstraints);
property public abstract float edgeAlpha;
property public abstract float edgeScale;
property public abstract float maxElementHeight;
@@ -567,7 +570,8 @@
public final class ScrollAwayKt {
method public static androidx.compose.ui.Modifier scrollAway(androidx.compose.ui.Modifier, androidx.compose.foundation.ScrollState scrollState, optional float offset);
method public static androidx.compose.ui.Modifier scrollAway(androidx.compose.ui.Modifier, androidx.compose.foundation.lazy.LazyListState scrollState, optional int itemIndex, optional float offset);
- method public static androidx.compose.ui.Modifier scrollAway(androidx.compose.ui.Modifier, androidx.wear.compose.material.ScalingLazyListState scrollState, optional int itemIndex, optional float offset);
+ method public static androidx.compose.ui.Modifier scrollAway(androidx.compose.ui.Modifier, androidx.wear.compose.foundation.lazy.ScalingLazyListState scrollState, optional int itemIndex, optional float offset);
+ method @Deprecated public static androidx.compose.ui.Modifier scrollAway(androidx.compose.ui.Modifier, androidx.wear.compose.material.ScalingLazyListState scrollState, optional int itemIndex, optional float offset);
}
@androidx.compose.runtime.Immutable public final class Shapes {
@@ -884,13 +888,17 @@
}
public final class DialogKt {
- method @androidx.compose.runtime.Composable public static void Alert(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> title, kotlin.jvm.functions.Function0<kotlin.Unit> negativeButton, kotlin.jvm.functions.Function0<kotlin.Unit> positiveButton, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? icon, optional androidx.wear.compose.material.ScalingLazyListState scrollState, optional long backgroundColor, optional long contentColor, optional long titleColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? content);
- method @androidx.compose.runtime.Composable public static void Alert(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? icon, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? message, optional androidx.wear.compose.material.ScalingLazyListState scrollState, optional long backgroundColor, optional long titleColor, optional long messageColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.ScalingLazyListScope,kotlin.Unit> content);
- method @androidx.compose.runtime.Composable public static void Confirmation(kotlin.jvm.functions.Function0<kotlin.Unit> onTimeout, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? icon, optional androidx.wear.compose.material.ScalingLazyListState scrollState, optional long durationMillis, optional long backgroundColor, optional long contentColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Alert(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> title, kotlin.jvm.functions.Function0<kotlin.Unit> negativeButton, kotlin.jvm.functions.Function0<kotlin.Unit> positiveButton, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? icon, optional androidx.wear.compose.foundation.lazy.ScalingLazyListState scrollState, optional long backgroundColor, optional long contentColor, optional long titleColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? content);
+ method @androidx.compose.runtime.Composable public static void Alert(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? icon, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? message, optional androidx.wear.compose.foundation.lazy.ScalingLazyListState scrollState, optional long backgroundColor, optional long titleColor, optional long messageColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.lazy.ScalingLazyListScope,kotlin.Unit> content);
+ method @Deprecated @androidx.compose.runtime.Composable public static void Alert(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,? extends kotlin.Unit> title, kotlin.jvm.functions.Function0<? extends kotlin.Unit> negativeButton, kotlin.jvm.functions.Function0<? extends kotlin.Unit> positiveButton, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,? extends kotlin.Unit>? icon, optional androidx.wear.compose.material.ScalingLazyListState scrollState, optional long backgroundColor, optional long contentColor, optional long titleColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,? extends kotlin.Unit>? content);
+ method @Deprecated @androidx.compose.runtime.Composable public static void Alert(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,? extends kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,? extends kotlin.Unit>? icon, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,? extends kotlin.Unit>? message, optional androidx.wear.compose.material.ScalingLazyListState scrollState, optional long backgroundColor, optional long titleColor, optional long messageColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.ScalingLazyListScope,? extends kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Confirmation(kotlin.jvm.functions.Function0<kotlin.Unit> onTimeout, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? icon, optional androidx.wear.compose.foundation.lazy.ScalingLazyListState scrollState, optional long durationMillis, optional long backgroundColor, optional long contentColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ method @Deprecated @androidx.compose.runtime.Composable public static void Confirmation(kotlin.jvm.functions.Function0<? extends kotlin.Unit> onTimeout, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,? extends kotlin.Unit>? icon, optional androidx.wear.compose.material.ScalingLazyListState scrollState, optional long durationMillis, optional long backgroundColor, optional long contentColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,? extends kotlin.Unit> content);
}
public final class Dialog_androidKt {
- method @androidx.compose.runtime.Composable public static void Dialog(boolean showDialog, kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.material.ScalingLazyListState? scrollState, optional androidx.compose.ui.window.DialogProperties properties, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Dialog(boolean showDialog, kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.foundation.lazy.ScalingLazyListState? scrollState, optional androidx.compose.ui.window.DialogProperties properties, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @Deprecated @androidx.compose.runtime.Composable public static void Dialog(boolean showDialog, kotlin.jvm.functions.Function0<? extends kotlin.Unit> onDismissRequest, optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.material.ScalingLazyListState? scrollState, optional androidx.compose.ui.window.DialogProperties properties, kotlin.jvm.functions.Function0<? extends kotlin.Unit> content);
}
}
diff --git a/wear/compose/compose-material/api/restricted_current.ignore b/wear/compose/compose-material/api/restricted_current.ignore
index 82c32a0..05e58f9 100644
--- a/wear/compose/compose-material/api/restricted_current.ignore
+++ b/wear/compose/compose-material/api/restricted_current.ignore
@@ -1,7 +1,3 @@
// Baseline format: 1.0
ChangedValue: androidx.wear.compose.material.TimeTextDefaults#TimeFormat12Hours:
Field androidx.wear.compose.material.TimeTextDefaults.TimeFormat12Hours has changed value from h:mm a to h:mm
-
-
-InvalidNullConversion: androidx.wear.compose.material.PickerKt#Picker(androidx.wear.compose.material.PickerState, String, androidx.compose.ui.Modifier, boolean, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,? extends kotlin.Unit>, kotlin.jvm.functions.Function0<? extends kotlin.Unit>, androidx.wear.compose.material.ScalingParams, float, float, long, androidx.compose.foundation.gestures.FlingBehavior, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.PickerScope,? super java.lang.Integer,? extends kotlin.Unit>) parameter #1:
- Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter contentDescription in androidx.wear.compose.material.PickerKt.Picker(androidx.wear.compose.material.PickerState state, String contentDescription, androidx.compose.ui.Modifier modifier, boolean readOnly, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,? extends kotlin.Unit> readOnlyLabel, kotlin.jvm.functions.Function0<? extends kotlin.Unit> onSelected, androidx.wear.compose.material.ScalingParams scalingParams, float separation, float gradientRatio, long gradientColor, androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.PickerScope,? super java.lang.Integer,? extends kotlin.Unit> option)
diff --git a/wear/compose/compose-material/api/restricted_current.txt b/wear/compose/compose-material/api/restricted_current.txt
index f728567..029a1e9 100644
--- a/wear/compose/compose-material/api/restricted_current.txt
+++ b/wear/compose/compose-material/api/restricted_current.txt
@@ -4,8 +4,8 @@
public final class AnimationKt {
}
- @androidx.compose.runtime.Immutable public final class AutoCenteringParams {
- ctor public AutoCenteringParams(optional int itemIndex, optional int itemOffset);
+ @Deprecated @androidx.compose.runtime.Immutable public final class AutoCenteringParams {
+ ctor @Deprecated public AutoCenteringParams(optional int itemIndex, optional int itemOffset);
}
@androidx.compose.runtime.Stable public interface ButtonBorder {
@@ -262,17 +262,19 @@
}
public final class PickerDefaults {
+ method public androidx.wear.compose.foundation.lazy.ScalingParams defaultScalingParams(optional float edgeScale, optional float edgeAlpha, optional float minElementHeight, optional float maxElementHeight, optional float minTransitionArea, optional float maxTransitionArea, optional androidx.compose.animation.core.Easing scaleInterpolator, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Constraints,java.lang.Integer> viewportVerticalOffsetResolver);
method @androidx.compose.runtime.Composable public androidx.compose.foundation.gestures.FlingBehavior flingBehavior(androidx.wear.compose.material.PickerState state, optional androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decay);
method public float getDefaultGradientRatio();
- method public androidx.wear.compose.material.ScalingParams scalingParams(optional float edgeScale, optional float edgeAlpha, optional float minElementHeight, optional float maxElementHeight, optional float minTransitionArea, optional float maxTransitionArea, optional androidx.compose.animation.core.Easing scaleInterpolator, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Constraints,java.lang.Integer> viewportVerticalOffsetResolver);
+ method @Deprecated public androidx.wear.compose.material.ScalingParams scalingParams(optional float edgeScale, optional float edgeAlpha, optional float minElementHeight, optional float maxElementHeight, optional float minTransitionArea, optional float maxTransitionArea, optional androidx.compose.animation.core.Easing scaleInterpolator, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Constraints,java.lang.Integer> viewportVerticalOffsetResolver);
property public final float DefaultGradientRatio;
field public static final androidx.wear.compose.material.PickerDefaults INSTANCE;
}
public final class PickerKt {
- method @androidx.compose.runtime.Composable public static void Picker(androidx.wear.compose.material.PickerState state, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional boolean readOnly, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>? readOnlyLabel, optional kotlin.jvm.functions.Function0<kotlin.Unit> onSelected, optional androidx.wear.compose.material.ScalingParams scalingParams, optional float separation, optional float gradientRatio, optional long gradientColor, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.PickerScope,? super java.lang.Integer,kotlin.Unit> option);
+ method @androidx.compose.runtime.Composable public static void Picker(androidx.wear.compose.material.PickerState state, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional boolean readOnly, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>? readOnlyLabel, optional kotlin.jvm.functions.Function0<kotlin.Unit> onSelected, optional androidx.wear.compose.foundation.lazy.ScalingParams scalingParams, optional float separation, optional float gradientRatio, optional long gradientColor, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.PickerScope,? super java.lang.Integer,kotlin.Unit> option);
method @Deprecated @androidx.compose.runtime.Composable public static void Picker(androidx.wear.compose.material.PickerState state, optional androidx.compose.ui.Modifier modifier, optional boolean readOnly, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>? readOnlyLabel, optional androidx.wear.compose.material.ScalingParams scalingParams, optional float separation, optional float gradientRatio, optional long gradientColor, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.PickerScope,? super java.lang.Integer,kotlin.Unit> option);
- method @Deprecated @androidx.compose.runtime.Composable public static void Picker(androidx.wear.compose.material.PickerState state, String contentDescription, optional androidx.compose.ui.Modifier modifier, optional boolean readOnly, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,? extends kotlin.Unit>? readOnlyLabel, optional kotlin.jvm.functions.Function0<? extends kotlin.Unit> onSelected, optional androidx.wear.compose.material.ScalingParams scalingParams, optional float separation, optional float gradientRatio, optional long gradientColor, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.PickerScope,? super java.lang.Integer,? extends kotlin.Unit> option);
+ method @Deprecated @androidx.compose.runtime.Composable public static void Picker(androidx.wear.compose.material.PickerState state, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional boolean readOnly, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,? extends kotlin.Unit>? readOnlyLabel, optional kotlin.jvm.functions.Function0<? extends kotlin.Unit> onSelected, optional androidx.wear.compose.material.ScalingParams scalingParams, optional float separation, optional float gradientRatio, optional long gradientColor, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.PickerScope,? super java.lang.Integer,? extends kotlin.Unit> option);
+ method @Deprecated @androidx.compose.runtime.Composable public static void Picker(androidx.wear.compose.material.PickerState state, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional boolean readOnly, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,? extends kotlin.Unit>? readOnlyLabel, optional kotlin.jvm.functions.Function0<? extends kotlin.Unit> onSelected, optional androidx.wear.compose.material.ScalingParams scalingParams, optional float separation, optional float gradientRatio, optional long gradientColor, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.PickerScope,? super java.lang.Integer,? extends kotlin.Unit> option);
method @androidx.compose.runtime.Composable public static androidx.wear.compose.material.PickerState rememberPickerState(int initialNumberOfOptions, optional int initiallySelectedOption, optional boolean repeatItems);
}
@@ -325,7 +327,8 @@
public final class PositionIndicatorKt {
method @androidx.compose.runtime.Composable public static void PositionIndicator(androidx.compose.foundation.ScrollState scrollState, optional androidx.compose.ui.Modifier modifier, optional boolean reverseDirection);
- method @androidx.compose.runtime.Composable public static void PositionIndicator(androidx.wear.compose.material.ScalingLazyListState scalingLazyListState, optional androidx.compose.ui.Modifier modifier, optional boolean reverseDirection);
+ method @androidx.compose.runtime.Composable public static void PositionIndicator(androidx.wear.compose.foundation.lazy.ScalingLazyListState scalingLazyListState, optional androidx.compose.ui.Modifier modifier, optional boolean reverseDirection);
+ method @Deprecated @androidx.compose.runtime.Composable public static void PositionIndicator(androidx.wear.compose.material.ScalingLazyListState scalingLazyListState, optional androidx.compose.ui.Modifier modifier, optional boolean reverseDirection);
method @androidx.compose.runtime.Composable public static void PositionIndicator(androidx.compose.foundation.lazy.LazyListState lazyListState, optional androidx.compose.ui.Modifier modifier, optional boolean reverseDirection);
method @androidx.compose.runtime.Composable public static void PositionIndicator(kotlin.jvm.functions.Function0<java.lang.Float> value, optional androidx.compose.ui.Modifier modifier, optional kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> range, optional long color, optional boolean reverseDirection, optional int position);
method @androidx.compose.runtime.Composable public static void PositionIndicator(androidx.wear.compose.material.PositionIndicatorState state, float indicatorHeight, float indicatorWidth, float paddingHorizontal, optional androidx.compose.ui.Modifier modifier, optional long background, optional long color, optional boolean reverseDirection, optional int position);
@@ -384,43 +387,43 @@
method @androidx.compose.runtime.Composable public static void Scaffold(optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? vignette, optional kotlin.jvm.functions.Function0<kotlin.Unit>? positionIndicator, optional kotlin.jvm.functions.Function0<kotlin.Unit>? pageIndicator, optional kotlin.jvm.functions.Function0<kotlin.Unit>? timeText, kotlin.jvm.functions.Function0<kotlin.Unit> content);
}
- public final class ScalingLazyColumnDefaults {
- method public androidx.wear.compose.material.ScalingParams scalingParams(optional float edgeScale, optional float edgeAlpha, optional float minElementHeight, optional float maxElementHeight, optional float minTransitionArea, optional float maxTransitionArea, optional androidx.compose.animation.core.Easing scaleInterpolator, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Constraints,java.lang.Integer> viewportVerticalOffsetResolver);
- method @androidx.compose.runtime.Composable public androidx.compose.foundation.gestures.FlingBehavior snapFlingBehavior(androidx.wear.compose.material.ScalingLazyListState state, optional float snapOffset, optional androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decay);
- field public static final androidx.wear.compose.material.ScalingLazyColumnDefaults INSTANCE;
+ @Deprecated public final class ScalingLazyColumnDefaults {
+ method @Deprecated public androidx.wear.compose.material.ScalingParams scalingParams(optional float edgeScale, optional float edgeAlpha, optional float minElementHeight, optional float maxElementHeight, optional float minTransitionArea, optional float maxTransitionArea, optional androidx.compose.animation.core.Easing scaleInterpolator, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.unit.Constraints,java.lang.Integer> viewportVerticalOffsetResolver);
+ method @Deprecated @androidx.compose.runtime.Composable public androidx.compose.foundation.gestures.FlingBehavior snapFlingBehavior(androidx.wear.compose.material.ScalingLazyListState state, optional float snapOffset, optional androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decay);
+ field @Deprecated public static final androidx.wear.compose.material.ScalingLazyColumnDefaults INSTANCE;
}
public final class ScalingLazyColumnKt {
- method @androidx.compose.runtime.Composable public static void ScalingLazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.material.ScalingLazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, optional androidx.wear.compose.material.ScalingParams scalingParams, optional int anchorType, optional androidx.wear.compose.material.AutoCenteringParams? autoCentering, kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.ScalingLazyListScope,kotlin.Unit> content);
- method public static inline <T> void items(androidx.wear.compose.material.ScalingLazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super T,kotlin.Unit> itemContent);
- method public static inline <T> void items(androidx.wear.compose.material.ScalingLazyListScope, T![] items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super T,kotlin.Unit> itemContent);
- method public static inline <T> void itemsIndexed(androidx.wear.compose.material.ScalingLazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
- method public static inline <T> void itemsIndexed(androidx.wear.compose.material.ScalingLazyListScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ method @Deprecated @androidx.compose.runtime.Composable public static void ScalingLazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.material.ScalingLazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional androidx.compose.foundation.gestures.FlingBehavior flingBehavior, optional boolean userScrollEnabled, optional androidx.wear.compose.material.ScalingParams scalingParams, optional int anchorType, optional androidx.wear.compose.material.AutoCenteringParams? autoCentering, kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.ScalingLazyListScope,kotlin.Unit> content);
+ method @Deprecated public static inline <T> void items(androidx.wear.compose.material.ScalingLazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super T,kotlin.Unit> itemContent);
+ method @Deprecated public static inline <T> void items(androidx.wear.compose.material.ScalingLazyListScope, T![] items, optional kotlin.jvm.functions.Function1<? super T,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super T,kotlin.Unit> itemContent);
+ method @Deprecated public static inline <T> void itemsIndexed(androidx.wear.compose.material.ScalingLazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
+ method @Deprecated public static inline <T> void itemsIndexed(androidx.wear.compose.material.ScalingLazyListScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, kotlin.jvm.functions.Function3<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
}
public final class ScalingLazyColumnMeasureKt {
}
- @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class ScalingLazyListAnchorType {
- field public static final androidx.wear.compose.material.ScalingLazyListAnchorType.Companion Companion;
+ @Deprecated @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class ScalingLazyListAnchorType {
+ field @Deprecated public static final androidx.wear.compose.material.ScalingLazyListAnchorType.Companion Companion;
}
- public static final class ScalingLazyListAnchorType.Companion {
- method public int getItemCenter();
- method public int getItemStart();
+ @Deprecated public static final class ScalingLazyListAnchorType.Companion {
+ method @Deprecated public int getItemCenter();
+ method @Deprecated public int getItemStart();
property public final int ItemCenter;
property public final int ItemStart;
}
- public sealed interface ScalingLazyListItemInfo {
- method public float getAlpha();
- method public int getIndex();
- method public Object getKey();
- method public int getOffset();
- method public float getScale();
- method public int getSize();
- method public int getUnadjustedOffset();
- method public int getUnadjustedSize();
+ @Deprecated public sealed interface ScalingLazyListItemInfo {
+ method @Deprecated public float getAlpha();
+ method @Deprecated public int getIndex();
+ method @Deprecated public Object getKey();
+ method @Deprecated public int getOffset();
+ method @Deprecated public float getScale();
+ method @Deprecated public int getSize();
+ method @Deprecated public int getUnadjustedOffset();
+ method @Deprecated public int getUnadjustedSize();
property public abstract float alpha;
property public abstract int index;
property public abstract Object key;
@@ -431,24 +434,24 @@
property public abstract int unadjustedSize;
}
- @androidx.compose.runtime.Stable @androidx.wear.compose.material.ScalingLazyScopeMarker public sealed interface ScalingLazyListItemScope {
- method public androidx.compose.ui.Modifier fillParentMaxHeight(androidx.compose.ui.Modifier, optional float fraction);
- method public androidx.compose.ui.Modifier fillParentMaxSize(androidx.compose.ui.Modifier, optional float fraction);
- method public androidx.compose.ui.Modifier fillParentMaxWidth(androidx.compose.ui.Modifier, optional float fraction);
+ @Deprecated @androidx.compose.runtime.Stable @androidx.wear.compose.material.ScalingLazyScopeMarker public sealed interface ScalingLazyListItemScope {
+ method @Deprecated public androidx.compose.ui.Modifier fillParentMaxHeight(androidx.compose.ui.Modifier, optional float fraction);
+ method @Deprecated public androidx.compose.ui.Modifier fillParentMaxSize(androidx.compose.ui.Modifier, optional float fraction);
+ method @Deprecated public androidx.compose.ui.Modifier fillParentMaxWidth(androidx.compose.ui.Modifier, optional float fraction);
}
- public sealed interface ScalingLazyListLayoutInfo {
- method public int getAfterAutoCenteringPadding();
- method public int getAfterContentPadding();
- method public int getBeforeAutoCenteringPadding();
- method public int getBeforeContentPadding();
- method public androidx.compose.foundation.gestures.Orientation getOrientation();
- method public boolean getReverseLayout();
- method public int getTotalItemsCount();
- method public int getViewportEndOffset();
- method public long getViewportSize();
- method public int getViewportStartOffset();
- method public java.util.List<androidx.wear.compose.material.ScalingLazyListItemInfo> getVisibleItemsInfo();
+ @Deprecated public sealed interface ScalingLazyListLayoutInfo {
+ method @Deprecated public int getAfterAutoCenteringPadding();
+ method @Deprecated public int getAfterContentPadding();
+ method @Deprecated public int getBeforeAutoCenteringPadding();
+ method @Deprecated public int getBeforeContentPadding();
+ method @Deprecated public androidx.compose.foundation.gestures.Orientation getOrientation();
+ method @Deprecated public boolean getReverseLayout();
+ method @Deprecated public int getTotalItemsCount();
+ method @Deprecated public int getViewportEndOffset();
+ method @Deprecated public long getViewportSize();
+ method @Deprecated public int getViewportStartOffset();
+ method @Deprecated public java.util.List<androidx.wear.compose.material.ScalingLazyListItemInfo> getVisibleItemsInfo();
property public abstract int afterAutoCenteringPadding;
property public abstract int afterContentPadding;
property public abstract int beforeAutoCenteringPadding;
@@ -462,51 +465,51 @@
property public abstract java.util.List<androidx.wear.compose.material.ScalingLazyListItemInfo> visibleItemsInfo;
}
- @androidx.wear.compose.material.ScalingLazyScopeMarker public sealed interface ScalingLazyListScope {
- method public void item(optional Object? key, kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.ScalingLazyListItemScope,kotlin.Unit> content);
- method public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
+ @Deprecated @androidx.wear.compose.material.ScalingLazyScopeMarker public sealed interface ScalingLazyListScope {
+ method @Deprecated public void item(optional Object? key, kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.ScalingLazyListItemScope,kotlin.Unit> content);
+ method @Deprecated public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, kotlin.jvm.functions.Function2<? super androidx.wear.compose.material.ScalingLazyListItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
}
- @androidx.compose.runtime.Stable public final class ScalingLazyListState implements androidx.compose.foundation.gestures.ScrollableState {
- ctor public ScalingLazyListState(optional int initialCenterItemIndex, optional int initialCenterItemScrollOffset);
- method public suspend Object? animateScrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
- method public float dispatchRawDelta(float delta);
- method public int getCenterItemIndex();
- method public int getCenterItemScrollOffset();
- method public androidx.wear.compose.material.ScalingLazyListLayoutInfo getLayoutInfo();
- method public boolean isScrollInProgress();
- method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
- method public suspend Object? scrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ @Deprecated @androidx.compose.runtime.Stable public final class ScalingLazyListState implements androidx.compose.foundation.gestures.ScrollableState {
+ ctor @Deprecated public ScalingLazyListState(optional int initialCenterItemIndex, optional int initialCenterItemScrollOffset);
+ method @Deprecated public suspend Object? animateScrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @Deprecated public float dispatchRawDelta(float delta);
+ method @Deprecated public int getCenterItemIndex();
+ method @Deprecated public int getCenterItemScrollOffset();
+ method @Deprecated public androidx.wear.compose.material.ScalingLazyListLayoutInfo getLayoutInfo();
+ method @Deprecated public boolean isScrollInProgress();
+ method @Deprecated public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method @Deprecated public suspend Object? scrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
property public boolean canScrollBackward;
property public boolean canScrollForward;
property public final int centerItemIndex;
property public final int centerItemScrollOffset;
property public boolean isScrollInProgress;
property public final androidx.wear.compose.material.ScalingLazyListLayoutInfo layoutInfo;
- field public static final androidx.wear.compose.material.ScalingLazyListState.Companion Companion;
+ field @Deprecated public static final androidx.wear.compose.material.ScalingLazyListState.Companion Companion;
}
- public static final class ScalingLazyListState.Companion {
- method public androidx.compose.runtime.saveable.Saver<androidx.wear.compose.material.ScalingLazyListState,java.lang.Object> getSaver();
+ @Deprecated public static final class ScalingLazyListState.Companion {
+ method @Deprecated public androidx.compose.runtime.saveable.Saver<androidx.wear.compose.material.ScalingLazyListState,java.lang.Object> getSaver();
property public final androidx.compose.runtime.saveable.Saver<androidx.wear.compose.material.ScalingLazyListState,java.lang.Object> Saver;
}
public final class ScalingLazyListStateKt {
- method @androidx.compose.runtime.Composable public static androidx.wear.compose.material.ScalingLazyListState rememberScalingLazyListState(optional int initialCenterItemIndex, optional int initialCenterItemScrollOffset);
+ method @Deprecated @androidx.compose.runtime.Composable public static androidx.wear.compose.material.ScalingLazyListState rememberScalingLazyListState(optional int initialCenterItemIndex, optional int initialCenterItemScrollOffset);
}
- @kotlin.DslMarker public @interface ScalingLazyScopeMarker {
+ @Deprecated @kotlin.DslMarker public @interface ScalingLazyScopeMarker {
}
- @androidx.compose.runtime.Stable public interface ScalingParams {
- method public float getEdgeAlpha();
- method public float getEdgeScale();
- method public float getMaxElementHeight();
- method public float getMaxTransitionArea();
- method public float getMinElementHeight();
- method public float getMinTransitionArea();
- method public androidx.compose.animation.core.Easing getScaleInterpolator();
- method public int resolveViewportVerticalOffset(long viewportConstraints);
+ @Deprecated @androidx.compose.runtime.Stable public interface ScalingParams {
+ method @Deprecated public float getEdgeAlpha();
+ method @Deprecated public float getEdgeScale();
+ method @Deprecated public float getMaxElementHeight();
+ method @Deprecated public float getMaxTransitionArea();
+ method @Deprecated public float getMinElementHeight();
+ method @Deprecated public float getMinTransitionArea();
+ method @Deprecated public androidx.compose.animation.core.Easing getScaleInterpolator();
+ method @Deprecated public int resolveViewportVerticalOffset(long viewportConstraints);
property public abstract float edgeAlpha;
property public abstract float edgeScale;
property public abstract float maxElementHeight;
@@ -519,7 +522,8 @@
public final class ScrollAwayKt {
method public static androidx.compose.ui.Modifier scrollAway(androidx.compose.ui.Modifier, androidx.compose.foundation.ScrollState scrollState, optional float offset);
method public static androidx.compose.ui.Modifier scrollAway(androidx.compose.ui.Modifier, androidx.compose.foundation.lazy.LazyListState scrollState, optional int itemIndex, optional float offset);
- method public static androidx.compose.ui.Modifier scrollAway(androidx.compose.ui.Modifier, androidx.wear.compose.material.ScalingLazyListState scrollState, optional int itemIndex, optional float offset);
+ method public static androidx.compose.ui.Modifier scrollAway(androidx.compose.ui.Modifier, androidx.wear.compose.foundation.lazy.ScalingLazyListState scrollState, optional int itemIndex, optional float offset);
+ method @Deprecated public static androidx.compose.ui.Modifier scrollAway(androidx.compose.ui.Modifier, androidx.wear.compose.material.ScalingLazyListState scrollState, optional int itemIndex, optional float offset);
}
@androidx.compose.runtime.Immutable public final class Shapes {
@@ -783,13 +787,17 @@
}
public final class DialogKt {
- method @androidx.compose.runtime.Composable public static void Alert(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> title, kotlin.jvm.functions.Function0<kotlin.Unit> negativeButton, kotlin.jvm.functions.Function0<kotlin.Unit> positiveButton, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? icon, optional androidx.wear.compose.material.ScalingLazyListState scrollState, optional long backgroundColor, optional long contentColor, optional long titleColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? content);
- method @androidx.compose.runtime.Composable public static void Alert(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? icon, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? message, optional androidx.wear.compose.material.ScalingLazyListState scrollState, optional long backgroundColor, optional long titleColor, optional long messageColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.ScalingLazyListScope,kotlin.Unit> content);
- method @androidx.compose.runtime.Composable public static void Confirmation(kotlin.jvm.functions.Function0<kotlin.Unit> onTimeout, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? icon, optional androidx.wear.compose.material.ScalingLazyListState scrollState, optional long durationMillis, optional long backgroundColor, optional long contentColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Alert(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> title, kotlin.jvm.functions.Function0<kotlin.Unit> negativeButton, kotlin.jvm.functions.Function0<kotlin.Unit> positiveButton, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? icon, optional androidx.wear.compose.foundation.lazy.ScalingLazyListState scrollState, optional long backgroundColor, optional long contentColor, optional long titleColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? content);
+ method @androidx.compose.runtime.Composable public static void Alert(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? icon, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? message, optional androidx.wear.compose.foundation.lazy.ScalingLazyListState scrollState, optional long backgroundColor, optional long titleColor, optional long messageColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.wear.compose.foundation.lazy.ScalingLazyListScope,kotlin.Unit> content);
+ method @Deprecated @androidx.compose.runtime.Composable public static void Alert(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,? extends kotlin.Unit> title, kotlin.jvm.functions.Function0<? extends kotlin.Unit> negativeButton, kotlin.jvm.functions.Function0<? extends kotlin.Unit> positiveButton, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,? extends kotlin.Unit>? icon, optional androidx.wear.compose.material.ScalingLazyListState scrollState, optional long backgroundColor, optional long contentColor, optional long titleColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,? extends kotlin.Unit>? content);
+ method @Deprecated @androidx.compose.runtime.Composable public static void Alert(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,? extends kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,? extends kotlin.Unit>? icon, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,? extends kotlin.Unit>? message, optional androidx.wear.compose.material.ScalingLazyListState scrollState, optional long backgroundColor, optional long titleColor, optional long messageColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.wear.compose.material.ScalingLazyListScope,? extends kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Confirmation(kotlin.jvm.functions.Function0<kotlin.Unit> onTimeout, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit>? icon, optional androidx.wear.compose.foundation.lazy.ScalingLazyListState scrollState, optional long durationMillis, optional long backgroundColor, optional long contentColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+ method @Deprecated @androidx.compose.runtime.Composable public static void Confirmation(kotlin.jvm.functions.Function0<? extends kotlin.Unit> onTimeout, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,? extends kotlin.Unit>? icon, optional androidx.wear.compose.material.ScalingLazyListState scrollState, optional long durationMillis, optional long backgroundColor, optional long contentColor, optional long iconColor, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,? extends kotlin.Unit> content);
}
public final class Dialog_androidKt {
- method @androidx.compose.runtime.Composable public static void Dialog(boolean showDialog, kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.material.ScalingLazyListState? scrollState, optional androidx.compose.ui.window.DialogProperties properties, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void Dialog(boolean showDialog, kotlin.jvm.functions.Function0<kotlin.Unit> onDismissRequest, optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.foundation.lazy.ScalingLazyListState? scrollState, optional androidx.compose.ui.window.DialogProperties properties, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @Deprecated @androidx.compose.runtime.Composable public static void Dialog(boolean showDialog, kotlin.jvm.functions.Function0<? extends kotlin.Unit> onDismissRequest, optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.material.ScalingLazyListState? scrollState, optional androidx.compose.ui.window.DialogProperties properties, kotlin.jvm.functions.Function0<? extends kotlin.Unit> content);
}
}
diff --git a/wear/compose/compose-material/benchmark/src/androidTest/java/androidx/wear/compose/material/benchmark/ScalingLazyColumnBenchmark.kt b/wear/compose/compose-material/benchmark/src/androidTest/java/androidx/wear/compose/material/benchmark/ScalingLazyColumnBenchmark.kt
index dbb84ac..b352e1c 100644
--- a/wear/compose/compose-material/benchmark/src/androidTest/java/androidx/wear/compose/material/benchmark/ScalingLazyColumnBenchmark.kt
+++ b/wear/compose/compose-material/benchmark/src/androidTest/java/androidx/wear/compose/material/benchmark/ScalingLazyColumnBenchmark.kt
@@ -88,6 +88,7 @@
}
}
+@Suppress("DEPRECATION")
internal class ScalingLazyColumnTestCase : LayeredComposeTestCase() {
private var itemSizeDp: Dp = 10.dp
private var defaultItemSpacingDp: Dp = 4.dp
diff --git a/wear/compose/compose-material/samples/src/main/java/androidx/wear/compose/material/samples/DialogSample.kt b/wear/compose/compose-material/samples/src/main/java/androidx/wear/compose/material/samples/DialogSample.kt
index 7d233f6..e402617 100644
--- a/wear/compose/compose-material/samples/src/main/java/androidx/wear/compose/material/samples/DialogSample.kt
+++ b/wear/compose/compose-material/samples/src/main/java/androidx/wear/compose/material/samples/DialogSample.kt
@@ -41,6 +41,7 @@
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
+import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState
import androidx.wear.compose.material.Button
import androidx.wear.compose.material.ButtonDefaults
import androidx.wear.compose.material.Chip
@@ -51,7 +52,6 @@
import androidx.wear.compose.material.dialog.Alert
import androidx.wear.compose.material.dialog.Confirmation
import androidx.wear.compose.material.dialog.Dialog
-import androidx.wear.compose.material.rememberScalingLazyListState
@Sampled
@Composable
diff --git a/wear/compose/compose-material/samples/src/main/java/androidx/wear/compose/material/samples/ScaffoldSample.kt b/wear/compose/compose-material/samples/src/main/java/androidx/wear/compose/material/samples/ScaffoldSample.kt
index 31f3bd0..9aa2006 100644
--- a/wear/compose/compose-material/samples/src/main/java/androidx/wear/compose/material/samples/ScaffoldSample.kt
+++ b/wear/compose/compose-material/samples/src/main/java/androidx/wear/compose/material/samples/ScaffoldSample.kt
@@ -28,12 +28,12 @@
import androidx.wear.compose.material.ChipDefaults
import androidx.wear.compose.material.PositionIndicator
import androidx.wear.compose.material.Scaffold
-import androidx.wear.compose.material.ScalingLazyColumn
+import androidx.wear.compose.foundation.lazy.ScalingLazyColumn
import androidx.wear.compose.material.Text
import androidx.wear.compose.material.TimeText
import androidx.wear.compose.material.Vignette
import androidx.wear.compose.material.VignettePosition
-import androidx.wear.compose.material.rememberScalingLazyListState
+import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState
@SuppressLint("UnrememberedMutableState")
@Sampled
diff --git a/wear/compose/compose-material/samples/src/main/java/androidx/wear/compose/material/samples/ScalingLazyColumnSample.kt b/wear/compose/compose-material/samples/src/main/java/androidx/wear/compose/material/samples/ScalingLazyColumnSample.kt
index c877c44..1826758 100644
--- a/wear/compose/compose-material/samples/src/main/java/androidx/wear/compose/material/samples/ScalingLazyColumnSample.kt
+++ b/wear/compose/compose-material/samples/src/main/java/androidx/wear/compose/material/samples/ScalingLazyColumnSample.kt
@@ -25,15 +25,15 @@
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.unit.dp
-import androidx.wear.compose.material.AutoCenteringParams
+import androidx.wear.compose.foundation.lazy.AutoCenteringParams
+import androidx.wear.compose.foundation.lazy.ScalingLazyColumn
+import androidx.wear.compose.foundation.lazy.ScalingLazyColumnDefaults
+import androidx.wear.compose.foundation.lazy.ScalingLazyListAnchorType
+import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState
import androidx.wear.compose.material.Chip
import androidx.wear.compose.material.ChipDefaults
import androidx.wear.compose.material.ListHeader
-import androidx.wear.compose.material.ScalingLazyColumn
-import androidx.wear.compose.material.ScalingLazyColumnDefaults
-import androidx.wear.compose.material.ScalingLazyListAnchorType
import androidx.wear.compose.material.Text
-import androidx.wear.compose.material.rememberScalingLazyListState
import kotlinx.coroutines.launch
@Sampled
diff --git a/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/PositionIndicatorTest.kt b/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/PositionIndicatorTest.kt
index bb27e59..246fd6a 100644
--- a/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/PositionIndicatorTest.kt
+++ b/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/PositionIndicatorTest.kt
@@ -16,6 +16,13 @@
package androidx.wear.compose.material
+import androidx.wear.compose.foundation.lazy.ScalingLazyListLayoutInfo as ScalingLazyListLayoutInfo
+import androidx.wear.compose.foundation.lazy.ScalingLazyListState as ScalingLazyListState
+import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState as rememberScalingLazyListState
+import androidx.wear.compose.foundation.lazy.ScalingLazyColumn as ScalingLazyColumn
+import androidx.wear.compose.foundation.lazy.ScalingLazyColumnDefaults as ScalingLazyColumnDefaults
+import androidx.wear.compose.foundation.lazy.AutoCenteringParams as AutoCenteringParams
+import androidx.wear.compose.foundation.lazy.ScalingLazyListScope as ScalingLazyListScope
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.ScrollState
import androidx.compose.foundation.background
@@ -24,16 +31,19 @@
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.requiredHeight
import androidx.compose.foundation.layout.requiredSize
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.LazyListLayoutInfo
+import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.foundation.lazy.LazyListState
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
+import androidx.compose.runtime.Composable
import androidx.compose.runtime.mutableStateOf
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
@@ -73,38 +83,9 @@
@Test
fun emptyScalingLazyColumnGivesCorrectPositionAndSize() {
- lateinit var state: ScalingLazyListState
- lateinit var positionIndicatorState: PositionIndicatorState
- var viewPortHeight = 0
- rule.setContent {
- state = rememberScalingLazyListState()
- positionIndicatorState = ScalingLazyColumnStateAdapter(state)
- ScalingLazyColumn(
- state = state,
- verticalArrangement = Arrangement.spacedBy(itemSpacingDp),
- modifier = Modifier
- .onSizeChanged { viewPortHeight = it.height }
- .requiredSize(itemSizeDp * 3.5f + itemSpacingDp * 2.5f)
- ) {
- }
- PositionIndicator(
- state = positionIndicatorState,
- indicatorHeight = 50.dp,
- indicatorWidth = 4.dp,
- paddingHorizontal = 5.dp,
- )
- }
-
- // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
- rule.waitUntil { state.initialized.value }
- rule.runOnIdle {
- assertThat(
- positionIndicatorState.positionFraction
- ).isEqualTo(0)
- assertThat(
- positionIndicatorState.sizeFraction(viewPortHeight.toFloat())
- ).isEqualTo(1)
- }
+ scalingLazyColumnNotLargeEnoughToScroll(
+ Arrangement.spacedBy(itemSpacingDp)
+ ) {}
}
@Test
@@ -118,46 +99,36 @@
}
private fun scalingLazyColumnNotLargeEnoughToScrollGivesCorrectPositionAndSize(itemSize: Dp) {
- lateinit var state: ScalingLazyListState
- lateinit var positionIndicatorState: PositionIndicatorState
- var viewPortHeight = 0
- rule.setContent {
- state = rememberScalingLazyListState()
- positionIndicatorState = ScalingLazyColumnStateAdapter(state)
- ScalingLazyColumn(
- state = state,
- verticalArrangement = Arrangement.spacedBy(itemSpacingDp),
- modifier = Modifier
- .onSizeChanged { viewPortHeight = it.height }
- .requiredSize(itemSizeDp * 3.5f + itemSpacingDp * 2.5f),
- autoCentering = null
- ) {
- items(3) {
- Box(Modifier.requiredSize(itemSize))
- }
+ scalingLazyColumnNotLargeEnoughToScroll(
+ Arrangement.spacedBy(itemSpacingDp),
+ autoCentering = null
+ ) {
+ items(3) {
+ Box(Modifier.requiredSize(itemSize))
}
- PositionIndicator(
- state = positionIndicatorState,
- indicatorHeight = 50.dp,
- indicatorWidth = 4.dp,
- paddingHorizontal = 5.dp,
- )
- }
-
- // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
- rule.waitUntil { state.initialized.value }
- rule.runOnIdle {
- assertThat(
- positionIndicatorState.positionFraction
- ).isEqualTo(0f)
- assertThat(
- positionIndicatorState.sizeFraction(viewPortHeight.toFloat())
- ).isEqualTo(1f)
}
}
@Test
fun scalingLazyColumnNotLargeEnoughToScrollSwapVerticalAlignmentGivesCorrectPositionAndSize() {
+ scalingLazyColumnNotLargeEnoughToScroll(
+ Arrangement.spacedBy(
+ space = itemSpacingDp,
+ alignment = Alignment.Bottom
+ )
+ ) {
+ items(3) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+
+ private fun scalingLazyColumnNotLargeEnoughToScroll(
+ verticalArrangement: Arrangement.Vertical,
+ reverseLayout: Boolean = false,
+ autoCentering: AutoCenteringParams? = AutoCenteringParams(),
+ content: ScalingLazyListScope.() -> Unit
+ ) {
lateinit var state: ScalingLazyListState
lateinit var positionIndicatorState: PositionIndicatorState
var viewPortHeight = 0
@@ -166,17 +137,14 @@
positionIndicatorState = ScalingLazyColumnStateAdapter(state)
ScalingLazyColumn(
state = state,
- verticalArrangement = Arrangement.spacedBy(
- space = itemSpacingDp,
- alignment = Alignment.Bottom
- ),
+ verticalArrangement = verticalArrangement,
+ reverseLayout = reverseLayout,
modifier = Modifier
.onSizeChanged { viewPortHeight = it.height }
- .requiredSize(itemSizeDp * 3.5f + itemSpacingDp * 2.5f)
+ .requiredSize(itemSizeDp * 3.5f + itemSpacingDp * 2.5f),
+ autoCentering = autoCentering
) {
- items(3) {
- Box(Modifier.requiredSize(itemSizeDp))
- }
+ content(this)
}
PositionIndicator(
state = positionIndicatorState,
@@ -186,8 +154,6 @@
)
}
- // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
- rule.waitUntil { state.initialized.value }
rule.runOnIdle {
assertThat(
positionIndicatorState.positionFraction
@@ -250,7 +216,11 @@
}
) {
items(5) {
- Box(Modifier.requiredSize(itemSizeDp).border(BorderStroke(1.dp, Color.Green)))
+ Box(
+ Modifier
+ .requiredSize(itemSizeDp)
+ .border(BorderStroke(1.dp, Color.Green))
+ )
}
}
PositionIndicator(
@@ -261,8 +231,6 @@
)
}
- // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
- rule.waitUntil { state.initialized.value }
rule.runOnIdle {
// Scroll forwards so that item with index 2 is in the center of the viewport
runBlocking {
@@ -286,84 +254,25 @@
@Test
fun emptyReverseLayoutScalingLazyColumnGivesCorrectPositionAndSize() {
- lateinit var state: ScalingLazyListState
- lateinit var positionIndicatorState: PositionIndicatorState
- var viewPortHeight = 0
- rule.setContent {
- state = rememberScalingLazyListState()
- positionIndicatorState = ScalingLazyColumnStateAdapter(state)
- ScalingLazyColumn(
- state = state,
- verticalArrangement = Arrangement.spacedBy(itemSpacingDp),
- reverseLayout = true,
- modifier = Modifier
- .onSizeChanged { viewPortHeight = it.height }
- .requiredSize(itemSizeDp * 3.5f + itemSpacingDp * 2.5f)
- ) {
- }
- PositionIndicator(
- state = positionIndicatorState,
- indicatorHeight = 50.dp,
- indicatorWidth = 4.dp,
- paddingHorizontal = 5.dp,
- )
- }
-
- // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
- rule.waitUntil { state.initialized.value }
- rule.runOnIdle {
- assertThat(
- positionIndicatorState.positionFraction
- ).isEqualTo(0)
- assertThat(
- positionIndicatorState.sizeFraction(viewPortHeight.toFloat())
- ).isEqualTo(1)
- }
+ scalingLazyColumnNotLargeEnoughToScroll(
+ Arrangement.spacedBy(itemSpacingDp),
+ reverseLayout = true
+ ) {}
}
@Test
fun reverseLayoutScalingLazyColumnNotLargeEnoughToScrollGivesCorrectPositionAndSize() {
- lateinit var state: ScalingLazyListState
- lateinit var positionIndicatorState: PositionIndicatorState
- var viewPortHeight = 0
- rule.setContent {
- state = rememberScalingLazyListState()
- positionIndicatorState = ScalingLazyColumnStateAdapter(state)
- ScalingLazyColumn(
- state = state,
- verticalArrangement = Arrangement.spacedBy(
- space = itemSpacingDp,
- alignment = Alignment.Bottom
- ),
- reverseLayout = true,
- modifier = Modifier
- .onSizeChanged { viewPortHeight = it.height }
- .fillMaxWidth()
- .requiredSize(itemSizeDp * 3.5f + itemSpacingDp * 2.5f)
- .background(Color.DarkGray),
- autoCentering = null
- ) {
- items(3) {
- Box(Modifier.requiredSize(itemSizeDp))
- }
+ scalingLazyColumnNotLargeEnoughToScroll(
+ Arrangement.spacedBy(
+ space = itemSpacingDp,
+ alignment = Alignment.Bottom
+ ),
+ autoCentering = null,
+ reverseLayout = true
+ ) {
+ items(3) {
+ Box(Modifier.requiredSize(itemSizeDp))
}
- PositionIndicator(
- state = positionIndicatorState,
- indicatorHeight = 50.dp,
- indicatorWidth = 4.dp,
- paddingHorizontal = 5.dp,
- )
- }
-
- // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
- rule.waitUntil { state.initialized.value }
- rule.runOnIdle {
- assertThat(
- positionIndicatorState.positionFraction
- ).isEqualTo(0f)
- assertThat(
- positionIndicatorState.sizeFraction(viewPortHeight.toFloat())
- ).isEqualTo(1f)
}
}
@@ -401,8 +310,6 @@
)
}
- // TODO(b/210654937): Remove the waitUntil once we no longer need 2 stage initialization
- rule.waitUntil { state.initialized.value }
rule.runOnIdle {
runBlocking {
state.scrollBy(itemSizePx.toFloat() + itemSpacingPx.toFloat())
@@ -425,86 +332,52 @@
@Test
fun emptyLazyColumnGivesCorrectPositionAndSize() {
- lateinit var state: LazyListState
- lateinit var positionIndicatorState: PositionIndicatorState
- var viewPortHeight = 0
- rule.setContent {
- state = rememberLazyListState()
- positionIndicatorState = LazyColumnStateAdapter(state)
- LazyColumn(
- state = state,
- verticalArrangement = Arrangement.spacedBy(itemSpacingDp),
- modifier = Modifier
- .onSizeChanged { viewPortHeight = it.height }
- .requiredSize(itemSizeDp * 3.5f + itemSpacingDp * 2.5f)
- ) {
- }
- PositionIndicator(
- state = positionIndicatorState,
- indicatorHeight = 50.dp,
- indicatorWidth = 4.dp,
- paddingHorizontal = 5.dp,
- )
- }
-
- rule.runOnIdle {
- assertThat(
- positionIndicatorState.positionFraction
- ).isEqualTo(0)
- assertThat(
- positionIndicatorState.sizeFraction(viewPortHeight.toFloat())
- ).isEqualTo(1)
- }
+ lazyColumnNotLargeEnoughToScroll(
+ Arrangement.spacedBy(itemSpacingDp)
+ ) {}
}
@Test
fun lazyColumnNotLargeEnoughToScrollGivesCorrectPositionAndSize() {
- lazyColumnNotLargeEnoughToScrollGivesCorrectPositionAndSize(itemSizeDp)
+ lazyColumnNotLargeEnoughToScroll(
+ Arrangement.spacedBy(itemSpacingDp)
+ ) {
+ items(3) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
}
@Test
fun lazyColumnNotLargeEnoughToScrollGivesCorrectPositionAndSizeForZeroSizeItems() {
- lazyColumnNotLargeEnoughToScrollGivesCorrectPositionAndSize(0.dp)
- }
-
- private fun lazyColumnNotLargeEnoughToScrollGivesCorrectPositionAndSize(itemSize: Dp) {
- lateinit var state: LazyListState
- lateinit var positionIndicatorState: PositionIndicatorState
- var viewPortHeight = 0
- rule.setContent {
- state = rememberLazyListState()
- positionIndicatorState = LazyColumnStateAdapter(state)
- LazyColumn(
- state = state,
- verticalArrangement = Arrangement.spacedBy(itemSpacingDp),
- modifier = Modifier
- .onSizeChanged { viewPortHeight = it.height }
- .requiredSize(itemSizeDp * 3.5f + itemSpacingDp * 2.5f)
- ) {
- items(3) {
- Box(Modifier.requiredSize(itemSize))
- }
+ lazyColumnNotLargeEnoughToScroll(
+ Arrangement.spacedBy(itemSpacingDp)
+ ) {
+ items(3) {
+ Box(Modifier.requiredSize(0.dp))
}
- PositionIndicator(
- state = positionIndicatorState,
- indicatorHeight = 50.dp,
- indicatorWidth = 4.dp,
- paddingHorizontal = 5.dp,
- )
- }
-
- rule.runOnIdle {
- assertThat(
- positionIndicatorState.positionFraction
- ).isEqualTo(0f)
- assertThat(
- positionIndicatorState.sizeFraction(viewPortHeight.toFloat())
- ).isEqualTo(1f)
}
}
@Test
fun lazyColumnNotLargeEnoughToScrollSwapVerticalAlignmentGivesCorrectPositionAndSize() {
+ lazyColumnNotLargeEnoughToScroll(
+ Arrangement.spacedBy(
+ space = itemSpacingDp,
+ alignment = Alignment.Bottom
+ )
+ ) {
+ items(3) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+
+ private fun lazyColumnNotLargeEnoughToScroll(
+ verticalArrangement: Arrangement.Vertical,
+ reverseLayout: Boolean = false,
+ content: LazyListScope.() -> Unit
+ ) {
lateinit var state: LazyListState
lateinit var positionIndicatorState: PositionIndicatorState
var viewPortHeight = 0
@@ -513,17 +386,13 @@
positionIndicatorState = LazyColumnStateAdapter(state)
LazyColumn(
state = state,
- verticalArrangement = Arrangement.spacedBy(
- space = itemSpacingDp,
- alignment = Alignment.Bottom
- ),
+ verticalArrangement = verticalArrangement,
+ reverseLayout = reverseLayout,
modifier = Modifier
.onSizeChanged { viewPortHeight = it.height }
.requiredSize(itemSizeDp * 3.5f + itemSpacingDp * 2.5f)
) {
- items(3) {
- Box(Modifier.requiredSize(itemSizeDp))
- }
+ content()
}
PositionIndicator(
state = positionIndicatorState,
@@ -591,79 +460,24 @@
@Test
fun emptyReverseLayoutLazyColumnGivesCorrectPositionAndSize() {
- lateinit var state: LazyListState
- lateinit var positionIndicatorState: PositionIndicatorState
- var viewPortHeight = 0
- rule.setContent {
- state = rememberLazyListState()
- positionIndicatorState = LazyColumnStateAdapter(state)
- LazyColumn(
- state = state,
- verticalArrangement = Arrangement.spacedBy(itemSpacingDp),
- reverseLayout = true,
- modifier = Modifier
- .onSizeChanged { viewPortHeight = it.height }
- .requiredSize(itemSizeDp * 3.5f + itemSpacingDp * 2.5f)
- ) {
- }
- PositionIndicator(
- state = positionIndicatorState,
- indicatorHeight = 50.dp,
- indicatorWidth = 4.dp,
- paddingHorizontal = 5.dp,
- )
- }
-
- rule.runOnIdle {
- assertThat(
- positionIndicatorState.positionFraction
- ).isEqualTo(0)
- assertThat(
- positionIndicatorState.sizeFraction(viewPortHeight.toFloat())
- ).isEqualTo(1)
- }
+ lazyColumnNotLargeEnoughToScroll(
+ Arrangement.spacedBy(itemSpacingDp),
+ reverseLayout = true
+ ) {}
}
@Test
fun reverseLayoutLazyColumnNotLargeEnoughToScrollGivesCorrectPositionAndSize() {
- lateinit var state: LazyListState
- lateinit var positionIndicatorState: PositionIndicatorState
- var viewPortHeight = 0
- rule.setContent {
- state = rememberLazyListState()
- positionIndicatorState = LazyColumnStateAdapter(state)
- LazyColumn(
- state = state,
- verticalArrangement = Arrangement.spacedBy(
- space = itemSpacingDp,
- alignment = Alignment.Bottom
- ),
- reverseLayout = true,
- modifier = Modifier
- .onSizeChanged { viewPortHeight = it.height }
- .fillMaxWidth()
- .requiredSize(itemSizeDp * 3.5f + itemSpacingDp * 2.5f)
- .background(Color.DarkGray),
- ) {
- items(3) {
- Box(Modifier.requiredSize(itemSizeDp))
- }
+ lazyColumnNotLargeEnoughToScroll(
+ Arrangement.spacedBy(
+ space = itemSpacingDp,
+ alignment = Alignment.Bottom
+ ),
+ reverseLayout = true
+ ) {
+ items(3) {
+ Box(Modifier.requiredSize(itemSizeDp))
}
- PositionIndicator(
- state = positionIndicatorState,
- indicatorHeight = 50.dp,
- indicatorWidth = 4.dp,
- paddingHorizontal = 5.dp,
- )
- }
-
- rule.runOnIdle {
- assertThat(
- positionIndicatorState.positionFraction
- ).isEqualTo(0f)
- assertThat(
- positionIndicatorState.sizeFraction(viewPortHeight.toFloat())
- ).isEqualTo(1f)
}
}
@@ -716,82 +530,56 @@
@Test
fun emptyScrollableColumnGivesCorrectPositionAndSize() {
- lateinit var state: ScrollState
- lateinit var positionIndicatorState: PositionIndicatorState
- var viewPortHeight = 0
- rule.setContent {
- state = rememberScrollState()
- positionIndicatorState = ScrollStateAdapter(scrollState = state)
- Column(
- modifier = Modifier
- .onSizeChanged { viewPortHeight = it.height }
- .requiredSize(itemSizeDp * 3.5f + itemSpacingDp * 2.5f)
- .verticalScroll(state = state)
- ) {
- }
- PositionIndicator(
- state = positionIndicatorState,
- indicatorHeight = 50.dp,
- indicatorWidth = 4.dp,
- paddingHorizontal = 5.dp,
- )
- }
-
- rule.runOnIdle {
- assertThat(
- positionIndicatorState.positionFraction
- ).isEqualTo(0)
- assertThat(
- positionIndicatorState.sizeFraction(viewPortHeight.toFloat())
- ).isEqualTo(1)
- }
+ scrollableColumnNotLargeEnoughToScroll({})
}
@Test
fun emptyReversedScrollableColumnGivesCorrectPositionAndSize() {
- lateinit var state: ScrollState
- lateinit var positionIndicatorState: PositionIndicatorState
- var viewPortHeight = 0
- rule.setContent {
- state = rememberScrollState()
- positionIndicatorState = ScrollStateAdapter(scrollState = state)
- Column(
- modifier = Modifier
- .onSizeChanged { viewPortHeight = it.height }
- .requiredSize(itemSizeDp * 3.5f + itemSpacingDp * 2.5f)
- .verticalScroll(state = state, reverseScrolling = true)
- ) {
- }
- PositionIndicator(
- state = positionIndicatorState,
- indicatorHeight = 50.dp,
- indicatorWidth = 4.dp,
- paddingHorizontal = 5.dp,
- reverseDirection = true,
- )
- }
-
- rule.runOnIdle {
- assertThat(
- positionIndicatorState.positionFraction
- ).isEqualTo(0)
- assertThat(
- positionIndicatorState.sizeFraction(viewPortHeight.toFloat())
- ).isEqualTo(1)
- }
+ scrollableColumnNotLargeEnoughToScroll({}, reverseScrolling = true)
}
@Test
fun scrollableColumnNotLargeEnoughToScrollGivesCorrectPositionAndSize() {
- scrollableColumnNotLargeEnoughToScrollGivesCorrectPositionAndSize(itemSizeDp)
+ scrollableColumnNotLargeEnoughToScroll(
+ {
+ Box(Modifier.requiredSize(itemSizeDp))
+ Box(Modifier.requiredSize(itemSizeDp))
+ Box(Modifier.requiredSize(itemSizeDp))
+ },
+ Arrangement.spacedBy(itemSpacingDp),
+ )
}
@Test
fun scrollableColumnNotLargeEnoughToScrollGivesCorrectPositionAndSizeForZeroSizeItems() {
- scrollableColumnNotLargeEnoughToScrollGivesCorrectPositionAndSize(0.dp)
+ scrollableColumnNotLargeEnoughToScroll(
+ {
+ Box(Modifier.requiredSize(0.dp))
+ Box(Modifier.requiredSize(0.dp))
+ Box(Modifier.requiredSize(0.dp))
+ },
+ Arrangement.spacedBy(itemSpacingDp),
+ )
}
- private fun scrollableColumnNotLargeEnoughToScrollGivesCorrectPositionAndSize(itemSize: Dp) {
+ @Test
+ fun reversedScrollableColumnNotLargeEnoughToScrollGivesCorrectPositionAndSize() {
+ scrollableColumnNotLargeEnoughToScroll(
+ {
+ Box(Modifier.requiredSize(itemSizeDp))
+ Box(Modifier.requiredSize(itemSizeDp))
+ Box(Modifier.requiredSize(itemSizeDp))
+ },
+ Arrangement.spacedBy(itemSpacingDp),
+ reverseScrolling = true
+ )
+ }
+
+ private fun scrollableColumnNotLargeEnoughToScroll(
+ columnContent: @Composable ColumnScope.() -> Unit,
+ verticalArrangement: Arrangement.Vertical = Arrangement.Top,
+ reverseScrolling: Boolean = false
+ ) {
lateinit var state: ScrollState
lateinit var positionIndicatorState: PositionIndicatorState
var viewPortHeight = 0
@@ -802,66 +590,27 @@
modifier = Modifier
.onSizeChanged { viewPortHeight = it.height }
.requiredSize(itemSizeDp * 3.5f + itemSpacingDp * 2.5f)
- .verticalScroll(state = state),
- verticalArrangement = Arrangement.spacedBy(itemSpacingDp)
+ .verticalScroll(state = state, reverseScrolling = reverseScrolling),
+ verticalArrangement = verticalArrangement
) {
- Box(Modifier.requiredSize(itemSize))
- Box(Modifier.requiredSize(itemSize))
- Box(Modifier.requiredSize(itemSize))
+ columnContent()
}
PositionIndicator(
state = positionIndicatorState,
indicatorHeight = 50.dp,
indicatorWidth = 4.dp,
paddingHorizontal = 5.dp,
+ reverseDirection = reverseScrolling
)
}
rule.runOnIdle {
assertThat(
positionIndicatorState.positionFraction
- ).isEqualTo(0)
+ ).isEqualTo(0f)
assertThat(
positionIndicatorState.sizeFraction(viewPortHeight.toFloat())
- ).isEqualTo(1)
- }
- }
-
- @Test
- fun reversedScrollableColumnNotLargeEnoughToScrollGivesCorrectPositionAndSize() {
- lateinit var state: ScrollState
- lateinit var positionIndicatorState: PositionIndicatorState
- var viewPortHeight = 0
- rule.setContent {
- state = rememberScrollState()
- positionIndicatorState = ScrollStateAdapter(scrollState = state)
- Column(
- modifier = Modifier
- .onSizeChanged { viewPortHeight = it.height }
- .requiredSize(itemSizeDp * 3.5f + itemSpacingDp * 2.5f)
- .verticalScroll(state = state, reverseScrolling = true),
- verticalArrangement = Arrangement.spacedBy(itemSpacingDp)
- ) {
- Box(Modifier.requiredSize(itemSizeDp))
- Box(Modifier.requiredSize(itemSizeDp))
- Box(Modifier.requiredSize(itemSizeDp))
- }
- PositionIndicator(
- state = positionIndicatorState,
- indicatorHeight = 50.dp,
- indicatorWidth = 4.dp,
- paddingHorizontal = 5.dp,
- reverseDirection = true,
- )
- }
-
- rule.runOnIdle {
- assertThat(
- positionIndicatorState.positionFraction
- ).isEqualTo(0)
- assertThat(
- positionIndicatorState.sizeFraction(viewPortHeight.toFloat())
- ).isEqualTo(1)
+ ).isEqualTo(1f)
}
}
@@ -1011,7 +760,303 @@
) {
assertThat(visibleItemsInfo.first().index).isEqualTo(firstItemIndex)
assertThat(visibleItemsInfo.last().index).isEqualTo(lastItemIndex)
- assertThat((viewPortHeight / 2f) >=
- (visibleItemsInfo.last().offset + (visibleItemsInfo.last().size / 2)))
+ assertThat(
+ (viewPortHeight / 2f) >=
+ (visibleItemsInfo.last().offset + (visibleItemsInfo.last().size / 2))
+ )
}
}
+
+/**
+ * Tests for PositionIndicator api which uses deprecated ScalingLazyColumn
+ * from androidx.wear.compose.material package.
+ */
+@MediumTest
+@Suppress("DEPRECATION")
+@RunWith(AndroidJUnit4::class)
+public class PositionIndicatorWithMaterialSLCTest {
+ @get:Rule
+ val rule = createComposeRule()
+
+ private var itemSizePx: Int = 50
+ private var itemSizeDp: Dp = Dp.Infinity
+ private var itemSpacingPx = 6
+ private var itemSpacingDp: Dp = Dp.Infinity
+
+ @Before
+ fun before() {
+ with(rule.density) {
+ itemSizeDp = itemSizePx.toDp()
+ itemSpacingDp = itemSpacingPx.toDp()
+ }
+ }
+
+ @Test
+ fun emptyScalingLazyColumnGivesCorrectPositionAndSize() {
+ scalingLazyColumnNotLargeEnoughToScroll(
+ Arrangement.spacedBy(itemSpacingDp)
+ ) {}
+ }
+
+ @Test
+ fun scalingLazyColumnNotLargeEnoughToScrollGivesCorrectPositionAndSize() {
+ scalingLazyColumnNotLargeEnoughToScrollGivesCorrectPositionAndSize(itemSizeDp)
+ }
+
+ @Test
+ fun scalingLazyColumnNotLargeEnoughToScrollGivesCorrectPositionAndSizeForZeroSizeItems() {
+ scalingLazyColumnNotLargeEnoughToScrollGivesCorrectPositionAndSize(0.dp)
+ }
+
+ private fun scalingLazyColumnNotLargeEnoughToScrollGivesCorrectPositionAndSize(itemSize: Dp) {
+ scalingLazyColumnNotLargeEnoughToScroll(
+ Arrangement.spacedBy(itemSpacingDp),
+ autoCentering = null
+ ) {
+ items(3) {
+ Box(Modifier.requiredSize(itemSize))
+ }
+ }
+ }
+
+ @Test
+ fun scalingLazyColumnNotLargeEnoughToScrollSwapVerticalAlignmentGivesCorrectPositionAndSize() {
+ scalingLazyColumnNotLargeEnoughToScroll(
+ Arrangement.spacedBy(
+ space = itemSpacingDp,
+ alignment = Alignment.Bottom
+ )
+ ) {
+ items(3) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+
+ fun scrollableScalingLazyColumnGivesCorrectPositionAndSize() {
+ scrollableScalingLazyColumnPositionAndSize(
+ enableAutoCentering = true,
+ contentPaddingPx = 0
+ )
+ }
+
+ @Test
+ fun scrollableScalingLazyColumnGivesCorrectPositionAndSizeWithContentPadding() {
+ scrollableScalingLazyColumnPositionAndSize(
+ enableAutoCentering = true,
+ contentPaddingPx = itemSizePx + itemSpacingPx
+ )
+ }
+
+ @Test
+ fun scrollableScalingLazyColumnGivesCorrectPositionAndSizeWithContentPaddingNoAutoCenter() {
+ scrollableScalingLazyColumnPositionAndSize(
+ enableAutoCentering = false,
+ contentPaddingPx = itemSizePx + itemSpacingPx
+ )
+ }
+
+ private fun scrollableScalingLazyColumnPositionAndSize(
+ enableAutoCentering: Boolean,
+ contentPaddingPx: Int
+ ) {
+ lateinit var state: androidx.wear.compose.material.ScalingLazyListState
+ lateinit var positionIndicatorState: PositionIndicatorState
+ var viewPortHeight = 0
+ rule.setContent {
+ state =
+ androidx.wear.compose.material.rememberScalingLazyListState(
+ initialCenterItemIndex = 0
+ )
+ positionIndicatorState = MaterialScalingLazyColumnStateAdapter(state)
+ ScalingLazyColumn(
+ state = state,
+ verticalArrangement = Arrangement.spacedBy(itemSpacingDp),
+ modifier = Modifier
+ .onSizeChanged { viewPortHeight = it.height }
+ .requiredHeight(
+ // Exactly the right size to hold 3 items with spacing
+ itemSizeDp * 3f + itemSpacingDp * 2f
+ )
+ .background(Color.Black),
+ scalingParams =
+ androidx.wear.compose.material.ScalingLazyColumnDefaults.scalingParams(
+ edgeScale = 1.0f
+ ),
+ autoCentering = if (enableAutoCentering)
+ androidx.wear.compose.material.AutoCenteringParams(itemIndex = 0) else null,
+ contentPadding = with(LocalDensity.current) {
+ PaddingValues(contentPaddingPx.toDp())
+ }
+ ) {
+ items(5) {
+ Box(
+ Modifier
+ .requiredSize(itemSizeDp)
+ .border(BorderStroke(1.dp, Color.Green))
+ )
+ }
+ }
+ PositionIndicator(
+ state = positionIndicatorState,
+ indicatorHeight = 50.dp,
+ indicatorWidth = 4.dp,
+ paddingHorizontal = 5.dp,
+ )
+ }
+
+ rule.runOnIdle {
+ // Scroll forwards so that item with index 2 is in the center of the viewport
+ runBlocking {
+ state.scrollBy((itemSizePx.toFloat() + itemSpacingPx.toFloat()) * 2f)
+ }
+
+ state.layoutInfo.assertWhollyVisibleItems(
+ firstItemIndex = 1, lastItemIndex = 3,
+ viewPortHeight = viewPortHeight
+ )
+
+ // And that the indicator is at position 0.5 and of expected size
+ assertThat(
+ positionIndicatorState.positionFraction
+ ).isWithin(0.05f).of(0.5f)
+ assertThat(
+ positionIndicatorState.sizeFraction(viewPortHeight.toFloat())
+ ).isWithin(0.05f).of(0.6f)
+ }
+ }
+
+ @Test
+ fun emptyReverseLayoutScalingLazyColumnGivesCorrectPositionAndSize() {
+ scalingLazyColumnNotLargeEnoughToScroll(
+ Arrangement.spacedBy(itemSpacingDp),
+ reverseLayout = true
+ ) {}
+ }
+
+ @Test
+ fun reverseLayoutScalingLazyColumnNotLargeEnoughToScrollGivesCorrectPositionAndSize() {
+ scalingLazyColumnNotLargeEnoughToScroll(
+ Arrangement.spacedBy(
+ space = itemSpacingDp,
+ alignment = Alignment.Bottom
+ ),
+ autoCentering = null,
+ reverseLayout = true
+ ) {
+ items(3) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ }
+
+ private fun scalingLazyColumnNotLargeEnoughToScroll(
+ verticalArrangement: Arrangement.Vertical,
+ reverseLayout: Boolean = false,
+ autoCentering: androidx.wear.compose.material.AutoCenteringParams? =
+ androidx.wear.compose.material.AutoCenteringParams(),
+ slcContent: androidx.wear.compose.material.ScalingLazyListScope.() -> Unit
+ ) {
+ lateinit var state: androidx.wear.compose.material.ScalingLazyListState
+ lateinit var positionIndicatorState: PositionIndicatorState
+ var viewPortHeight = 0
+ rule.setContent {
+ state = androidx.wear.compose.material.rememberScalingLazyListState()
+ positionIndicatorState = MaterialScalingLazyColumnStateAdapter(state)
+ ScalingLazyColumn(
+ state = state,
+ verticalArrangement = verticalArrangement,
+ reverseLayout = reverseLayout,
+ modifier = Modifier
+ .onSizeChanged { viewPortHeight = it.height }
+ .requiredSize(itemSizeDp * 3.5f + itemSpacingDp * 2.5f),
+ autoCentering = autoCentering
+ ) {
+ slcContent(this)
+ }
+ PositionIndicator(
+ state = positionIndicatorState,
+ indicatorHeight = 50.dp,
+ indicatorWidth = 4.dp,
+ paddingHorizontal = 5.dp,
+ )
+ }
+
+ rule.runOnIdle {
+ assertThat(
+ positionIndicatorState.positionFraction
+ ).isEqualTo(0f)
+ assertThat(
+ positionIndicatorState.sizeFraction(viewPortHeight.toFloat())
+ ).isEqualTo(1f)
+ }
+ }
+
+ @Test
+ fun reverseLayoutScrollableScalingLazyColumnGivesCorrectPositionAndSize() {
+ lateinit var state: androidx.wear.compose.material.ScalingLazyListState
+ lateinit var positionIndicatorState: PositionIndicatorState
+ var viewPortHeight = 0
+ rule.setContent {
+ state = androidx.wear.compose.material.rememberScalingLazyListState()
+ positionIndicatorState = MaterialScalingLazyColumnStateAdapter(state)
+ ScalingLazyColumn(
+ state = state,
+ verticalArrangement = Arrangement.spacedBy(itemSpacingDp),
+ reverseLayout = true,
+ modifier = Modifier
+ .onSizeChanged { viewPortHeight = it.height }
+ .requiredHeight(
+ // Exactly the right size to hold 3 items with spacing
+ itemSizeDp * 3f + itemSpacingDp * 2f
+ )
+ .background(Color.DarkGray),
+ scalingParams = androidx.wear.compose.material.ScalingLazyColumnDefaults
+ .scalingParams(edgeScale = 1.0f),
+ autoCentering = null
+ ) {
+ items(5) {
+ Box(Modifier.requiredSize(itemSizeDp))
+ }
+ }
+ PositionIndicator(
+ state = positionIndicatorState,
+ indicatorHeight = 50.dp,
+ indicatorWidth = 4.dp,
+ paddingHorizontal = 5.dp,
+ )
+ }
+
+ rule.runOnIdle {
+ runBlocking {
+ state.scrollBy(itemSizePx.toFloat() + itemSpacingPx.toFloat())
+ }
+
+ state.layoutInfo.assertWhollyVisibleItems(
+ firstItemIndex = 1, lastItemIndex = 3,
+ viewPortHeight = viewPortHeight
+ )
+
+ // And that the indicator is at position 0.5 and of expected size
+ assertThat(
+ positionIndicatorState.positionFraction
+ ).isWithin(0.05f).of(0.5f)
+ assertThat(
+ positionIndicatorState.sizeFraction(viewPortHeight.toFloat())
+ ).isWithin(0.05f).of(0.6f)
+ }
+ }
+
+ private fun androidx.wear.compose.material.ScalingLazyListLayoutInfo.assertWhollyVisibleItems(
+ firstItemIndex: Int,
+ lastItemIndex: Int,
+ viewPortHeight: Int
+ ) {
+ assertThat(visibleItemsInfo.first().index).isEqualTo(firstItemIndex)
+ assertThat(visibleItemsInfo.last().index).isEqualTo(lastItemIndex)
+ assertThat(
+ (viewPortHeight / 2f) >=
+ (visibleItemsInfo.last().offset + (visibleItemsInfo.last().size / 2))
+ )
+ }
+}
\ No newline at end of file
diff --git a/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/ScaffoldTest.kt b/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/ScaffoldTest.kt
index e4261bf..c6c1ed6 100644
--- a/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/ScaffoldTest.kt
+++ b/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/ScaffoldTest.kt
@@ -26,6 +26,8 @@
import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.onNodeWithTag
import androidx.compose.ui.test.onNodeWithText
+import androidx.wear.compose.foundation.lazy.ScalingLazyColumn
+import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState
import org.junit.Ignore
import org.junit.Rule
import org.junit.Test
@@ -107,7 +109,9 @@
val scrollState = rememberScalingLazyListState()
Scaffold(
- modifier = Modifier.testTag(TEST_TAG).background(Color.Black),
+ modifier = Modifier
+ .testTag(TEST_TAG)
+ .background(Color.Black),
timeText = { Text(TIME_TEXT_MESSAGE) },
vignette = {
if (showVignette.value) {
diff --git a/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/ScalingLazyColumnIndexedTest.kt b/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/ScalingLazyColumnIndexedTest.kt
index 1a3cbe7..5eec897 100644
--- a/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/ScalingLazyColumnIndexedTest.kt
+++ b/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/ScalingLazyColumnIndexedTest.kt
@@ -34,6 +34,7 @@
import org.junit.Rule
import org.junit.Test
+@Suppress("DEPRECATION")
class ScalingLazyColumnIndexedTest {
@get:Rule
diff --git a/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/ScalingLazyColumnTest.kt b/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/ScalingLazyColumnTest.kt
index b6f60a4..2549f15 100644
--- a/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/ScalingLazyColumnTest.kt
+++ b/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/ScalingLazyColumnTest.kt
@@ -57,6 +57,7 @@
import kotlin.math.roundToInt
import kotlinx.coroutines.runBlocking
+@Suppress("DEPRECATION")
@MediumTest
@RunWith(AndroidJUnit4::class)
// These tests are in addition to ScalingLazyListLayoutInfoTest which handles scroll events at an
diff --git a/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/ScalingLazyListLayoutInfoTest.kt b/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/ScalingLazyListLayoutInfoTest.kt
index a9d571a..82dcfc3 100644
--- a/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/ScalingLazyListLayoutInfoTest.kt
+++ b/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/ScalingLazyListLayoutInfoTest.kt
@@ -50,6 +50,7 @@
import kotlin.math.roundToInt
import org.junit.Ignore
+@Suppress("DEPRECATION")
@MediumTest
@RunWith(AndroidJUnit4::class)
public class ScalingLazyListLayoutInfoTest {
diff --git a/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/ScrollAwayTest.kt b/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/ScrollAwayTest.kt
index 86a4f4b..edbe7fc 100644
--- a/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/ScrollAwayTest.kt
+++ b/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/ScrollAwayTest.kt
@@ -36,6 +36,10 @@
import androidx.compose.ui.unit.dp
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.MediumTest
+import androidx.wear.compose.foundation.lazy.AutoCenteringParams
+import androidx.wear.compose.foundation.lazy.ScalingLazyColumn
+import androidx.wear.compose.foundation.lazy.ScalingLazyListState
+import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
@@ -83,6 +87,49 @@
rule.onNodeWithTag(TIME_TEXT_TAG).assertIsDisplayed()
}
+ @Suppress("DEPRECATION")
+ @Test
+ fun hidesTimeTextWithMaterialScalingLazyColumn() {
+ lateinit var scrollState: androidx.wear.compose.material.ScalingLazyListState
+ rule.setContentWithTheme {
+ scrollState =
+ androidx.wear.compose.material.rememberScalingLazyListState(
+ initialCenterItemIndex = 1,
+ initialCenterItemScrollOffset = 0
+ )
+ MaterialScalingLazyColumnTest(itemIndex = 1, offset = 0.dp, scrollState)
+ }
+
+ rule.onNodeWithTag(SCROLL_TAG).performTouchInput { swipeUp() }
+
+ rule.onNodeWithTag(TIME_TEXT_TAG).assertIsNotDisplayed()
+ }
+
+ @Suppress("DEPRECATION")
+ @Test
+ fun showsTimeTextWithMaterialScalingLazyColumnIfItemIndexInvalid() {
+ val scrollAwayItemIndex = 10
+ lateinit var scrollState: androidx.wear.compose.material.ScalingLazyListState
+ rule.setContentWithTheme {
+ scrollState =
+ androidx.wear.compose.material.rememberScalingLazyListState(
+ initialCenterItemIndex = 1,
+ initialCenterItemScrollOffset = 0
+ )
+ MaterialScalingLazyColumnTest(
+ itemIndex = scrollAwayItemIndex,
+ offset = 0.dp,
+ scrollState
+ )
+ }
+
+ rule.onNodeWithTag(SCROLL_TAG).performTouchInput { swipeUp() }
+
+ // b/256166359 - itemIndex > number of items in the list.
+ // ScrollAway should default to always showing TimeText
+ rule.onNodeWithTag(TIME_TEXT_TAG).assertIsDisplayed()
+ }
+
@Composable
private fun ScalingLazyColumnTest(
itemIndex: Int,
@@ -91,7 +138,9 @@
) {
WithTouchSlop(0f) {
Scaffold(
- modifier = Modifier.fillMaxSize().background(MaterialTheme.colors.background),
+ modifier = Modifier
+ .fillMaxSize()
+ .background(MaterialTheme.colors.background),
timeText = {
TimeText(
modifier = Modifier
@@ -122,6 +171,50 @@
}
}
+ @Suppress("DEPRECATION")
+ @Composable
+ private fun MaterialScalingLazyColumnTest(
+ itemIndex: Int,
+ offset: Dp,
+ scrollState: androidx.wear.compose.material.ScalingLazyListState
+ ) {
+ WithTouchSlop(0f) {
+ Scaffold(
+ modifier = Modifier
+ .fillMaxSize()
+ .background(MaterialTheme.colors.background),
+ timeText = {
+ TimeText(
+ modifier = Modifier
+ .scrollAway(
+ scrollState = scrollState,
+ itemIndex = itemIndex,
+ offset = offset,
+ )
+ .testTag(TIME_TEXT_TAG)
+ )
+ },
+ ) {
+ ScalingLazyColumn(
+ contentPadding = PaddingValues(10.dp),
+ state = scrollState,
+ autoCentering = androidx.wear.compose.material.AutoCenteringParams(
+ itemIndex = 1, itemOffset = 0
+ ),
+ modifier = Modifier.testTag(SCROLL_TAG)
+ ) {
+ item {
+ ListHeader { Text("Chips") }
+ }
+
+ items(5) { i ->
+ ChipTest(Modifier.fillParentMaxHeight(0.5f), i)
+ }
+ }
+ }
+ }
+ }
+
@Test
fun hidesTimeTextWithLazyColumn() {
lateinit var scrollState: LazyListState
@@ -149,7 +242,8 @@
initialFirstVisibleItemIndex = 1,
)
LazyColumnTest(
- itemIndex = scrollAwayItemIndex, offset = 0.dp, scrollState)
+ itemIndex = scrollAwayItemIndex, offset = 0.dp, scrollState
+ )
}
rule.onNodeWithTag(SCROLL_TAG).performTouchInput { swipeUp() }
@@ -167,7 +261,9 @@
) {
WithTouchSlop(0f) {
Scaffold(
- modifier = Modifier.fillMaxSize().background(MaterialTheme.colors.background),
+ modifier = Modifier
+ .fillMaxSize()
+ .background(MaterialTheme.colors.background),
timeText = {
TimeText(
modifier = Modifier
diff --git a/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/dialog/DialogWithMaterialSlcTest.kt b/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/dialog/DialogWithMaterialSlcTest.kt
new file mode 100644
index 0000000..1eddea4
--- /dev/null
+++ b/wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/dialog/DialogWithMaterialSlcTest.kt
@@ -0,0 +1,1131 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.wear.compose.material.dialog
+
+import android.os.Build
+import androidx.annotation.RequiresApi
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.testutils.assertIsEqualTo
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.test.captureToImage
+import androidx.compose.ui.test.getUnclippedBoundsInRoot
+import androidx.compose.ui.test.hasClickAction
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import androidx.compose.ui.test.performTouchInput
+import androidx.compose.ui.test.swipeRight
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.unit.dp
+import androidx.test.filters.SdkSuppress
+import androidx.wear.compose.material.Button
+import androidx.wear.compose.material.Chip
+import androidx.wear.compose.material.LocalContentColor
+import androidx.wear.compose.material.LocalTextStyle
+import androidx.wear.compose.material.MaterialTheme
+import androidx.wear.compose.material.TEST_TAG
+import androidx.wear.compose.material.TestImage
+import androidx.wear.compose.material.Text
+import androidx.wear.compose.material.assertContainsColor
+import androidx.wear.compose.material.setContentWithTheme
+import androidx.wear.compose.material.setContentWithThemeForSizeAssertions
+import org.junit.Assert
+import org.junit.Rule
+import org.junit.Test
+
+/**
+ * These tests were copied from DialogTest.kt for support of deprecated Dialogs
+ */
+
+@Suppress("DEPRECATION")
+class DialogWithMaterialSlcBehaviourTest {
+ @get:Rule
+ val rule = createComposeRule()
+
+ @Test
+ fun supports_testtag_on_alert_with_buttons() {
+ rule.setContentWithTheme {
+ AlertWithMaterialSlc(
+ title = {},
+ negativeButton = {},
+ positiveButton = {},
+ modifier = Modifier.testTag(TEST_TAG),
+ )
+ }
+
+ rule.onNodeWithTag(TEST_TAG).assertExists()
+ }
+
+ @Test
+ fun supports_testtag_on_alert_with_chips() {
+ rule.setContentWithTheme {
+ AlertWithMaterialSlc(
+ title = {},
+ message = {},
+ content = {},
+ modifier = Modifier.testTag(TEST_TAG),
+ )
+ }
+
+ rule.onNodeWithTag(TEST_TAG).assertExists()
+ }
+
+ @Test
+ fun supports_testtag_on_ConfirmationWithMaterialSlc() {
+ rule.setContentWithTheme {
+ ConfirmationWithMaterialSlc(
+ >
+ icon = {},
+ content = {},
+ modifier = Modifier.testTag(TEST_TAG),
+ )
+ }
+
+ rule.onNodeWithTag(TEST_TAG).assertExists()
+ }
+
+ @Test
+ fun displays_icon_on_alert_with_buttons() {
+ rule.setContentWithTheme {
+ AlertWithMaterialSlc(
+ icon = { TestImage(TEST_TAG) },
+ title = {},
+ negativeButton = {},
+ positiveButton = {},
+ )
+ }
+
+ rule.onNodeWithTag(TEST_TAG).assertExists()
+ }
+
+ @Test
+ fun displays_icon_on_alert_with_chips() {
+ rule.setContentWithTheme {
+ AlertWithMaterialSlc(
+ icon = { TestImage(TEST_TAG) },
+ title = {},
+ message = {},
+ content = {},
+ )
+ }
+
+ rule.onNodeWithTag(TEST_TAG).assertExists()
+ }
+
+ @Test
+ fun displays_icon_on_ConfirmationWithMaterialSlc() {
+ rule.setContentWithTheme {
+ ConfirmationWithMaterialSlc(
+ >
+ icon = { TestImage(TEST_TAG) },
+ content = {},
+ )
+ }
+
+ rule.onNodeWithTag(TEST_TAG).assertExists()
+ }
+
+ @Test
+ fun displays_title_on_alert_with_buttons() {
+ rule.setContentWithTheme {
+ AlertWithMaterialSlc(
+ title = { Text("Text", modifier = Modifier.testTag(TEST_TAG)) },
+ negativeButton = {},
+ positiveButton = {},
+ )
+ }
+
+ rule.onNodeWithTag(TEST_TAG).assertExists()
+ }
+
+ @Test
+ fun displays_title_on_alert_with_chips() {
+ rule.setContentWithTheme {
+ AlertWithMaterialSlc(
+ icon = {},
+ title = { Text("Text", modifier = Modifier.testTag(TEST_TAG)) },
+ message = {},
+ content = {},
+ )
+ }
+
+ rule.onNodeWithTag(TEST_TAG).assertExists()
+ }
+
+ @Test
+ fun displays_title_on_ConfirmationWithMaterialSlc() {
+ rule.setContentWithTheme {
+ ConfirmationWithMaterialSlc(
+ >
+ icon = {},
+ content = { Text("Text", modifier = Modifier.testTag(TEST_TAG)) },
+ )
+ }
+
+ rule.onNodeWithTag(TEST_TAG).assertExists()
+ }
+
+ @Test
+ fun displays_bodymessage_on_alert_with_buttons() {
+ rule.setContentWithTheme {
+ AlertWithMaterialSlc(
+ title = {},
+ negativeButton = {},
+ positiveButton = {},
+ content = { Text("Text", modifier = Modifier.testTag(TEST_TAG)) },
+ )
+ }
+
+ rule.onNodeWithTag(TEST_TAG).assertExists()
+ }
+
+ @Test
+ fun displays_bodymessage_on_alert_with_chips() {
+ rule.setContentWithTheme {
+ AlertWithMaterialSlc(
+ icon = {},
+ title = {},
+ message = { Text("Text", modifier = Modifier.testTag(TEST_TAG)) },
+ content = {},
+ )
+ }
+
+ rule.onNodeWithTag(TEST_TAG).assertExists()
+ }
+
+ @Test
+ fun displays_buttons_on_alert_with_buttons() {
+ val buttonTag1 = "Button1"
+ val buttonTag2 = "Button2"
+
+ rule.setContentWithTheme {
+ AlertWithMaterialSlc(
+ title = {},
+ negativeButton = {
+ Button( modifier = Modifier.testTag(buttonTag1), content = {})
+ },
+ positiveButton = {
+ Button( modifier = Modifier.testTag(buttonTag2), content = {})
+ },
+ content = {},
+ )
+ }
+
+ rule.onNodeWithTag(buttonTag1).assertExists()
+ rule.onNodeWithTag(buttonTag2).assertExists()
+ }
+
+ @Test
+ fun supports_swipetodismiss_on_wrapped_alertdialog_with_buttons() {
+ rule.setContentWithTheme {
+ Box {
+ var showDialog by remember { mutableStateOf(true) }
+ Column(
+ modifier = Modifier.fillMaxSize(),
+ verticalArrangement = Arrangement.Center,
+ horizontalAlignment = Alignment.CenterHorizontally
+ ) {
+ Text("Start Screen")
+ }
+ Dialog(
+ showDialog = showDialog,
+ showDialog = false },
+ ) {
+ AlertWithMaterialSlc(
+ title = {},
+ negativeButton = {
+ Button( content = {})
+ },
+ positiveButton = {
+ Button( content = {})
+ },
+ content = { Text("Dialog", modifier = Modifier.testTag(TEST_TAG)) },
+ )
+ }
+ }
+ }
+
+ rule.onNodeWithTag(TEST_TAG).performTouchInput({ swipeRight() })
+ rule.onNodeWithTag(TEST_TAG).assertDoesNotExist()
+ }
+
+ @Test
+ fun supports_swipetodismiss_on_wrapped_alertdialog_with_chips() {
+ rule.setContentWithTheme {
+ Box {
+ var showDialog by remember { mutableStateOf(true) }
+ Column(
+ modifier = Modifier.fillMaxSize(),
+ verticalArrangement = Arrangement.Center,
+ horizontalAlignment = Alignment.CenterHorizontally
+ ) {
+ Text("Label")
+ }
+ Dialog(
+ showDialog = showDialog,
+ showDialog = false },
+ ) {
+ AlertWithMaterialSlc(
+ icon = {},
+ title = {},
+ message = { Text("Text", modifier = Modifier.testTag(TEST_TAG)) },
+ content = {},
+ )
+ }
+ }
+ }
+
+ rule.onNodeWithTag(TEST_TAG).performTouchInput({ swipeRight() })
+ rule.onNodeWithTag(TEST_TAG).assertDoesNotExist()
+ }
+
+ @Test
+ fun supports_swipetodismiss_on_wrapped_confirmationdialog() {
+ rule.setContentWithTheme {
+ Box {
+ var showDialog by remember { mutableStateOf(true) }
+ Column(
+ modifier = Modifier.fillMaxSize(),
+ verticalArrangement = Arrangement.Center,
+ horizontalAlignment = Alignment.CenterHorizontally
+ ) {
+ Text("Label")
+ }
+ Dialog(
+ showDialog = showDialog,
+ showDialog = false },
+ ) {
+ ConfirmationWithMaterialSlc(
+ showDialog = false },
+ icon = {},
+ content = { Text("Dialog", modifier = Modifier.testTag(TEST_TAG)) },
+ )
+ }
+ }
+ }
+
+ rule.onNodeWithTag(TEST_TAG).performTouchInput({ swipeRight() })
+ rule.onNodeWithTag(TEST_TAG).assertDoesNotExist()
+ }
+
+ @Test
+ fun shows_dialog_when_showdialog_equals_true() {
+ rule.setContentWithTheme {
+ Box {
+ var showDialog by remember { mutableStateOf(false) }
+ Column(
+ modifier = Modifier.fillMaxSize(),
+ verticalArrangement = Arrangement.Center,
+ horizontalAlignment = Alignment.CenterHorizontally
+ ) {
+ Chip( showDialog = true }, label = { Text("Show") })
+ }
+ Dialog(
+ showDialog = showDialog,
+ showDialog = false },
+ ) {
+ AlertWithMaterialSlc(
+ icon = {},
+ title = {},
+ message = { Text("Text", modifier = Modifier.testTag(TEST_TAG)) },
+ content = {},
+ )
+ }
+ }
+ }
+
+ rule.onNode(hasClickAction()).performClick()
+ rule.onNodeWithTag(TEST_TAG).assertExists()
+ }
+
+ @Test
+ fun calls_ondismissrequest_when_dialog_is_swiped() {
+ val dismissedText = "Dismissed"
+ rule.setContentWithTheme {
+ Box {
+ var dismissed by remember { mutableStateOf(false) }
+ Column(
+ modifier = Modifier.fillMaxSize(),
+ verticalArrangement = Arrangement.Center,
+ horizontalAlignment = Alignment.CenterHorizontally
+ ) {
+ Text(if (dismissed) dismissedText else "Label")
+ }
+ Dialog(
+ showDialog = !dismissed,
+ dismissed = true },
+ ) {
+ AlertWithMaterialSlc(
+ icon = {},
+ title = {},
+ message = { Text("Text", modifier = Modifier.testTag(TEST_TAG)) },
+ content = {},
+ )
+ }
+ }
+ }
+
+ rule.onNodeWithTag(TEST_TAG).performTouchInput({ swipeRight() })
+ rule.onNodeWithText(dismissedText).assertExists()
+ }
+}
+
+@Suppress("DEPRECATION")
+class DialogWithMaterialSlcContentSizeAndPositionTest {
+ @get:Rule
+ val rule = createComposeRule()
+
+ @Test
+ fun spaces_icon_and_title_correctly_on_alert_with_buttons() {
+ rule
+ .setContentWithThemeForSizeAssertions(useUnmergedTree = true) {
+ AlertWithMaterialSlc(
+ icon = { TestImage(ICON_TAG) },
+ title = { Text("Title", modifier = Modifier.testTag(TITLE_TAG)) },
+ negativeButton = {
+ Button( modifier = Modifier.testTag(BUTTON_TAG)) {}
+ },
+ positiveButton = { Button( {} },
+ verticalArrangement = Arrangement.spacedBy(0.dp, Alignment.CenterVertically),
+ modifier = Modifier.testTag(TEST_TAG),
+ )
+ }
+
+ val iconBottom = rule.onNodeWithTag(ICON_TAG).getUnclippedBoundsInRoot().bottom
+ val titleTop = rule.onNodeWithTag(TITLE_TAG).getUnclippedBoundsInRoot().top
+ titleTop.assertIsEqualTo(iconBottom + DialogDefaults.IconSpacing)
+ }
+
+ @Test
+ fun spaces_title_and_buttons_correctly_on_alert_with_buttons() {
+ var titlePadding = 0.dp
+
+ rule
+ .setContentWithThemeForSizeAssertions(useUnmergedTree = true) {
+ titlePadding = DialogDefaults.TitlePadding.calculateBottomPadding()
+ AlertWithMaterialSlc(
+ icon = { TestImage(ICON_TAG) },
+ title = { Text("Title", modifier = Modifier.testTag(TITLE_TAG)) },
+ negativeButton = {
+ Button( modifier = Modifier.testTag(BUTTON_TAG)) {}
+ },
+ positiveButton = { Button( {} },
+ verticalArrangement = Arrangement.spacedBy(0.dp, Alignment.CenterVertically),
+ modifier = Modifier.testTag(TEST_TAG),
+ )
+ }
+
+ val titleBottom = rule.onNodeWithTag(TITLE_TAG).getUnclippedBoundsInRoot().bottom
+ val buttonTop = rule.onNodeWithTag(BUTTON_TAG).getUnclippedBoundsInRoot().top
+ buttonTop.assertIsEqualTo(titleBottom + titlePadding)
+ }
+
+ @Test
+ fun spaces_icon_and_title_correctly_on_alert_with_chips() {
+ rule
+ .setContentWithThemeForSizeAssertions(useUnmergedTree = true) {
+ AlertWithMaterialSlc(
+ icon = { TestImage(ICON_TAG) },
+ title = { Text("Title", modifier = Modifier.testTag(TITLE_TAG)) },
+ content = {
+ item {
+ Chip(
+ label = { Text("Chip") },
+ >
+ modifier = Modifier.testTag(CHIP_TAG)
+ )
+ }
+ },
+ verticalArrangement = Arrangement.spacedBy(0.dp, Alignment.CenterVertically),
+ modifier = Modifier.testTag(TEST_TAG),
+ )
+ }
+
+ val iconBottom = rule.onNodeWithTag(ICON_TAG).getUnclippedBoundsInRoot().bottom
+ val titleTop = rule.onNodeWithTag(TITLE_TAG).getUnclippedBoundsInRoot().top
+ titleTop.assertIsEqualTo(iconBottom + DialogDefaults.IconSpacing)
+ }
+
+ @Test
+ fun spaces_title_and_chips_correctly_on_alert_with_chips() {
+ var titlePadding = 0.dp
+
+ rule
+ .setContentWithThemeForSizeAssertions(useUnmergedTree = true) {
+ titlePadding = DialogDefaults.TitlePadding.calculateBottomPadding()
+ AlertWithMaterialSlc(
+ icon = { TestImage(ICON_TAG) },
+ title = { Text("Title", modifier = Modifier.testTag(TITLE_TAG)) },
+ content = {
+ item {
+ Chip(
+ label = { Text("Chip") },
+ >
+ modifier = Modifier.testTag(CHIP_TAG)
+ )
+ }
+ },
+ verticalArrangement = Arrangement.spacedBy(0.dp, Alignment.CenterVertically),
+ modifier = Modifier.testTag(TEST_TAG),
+ )
+ }
+
+ val titleBottom = rule.onNodeWithTag(TITLE_TAG).getUnclippedBoundsInRoot().bottom
+ val chipTop = rule.onNodeWithTag(CHIP_TAG).getUnclippedBoundsInRoot().top
+ chipTop.assertIsEqualTo(titleBottom + titlePadding)
+ }
+
+ @Test
+ fun spaces_icon_and_title_correctly_on_ConfirmationWithMaterialSlc() {
+ rule
+ .setContentWithThemeForSizeAssertions(useUnmergedTree = true) {
+ ConfirmationWithMaterialSlc(
+ >
+ icon = { TestImage(ICON_TAG) },
+ content = { Text("Title", modifier = Modifier.testTag(TITLE_TAG)) },
+ verticalArrangement = Arrangement.spacedBy(0.dp, Alignment.CenterVertically),
+ modifier = Modifier.testTag(TEST_TAG),
+ )
+ }
+
+ val iconBottom = rule.onNodeWithTag(ICON_TAG).getUnclippedBoundsInRoot().bottom
+ val titleTop = rule.onNodeWithTag(TITLE_TAG).getUnclippedBoundsInRoot().top
+ titleTop.assertIsEqualTo(iconBottom + DialogDefaults.IconSpacing)
+ }
+
+ @Test
+ fun spaces_title_and_body_correctly_on_alert_with_buttons() {
+ var titleSpacing = 0.dp
+
+ rule
+ .setContentWithThemeForSizeAssertions(useUnmergedTree = true) {
+ titleSpacing = DialogDefaults.TitlePadding.calculateBottomPadding()
+ AlertWithMaterialSlc(
+ title = { Text("Title", modifier = Modifier.testTag(TITLE_TAG)) },
+ negativeButton = {
+ Button( modifier = Modifier.testTag(BUTTON_TAG)) {}
+ },
+ positiveButton = { Button( {} },
+ content = { Text("Body", modifier = Modifier.testTag(BODY_TAG)) },
+ verticalArrangement = Arrangement.spacedBy(0.dp, Alignment.CenterVertically),
+ modifier = Modifier.testTag(TEST_TAG),
+ )
+ }
+
+ val titleBottom = rule.onNodeWithTag(TITLE_TAG).getUnclippedBoundsInRoot().bottom
+ val bodyTop = rule.onNodeWithTag(BODY_TAG).getUnclippedBoundsInRoot().top
+ bodyTop.assertIsEqualTo(titleBottom + titleSpacing)
+ }
+
+ @Test
+ fun spaces_title_and_body_correctly_on_alert_with_chips() {
+ var titleSpacing = 0.dp
+
+ rule
+ .setContentWithThemeForSizeAssertions(useUnmergedTree = true) {
+ titleSpacing = DialogDefaults.TitlePadding.calculateBottomPadding()
+ AlertWithMaterialSlc(
+ icon = { TestImage(ICON_TAG) },
+ title = { Text("Title", modifier = Modifier.testTag(TITLE_TAG)) },
+ message = { Text("Message", modifier = Modifier.testTag(BODY_TAG)) },
+ content = {
+ item {
+ Chip(
+ label = { Text("Chip") },
+ >
+ modifier = Modifier.testTag(CHIP_TAG)
+ )
+ }
+ },
+ verticalArrangement = Arrangement.spacedBy(0.dp, Alignment.CenterVertically),
+ modifier = Modifier.testTag(TEST_TAG),
+ )
+ }
+
+ val titleBottom = rule.onNodeWithTag(TITLE_TAG).getUnclippedBoundsInRoot().bottom
+ val bodyTop = rule.onNodeWithTag(BODY_TAG).getUnclippedBoundsInRoot().top
+ bodyTop.assertIsEqualTo(titleBottom + titleSpacing)
+ }
+
+ @Test
+ fun spaces_body_and_buttons_correctly_on_alert_with_buttons() {
+ var bodyPadding = 0.dp
+
+ rule
+ .setContentWithThemeForSizeAssertions(useUnmergedTree = true) {
+ bodyPadding = DialogDefaults.BodyPadding.calculateBottomPadding()
+ AlertWithMaterialSlc(
+ icon = {},
+ title = {},
+ negativeButton = {
+ Button( modifier = Modifier.testTag(BUTTON_TAG)) {}
+ },
+ positiveButton = {
+ Button( {}
+ },
+ content = { Text("Body", modifier = Modifier.testTag(BODY_TAG)) },
+ verticalArrangement = Arrangement.spacedBy(0.dp, Alignment.CenterVertically),
+ modifier = Modifier.testTag(TEST_TAG),
+ )
+ }
+
+ val bodyBottom = rule.onNodeWithTag(BODY_TAG).getUnclippedBoundsInRoot().bottom
+ val buttonTop = rule.onNodeWithTag(BUTTON_TAG).getUnclippedBoundsInRoot().top
+ buttonTop.assertIsEqualTo(bodyBottom + bodyPadding)
+ }
+
+ @Test
+ fun spaces_body_and_chips_correctly_on_alert_with_chips() {
+ var bodyPadding = 0.dp
+
+ rule
+ .setContentWithThemeForSizeAssertions(useUnmergedTree = true) {
+ bodyPadding = DialogDefaults.BodyPadding.calculateBottomPadding()
+ AlertWithMaterialSlc(
+ icon = { TestImage(ICON_TAG) },
+ title = { Text("Title", modifier = Modifier.testTag(TITLE_TAG)) },
+ message = { Text("Message", modifier = Modifier.testTag(BODY_TAG)) },
+ content = {
+ item {
+ Chip(
+ label = { Text("Chip") },
+ >
+ modifier = Modifier.testTag(CHIP_TAG)
+ )
+ }
+ },
+ verticalArrangement = Arrangement.spacedBy(0.dp, Alignment.CenterVertically),
+ modifier = Modifier.testTag(TEST_TAG),
+ )
+ }
+
+ val bodyBottom = rule.onNodeWithTag(BODY_TAG).getUnclippedBoundsInRoot().bottom
+ val chipTop = rule.onNodeWithTag(CHIP_TAG).getUnclippedBoundsInRoot().top
+ chipTop.assertIsEqualTo(bodyBottom + bodyPadding)
+ }
+}
+
+@Suppress("DEPRECATION")
+class DialogWithMaterialSlcContentColorTest {
+ @get:Rule
+ val rule = createComposeRule()
+
+ @Test
+ fun gives_icon_onbackground_on_alert_for_buttons() {
+ var expectedColor = Color.Transparent
+ var actualColor = Color.Transparent
+
+ rule.setContentWithTheme {
+ expectedColor = MaterialTheme.colors.onBackground
+ AlertWithMaterialSlc(
+ icon = { actualColor = LocalContentColor.current },
+ title = {},
+ negativeButton = {},
+ positiveButton = {},
+ content = {},
+ )
+ }
+
+ Assert.assertEquals(expectedColor, actualColor)
+ }
+
+ @Test
+ fun gives_icon_onbackground_on_alert_for_chips() {
+ var expectedColor = Color.Transparent
+ var actualColor = Color.Transparent
+
+ rule.setContentWithTheme {
+ expectedColor = MaterialTheme.colors.onBackground
+ AlertWithMaterialSlc(
+ icon = { actualColor = LocalContentColor.current },
+ title = {},
+ message = {},
+ content = {},
+ )
+ }
+
+ Assert.assertEquals(expectedColor, actualColor)
+ }
+
+ @Test
+ fun gives_icon_onbackground_on_ConfirmationWithMaterialSlc() {
+ var expectedColor = Color.Transparent
+ var actualColor = Color.Transparent
+
+ rule.setContentWithTheme {
+ expectedColor = MaterialTheme.colors.onBackground
+ ConfirmationWithMaterialSlc(
+ >
+ icon = { actualColor = LocalContentColor.current },
+ content = {},
+ )
+ }
+
+ Assert.assertEquals(expectedColor, actualColor)
+ }
+
+ @Test
+ fun gives_custom_icon_on_alert_for_buttons() {
+ val overrideColor = Color.Yellow
+ var actualColor = Color.Transparent
+
+ rule.setContentWithTheme {
+ AlertWithMaterialSlc(
+ iconColor = overrideColor,
+ icon = { actualColor = LocalContentColor.current },
+ title = {},
+ negativeButton = {},
+ positiveButton = {},
+ content = {},
+ )
+ }
+
+ Assert.assertEquals(overrideColor, actualColor)
+ }
+
+ @Test
+ fun gives_custom_icon_on_alert_for_chips() {
+ val overrideColor = Color.Yellow
+ var actualColor = Color.Transparent
+
+ rule.setContentWithTheme {
+ AlertWithMaterialSlc(
+ iconColor = overrideColor,
+ icon = { actualColor = LocalContentColor.current },
+ title = {},
+ message = {},
+ content = {},
+ )
+ }
+
+ Assert.assertEquals(overrideColor, actualColor)
+ }
+
+ @Test
+ fun gives_custom_icon_on_ConfirmationWithMaterialSlc() {
+ val overrideColor = Color.Yellow
+ var actualColor = Color.Transparent
+
+ rule.setContentWithTheme {
+ ConfirmationWithMaterialSlc(
+ >
+ iconColor = overrideColor,
+ icon = { actualColor = LocalContentColor.current },
+ content = {},
+ )
+ }
+
+ Assert.assertEquals(overrideColor, actualColor)
+ }
+
+ @Test
+ fun gives_title_onbackground_on_alert_for_buttons() {
+ var expectedColor = Color.Transparent
+ var actualColor = Color.Transparent
+
+ rule.setContentWithTheme {
+ expectedColor = MaterialTheme.colors.onBackground
+ AlertWithMaterialSlc(
+ title = { actualColor = LocalContentColor.current },
+ negativeButton = {},
+ positiveButton = {},
+ content = {},
+ )
+ }
+
+ Assert.assertEquals(expectedColor, actualColor)
+ }
+
+ @Test
+ fun gives_title_onbackground_on_alert_for_chips() {
+ var expectedColor = Color.Transparent
+ var actualColor = Color.Transparent
+
+ rule.setContentWithTheme {
+ expectedColor = MaterialTheme.colors.onBackground
+ AlertWithMaterialSlc(
+ title = { actualColor = LocalContentColor.current },
+ message = {},
+ content = {},
+ )
+ }
+
+ Assert.assertEquals(expectedColor, actualColor)
+ }
+
+ @Test
+ fun gives_title_onbackground_on_ConfirmationWithMaterialSlc() {
+ var expectedColor = Color.Transparent
+ var actualColor = Color.Transparent
+
+ rule.setContentWithTheme {
+ expectedColor = MaterialTheme.colors.onBackground
+ ConfirmationWithMaterialSlc(
+ >
+ content = { actualColor = LocalContentColor.current },
+ )
+ }
+
+ Assert.assertEquals(expectedColor, actualColor)
+ }
+
+ @Test
+ fun gives_custom_title_on_alert_for_buttons() {
+ val overrideColor = Color.Yellow
+ var actualColor = Color.Transparent
+
+ rule.setContentWithTheme {
+ AlertWithMaterialSlc(
+ titleColor = overrideColor,
+ title = { actualColor = LocalContentColor.current },
+ negativeButton = {},
+ positiveButton = {},
+ content = {},
+ )
+ }
+
+ Assert.assertEquals(overrideColor, actualColor)
+ }
+
+ @Test
+ fun gives_custom_title_on_alert_for_chips() {
+ val overrideColor = Color.Yellow
+ var actualColor = Color.Transparent
+
+ rule.setContentWithTheme {
+ AlertWithMaterialSlc(
+ titleColor = overrideColor,
+ title = { actualColor = LocalContentColor.current },
+ message = {},
+ content = {},
+ )
+ }
+
+ Assert.assertEquals(overrideColor, actualColor)
+ }
+
+ @Test
+ fun gives_custom_title_on_ConfirmationWithMaterialSlc() {
+ val overrideColor = Color.Yellow
+ var actualColor = Color.Transparent
+
+ rule.setContentWithTheme {
+ ConfirmationWithMaterialSlc(
+ >
+ contentColor = overrideColor,
+ content = { actualColor = LocalContentColor.current },
+ )
+ }
+
+ Assert.assertEquals(overrideColor, actualColor)
+ }
+
+ @Test
+ fun gives_bodymessage_onbackground_on_alert_for_buttons() {
+ var expectedContentColor = Color.Transparent
+ var actualContentColor = Color.Transparent
+
+ rule.setContentWithTheme {
+ expectedContentColor = MaterialTheme.colors.onBackground
+ AlertWithMaterialSlc(
+ title = {},
+ negativeButton = {},
+ positiveButton = {},
+ content = { actualContentColor = LocalContentColor.current },
+ )
+ }
+
+ Assert.assertEquals(expectedContentColor, actualContentColor)
+ }
+
+ @Test
+ fun gives_bodymessage_onbackground_on_alert_for_chips() {
+ var expectedContentColor = Color.Transparent
+ var actualContentColor = Color.Transparent
+
+ rule.setContentWithTheme {
+ expectedContentColor = MaterialTheme.colors.onBackground
+ AlertWithMaterialSlc(
+ title = {},
+ message = { actualContentColor = LocalContentColor.current },
+ content = {},
+ )
+ }
+
+ Assert.assertEquals(expectedContentColor, actualContentColor)
+ }
+
+ @Test
+ fun gives_custom_bodymessage_on_alert_for_buttons() {
+ val overrideColor = Color.Yellow
+ var actualColor = Color.Transparent
+
+ rule.setContentWithTheme {
+ AlertWithMaterialSlc(
+ title = {},
+ negativeButton = {},
+ positiveButton = {},
+ contentColor = overrideColor,
+ content = { actualColor = LocalContentColor.current },
+ )
+ }
+
+ Assert.assertEquals(overrideColor, actualColor)
+ }
+
+ @Test
+ fun gives_custom_bodymessage_on_alert_for_chips() {
+ val overrideColor = Color.Yellow
+ var actualColor = Color.Transparent
+
+ rule.setContentWithTheme {
+ AlertWithMaterialSlc(
+ title = {},
+ messageColor = overrideColor,
+ message = { actualColor = LocalContentColor.current },
+ content = {},
+ )
+ }
+
+ Assert.assertEquals(overrideColor, actualColor)
+ }
+
+ @RequiresApi(Build.VERSION_CODES.O)
+ @Test
+ fun gives_correct_background_color_on_alert_for_buttons() {
+ verifyBackgroundColor(expected = { MaterialTheme.colors.background }) {
+ AlertWithMaterialSlc(
+ title = {},
+ negativeButton = {},
+ positiveButton = {},
+ content = {},
+ modifier = Modifier.testTag(TEST_TAG)
+ )
+ }
+ }
+
+ @RequiresApi(Build.VERSION_CODES.O)
+ @Test
+ fun gives_correct_background_color_on_alert_for_chips() {
+ verifyBackgroundColor(expected = { MaterialTheme.colors.background }) {
+ AlertWithMaterialSlc(
+ title = {},
+ message = {},
+ content = {},
+ modifier = Modifier.testTag(TEST_TAG)
+ )
+ }
+ }
+
+ @RequiresApi(Build.VERSION_CODES.O)
+ @Test
+ fun gives_correct_background_color_on_ConfirmationWithMaterialSlc() {
+ verifyBackgroundColor(expected = { MaterialTheme.colors.background }) {
+ ConfirmationWithMaterialSlc(
+ >
+ content = {},
+ modifier = Modifier.testTag(TEST_TAG),
+ )
+ }
+ }
+
+ @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+ @Test
+ fun gives_custom_background_color_on_alert_for_buttons() {
+ val overrideColor = Color.Yellow
+
+ rule.setContentWithTheme {
+ AlertWithMaterialSlc(
+ title = {},
+ negativeButton = {},
+ positiveButton = {},
+ content = {},
+ backgroundColor = overrideColor,
+ modifier = Modifier.testTag(TEST_TAG),
+ )
+ }
+
+ rule.onNodeWithTag(TEST_TAG)
+ .captureToImage()
+ .assertContainsColor(overrideColor, 100.0f)
+ }
+
+ @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+ @Test
+ fun gives_custom_background_color_on_alert_for_chips() {
+ val overrideColor = Color.Yellow
+
+ rule.setContentWithTheme {
+ AlertWithMaterialSlc(
+ title = {},
+ message = {},
+ content = {},
+ backgroundColor = overrideColor,
+ modifier = Modifier.testTag(TEST_TAG),
+ )
+ }
+
+ rule.onNodeWithTag(TEST_TAG)
+ .captureToImage()
+ .assertContainsColor(overrideColor, 100.0f)
+ }
+
+ @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+ @Test
+ fun gives_custom_background_color_on_ConfirmationWithMaterialSlc() {
+ val overrideColor = Color.Yellow
+
+ rule.setContentWithTheme {
+ ConfirmationWithMaterialSlc(
+ >
+ content = {},
+ backgroundColor = overrideColor,
+ modifier = Modifier.testTag(TEST_TAG),
+ )
+ }
+
+ rule.onNodeWithTag(TEST_TAG)
+ .captureToImage()
+ .assertContainsColor(overrideColor, 100.0f)
+ }
+
+ @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+ private fun verifyBackgroundColor(
+ expected: @Composable () -> Color,
+ content: @Composable () -> Unit
+ ) {
+ val testBackground = Color.White
+ var expectedBackground = Color.Transparent
+
+ rule.setContentWithTheme {
+ Box(modifier = Modifier
+ .fillMaxSize()
+ .background(testBackground)) {
+ expectedBackground = expected()
+ content()
+ }
+ }
+
+ rule.onNodeWithTag(TEST_TAG)
+ .captureToImage()
+ .assertContainsColor(expectedBackground, 100.0f)
+ }
+}
+
+@Suppress("DEPRECATION")
+class DialogWithMaterialSlcTextStyleTest {
+ @get:Rule
+ val rule = createComposeRule()
+
+ @Test
+ fun gives_title_correct_textstyle_on_alert_for_buttons() {
+ var actualTextStyle = TextStyle.Default
+ var expectedTextStyle = TextStyle.Default
+
+ rule.setContentWithTheme {
+ expectedTextStyle = MaterialTheme.typography.title3
+ AlertWithMaterialSlc(
+ title = { actualTextStyle = LocalTextStyle.current },
+ negativeButton = {},
+ positiveButton = {},
+ )
+ }
+
+ Assert.assertEquals(expectedTextStyle, actualTextStyle)
+ }
+
+ @Test
+ fun gives_title_correct_textstyle_on_alert_for_chips() {
+ var actualTextStyle = TextStyle.Default
+ var expectedTextStyle = TextStyle.Default
+
+ rule.setContentWithTheme {
+ expectedTextStyle = MaterialTheme.typography.title3
+ AlertWithMaterialSlc(
+ title = { actualTextStyle = LocalTextStyle.current },
+ message = {},
+ content = {},
+ )
+ }
+
+ Assert.assertEquals(expectedTextStyle, actualTextStyle)
+ }
+
+ @Test
+ fun gives_body_correct_textstyle_on_alert_for_buttons() {
+ var actualTextStyle = TextStyle.Default
+ var expectedTextStyle = TextStyle.Default
+
+ rule.setContentWithTheme {
+ expectedTextStyle = MaterialTheme.typography.body2
+ AlertWithMaterialSlc(
+ title = { Text("Title") },
+ negativeButton = {},
+ positiveButton = {},
+ content = { actualTextStyle = LocalTextStyle.current }
+ )
+ }
+
+ Assert.assertEquals(expectedTextStyle, actualTextStyle)
+ }
+
+ @Test
+ fun gives_body_correct_textstyle_on_alert_for_chips() {
+ var actualTextStyle = TextStyle.Default
+ var expectedTextStyle = TextStyle.Default
+
+ rule.setContentWithTheme {
+ expectedTextStyle = MaterialTheme.typography.body2
+ AlertWithMaterialSlc(
+ title = { Text("Title") },
+ message = { actualTextStyle = LocalTextStyle.current },
+ content = {},
+ )
+ }
+
+ Assert.assertEquals(expectedTextStyle, actualTextStyle)
+ }
+
+ @Test
+ fun gives_title_correct_textstyle_on_ConfirmationWithMaterialSlc() {
+ var actualTextStyle = TextStyle.Default
+ var expectedTextStyle = TextStyle.Default
+
+ rule.setContentWithTheme {
+ expectedTextStyle = MaterialTheme.typography.title3
+ ConfirmationWithMaterialSlc(
+ >
+ content = { actualTextStyle = LocalTextStyle.current },
+ )
+ }
+
+ Assert.assertEquals(expectedTextStyle, actualTextStyle)
+ }
+}
diff --git a/wear/compose/compose-material/src/androidMain/kotlin/androidx/wear/compose/material/dialog/Dialog.android.kt b/wear/compose/compose-material/src/androidMain/kotlin/androidx/wear/compose/material/dialog/Dialog.android.kt
index 3ee68c0b..adcec0e 100644
--- a/wear/compose/compose-material/src/androidMain/kotlin/androidx/wear/compose/material/dialog/Dialog.android.kt
+++ b/wear/compose/compose-material/src/androidMain/kotlin/androidx/wear/compose/material/dialog/Dialog.android.kt
@@ -38,6 +38,8 @@
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.window.Dialog
import androidx.compose.ui.window.DialogProperties
+import androidx.wear.compose.foundation.lazy.ScalingLazyListState
+import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState
import androidx.wear.compose.material.CASUAL
import androidx.wear.compose.material.MaterialTheme
import androidx.wear.compose.material.PositionIndicator
@@ -46,11 +48,9 @@
import androidx.wear.compose.material.STANDARD_IN
import androidx.wear.compose.material.STANDARD_OUT
import androidx.wear.compose.material.Scaffold
-import androidx.wear.compose.material.ScalingLazyListState
import androidx.wear.compose.material.SwipeToDismissBox
import androidx.wear.compose.material.Vignette
import androidx.wear.compose.material.VignettePosition
-import androidx.wear.compose.material.rememberScalingLazyListState
import androidx.wear.compose.material.rememberSwipeToDismissBoxState
/**
@@ -87,6 +87,80 @@
properties: DialogProperties = DialogProperties(),
content: @Composable () -> Unit,
) {
+ Dialog(
+ showDialog = showDialog,
+ >
+ modifier = modifier,
+ properties = properties,
+ positionIndicator = { if (scrollState != null) PositionIndicator(scrollState) },
+ content = content
+ )
+}
+
+/**
+ * [Dialog] displays a full-screen dialog, layered over any other content. It takes a single slot,
+ * which is expected to be an opinionated Wear dialog content, such as [Alert]
+ * or [Confirmation].
+ *
+ * The dialog supports swipe-to-dismiss and reveals the parent content in the background
+ * during the swipe gesture.
+ *
+ * Example of content using [Dialog] to trigger an alert dialog using [Alert]:
+ * @sample androidx.wear.compose.material.samples.AlertDialogSample
+ *
+ * Example of content using [Dialog] to trigger a confirmation dialog using
+ * [Confirmation]:
+ * @sample androidx.wear.compose.material.samples.ConfirmationDialogSample
+
+ * @param showDialog Controls whether to display the [Dialog]. Set to true initially to trigger
+ * an 'intro' animation and display the [Dialog]. Subsequently, setting to false triggers
+ * an 'outro' animation, then [Dialog] calls [onDismissRequest] and hides itself.
+ * @param onDismissRequest Executes when the user dismisses the dialog.
+ * Must remove the dialog from the composition.
+ * @param modifier Modifier to be applied to the dialog.
+ * @param scrollState The scroll state for the dialog so that the scroll position can be displayed.
+ * @param properties Typically platform specific properties to further configure the dialog.
+ * @param content Slot for dialog content such as [Alert] or [Confirmation].
+ */
+@Suppress("DEPRECATION")
+@Deprecated(
+ "This overload is provided for backwards compatibility with Compose for Wear OS 1.1." +
+ "A newer overload is available which uses ScalingLazyListState from " +
+ "wear.compose.foundation.lazy package", level = DeprecationLevel.HIDDEN
+)
+@Composable
+public fun Dialog(
+ showDialog: Boolean,
+ onDismissRequest: () -> Unit,
+ modifier: Modifier = Modifier,
+ scrollState: androidx.wear.compose.material.ScalingLazyListState? =
+ androidx.wear.compose.material.rememberScalingLazyListState(),
+ properties: DialogProperties = DialogProperties(),
+ content: @Composable () -> Unit,
+) {
+ Dialog(
+ showDialog = showDialog,
+ >
+ modifier = modifier,
+ properties = properties,
+ positionIndicator = { if (scrollState != null) PositionIndicator(scrollState) },
+ content = content
+ )
+}
+
+/**
+ * A Dialog composable which was created for sharing code between 2 versions
+ * of public [Dialog]s - with ScalingLazyListState from material and another from foundation.lazy
+ */
+@Composable
+private fun Dialog(
+ showDialog: Boolean,
+ onDismissRequest: () -> Unit,
+ modifier: Modifier = Modifier,
+ properties: DialogProperties = DialogProperties(),
+ positionIndicator: @Composable () -> Unit,
+ content: @Composable () -> Unit,
+) {
// Transitions for background and 'dialog content' alpha.
var alphaTransitionState by remember {
mutableStateOf(MutableTransitionState(AlphaStage.IntroFadeOut))
@@ -101,7 +175,8 @@
if (showDialog ||
alphaTransitionState.targetState != AlphaStage.IntroFadeOut ||
- scaleTransitionState.targetState != ScaleStage.Intro) {
+ scaleTransitionState.targetState != ScaleStage.Intro
+ ) {
Dialog(
>
properties = properties,
@@ -114,17 +189,19 @@
vignette = {
AnimatedVisibility(
visible = scaleTransitionState.targetState == ScaleStage.Display,
- enter = fadeIn(animationSpec =
+ enter = fadeIn(
+ animationSpec =
TweenSpec(durationMillis = CASUAL, easing = STANDARD_IN)
),
- exit = fadeOut(animationSpec =
+ exit = fadeOut(
+ animationSpec =
TweenSpec(durationMillis = CASUAL, easing = STANDARD_OUT)
),
) {
Vignette(vignettePosition = VignettePosition.TopAndBottom)
}
},
- positionIndicator = { if (scrollState != null) PositionIndicator(scrollState) },
+ positionIndicator = positionIndicator,
modifier = modifier,
) {
SwipeToDismissBox(
@@ -142,8 +219,11 @@
}
) { isBackground ->
Box(
- modifier = Modifier.matchParentSize().background(
- MaterialTheme.colors.background.copy(alpha = backgroundAlpha))
+ modifier = Modifier
+ .matchParentSize()
+ .background(
+ MaterialTheme.colors.background.copy(alpha = backgroundAlpha)
+ )
)
if (!isBackground) content()
}
diff --git a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/Picker.kt b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/Picker.kt
index 6bc2957..31db6b9 100644
--- a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/Picker.kt
+++ b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/Picker.kt
@@ -1,4 +1,3 @@
-
/*
* Copyright 2021 The Android Open Source Project
*
@@ -16,6 +15,11 @@
*/
package androidx.wear.compose.material
+import androidx.wear.compose.foundation.lazy.ScalingLazyColumn as ScalingLazyColumn
+import androidx.wear.compose.foundation.lazy.ScalingParams as ScalingParams
+import androidx.wear.compose.foundation.lazy.ScalingLazyColumnDefaults as ScalingLazyColumnDefaults
+import androidx.wear.compose.foundation.lazy.AutoCenteringParams as AutoCenteringParams
+import androidx.wear.compose.foundation.lazy.ScalingLazyListState as ScalingLazyListState
import androidx.compose.animation.core.CubicBezierEasing
import androidx.compose.animation.core.DecayAnimationSpec
import androidx.compose.animation.core.Easing
@@ -113,7 +117,7 @@
readOnly: Boolean = false,
readOnlyLabel: @Composable (BoxScope.() -> Unit)? = null,
onSelected: () -> Unit = {},
- scalingParams: ScalingParams = PickerDefaults.scalingParams(),
+ scalingParams: ScalingParams = PickerDefaults.defaultScalingParams(),
separation: Dp = 0.dp,
/* @FloatRange(from = 0.0, to = 0.5) */
gradientRatio: Float = PickerDefaults.DefaultGradientRatio,
@@ -224,6 +228,44 @@
}
}
+@Suppress("DEPRECATION")
+@Deprecated(
+ "This overload is provided for backwards compatibility with Compose for Wear OS 1.1." +
+ "A newer overload is available which uses ScalingParams from " +
+ "androidx.wear.compose.foundation.lazy package", level = DeprecationLevel.HIDDEN
+)
+@Composable
+public fun Picker(
+ state: PickerState,
+ contentDescription: String?,
+ modifier: Modifier = Modifier,
+ readOnly: Boolean = false,
+ readOnlyLabel: @Composable (BoxScope.() -> Unit)? = null,
+ onSelected: () -> Unit = {},
+ scalingParams: androidx.wear.compose.material.ScalingParams = PickerDefaults.scalingParams(),
+ separation: Dp = 0.dp,
+ /* @FloatRange(from = 0.0, to = 0.5) */
+ gradientRatio: Float = PickerDefaults.DefaultGradientRatio,
+ gradientColor: Color = MaterialTheme.colors.background,
+ flingBehavior: FlingBehavior = PickerDefaults.flingBehavior(state),
+ userScrollEnabled: Boolean = true,
+ option: @Composable PickerScope.(optionIndex: Int) -> Unit
+) = Picker(
+ state = state,
+ contentDescription = contentDescription,
+ modifier = modifier,
+ readOnly = readOnly,
+ readOnlyLabel = readOnlyLabel,
+ >
+ scalingParams = convertToDefaultFoundationScalingParams(scalingParams),
+ separation = separation,
+ gradientRatio = gradientRatio,
+ gradientColor = gradientColor,
+ flingBehavior = flingBehavior,
+ userScrollEnabled = userScrollEnabled,
+ option = option
+)
+
/**
* A scrollable list of items to pick from. By default, items will be repeated
* "infinitely" in both directions, unless [PickerState#repeatItems] is specified as false.
@@ -265,6 +307,7 @@
* use on a screen, it is recommended that this content is given [Alignment.Center] in order to
* align with the centrally selected Picker value.
*/
+@Suppress("DEPRECATION")
@Deprecated("This overload is provided for backwards compatibility with Compose for Wear OS 1.1." +
"A newer overload is available with additional userScrollEnabled parameter which improves " +
"accessibility of [Picker].", level = DeprecationLevel.HIDDEN)
@@ -276,7 +319,7 @@
readOnly: Boolean = false,
readOnlyLabel: @Composable (BoxScope.() -> Unit)? = null,
onSelected: () -> Unit = {},
- scalingParams: ScalingParams = PickerDefaults.scalingParams(),
+ scalingParams: androidx.wear.compose.material.ScalingParams = PickerDefaults.scalingParams(),
separation: Dp = 0.dp,
/* @FloatRange(from = 0.0, to = 0.5) */
gradientRatio: Float = PickerDefaults.DefaultGradientRatio,
@@ -290,7 +333,7 @@
readOnly = readOnly,
readOnlyLabel = readOnlyLabel,
>
- scalingParams = scalingParams,
+ scalingParams = convertToDefaultFoundationScalingParams(scalingParams),
separation = separation,
gradientRatio = gradientRatio,
gradientColor = gradientColor,
@@ -333,6 +376,7 @@
* use on a screen, it is recommended that this content is given [Alignment.Center] in order to
* align with the centrally selected Picker value.
*/
+@Suppress("DEPRECATION")
@Deprecated("This overload is provided for backwards compatibility with Compose for Wear OS 1.0." +
"A newer overload is available with additional contentDescription, onSelected and " +
"userScrollEnabled parameters, which improves accessibility of [Picker].")
@@ -342,7 +386,7 @@
modifier: Modifier = Modifier,
readOnly: Boolean = false,
readOnlyLabel: @Composable (BoxScope.() -> Unit)? = null,
- scalingParams: ScalingParams = PickerDefaults.scalingParams(),
+ scalingParams: androidx.wear.compose.material.ScalingParams = PickerDefaults.scalingParams(),
separation: Dp = 0.dp,
/* @FloatRange(from = 0.0, to = 0.5) */
gradientRatio: Float = PickerDefaults.DefaultGradientRatio,
@@ -355,7 +399,7 @@
modifier = modifier,
readOnly = readOnly,
readOnlyLabel = readOnlyLabel,
- scalingParams = scalingParams,
+ scalingParams = convertToDefaultFoundationScalingParams(scalingParams),
separation = separation,
gradientRatio = gradientRatio,
gradientColor = gradientColor,
@@ -557,14 +601,27 @@
}
}
}
+
/**
* Contains the default values used by [Picker]
*/
public object PickerDefaults {
+
/**
* Scaling params are used to determine when items start to be scaled down and alpha applied,
* and how much. For details, see [ScalingParams]
*/
+ @Suppress("DEPRECATION")
+ @Deprecated(
+ "This overload is provided for backwards compatibility with Compose for" +
+ " Wear OS 1.1 and was deprecated. Use [defaultScalingParams] instead",
+ replaceWith = ReplaceWith(
+ "PickerDefaults.defaultScalingParams(edgeScale," +
+ " edgeAlpha, minElementHeight, maxElementHeight, minTransitionArea, " +
+ "maxTransitionArea, scaleInterpolator, viewportVerticalOffsetResolver)"
+ ),
+ level = DeprecationLevel.WARNING
+ )
public fun scalingParams(
edgeScale: Float = 0.45f,
edgeAlpha: Float = 1.0f,
@@ -574,16 +631,42 @@
maxTransitionArea: Float = 0.45f,
scaleInterpolator: Easing = CubicBezierEasing(0.25f, 0.00f, 0.75f, 1.00f),
viewportVerticalOffsetResolver: (Constraints) -> Int = { (it.maxHeight / 5f).toInt() }
- ): ScalingParams = DefaultScalingParams(
- edgeScale = edgeScale,
- edgeAlpha = edgeAlpha,
- minElementHeight = minElementHeight,
- maxElementHeight = maxElementHeight,
- minTransitionArea = minTransitionArea,
- maxTransitionArea = maxTransitionArea,
- scaleInterpolator = scaleInterpolator,
- viewportVerticalOffsetResolver = viewportVerticalOffsetResolver
- )
+ ): androidx.wear.compose.material.ScalingParams =
+ androidx.wear.compose.material.ScalingLazyColumnDefaults.scalingParams(
+ edgeScale = edgeScale,
+ edgeAlpha = edgeAlpha,
+ minElementHeight = minElementHeight,
+ maxElementHeight = maxElementHeight,
+ minTransitionArea = minTransitionArea,
+ maxTransitionArea = maxTransitionArea,
+ scaleInterpolator = scaleInterpolator,
+ viewportVerticalOffsetResolver = viewportVerticalOffsetResolver
+ )
+
+ /**
+ * Scaling params are used to determine when items start to be scaled down and alpha applied,
+ * and how much. For details, see [ScalingParams]
+ */
+ public fun defaultScalingParams(
+ edgeScale: Float = 0.45f,
+ edgeAlpha: Float = 1.0f,
+ minElementHeight: Float = 0.0f,
+ maxElementHeight: Float = 0.0f,
+ minTransitionArea: Float = 0.45f,
+ maxTransitionArea: Float = 0.45f,
+ scaleInterpolator: Easing = CubicBezierEasing(0.25f, 0.00f, 0.75f, 1.00f),
+ viewportVerticalOffsetResolver: (Constraints) -> Int = { (it.maxHeight / 5f).toInt() }
+ ): ScalingParams =
+ ScalingLazyColumnDefaults.scalingParams(
+ edgeScale = edgeScale,
+ edgeAlpha = edgeAlpha,
+ minElementHeight = minElementHeight,
+ maxElementHeight = maxElementHeight,
+ minTransitionArea = minTransitionArea,
+ maxTransitionArea = maxTransitionArea,
+ scaleInterpolator = scaleInterpolator,
+ viewportVerticalOffsetResolver = viewportVerticalOffsetResolver
+ )
/**
* Create and remember a [FlingBehavior] that will represent natural fling curve with snap to
@@ -597,14 +680,13 @@
state: PickerState,
decay: DecayAnimationSpec<Float> = exponentialDecay()
): FlingBehavior {
- return remember(state, decay) {
- ScalingLazyColumnSnapFlingBehavior(
- state = state.scalingLazyListState,
- snapOffset = 0,
- decay = decay
- )
- }
+ return ScalingLazyColumnDefaults.snapFlingBehavior(
+ state = state.scalingLazyListState,
+ snapOffset = 0.dp,
+ decay = decay
+ )
}
+
/**
* Default Picker gradient ratio - the proportion of the Picker height allocated to each of the
* of the top and bottom gradients.
@@ -624,6 +706,22 @@
private fun positiveModule(n: Int, mod: Int) = ((n % mod) + mod) % mod
+private fun convertToDefaultFoundationScalingParams(
+ @Suppress("DEPRECATION")
+ scalingParams: androidx.wear.compose.material.ScalingParams
+): ScalingParams = PickerDefaults.defaultScalingParams(
+ edgeScale = scalingParams.edgeScale,
+ edgeAlpha = scalingParams.edgeAlpha,
+ minElementHeight = scalingParams.minElementHeight,
+ maxElementHeight = scalingParams.maxElementHeight,
+ minTransitionArea = scalingParams.minTransitionArea,
+ maxTransitionArea = scalingParams.maxTransitionArea,
+ scaleInterpolator = scalingParams.scaleInterpolator,
+ viewportVerticalOffsetResolver = { viewportConstraints ->
+ scalingParams.resolveViewportVerticalOffset(viewportConstraints)
+ }
+)
+
@Stable
private class PickerScopeImpl(
private val pickerState: PickerState
diff --git a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/PositionIndicator.kt b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/PositionIndicator.kt
index ecd6bde..184e824 100644
--- a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/PositionIndicator.kt
+++ b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/PositionIndicator.kt
@@ -16,6 +16,10 @@
package androidx.wear.compose.material
+import androidx.wear.compose.foundation.lazy.ScalingLazyListState as ScalingLazyListState
+import androidx.wear.compose.foundation.lazy.ScalingLazyColumn as ScalingLazyColumn
+import androidx.wear.compose.foundation.lazy.ScalingLazyListItemInfo as ScalingLazyListItemInfo
+import androidx.wear.compose.foundation.lazy.ScalingLazyListAnchorType as ScalingLazyListAnchorType
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.core.Animatable
import androidx.compose.animation.core.AnimationSpec
@@ -204,6 +208,39 @@
)
/**
+ * Creates an [PositionIndicator] based on the values in a [ScalingLazyListState] object that
+ * a [ScalingLazyColumn] uses.
+ *
+ * For more information, see the
+ * [Scroll indicators](https://developer.android.com/training/wearables/components/scroll)
+ * guide.
+ *
+ * @param scalingLazyListState the [ScalingLazyListState] to use as the basis for the
+ * PositionIndicatorState.
+ * @param modifier The modifier to be applied to the component
+ * @param reverseDirection Reverses direction of PositionIndicator if true
+ */
+@Suppress("DEPRECATION")
+@Deprecated("This overload is provided for backwards compatibility with Compose for Wear OS 1.1." +
+ "A newer overload is available which uses ScalingLazyListState from " +
+ "androidx.wear.compose.foundation.lazy package", level = DeprecationLevel.WARNING)
+@Composable
+public fun PositionIndicator(
+ scalingLazyListState: androidx.wear.compose.material.ScalingLazyListState,
+ modifier: Modifier = Modifier,
+ reverseDirection: Boolean = false
+) = PositionIndicator(
+ state = MaterialScalingLazyColumnStateAdapter(
+ state = scalingLazyListState
+ ),
+ indicatorHeight = 50.dp,
+ indicatorWidth = 4.dp,
+ paddingHorizontal = 5.dp,
+ modifier = modifier,
+ reverseDirection = reverseDirection
+)
+
+/**
* Creates an [PositionIndicator] based on the values in a [LazyListState] object that
* a [LazyColumn] uses.
*
@@ -654,51 +691,13 @@
*/
internal class ScalingLazyColumnStateAdapter(
private val state: ScalingLazyListState
-) : PositionIndicatorState {
- override val positionFraction: Float
- get() {
- return if (state.layoutInfo.visibleItemsInfo.isEmpty()) {
- 0.0f
- } else {
- val decimalFirstItemIndex = decimalFirstItemIndex()
- val decimalLastItemIndex = decimalLastItemIndex()
- val decimalLastItemIndexDistanceFromEnd = state.layoutInfo.totalItemsCount -
- decimalLastItemIndex
+) : BaseScalingLazyColumnStateAdapter() {
- if (decimalFirstItemIndex + decimalLastItemIndexDistanceFromEnd == 0.0f) {
- 0.0f
- } else {
- decimalFirstItemIndex /
- (decimalFirstItemIndex + decimalLastItemIndexDistanceFromEnd)
- }
- }
- }
+ override fun noVisibleItems(): Boolean = state.layoutInfo.visibleItemsInfo.isEmpty()
- override fun sizeFraction(scrollableContainerSizePx: Float) =
- if (state.layoutInfo.totalItemsCount == 0) {
- 1.0f
- } else {
- val decimalFirstItemIndex = decimalFirstItemIndex()
- val decimalLastItemIndex = decimalLastItemIndex()
+ override fun totalItemsCount(): Int = state.layoutInfo.totalItemsCount
- (decimalLastItemIndex - decimalFirstItemIndex) /
- state.layoutInfo.totalItemsCount.toFloat()
- }
-
- override fun visibility(scrollableContainerSizePx: Float): PositionIndicatorVisibility {
- val canScroll = state.layoutInfo.visibleItemsInfo.isNotEmpty() &&
- (decimalFirstItemIndex() > 0 ||
- decimalLastItemIndex() < state.layoutInfo.totalItemsCount)
- return if (canScroll) {
- if (state.isScrollInProgress) {
- PositionIndicatorVisibility.Show
- } else {
- PositionIndicatorVisibility.AutoHide
- }
- } else {
- PositionIndicatorVisibility.Hide
- }
- }
+ override fun isScrollInProgress(): Boolean = state.isScrollInProgress
override fun hashCode(): Int {
return state.hashCode()
@@ -717,7 +716,91 @@
* Note that decimal index calculations ignore spacing between list items both for determining
* the number and the number of visible items.
*/
- private fun decimalLastItemIndex(): Float {
+ override fun decimalLastItemIndex(): Float {
+ if (state.layoutInfo.visibleItemsInfo.isEmpty()) return 0f
+ val lastItem = state.layoutInfo.visibleItemsInfo.last()
+ // This is the offset of the last item w.r.t. the ScalingLazyColumn coordinate system where
+ // 0 in the center of the visible viewport and +/-(state.viewportHeightPx / 2f) are the
+ // start and end of the viewport.
+ //
+ // Note that [ScalingLazyListAnchorType] determines how the list items are anchored to the
+ // center of the viewport, it does not change viewport coordinates. As a result this
+ // calculation needs to take the anchorType into account to calculate the correct end
+ // of list item offset.
+ val lastItemEndOffset = lastItem.startOffset(state.layoutInfo.anchorType) + lastItem.size
+ val viewportEndOffset = state.layoutInfo.viewportSize.height / 2f
+ // Coerce item size to at least 1 to avoid divide by zero for zero height items
+ val lastItemVisibleFraction =
+ (1f - ((lastItemEndOffset - viewportEndOffset) /
+ lastItem.size.coerceAtLeast(1))).coerceAtMost(1f)
+
+ return lastItem.index.toFloat() + lastItemVisibleFraction
+ }
+
+ /**
+ * Provide a float value that represents the index of first visible list item in a scaling lazy
+ * column. The value should be in the range from [n,n+1] for a given index n, where n is the
+ * index of the first visible item and a value of n represents that all of the item is visible
+ * in the viewport and a value of n+1 means that only the very end|bottom of the list item is
+ * visible at the start|top of the viewport.
+ *
+ * Note that decimal index calculations ignore spacing between list items both for determining
+ * the number and the number of visible items.
+ */
+ override fun decimalFirstItemIndex(): Float {
+ if (state.layoutInfo.visibleItemsInfo.isEmpty()) return 0f
+ val firstItem = state.layoutInfo.visibleItemsInfo.first()
+ val firstItemStartOffset = firstItem.startOffset(state.layoutInfo.anchorType)
+ val viewportStartOffset = - (state.layoutInfo.viewportSize.height / 2f)
+ // Coerce item size to at least 1 to avoid divide by zero for zero height items
+ val firstItemInvisibleFraction =
+ ((viewportStartOffset - firstItemStartOffset) /
+ firstItem.size.coerceAtLeast(1)).coerceAtLeast(0f)
+
+ return firstItem.index.toFloat() + firstItemInvisibleFraction
+ }
+}
+
+/**
+ * An implementation of [PositionIndicatorState] to display the amount and position of a
+ * [ScalingLazyColumn] component via its [ScalingLazyListState].
+ *
+ * Note that size and position calculations ignore spacing between list items both for determining
+ * the number and the number of visible items.
+
+ * @param state the [ScalingLazyListState] to adapt.
+ */
+@Deprecated("Use [ScalingLazyColumnStateAdapter] instead")
+internal class MaterialScalingLazyColumnStateAdapter(
+ @Suppress("DEPRECATION")
+ private val state: androidx.wear.compose.material.ScalingLazyListState
+) : BaseScalingLazyColumnStateAdapter() {
+
+ override fun noVisibleItems(): Boolean = state.layoutInfo.visibleItemsInfo.isEmpty()
+
+ override fun totalItemsCount(): Int = state.layoutInfo.totalItemsCount
+
+ override fun isScrollInProgress(): Boolean = state.isScrollInProgress
+
+ override fun hashCode(): Int {
+ return state.hashCode()
+ }
+
+ @Suppress("DEPRECATION")
+ override fun equals(other: Any?): Boolean {
+ return (other as? MaterialScalingLazyColumnStateAdapter)?.state == state
+ }
+
+ /**
+ * Provide a float value that represents the index of the last visible list item in a scaling
+ * lazy column. The value should be in the range from [n,n+1] for a given index n, where n is
+ * the index of the last visible item and a value of n represents that only the very start|top
+ * of the item is visible, and n+1 means that whole of the item is visible in the viewport.
+ *
+ * Note that decimal index calculations ignore spacing between list items both for determining
+ * the number and the number of visible items.
+ */
+ override fun decimalLastItemIndex(): Float {
if (state.layoutInfo.visibleItemsInfo.isEmpty()) return 0f
val lastItem = state.layoutInfo.visibleItemsInfo.last()
// This is the offset of the last item w.r.t. the ScalingLazyColumn coordinate system where
@@ -748,7 +831,7 @@
* Note that decimal index calculations ignore spacing between list items both for determining
* the number and the number of visible items.
*/
- private fun decimalFirstItemIndex(): Float {
+ override fun decimalFirstItemIndex(): Float {
if (state.layoutInfo.visibleItemsInfo.isEmpty()) return 0f
val firstItem = state.layoutInfo.visibleItemsInfo.first()
val firstItemStartOffset = firstItem.startOffset(state.anchorType.value!!)
@@ -762,6 +845,63 @@
}
}
+internal abstract class BaseScalingLazyColumnStateAdapter : PositionIndicatorState {
+ override val positionFraction: Float
+ get() {
+ return if (noVisibleItems()) {
+ 0.0f
+ } else {
+ val decimalFirstItemIndex = decimalFirstItemIndex()
+ val decimalLastItemIndex = decimalLastItemIndex()
+ val decimalLastItemIndexDistanceFromEnd = totalItemsCount() -
+ decimalLastItemIndex
+
+ if (decimalFirstItemIndex + decimalLastItemIndexDistanceFromEnd == 0.0f) {
+ 0.0f
+ } else {
+ decimalFirstItemIndex /
+ (decimalFirstItemIndex + decimalLastItemIndexDistanceFromEnd)
+ }
+ }
+ }
+
+ override fun sizeFraction(scrollableContainerSizePx: Float) =
+ if (totalItemsCount() == 0) {
+ 1.0f
+ } else {
+ val decimalFirstItemIndex = decimalFirstItemIndex()
+ val decimalLastItemIndex = decimalLastItemIndex()
+
+ (decimalLastItemIndex - decimalFirstItemIndex) /
+ totalItemsCount().toFloat()
+ }
+
+ override fun visibility(scrollableContainerSizePx: Float): PositionIndicatorVisibility {
+ val canScroll = !noVisibleItems() &&
+ (decimalFirstItemIndex() > 0 ||
+ decimalLastItemIndex() < totalItemsCount())
+ return if (canScroll) {
+ if (isScrollInProgress()) {
+ PositionIndicatorVisibility.Show
+ } else {
+ PositionIndicatorVisibility.AutoHide
+ }
+ } else {
+ PositionIndicatorVisibility.Hide
+ }
+ }
+
+ abstract fun noVisibleItems(): Boolean
+
+ abstract fun totalItemsCount(): Int
+
+ abstract fun isScrollInProgress(): Boolean
+
+ abstract fun decimalLastItemIndex(): Float
+
+ abstract fun decimalFirstItemIndex(): Float
+}
+
/**
* An implementation of [PositionIndicatorState] to display the amount and position of a
* [LazyColumn] component via its [LazyListState].
@@ -972,4 +1112,14 @@
}
)
-private fun sqr(x: Float) = x * x
\ No newline at end of file
+private fun sqr(x: Float) = x * x
+
+/**
+ * Find the start offset of the list item w.r.t. the
+ */
+internal fun ScalingLazyListItemInfo.startOffset(anchorType: ScalingLazyListAnchorType) =
+ offset - if (anchorType == ScalingLazyListAnchorType.ItemCenter) {
+ (size / 2f)
+ } else {
+ 0f
+ }
diff --git a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyColumn.kt b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyColumn.kt
index b6dc5d4..d9f36e0 100644
--- a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyColumn.kt
+++ b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyColumn.kt
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+@file:Suppress("DEPRECATION")
+
package androidx.wear.compose.material
import androidx.compose.animation.core.CubicBezierEasing
@@ -35,7 +37,6 @@
import androidx.compose.runtime.Composable
import androidx.compose.runtime.Immutable
import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.Stable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
@@ -45,20 +46,22 @@
import androidx.compose.ui.draw.clipToBounds
import androidx.compose.ui.graphics.TransformOrigin
import androidx.compose.ui.graphics.graphicsLayer
-import androidx.compose.ui.layout.layout
import androidx.compose.ui.layout.onGloballyPositioned
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.platform.LocalInspectionMode
import androidx.compose.ui.platform.LocalLayoutDirection
import androidx.compose.ui.unit.Constraints
import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.offset
+import androidx.wear.compose.foundation.lazy.CombinedPaddingValues
+import androidx.wear.compose.foundation.lazy.verticalNegativePadding
/**
* Receiver scope which is used by [ScalingLazyColumn].
*/
+@Deprecated("Was moved to androidx.wear.compose.foundation.lazy package. " +
+ "Please use it instead")
@ScalingLazyScopeMarker
public sealed interface ScalingLazyListScope {
/**
@@ -105,7 +108,9 @@
* will be kept as the first visible one.
* @param itemContent the content displayed by a single item
*/
-inline fun <T> ScalingLazyListScope.items(
+@Deprecated("Was moved to androidx.wear.compose.foundation.lazy package. " +
+ "Please use it instead")
+public inline fun <T> ScalingLazyListScope.items(
items: List<T>,
noinline key: ((item: T) -> Any)? = null,
crossinline itemContent: @Composable ScalingLazyListItemScope.(item: T) -> Unit
@@ -125,6 +130,8 @@
* will be kept as the first visible one.
* @param itemContent the content displayed by a single item
*/
+@Deprecated("Was moved to androidx.wear.compose.foundation.lazy package. " +
+ "Please use it instead")
inline fun <T> ScalingLazyListScope.itemsIndexed(
items: List<T>,
noinline key: ((index: Int, item: T) -> Any)? = null,
@@ -145,6 +152,8 @@
* will be kept as the first visible one.
* @param itemContent the content displayed by a single item
*/
+@Deprecated("Was moved to androidx.wear.compose.foundation.lazy package. " +
+ "Please use it instead")
inline fun <T> ScalingLazyListScope.items(
items: Array<T>,
noinline key: ((item: T) -> Any)? = null,
@@ -165,6 +174,8 @@
* will be kept as the first visible one.
* @param itemContent the content displayed by a single item
*/
+@Deprecated("Was moved to androidx.wear.compose.foundation.lazy package. " +
+ "Please use it instead")
public inline fun <T> ScalingLazyListScope.itemsIndexed(
items: Array<T>,
noinline key: ((index: Int, item: T) -> Any)? = null,
@@ -174,6 +185,8 @@
}
@Immutable
+@Deprecated("Was moved to androidx.wear.compose.foundation.lazy package. " +
+ "Please use it instead")
@kotlin.jvm.JvmInline
public value class ScalingLazyListAnchorType internal constructor(internal val type: Int) {
@@ -242,6 +255,8 @@
* For an example of a [ScalingLazyColumn] with an explicit itemOffset see:
* @sample androidx.wear.compose.material.samples.ScalingLazyColumnEdgeAnchoredAndAnimatedScrollTo
*/
+@Deprecated("Was moved to androidx.wear.compose.foundation.lazy package. " +
+ "Please use it instead")
@Immutable
public class AutoCenteringParams(
// @IntRange(from = 0)
@@ -318,6 +333,8 @@
* null no automatic space will be added and instead the developer can use [contentPadding] to
* manually arrange the items.
*/
+@Deprecated("Was moved to androidx.wear.compose.foundation.lazy package. " +
+ "Please use it instead")
@Composable
public fun ScalingLazyColumn(
modifier: Modifier = Modifier,
@@ -442,6 +459,8 @@
/**
* Contains the default values used by [ScalingLazyColumn]
*/
+@Deprecated("Was moved to androidx.wear.compose.foundation.lazy package. " +
+ "Please use it instead")
public object ScalingLazyColumnDefaults {
/**
* Creates a [ScalingParams] that represents the scaling and alpha properties for a
@@ -670,64 +689,3 @@
itemScope.content()
}
}
-
-@Immutable
-private class CombinedPaddingValues(
- @Stable
- val contentPadding: PaddingValues,
- @Stable
- val extraPadding: Dp
-) : PaddingValues {
- override fun calculateLeftPadding(layoutDirection: LayoutDirection): Dp =
- contentPadding.calculateLeftPadding(layoutDirection)
-
- override fun calculateTopPadding(): Dp =
- contentPadding.calculateTopPadding() + extraPadding
-
- override fun calculateRightPadding(layoutDirection: LayoutDirection): Dp =
- contentPadding.calculateRightPadding(layoutDirection)
-
- override fun calculateBottomPadding(): Dp =
- contentPadding.calculateBottomPadding() + extraPadding
- override fun equals(other: Any?): Boolean {
- if (this === other) return true
- if (other == null) return false
- if (this::class != other::class) return false
-
- other as CombinedPaddingValues
-
- if (contentPadding != other.contentPadding) return false
- if (extraPadding != other.extraPadding) return false
-
- return true
- }
-
- override fun hashCode(): Int {
- var result = contentPadding.hashCode()
- result = 31 * result + extraPadding.hashCode()
- return result
- }
-
- override fun toString(): String {
- return "CombinedPaddingValuesImpl(contentPadding=$contentPadding, " +
- "extraPadding=$extraPadding)"
- }
-}
-
-private fun Modifier.verticalNegativePadding(
- extraPadding: Dp,
-) = layout { measurable, constraints ->
- require(constraints.hasBoundedWidth)
- require(constraints.hasBoundedHeight)
- val topAndBottomPadding = (extraPadding * 2).roundToPx()
- val placeable = measurable.measure(
- constraints.copy(
- minHeight = constraints.minHeight + topAndBottomPadding,
- maxHeight = constraints.maxHeight + topAndBottomPadding
- )
- )
-
- layout(placeable.measuredWidth, constraints.maxHeight) {
- placeable.place(0, -extraPadding.roundToPx())
- }
-}
diff --git a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyColumnMeasure.kt b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyColumnMeasure.kt
index 097b26c..382be50 100644
--- a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyColumnMeasure.kt
+++ b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyColumnMeasure.kt
@@ -14,16 +14,19 @@
* limitations under the License.
*/
+@file:Suppress("DEPRECATION")
+
package androidx.wear.compose.material
import androidx.compose.animation.core.Easing
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.lazy.LazyListItemInfo
-import androidx.compose.runtime.Immutable
import androidx.compose.runtime.Stable
import androidx.compose.ui.unit.Constraints
import androidx.compose.ui.unit.IntSize
import androidx.compose.ui.util.lerp
+import androidx.wear.compose.foundation.lazy.ScaleAndAlpha
+import androidx.wear.compose.foundation.lazy.inverseLerp
import kotlin.math.min
import kotlin.math.roundToInt
@@ -93,6 +96,8 @@
* point for each item.
*/
@Stable
+@Deprecated("Was moved to androidx.wear.compose.foundation.lazy package. " +
+ "Please use it instead")
public interface ScalingParams {
/**
* What fraction of the full size of the item to scale it by when most
@@ -443,17 +448,6 @@
}
}
-@Immutable
-internal data class ScaleAndAlpha(
- val scale: Float,
- val alpha: Float
-
-) {
- companion object {
- internal val noScaling = ScaleAndAlpha(1.0f, 1.0f)
- }
-}
-
/**
* Calculate the offset from the viewport center line of the Start|Center of an items unadjusted
* or scaled size. The for items with an height that is an odd number and that have
@@ -501,11 +495,3 @@
} else {
0f
}
-
-/**
- * Inverse linearly interpolate, return what fraction (0f..1f) that [value] is between [start] and
- * [stop]. Returns 0f if value =< start and 1f if value >= stop.
- */
-internal fun inverseLerp(start: Float, stop: Float, value: Float): Float {
- return ((value - start) / (stop - start)).coerceIn(0f, 1f)
-}
\ No newline at end of file
diff --git a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyColumnSnapFlingBehavior.kt b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyColumnSnapFlingBehavior.kt
index a1fdfa3..145804d 100644
--- a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyColumnSnapFlingBehavior.kt
+++ b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyColumnSnapFlingBehavior.kt
@@ -31,6 +31,7 @@
import kotlin.math.roundToInt
import kotlin.math.sqrt
+@Suppress("DEPRECATION")
internal class ScalingLazyColumnSnapFlingBehavior(
val state: ScalingLazyListState,
val snapOffset: Int = 0,
diff --git a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyListItemInfo.kt b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyListItemInfo.kt
index 39ab142..def6417 100644
--- a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyListItemInfo.kt
+++ b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyListItemInfo.kt
@@ -20,6 +20,8 @@
*
* @see ScalingLazyListLayoutInfo
*/
+@Deprecated("Was moved to androidx.wear.compose.foundation.lazy package. " +
+ "Please use it instead")
public sealed interface ScalingLazyListItemInfo {
/**
* The index of the item in the list.
diff --git a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyListItemScope.kt b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyListItemScope.kt
index bb00507..d346a0b 100644
--- a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyListItemScope.kt
+++ b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyListItemScope.kt
@@ -13,6 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+@file:Suppress("DEPRECATION")
+
package androidx.wear.compose.material
import androidx.compose.foundation.layout.height
@@ -28,6 +30,8 @@
* Receiver scope being used by the item content parameter of ScalingLazyColumn.
*/
@Stable
+@Deprecated("Was moved to androidx.wear.compose.foundation.lazy package. " +
+ "Please use it instead")
@ScalingLazyScopeMarker
public sealed interface ScalingLazyListItemScope {
/**
diff --git a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyListLayoutInfo.kt b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyListLayoutInfo.kt
index 498ca2b..04e1adf 100644
--- a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyListLayoutInfo.kt
+++ b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyListLayoutInfo.kt
@@ -24,10 +24,13 @@
*
* Use [ScalingLazyListState.layoutInfo] to retrieve this
*/
+@Deprecated("Was moved to androidx.wear.compose.foundation.lazy package. " +
+ "Please use it instead")
public sealed interface ScalingLazyListLayoutInfo {
/**
* The list of [ScalingLazyListItemInfo] representing all the currently visible items.
*/
+ @Suppress("DEPRECATION")
val visibleItemsInfo: List<ScalingLazyListItemInfo>
/**
diff --git a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyListState.kt b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyListState.kt
index e7e86c7..ea0ba02 100644
--- a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyListState.kt
+++ b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyListState.kt
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+@file:Suppress("DEPRECATION")
+
package androidx.wear.compose.material
import androidx.compose.foundation.MutatePriority
@@ -44,6 +46,8 @@
* @param initialCenterItemScrollOffset the initial value for
* [ScalingLazyListState.centerItemScrollOffset] in pixels
*/
+@Deprecated("Was moved to androidx.wear.compose.foundation.lazy package. " +
+ "Please use it instead")
@Composable
public fun rememberScalingLazyListState(
initialCenterItemIndex: Int = 1,
@@ -79,6 +83,8 @@
* [ScalingLazyColumn]. After the [ScalingLazyColumn] is initially drawn the actual values for the
* [centerItemIndex] and [centerItemScrollOffset] can be read from the state.
*/
+@Deprecated("Was moved to androidx.wear.compose.foundation.lazy package. " +
+ "Please use it instead")
@Stable
class ScalingLazyListState constructor(
private var initialCenterItemIndex: Int = 1,
diff --git a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyScopeMarker.kt b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyScopeMarker.kt
index aedeab3..aaa2487 100644
--- a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyScopeMarker.kt
+++ b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyScopeMarker.kt
@@ -19,5 +19,7 @@
/**
* DSL marker used to distinguish between lazy layout scope and the item scope.
*/
+@Deprecated("Was moved to androidx.wear.compose.foundation.lazy package. " +
+ "Please use it instead")
@DslMarker
annotation class ScalingLazyScopeMarker
diff --git a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScrollAway.kt b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScrollAway.kt
index e8e1938..b725fb2 100644
--- a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScrollAway.kt
+++ b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/ScrollAway.kt
@@ -31,6 +31,8 @@
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.compose.ui.util.lerp
+import androidx.wear.compose.foundation.lazy.ScalingLazyListState
+import androidx.wear.compose.foundation.lazy.ScalingLazyColumn
/**
* Scroll an item vertically in/out of view based on a [ScrollState].
@@ -99,6 +101,36 @@
)
}
+/**
+ * Scroll an item vertically in/out of view based on a [ScalingLazyListState].
+ * Typically used to scroll a [TimeText] item out of view as the user starts to scroll
+ * a [ScalingLazyColumn] of items upwards and bring additional items into view.
+ *
+ * @param scrollState The [ScalingLazyListState] to used as the basis for the scroll-away.
+ * @param itemIndex The item for which the scroll offset will trigger scrolling away.
+ * @param offset Adjustment to the starting point for scrolling away. Positive values result in
+ * the scroll away starting later, negative values start scrolling away earlier.
+ */
+@Deprecated(
+ "This overload is provided for backwards compatibility with Compose for Wear OS 1.1." +
+ "A newer overload is available which uses ScalingLazyListState " +
+ "from wear.compose.foundation.lazy package", level = DeprecationLevel.WARNING
+)
+public fun Modifier.scrollAway(
+ @Suppress("DEPRECATION")
+ scrollState: androidx.wear.compose.material.ScalingLazyListState,
+ itemIndex: Int = 1,
+ offset: Dp = 0.dp,
+): Modifier =
+ scrollAway {
+ ScrollParams(
+ valid = itemIndex < scrollState.layoutInfo.totalItemsCount,
+ yPx = scrollState.layoutInfo.visibleItemsInfo.find { it.index == itemIndex }?.let {
+ -it.offset - offset.toPx()
+ }
+ )
+ }
+
private fun Modifier.scrollAway(scrollFn: Density.() -> ScrollParams): Modifier =
this.then(
@Suppress("ModifierInspectorInfo")
diff --git a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/Vignette.kt b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/Vignette.kt
index f33c89e..245a5d0 100644
--- a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/Vignette.kt
+++ b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/Vignette.kt
@@ -23,6 +23,7 @@
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.layout.ContentScale
+import androidx.wear.compose.foundation.lazy.ScalingLazyColumn
/**
* Possible combinations for vignette state.
@@ -103,7 +104,9 @@
),
contentScale = ContentScale.FillWidth,
contentDescription = null,
- modifier = Modifier.align(Alignment.TopCenter).fillMaxWidth(),
+ modifier = Modifier
+ .align(Alignment.TopCenter)
+ .fillMaxWidth(),
)
}
if (vignettePosition.drawBottom()) {
@@ -114,7 +117,9 @@
),
contentScale = ContentScale.FillWidth,
contentDescription = null,
- modifier = Modifier.align(Alignment.BottomCenter).fillMaxWidth(),
+ modifier = Modifier
+ .align(Alignment.BottomCenter)
+ .fillMaxWidth(),
)
}
}
diff --git a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/dialog/Dialog.kt b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/dialog/Dialog.kt
index fac57f8..4f35115 100644
--- a/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/dialog/Dialog.kt
+++ b/wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/dialog/Dialog.kt
@@ -20,38 +20,38 @@
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.width
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.getValue
import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
import androidx.compose.runtime.rememberUpdatedState
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
+import androidx.wear.compose.foundation.lazy.ScalingLazyColumn
+import androidx.wear.compose.foundation.lazy.ScalingLazyListScope
+import androidx.wear.compose.foundation.lazy.ScalingLazyListState
+import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState
import androidx.wear.compose.material.Button
import androidx.wear.compose.material.Chip
-import androidx.wear.compose.material.ToggleChip
-import androidx.wear.compose.material.contentColorFor
import androidx.wear.compose.material.Icon
-import androidx.wear.compose.material.isRoundDevice
import androidx.wear.compose.material.LocalContentColor
import androidx.wear.compose.material.LocalTextStyle
import androidx.wear.compose.material.MaterialTheme
import androidx.wear.compose.material.PositionIndicator
import androidx.wear.compose.material.Scaffold
-import androidx.wear.compose.material.ScalingLazyColumn
-import androidx.wear.compose.material.ScalingLazyListScope
-import androidx.wear.compose.material.ScalingLazyListState
-import androidx.wear.compose.material.rememberScalingLazyListState
+import androidx.wear.compose.material.ToggleChip
+import androidx.wear.compose.material.contentColorFor
+import androidx.wear.compose.material.isRoundDevice
import kotlinx.coroutines.delay
/**
@@ -142,6 +142,138 @@
/**
* [Alert] lays out the content for an opinionated, alert screen.
+ * This overload offers 5 slots for title, negative button, positive button, optional icon and
+ * optional content. The buttons are shown side-by-side below the icon, text and content.
+ * [Alert] is scrollable by default if the content is taller than the viewport.
+ *
+ * [Alert] can be used as a destination in a navigation graph
+ * e.g. using SwipeDismissableNavHost. However, for a conventional fullscreen dialog,
+ * displayed on top of other content, use [Dialog].
+ *
+ * Example of an [Alert] with an icon, title, body text and buttons:
+ * @sample androidx.wear.compose.material.samples.AlertWithButtons
+ *
+ * @param title A slot for displaying the title of the dialog,
+ * expected to be one or two lines of text.
+ * @param negativeButton A slot for a [Button] indicating negative sentiment (e.g. No).
+ * Clicking the button must remove the dialog from the composition hierarchy.
+ * @param positiveButton A slot for a [Button] indicating positive sentiment (e.g. Yes).
+ * Clicking the button must remove the dialog from the composition hierarchy.
+ * @param modifier Modifier to be applied to the dialog content.
+ * @param icon Optional slot for an icon to be shown at the top of the dialog.
+ * @param scrollState The scroll state for the dialog so that the scroll position can be displayed
+ * e.g. by the [PositionIndicator] passed to [Scaffold].
+ * @param backgroundColor [Color] representing the background color for the dialog.
+ * @param contentColor [Color] representing the color for [content].
+ * @param titleColor [Color] representing the color for [title].
+ * @param iconColor Icon [Color] that defaults to [contentColor],
+ * unless specifically overridden.
+ * @param verticalArrangement The vertical arrangement of the dialog's children. This allows us
+ * to add spacing between items and specify the arrangement of the items when we have not enough
+ * of them to fill the whole minimum size.
+ * @param contentPadding The padding to apply around the whole of the dialog's contents.
+ * @param content A slot for additional content, expected to be 2-3 lines of text.
+ */
+@Suppress("DEPRECATION")
+@Deprecated(
+ "This overload is provided for backwards compatibility with Compose for Wear OS 1.1." +
+ "A newer overload is available which uses ScalingLazyListState from " +
+ "wear.compose.foundation.lazy package", level = DeprecationLevel.HIDDEN
+)
+@Composable
+public fun Alert(
+ title: @Composable ColumnScope.() -> Unit,
+ negativeButton: @Composable () -> Unit,
+ positiveButton: @Composable () -> Unit,
+ modifier: Modifier = Modifier,
+ icon: @Composable (ColumnScope.() -> Unit)? = null,
+ scrollState: androidx.wear.compose.material.ScalingLazyListState =
+ androidx.wear.compose.material.rememberScalingLazyListState(),
+ backgroundColor: Color = MaterialTheme.colors.background,
+ contentColor: Color = contentColorFor(backgroundColor),
+ titleColor: Color = contentColor,
+ iconColor: Color = contentColor,
+ verticalArrangement: Arrangement.Vertical = DialogDefaults.AlertVerticalArrangement,
+ contentPadding: PaddingValues = DialogDefaults.ContentPadding,
+ content: @Composable (ColumnScope.() -> Unit)? = null
+) {
+ AlertWithMaterialSlc(
+ title = title,
+ negativeButton = negativeButton,
+ positiveButton = positiveButton,
+ modifier = modifier,
+ icon = icon,
+ scrollState = scrollState,
+ backgroundColor = backgroundColor,
+ contentColor = contentColor,
+ titleColor = titleColor,
+ iconColor = iconColor,
+ verticalArrangement = verticalArrangement,
+ contentPadding = contentPadding,
+ content = content
+ )
+}
+
+/**
+ * @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+ */
+@Suppress("DEPRECATION")
+@Deprecated("Used only for testing")
+@Composable
+internal fun AlertWithMaterialSlc(
+ title: @Composable ColumnScope.() -> Unit,
+ negativeButton: @Composable () -> Unit,
+ positiveButton: @Composable () -> Unit,
+ modifier: Modifier = Modifier,
+ icon: @Composable (ColumnScope.() -> Unit)? = null,
+ scrollState: androidx.wear.compose.material.ScalingLazyListState =
+ androidx.wear.compose.material.rememberScalingLazyListState(),
+ backgroundColor: Color = MaterialTheme.colors.background,
+ contentColor: Color = contentColorFor(backgroundColor),
+ titleColor: Color = contentColor,
+ iconColor: Color = contentColor,
+ verticalArrangement: Arrangement.Vertical = DialogDefaults.AlertVerticalArrangement,
+ contentPadding: PaddingValues = DialogDefaults.ContentPadding,
+ content: @Composable (ColumnScope.() -> Unit)? = null
+) {
+ MaterialDialogImpl(
+ modifier = modifier,
+ scrollState = scrollState,
+ verticalArrangement = verticalArrangement,
+ contentPadding = contentPadding,
+ backgroundColor = backgroundColor,
+ ) {
+ if (icon != null) {
+ item {
+ DialogIconHeader(iconColor, content = icon)
+ }
+ }
+
+ item {
+ DialogTitle(titleColor, padding = DialogDefaults.TitlePadding, title)
+ }
+
+ if (content != null) {
+ item {
+ DialogBody(contentColor, content)
+ }
+ }
+
+ // Buttons
+ item {
+ Row(
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ negativeButton()
+ Spacer(modifier = Modifier.width(DialogDefaults.ButtonSpacing))
+ positiveButton()
+ }
+ }
+ }
+}
+
+/**
+ * [Alert] lays out the content for an opinionated, alert screen.
* This overload offers 4 slots for title, optional icon, optional message text and
* a content slot expected to be one or more vertically stacked [Chip]s or [ToggleChip]s.
* [Alert] is scrollable by default if the content is taller than the viewport.
@@ -213,6 +345,122 @@
}
/**
+ * [Alert] lays out the content for an opinionated, alert screen.
+ * This overload offers 4 slots for title, optional icon, optional message text and
+ * a content slot expected to be one or more vertically stacked [Chip]s or [ToggleChip]s.
+ * [Alert] is scrollable by default if the content is taller than the viewport.
+ *
+ * [Alert] can be used as a destination in a navigation graph
+ * e.g. using SwipeDismissableNavHost. However, for a conventional fullscreen dialog,
+ * displayed on top of other content, use [Dialog].
+ *
+ * Example of an [Alert] with an icon, title, message text and chips:
+ * @sample androidx.wear.compose.material.samples.AlertWithChips
+ *
+ * @param title A slot for displaying the title of the dialog,
+ * expected to be one or two lines of text.
+ * @param modifier Modifier to be applied to the dialog.
+ * @param icon Optional slot for an icon to be shown at the top of the dialog.
+ * @param message Optional slot for additional message content, expected to be 2-3 lines of text.
+ * @param scrollState The scroll state for the dialog so that the scroll position can be displayed
+ * e.g. by the [PositionIndicator] passed to [Scaffold].
+ * @param backgroundColor [Color] representing the background color for the dialog.
+ * @param titleColor [Color] representing the color for [title].
+ * @param messageColor [Color] representing the color for [message].
+ * @param iconColor [Color] representing the color for [icon].
+ * @param verticalArrangement The vertical arrangement of the dialog's children. This allows us
+ * to add spacing between items and specify the arrangement of the items when we have not enough
+ * of them to fill the whole minimum size.
+ * @param contentPadding The padding to apply around the whole of the dialog's contents.
+ * @param content A slot for one or more spaced [Chip]s, stacked vertically.
+ */
+@Suppress("DEPRECATION")
+@Deprecated(
+ "This overload is provided for backwards compatibility with Compose for Wear OS 1.1." +
+ "A newer overload is available which uses ScalingLazyListState and ScalingLazyListScope " +
+ "from wear.compose.foundation.lazy package", level = DeprecationLevel.HIDDEN
+)
+@Composable
+public fun Alert(
+ title: @Composable ColumnScope.() -> Unit,
+ modifier: Modifier = Modifier,
+ icon: @Composable (ColumnScope.() -> Unit)? = null,
+ message: @Composable (ColumnScope.() -> Unit)? = null,
+ scrollState: androidx.wear.compose.material.ScalingLazyListState =
+ androidx.wear.compose.material.rememberScalingLazyListState(),
+ backgroundColor: Color = MaterialTheme.colors.background,
+ titleColor: Color = contentColorFor(backgroundColor),
+ messageColor: Color = contentColorFor(backgroundColor),
+ iconColor: Color = contentColorFor(backgroundColor),
+ verticalArrangement: Arrangement.Vertical = DialogDefaults.AlertVerticalArrangement,
+ contentPadding: PaddingValues = DialogDefaults.ContentPadding,
+ content: androidx.wear.compose.material.ScalingLazyListScope.() -> Unit
+) {
+ AlertWithMaterialSlc(
+ title = title,
+ modifier = modifier,
+ icon = icon,
+ message = message,
+ scrollState = scrollState,
+ backgroundColor = backgroundColor,
+ titleColor = titleColor,
+ messageColor = messageColor,
+ iconColor = iconColor,
+ verticalArrangement = verticalArrangement,
+ contentPadding = contentPadding,
+ content = content
+ )
+}
+
+/**
+ * @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+ */
+@Suppress("DEPRECATION")
+@Deprecated("Used only for testing")
+@Composable
+internal fun AlertWithMaterialSlc(
+ title: @Composable ColumnScope.() -> Unit,
+ modifier: Modifier = Modifier,
+ icon: @Composable (ColumnScope.() -> Unit)? = null,
+ message: @Composable (ColumnScope.() -> Unit)? = null,
+ scrollState: androidx.wear.compose.material.ScalingLazyListState =
+ androidx.wear.compose.material.rememberScalingLazyListState(),
+ backgroundColor: Color = MaterialTheme.colors.background,
+ titleColor: Color = contentColorFor(backgroundColor),
+ messageColor: Color = contentColorFor(backgroundColor),
+ iconColor: Color = contentColorFor(backgroundColor),
+ verticalArrangement: Arrangement.Vertical = DialogDefaults.AlertVerticalArrangement,
+ contentPadding: PaddingValues = DialogDefaults.ContentPadding,
+ content: androidx.wear.compose.material.ScalingLazyListScope.() -> Unit
+) {
+ MaterialDialogImpl(
+ modifier = modifier,
+ scrollState = scrollState,
+ verticalArrangement = verticalArrangement,
+ contentPadding = contentPadding,
+ backgroundColor = backgroundColor,
+ ) {
+ if (icon != null) {
+ item {
+ DialogIconHeader(iconColor, content = icon)
+ }
+ }
+
+ item {
+ DialogTitle(titleColor, padding = DialogDefaults.TitlePadding, content = title)
+ }
+
+ if (message != null) {
+ item {
+ DialogBody(messageColor, message)
+ }
+ }
+
+ content()
+ }
+}
+
+/**
* [Confirmation] lays out the content for an opinionated confirmation screen that
* displays a message to the user for [durationMillis]. It has a slot for an icon or image
* (which could be animated).
@@ -289,6 +537,124 @@
}
/**
+ * [Confirmation] lays out the content for an opinionated confirmation screen that
+ * displays a message to the user for [durationMillis]. It has a slot for an icon or image
+ * (which could be animated).
+ *
+ * [Confirmation] can be used as a destination in a navigation graph
+ * e.g. using SwipeDismissableNavHost. However, for a conventional fullscreen dialog,
+ * displayed on top of other content, use [Dialog].
+ *
+ * Example of a [Confirmation] with animation:
+ * @sample androidx.wear.compose.material.samples.ConfirmationWithAnimation
+ *
+ * @param onTimeout Event invoked when the dialog has been shown for [durationMillis].
+ * @param modifier Modifier to be applied to the dialog.
+ * @param icon An optional slot for displaying an icon or image.
+ * @param scrollState The scroll state for the dialog so that the scroll position can be displayed
+ * e.g. by the [PositionIndicator] passed to [Scaffold].
+ * @param durationMillis The number of milliseconds for which the dialog is displayed,
+ * must be positive. Suggested values are [DialogDefaults.ShortDurationMillis],
+ * [DialogDefaults.LongDurationMillis] or [DialogDefaults.IndefiniteDurationMillis].
+ * @param backgroundColor [Color] representing the background color for this dialog.
+ * @param contentColor [Color] representing the color for [content].
+ * @param iconColor Icon [Color] that defaults to the [contentColor],
+ * unless specifically overridden.
+ * @param verticalArrangement The vertical arrangement of the dialog's children. This allows us
+ * to add spacing between items and specify the arrangement of the items when we have not enough
+ * of them to fill the whole minimum size.
+ * @param contentPadding The padding to apply around the whole of the dialog's contents.
+ * @param content A slot for the dialog title, expected to be one line of text.
+ */
+@Suppress("DEPRECATION")
+@Deprecated(
+ "This overload is provided for backwards compatibility with Compose for Wear OS 1.1." +
+ "A newer overload is available which uses ScalingLazyListState from " +
+ "wear.compose.foundation.lazy package", level = DeprecationLevel.HIDDEN
+)
+@Composable
+public fun Confirmation(
+ onTimeout: () -> Unit,
+ modifier: Modifier = Modifier,
+ icon: @Composable (ColumnScope.() -> Unit)? = null,
+ scrollState: androidx.wear.compose.material.ScalingLazyListState =
+ androidx.wear.compose.material.rememberScalingLazyListState(),
+ durationMillis: Long = DialogDefaults.ShortDurationMillis,
+ backgroundColor: Color = MaterialTheme.colors.background,
+ contentColor: Color = contentColorFor(backgroundColor),
+ iconColor: Color = contentColor,
+ verticalArrangement: Arrangement.Vertical = DialogDefaults.ConfirmationVerticalArrangement,
+ contentPadding: PaddingValues = DialogDefaults.ContentPadding,
+ content: @Composable ColumnScope.() -> Unit
+) {
+ ConfirmationWithMaterialSlc(
+ >
+ modifier = modifier,
+ icon = icon,
+ scrollState = scrollState,
+ durationMillis = durationMillis,
+ backgroundColor = backgroundColor,
+ contentColor = contentColor,
+ iconColor = iconColor,
+ verticalArrangement = verticalArrangement,
+ contentPadding = contentPadding,
+ content = content
+ )
+}
+
+/**
+ * @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+ */
+@Suppress("DEPRECATION")
+@Deprecated("Used only for testing")
+@Composable
+internal fun ConfirmationWithMaterialSlc(
+ onTimeout: () -> Unit,
+ modifier: Modifier = Modifier,
+ icon: @Composable (ColumnScope.() -> Unit)? = null,
+ scrollState: androidx.wear.compose.material.ScalingLazyListState =
+ androidx.wear.compose.material.rememberScalingLazyListState(),
+ durationMillis: Long = DialogDefaults.ShortDurationMillis,
+ backgroundColor: Color = MaterialTheme.colors.background,
+ contentColor: Color = contentColorFor(backgroundColor),
+ iconColor: Color = contentColor,
+ verticalArrangement: Arrangement.Vertical = DialogDefaults.ConfirmationVerticalArrangement,
+ contentPadding: PaddingValues = DialogDefaults.ContentPadding,
+ content: @Composable ColumnScope.() -> Unit
+) {
+ require(durationMillis > 0) { "Duration must be a positive integer" }
+
+ // Always refer to the latest inputs with which ConfirmationDialog was recomposed.
+ val currentOnTimeout by rememberUpdatedState(onTimeout)
+
+ LaunchedEffect(durationMillis) {
+ delay(durationMillis)
+ currentOnTimeout()
+ }
+ MaterialDialogImpl(
+ modifier = modifier,
+ scrollState = scrollState,
+ verticalArrangement = verticalArrangement,
+ contentPadding = contentPadding,
+ backgroundColor = backgroundColor,
+ ) {
+ if (icon != null) {
+ item {
+ DialogIconHeader(iconColor, content = icon)
+ }
+ }
+
+ item {
+ DialogTitle(
+ titleColor = contentColor,
+ padding = DialogDefaults.TitleBottomPadding,
+ content = content
+ )
+ }
+ }
+}
+
+/**
* Contains the default values used by [Alert] and [Confirmation].
*/
public object DialogDefaults {
@@ -394,6 +760,37 @@
}
/**
+ * Common Wear Material dialog implementation that offers a single content slot,
+ * fills the screen and is scrollable by default if the content is taller than the viewport.
+ */
+@Suppress("DEPRECATION")
+@Deprecated(
+ "Use [DialogImpl] targeting " +
+ "androidx.wear.compose.foundation.lazy ScalingLazyColumn instead"
+)
+@Composable
+private fun MaterialDialogImpl(
+ modifier: Modifier = Modifier,
+ scrollState: androidx.wear.compose.material.ScalingLazyListState,
+ verticalArrangement: Arrangement.Vertical,
+ backgroundColor: Color,
+ contentPadding: PaddingValues,
+ content: androidx.wear.compose.material.ScalingLazyListScope.() -> Unit
+) {
+ androidx.wear.compose.material.ScalingLazyColumn(
+ state = scrollState,
+ autoCentering = null,
+ horizontalAlignment = Alignment.CenterHorizontally,
+ verticalArrangement = verticalArrangement,
+ contentPadding = contentPadding,
+ modifier = modifier
+ .fillMaxSize()
+ .background(backgroundColor),
+ content = content
+ )
+}
+
+/**
* [DialogIconHeader] displays an icon at the top of the dialog
* followed by the recommended spacing.
*
@@ -411,7 +808,11 @@
horizontalAlignment = Alignment.CenterHorizontally
) {
content()
- Spacer(Modifier.fillMaxWidth().height(DialogDefaults.IconSpacing))
+ Spacer(
+ Modifier
+ .fillMaxWidth()
+ .height(DialogDefaults.IconSpacing)
+ )
}
}
}
diff --git a/wear/compose/compose-navigation/samples/src/main/java/androidx/wear/compose/navigation/samples/SwipeDismissableNavHostSample.kt b/wear/compose/compose-navigation/samples/src/main/java/androidx/wear/compose/navigation/samples/SwipeDismissableNavHostSample.kt
index 32fae6d..5e7b3f48 100644
--- a/wear/compose/compose-navigation/samples/src/main/java/androidx/wear/compose/navigation/samples/SwipeDismissableNavHostSample.kt
+++ b/wear/compose/compose-navigation/samples/src/main/java/androidx/wear/compose/navigation/samples/SwipeDismissableNavHostSample.kt
@@ -29,10 +29,10 @@
import androidx.compose.ui.unit.dp
import androidx.navigation.NavType
import androidx.navigation.navArgument
+import androidx.wear.compose.foundation.lazy.ScalingLazyColumn
import androidx.wear.compose.material.Button
import androidx.wear.compose.material.CompactChip
import androidx.wear.compose.material.ListHeader
-import androidx.wear.compose.material.ScalingLazyColumn
import androidx.wear.compose.material.Text
import androidx.wear.compose.navigation.SwipeDismissableNavHost
import androidx.wear.compose.navigation.composable
diff --git a/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/ButtonDemo.kt b/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/ButtonDemo.kt
index 891a178..98fb88f 100644
--- a/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/ButtonDemo.kt
+++ b/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/ButtonDemo.kt
@@ -35,6 +35,7 @@
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.unit.dp
+import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState
import androidx.wear.compose.material.Button
import androidx.wear.compose.material.ButtonDefaults
import androidx.wear.compose.material.CompactButton
@@ -44,7 +45,6 @@
import androidx.wear.compose.material.OutlinedCompactButton
import androidx.wear.compose.material.Text
import androidx.wear.compose.material.ToggleButton
-import androidx.wear.compose.material.rememberScalingLazyListState
@Composable
fun ButtonSizes() {
diff --git a/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/ChipDemo.kt b/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/ChipDemo.kt
index 0276717..8835d23 100644
--- a/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/ChipDemo.kt
+++ b/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/ChipDemo.kt
@@ -48,6 +48,7 @@
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.unit.dp
+import androidx.wear.compose.foundation.lazy.ScalingLazyColumn
import androidx.wear.compose.material.Chip
import androidx.wear.compose.material.ChipColors
import androidx.wear.compose.material.ChipDefaults
@@ -58,7 +59,6 @@
import androidx.wear.compose.material.MaterialTheme
import androidx.wear.compose.material.OutlinedChip
import androidx.wear.compose.material.OutlinedCompactChip
-import androidx.wear.compose.material.ScalingLazyColumn
import androidx.wear.compose.material.Text
import androidx.wear.compose.material.ToggleButton
import androidx.wear.compose.material.ToggleChip
diff --git a/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/DemoApp.kt b/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/DemoApp.kt
index 03a2344..c6be1c3 100644
--- a/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/DemoApp.kt
+++ b/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/DemoApp.kt
@@ -43,23 +43,23 @@
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
-import androidx.wear.compose.material.AutoCenteringParams
+import androidx.wear.compose.foundation.lazy.AutoCenteringParams
+import androidx.wear.compose.foundation.lazy.ScalingLazyColumn
+import androidx.wear.compose.foundation.lazy.ScalingLazyColumnDefaults
+import androidx.wear.compose.foundation.lazy.ScalingLazyListScope
+import androidx.wear.compose.foundation.lazy.ScalingLazyListState
+import androidx.wear.compose.foundation.lazy.ScalingParams
+import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState
import androidx.wear.compose.material.Chip
import androidx.wear.compose.material.ChipDefaults
import androidx.wear.compose.material.ListHeader
import androidx.wear.compose.material.LocalTextStyle
import androidx.wear.compose.material.MaterialTheme
-import androidx.wear.compose.material.ScalingLazyColumn
-import androidx.wear.compose.material.ScalingLazyColumnDefaults
-import androidx.wear.compose.material.ScalingLazyListScope
-import androidx.wear.compose.material.ScalingLazyListState
-import androidx.wear.compose.material.ScalingParams
import androidx.wear.compose.material.SwipeToDismissBox
import androidx.wear.compose.material.SwipeToDismissBoxState
import androidx.wear.compose.material.SwipeToDismissKeys
import androidx.wear.compose.material.SwipeToDismissValue
import androidx.wear.compose.material.Text
-import androidx.wear.compose.material.rememberScalingLazyListState
import androidx.wear.compose.material.rememberSwipeToDismissBoxState
import kotlinx.coroutines.channels.BufferOverflow
import kotlinx.coroutines.channels.Channel
diff --git a/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/DialogDemo.kt b/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/DialogDemo.kt
index d878605..fd110fe 100644
--- a/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/DialogDemo.kt
+++ b/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/DialogDemo.kt
@@ -35,6 +35,7 @@
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
+import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState
import androidx.wear.compose.material.Button
import androidx.wear.compose.material.ButtonDefaults
import androidx.wear.compose.material.Chip
@@ -44,7 +45,6 @@
import androidx.wear.compose.material.dialog.Alert
import androidx.wear.compose.material.dialog.Confirmation
import androidx.wear.compose.material.dialog.Dialog
-import androidx.wear.compose.material.rememberScalingLazyListState
@Composable
fun DialogPowerOff() {
diff --git a/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/FoundationDemos.kt b/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/FoundationDemos.kt
index ae0f7a3..1c592b2 100644
--- a/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/FoundationDemos.kt
+++ b/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/FoundationDemos.kt
@@ -26,7 +26,11 @@
import androidx.wear.compose.foundation.samples.CurvedWeight
import androidx.wear.compose.foundation.samples.HierarchicalFocusCoordinatorSample
import androidx.wear.compose.foundation.samples.OversizeComposable
+import androidx.wear.compose.foundation.samples.ScalingLazyColumnEdgeAnchoredAndAnimatedScrollTo
import androidx.wear.compose.foundation.samples.SimpleCurvedWorld
+import androidx.wear.compose.foundation.samples.SimpleScalingLazyColumn
+import androidx.wear.compose.foundation.samples.SimpleScalingLazyColumnWithContentPadding
+import androidx.wear.compose.foundation.samples.SimpleScalingLazyColumnWithSnap
val WearFoundationDemos = DemoCategory(
"Foundation",
@@ -52,5 +56,35 @@
ComposableDemo("Scrollable Row") { ScrollableRowDemo() },
DemoCategory("Rotary Input", RotaryInputDemos),
ComposableDemo("Focus Sample") { HierarchicalFocusCoordinatorSample() },
+ DemoCategory("Scaling Lazy Column", listOf(
+ ComposableDemo(
+ "Defaults",
+ "Basic ScalingLazyColumn using default values"
+ ) {
+ SimpleScalingLazyColumn()
+ },
+ ComposableDemo(
+ "With Content Padding",
+ "Basic ScalingLazyColumn with autoCentering disabled and explicit " +
+ "content padding of top = 20.dp, bottom = 20.dp"
+ ) {
+ SimpleScalingLazyColumnWithContentPadding()
+ },
+ ComposableDemo(
+ "With Snap",
+ "Basic ScalingLazyColumn, center aligned with snap enabled"
+ ) {
+ SimpleScalingLazyColumnWithSnap()
+ },
+ ComposableDemo(
+ "Edge Anchor",
+ "A ScalingLazyColumn with Edge (rather than center) item anchoring. " +
+ "If you click on an item there will be an animated scroll of the " +
+ "items edge to the center"
+ ) {
+ ScalingLazyColumnEdgeAnchoredAndAnimatedScrollTo()
+ },
+ )
+ )
),
)
diff --git a/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/PositionIndicatorDemos.kt b/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/PositionIndicatorDemos.kt
index 76fe1ef..d8f3599 100644
--- a/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/PositionIndicatorDemos.kt
+++ b/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/PositionIndicatorDemos.kt
@@ -41,6 +41,8 @@
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.unit.dp
+import androidx.wear.compose.foundation.lazy.ScalingLazyColumn
+import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState
import androidx.wear.compose.material.Button
import androidx.wear.compose.material.Chip
import androidx.wear.compose.material.MaterialTheme
@@ -49,10 +51,8 @@
import androidx.wear.compose.material.PositionIndicatorState
import androidx.wear.compose.material.PositionIndicatorVisibility
import androidx.wear.compose.material.Scaffold
-import androidx.wear.compose.material.ScalingLazyColumn
import androidx.wear.compose.material.Text
import androidx.wear.compose.material.ToggleButton
-import androidx.wear.compose.material.rememberScalingLazyListState
@Composable
fun HideWhenFullDemo() {
@@ -109,8 +109,8 @@
@Composable
fun ControllablePositionIndicator() {
- var position = remember { mutableStateOf(0.2f) }
- var size = remember { mutableStateOf(0.5f) }
+ val position = remember { mutableStateOf(0.2f) }
+ val size = remember { mutableStateOf(0.5f) }
var alignment by remember { mutableStateOf(0) }
var reverseDirection by remember { mutableStateOf(false) }
var layoutDirection by remember { mutableStateOf(false) }
@@ -139,7 +139,9 @@
}
) {
Box(
- modifier = Modifier.fillMaxHeight().padding(horizontal = 20.dp),
+ modifier = Modifier
+ .fillMaxHeight()
+ .padding(horizontal = 20.dp),
contentAlignment = Alignment.Center
) {
Column {
diff --git a/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/ScalingLazyColumnDemo.kt b/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/ScalingLazyColumnDemo.kt
index 33dd48b..7597a57 100644
--- a/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/ScalingLazyColumnDemo.kt
+++ b/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/ScalingLazyColumnDemo.kt
@@ -28,15 +28,15 @@
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.Dp
+import androidx.wear.compose.foundation.lazy.ScalingLazyColumn
+import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState
import androidx.wear.compose.material.AppCard
import androidx.wear.compose.material.CardDefaults
import androidx.wear.compose.material.Chip
import androidx.wear.compose.material.ChipDefaults
import androidx.wear.compose.material.ListHeader
import androidx.wear.compose.material.MaterialTheme
-import androidx.wear.compose.material.ScalingLazyColumn
import androidx.wear.compose.material.Text
-import androidx.wear.compose.material.rememberScalingLazyListState
import kotlin.math.roundToInt
@Composable
diff --git a/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/ScrollAwayDemos.kt b/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/ScrollAwayDemos.kt
index 6afd2a2..5ff8866 100644
--- a/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/ScrollAwayDemos.kt
+++ b/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/ScrollAwayDemos.kt
@@ -33,7 +33,9 @@
import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
-import androidx.wear.compose.material.AutoCenteringParams
+import androidx.wear.compose.foundation.lazy.AutoCenteringParams
+import androidx.wear.compose.foundation.lazy.ScalingLazyColumn
+import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState
import androidx.wear.compose.material.Card
import androidx.wear.compose.material.Chip
import androidx.wear.compose.material.ChipDefaults
@@ -41,10 +43,8 @@
import androidx.wear.compose.material.MaterialTheme
import androidx.wear.compose.material.PositionIndicator
import androidx.wear.compose.material.Scaffold
-import androidx.wear.compose.material.ScalingLazyColumn
import androidx.wear.compose.material.Text
import androidx.wear.compose.material.TimeText
-import androidx.wear.compose.material.rememberScalingLazyListState
import androidx.wear.compose.material.scrollAway
@Composable
diff --git a/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/SliderDemo.kt b/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/SliderDemo.kt
index 7eb5827..df5330a 100644
--- a/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/SliderDemo.kt
+++ b/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/SliderDemo.kt
@@ -31,7 +31,7 @@
import androidx.compose.ui.platform.LocalLayoutDirection
import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.unit.dp
-import androidx.wear.compose.material.AutoCenteringParams
+import androidx.wear.compose.foundation.lazy.AutoCenteringParams
import androidx.wear.compose.material.Icon
import androidx.wear.compose.material.InlineSlider
import androidx.wear.compose.material.InlineSliderColors
diff --git a/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/ToggleChipDemo.kt b/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/ToggleChipDemo.kt
index b5c6dfe..0b71905 100644
--- a/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/ToggleChipDemo.kt
+++ b/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/ToggleChipDemo.kt
@@ -35,20 +35,20 @@
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.unit.dp
+import androidx.wear.compose.foundation.lazy.ScalingLazyListState
+import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState
import androidx.wear.compose.material.Checkbox
import androidx.wear.compose.material.CheckboxDefaults
import androidx.wear.compose.material.ListHeader
import androidx.wear.compose.material.MaterialTheme
import androidx.wear.compose.material.RadioButton
import androidx.wear.compose.material.RadioButtonDefaults
-import androidx.wear.compose.material.ScalingLazyListState
import androidx.wear.compose.material.SplitToggleChip
import androidx.wear.compose.material.Switch
import androidx.wear.compose.material.SwitchDefaults
import androidx.wear.compose.material.Text
import androidx.wear.compose.material.ToggleChip
import androidx.wear.compose.material.ToggleChipDefaults
-import androidx.wear.compose.material.rememberScalingLazyListState
@Composable
fun ToggleChips(
diff --git a/wear/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/wear/compose/integration/macrobenchmark/target/ScrollActivity.kt b/wear/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/wear/compose/integration/macrobenchmark/target/ScrollActivity.kt
index e35455c..ee57c4f 100644
--- a/wear/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/wear/compose/integration/macrobenchmark/target/ScrollActivity.kt
+++ b/wear/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/wear/compose/integration/macrobenchmark/target/ScrollActivity.kt
@@ -16,8 +16,8 @@
package androidx.wear.compose.integration.macrobenchmark.target
-import androidx.activity.ComponentActivity
import android.os.Bundle
+import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
@@ -31,10 +31,10 @@
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
+import androidx.wear.compose.foundation.lazy.ScalingLazyColumn
+import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState
import androidx.wear.compose.material.MaterialTheme
-import androidx.wear.compose.material.ScalingLazyColumn
import androidx.wear.compose.material.Text
-import androidx.wear.compose.material.rememberScalingLazyListState
class ScrollActivity : ComponentActivity() {
private var itemHeightDp: Dp = 20.dp
@@ -56,7 +56,8 @@
modifier = Modifier.semantics { contentDescription = CONTENT_DESCRIPTION }
) {
items(5000) { it ->
- Box(Modifier
+ Box(
+ Modifier
.requiredHeight(itemHeightDp)
.background(MaterialTheme.colors.surface)
.fillMaxSize()
diff --git a/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/ComplicationHelperActivityTest.kt b/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/ComplicationHelperActivityTest.kt
index b2f2811..db2ad24 100644
--- a/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/ComplicationHelperActivityTest.kt
+++ b/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/ComplicationHelperActivityTest.kt
@@ -22,6 +22,8 @@
import android.os.Handler
import android.os.Looper
import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.MediumTest
import androidx.wear.watchface.complications.data.ComplicationType
import androidx.wear.watchface.complications.data.ComplicationType.LONG_TEXT
import androidx.wear.watchface.complications.data.ComplicationType.MONOCHROMATIC_IMAGE
@@ -34,9 +36,12 @@
import com.nhaarman.mockitokotlin2.verify
import java.util.concurrent.CountDownLatch
import java.util.concurrent.TimeUnit
+import org.junit.runner.RunWith
const val TIME_OUT_MILLIS = 500L
+@RunWith(AndroidJUnit4::class)
+@MediumTest
public class ComplicationHelperActivityTest {
private val mainThreadHandler = Handler(Looper.getMainLooper())
diff --git a/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/WatchFaceServiceAndroidTest.kt b/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/WatchFaceServiceAndroidTest.kt
index 7f3f0ad..3f6fe61 100644
--- a/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/WatchFaceServiceAndroidTest.kt
+++ b/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/WatchFaceServiceAndroidTest.kt
@@ -19,12 +19,17 @@
import android.content.Context
import android.graphics.drawable.Icon
import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.MediumTest
import androidx.wear.watchface.style.UserStyleSchema
import androidx.wear.watchface.style.UserStyleSetting
import androidx.wear.watchface.style.WatchFaceLayer
import androidx.wear.watchface.test.SimpleWatchFaceTestService
import org.junit.Test
+import org.junit.runner.RunWith
+@RunWith(AndroidJUnit4::class)
+@MediumTest
class WatchFaceServiceAndroidTest {
@Test
fun measuresWatchFaceIconsFromCustomContext() {
diff --git a/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/test/SimpleWatchFaceTestService.kt b/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/test/SimpleWatchFaceTestService.kt
index 77c3d9a..0738ffe 100644
--- a/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/test/SimpleWatchFaceTestService.kt
+++ b/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/test/SimpleWatchFaceTestService.kt
@@ -16,6 +16,7 @@
package androidx.wear.watchface.test
+import android.os.Build
import android.view.SurfaceHolder
import androidx.test.core.app.ApplicationProvider
import androidx.wear.watchface.ComplicationSlotsManager
@@ -42,5 +43,5 @@
) = throw NotImplementedError("Should not reach this step")
// Set this to `true` so that the whole setup is skipped for this test
- override fun isPreAndroidR() = true
+ override val wearSdkVersion = Build.VERSION_CODES.O_MR1
}
diff --git a/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/test/TestCanvasAnalogWatchFaceService.kt b/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/test/TestCanvasAnalogWatchFaceService.kt
index 12966a3..217a28a 100644
--- a/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/test/TestCanvasAnalogWatchFaceService.kt
+++ b/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/test/TestCanvasAnalogWatchFaceService.kt
@@ -17,6 +17,7 @@
package androidx.wear.watchface.test
import android.content.Context
+import android.os.Build
import android.os.Handler
import android.view.SurfaceHolder
import androidx.wear.watchface.ComplicationSlotsManager
@@ -87,7 +88,10 @@
override fun getWallpaperSurfaceHolderOverride() = surfaceHolderOverride
- override fun isPreAndroidR() = preRInitFlow
+ override val wearSdkVersion = when (preRInitFlow) {
+ true -> Build.VERSION_CODES.O_MR1
+ false -> Build.VERSION_CODES.R
+ }
override fun readDirectBootPrefs(
context: Context,
diff --git a/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/test/WatchFaceServiceImageTest.kt b/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/test/WatchFaceServiceImageTest.kt
index 3160787..60c9f35 100644
--- a/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/test/WatchFaceServiceImageTest.kt
+++ b/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/test/WatchFaceServiceImageTest.kt
@@ -42,16 +42,12 @@
import androidx.test.filters.MediumTest
import androidx.test.screenshot.AndroidXScreenshotTestRule
import androidx.test.screenshot.assertAgainstGolden
-import androidx.wear.watchface.ComplicationSlotsManager
import androidx.wear.watchface.DrawMode
-import androidx.wear.watchface.MutableWatchState
import androidx.wear.watchface.RenderParameters
import androidx.wear.watchface.SYSTEM_SUPPORTS_CONSISTENT_IDS_PREFIX
import androidx.wear.watchface.TapEvent
import androidx.wear.watchface.TapType
-import androidx.wear.watchface.WatchFace
import androidx.wear.watchface.WatchFaceService
-import androidx.wear.watchface.WatchState
import androidx.wear.watchface.complications.SystemDataSources
import androidx.wear.watchface.complications.data.ComplicationText
import androidx.wear.watchface.complications.data.LongTextComplicationData
@@ -75,8 +71,6 @@
import androidx.wear.watchface.samples.ExampleCanvasAnalogWatchFaceService.Companion.EXAMPLE_CANVAS_WATCHFACE_LEFT_COMPLICATION_ID
import androidx.wear.watchface.samples.ExampleCanvasAnalogWatchFaceService.Companion.EXAMPLE_CANVAS_WATCHFACE_RIGHT_COMPLICATION_ID
import androidx.wear.watchface.samples.ExampleCanvasAnalogWatchFaceService.Companion.GREEN_STYLE
-import androidx.wear.watchface.style.CurrentUserStyleRepository
-import androidx.wear.watchface.style.UserStyleSchema
import androidx.wear.watchface.style.WatchFaceLayer
import androidx.wear.watchface.style.data.UserStyleWireFormat
import com.google.common.truth.Truth.assertThat
@@ -85,7 +79,6 @@
import java.util.concurrent.CountDownLatch
import java.util.concurrent.TimeUnit
import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Deferred
import kotlinx.coroutines.android.asCoroutineDispatcher
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
@@ -136,74 +129,6 @@
}
}
-internal class TestControllableWatchFaceService(
- private val handler: Handler,
- private var surfaceHolderOverride: SurfaceHolder,
- private val factory: TestWatchFaceFactory,
- private val watchState: MutableWatchState,
- private val directBootParams: WallpaperInteractiveWatchFaceInstanceParams?
-) : WatchFaceService() {
- init {
- attachBaseContext(ApplicationProvider.getApplicationContext())
- }
-
- abstract class TestWatchFaceFactory {
- fun createUserStyleSchema(): UserStyleSchema = UserStyleSchema(emptyList())
-
- fun createComplicationsManager(
- currentUserStyleRepository: CurrentUserStyleRepository
- ): ComplicationSlotsManager =
- ComplicationSlotsManager(emptyList(), currentUserStyleRepository)
-
- abstract fun createWatchFaceAsync(
- surfaceHolder: SurfaceHolder,
- watchState: WatchState,
- complicationSlotsManager: ComplicationSlotsManager,
- currentUserStyleRepository: CurrentUserStyleRepository
- ): Deferred<WatchFace>
- }
-
- override fun createUserStyleSchema() = factory.createUserStyleSchema()
-
- override fun createComplicationSlotsManager(
- currentUserStyleRepository: CurrentUserStyleRepository
- ) = factory.createComplicationsManager(currentUserStyleRepository)
-
- override suspend fun createWatchFace(
- surfaceHolder: SurfaceHolder,
- watchState: WatchState,
- complicationSlotsManager: ComplicationSlotsManager,
- currentUserStyleRepository: CurrentUserStyleRepository
- ) = factory.createWatchFaceAsync(
- surfaceHolderOverride,
- watchState,
- complicationSlotsManager,
- currentUserStyleRepository
- ).await()
-
- override fun getUiThreadHandlerImpl() = handler
-
- override fun getBackgroundThreadHandlerImpl() = handler
-
- override fun getMutableWatchState() = watchState
-
- override fun readDirectBootPrefs(
- context: Context,
- fileName: String
- ) = directBootParams
-
- override fun writeDirectBootPrefs(
- context: Context,
- fileName: String,
- prefs: WallpaperInteractiveWatchFaceInstanceParams
- ) {
- }
-
- override fun isPreAndroidR() = false
-
- override fun getWallpaperSurfaceHolderOverride() = surfaceHolderOverride
-}
-
@RunWith(AndroidJUnit4::class)
@MediumTest
@RequiresApi(Build.VERSION_CODES.O_MR1)
diff --git a/wear/watchface/watchface/src/main/java/androidx/wear/watchface/WatchFaceService.kt b/wear/watchface/watchface/src/main/java/androidx/wear/watchface/WatchFaceService.kt
index 86d287cc..ca08131 100644
--- a/wear/watchface/watchface/src/main/java/androidx/wear/watchface/WatchFaceService.kt
+++ b/wear/watchface/watchface/src/main/java/androidx/wear/watchface/WatchFaceService.kt
@@ -25,7 +25,6 @@
import android.graphics.Canvas
import android.graphics.Rect
import android.os.Build
-import android.os.Build.VERSION.SDK_INT
import android.os.Bundle
import android.os.Handler
import android.os.HandlerThread
@@ -56,9 +55,9 @@
import androidx.annotation.WorkerThread
import androidx.versionedparcelable.ParcelUtils
import androidx.wear.watchface.complications.SystemDataSources.DataSourceId
-import androidx.wear.watchface.complications.data.ComplicationPersistencePolicies
import androidx.wear.watchface.complications.data.ComplicationData
import androidx.wear.watchface.complications.data.ComplicationExperimental
+import androidx.wear.watchface.complications.data.ComplicationPersistencePolicies
import androidx.wear.watchface.complications.data.ComplicationType
import androidx.wear.watchface.complications.data.NoDataComplicationData
import androidx.wear.watchface.complications.data.toApiComplicationData
@@ -364,6 +363,7 @@
UI,
CURRENT
}
+
/**
* Waits for deferredValue using runBlocking, then executes the task on the thread
* specified by executionThread param.
@@ -389,6 +389,7 @@
task(deferredValue)
}
}
+
ExecutionThread.CURRENT -> {
task(deferredValue)
}
@@ -714,10 +715,16 @@
internal open fun allowWatchFaceToAnimate() = true
/**
- * Whether or not the pre R style init flow (SET_BINDER wallpaper command) is expected.
- * This is open for use by tests.
+ * Equivalent to [Build.VERSION.SDK_INT], but allows override for any platform-independent
+ * versioning.
+ *
+ * This is meant to only be used in androidTest, which only support testing on one SDK. In
+ * Robolectric tests use `@Config(sdk = [Build.VERSION_CODES.*])`.
+ *
+ * Note that this cannot override platform-dependent versioning, which means inconsistency.
*/
- internal open fun isPreAndroidR() = Build.VERSION.SDK_INT < Build.VERSION_CODES.R
+ @VisibleForTesting
+ internal open val wearSdkVersion = Build.VERSION.SDK_INT
/** [Choreographer] isn't supposed to be mocked, so we use a thin wrapper. */
internal interface ChoreographerWrapper {
@@ -728,6 +735,7 @@
/** This is open to allow mocking. */
internal open fun getChoreographer(): ChoreographerWrapper = object : ChoreographerWrapper {
private val choreographer = Choreographer.getInstance()
+
init {
require(Looper.myLooper() == Looper.getMainLooper()) {
"Creating choreographer not on the main thread"
@@ -1357,7 +1365,7 @@
InteractiveInstanceManager.takePendingWallpaperInteractiveWatchFaceInstance()
// In a direct boot scenario attempt to load the previously serialized parameters.
- if (pendingWallpaperInstance == null && !isPreAndroidR()) {
+ if (pendingWallpaperInstance == null && wearSdkVersion >= Build.VERSION_CODES.R) {
val params = readDirectBootPrefs(_context, DIRECT_BOOT_PREFS)
directBootParams = params
// In tests a watchface may already have been created.
@@ -1767,7 +1775,7 @@
): Bundle? {
// From android R onwards the integration changes and no wallpaper commands are allowed
// or expected and can/should be ignored.
- if (!isPreAndroidR()) {
+ if (wearSdkVersion >= Build.VERSION_CODES.R) {
TraceEvent("onCommand Ignored").close()
return null
}
@@ -1776,26 +1784,32 @@
uiThreadHandler.runOnHandlerWithTracing("onCommand COMMAND_AMBIENT_UPDATE") {
ambientTickUpdate()
}
+
Constants.COMMAND_BACKGROUND_ACTION ->
uiThreadHandler.runOnHandlerWithTracing("onCommand COMMAND_BACKGROUND_ACTION") {
wslFlow.onBackgroundAction(extras!!)
}
+
Constants.COMMAND_COMPLICATION_DATA ->
uiThreadHandler.runOnHandlerWithTracing("onCommand COMMAND_COMPLICATION_DATA") {
wslFlow.onComplicationSlotDataUpdate(extras!!)
}
+
Constants.COMMAND_REQUEST_STYLE ->
uiThreadHandler.runOnHandlerWithTracing("onCommand COMMAND_REQUEST_STYLE") {
wslFlow.onRequestStyle()
}
+
Constants.COMMAND_SET_BINDER ->
uiThreadHandler.runOnHandlerWithTracing("onCommand COMMAND_SET_BINDER") {
wslFlow.onSetBinder(extras!!)
}
+
Constants.COMMAND_SET_PROPERTIES ->
uiThreadHandler.runOnHandlerWithTracing("onCommand COMMAND_SET_PROPERTIES") {
wslFlow.onPropertiesChanged(extras!!)
}
+
Constants.COMMAND_TAP ->
uiThreadCoroutineScope.runBlockingWithTracing("onCommand COMMAND_TAP") {
val watchFaceImpl = deferredWatchFaceImpl.await()
@@ -1810,6 +1824,7 @@
)
)
}
+
Constants.COMMAND_TOUCH ->
uiThreadCoroutineScope.runBlockingWithTracing("onCommand COMMAND_TOUCH") {
val watchFaceImpl = deferredWatchFaceImpl.await()
@@ -1824,6 +1839,7 @@
)
)
}
+
Constants.COMMAND_TOUCH_CANCEL ->
uiThreadCoroutineScope.runBlockingWithTracing(
"onCommand COMMAND_TOUCH_CANCEL"
@@ -1840,6 +1856,7 @@
)
)
}
+
else -> {
}
}
@@ -2187,7 +2204,7 @@
deferredWatchFaceImpl,
uiThreadCoroutineScope,
_context.contentResolver,
- !isPreAndroidR()
+ wearSdkVersion >= Build.VERSION_CODES.R
)
// There's no point creating BroadcastsReceiver or listening for Accessibility state
@@ -2323,7 +2340,7 @@
// watchface after requesting a change. It used [Constants.ACTION_REQUEST_STATE] as a
// signal to trigger the old boot flow (sending the binder etc). This is no longer
// required from android R onwards. See (b/181965946).
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
+ if (wearSdkVersion < Build.VERSION_CODES.R) {
// We are requesting state every time the watch face changes its visibility because
// wallpaper commands have a tendency to be dropped. By requesting it on every
// visibility change, we ensure that we don't become a victim of some race
@@ -2634,7 +2651,9 @@
* enabled.
*/
private fun maybeSendContentDescriptionLabelsBroadcast() {
- if (!isPreAndroidR() && getAccessibilityManager().isEnabled) {
+ if (
+ wearSdkVersion >= Build.VERSION_CODES.R && getAccessibilityManager().isEnabled
+ ) {
// TODO(alexclarke): This should require a permission. See http://b/184717802
_context.sendBroadcast(
Intent(Constants.ACTION_WATCH_FACE_REFRESH_A11Y_LABELS)
@@ -2697,8 +2716,11 @@
writer.println("WSL style init flow")
writer.println("watchFaceInitStarted=${wslFlow.watchFaceInitStarted}")
}
+
this.watchFaceCreatedOrPending() -> writer.println("Androidx style init flow")
- isPreAndroidR() -> writer.println("Expecting WSL style init")
+ wearSdkVersion < Build.VERSION_CODES.R ->
+ writer.println("Expecting WSL style init")
+
else -> writer.println("Expecting androidx style style init")
}
@@ -2750,7 +2772,7 @@
indentingPrintWriter.println("AndroidX WatchFaceService $packageName")
InteractiveInstanceManager.dump(indentingPrintWriter)
EditorService.globalEditorService.dump(indentingPrintWriter)
- if (SDK_INT >= 27) {
+ if (Build.VERSION.SDK_INT >= 27) {
HeadlessWatchFaceImpl.dump(indentingPrintWriter)
}
indentingPrintWriter.flush()
diff --git a/wear/watchface/watchface/src/test/java/androidx/wear/watchface/AsyncWatchFaceInitTest.kt b/wear/watchface/watchface/src/test/java/androidx/wear/watchface/AsyncWatchFaceInitTest.kt
index 283dbb4..cfad995 100644
--- a/wear/watchface/watchface/src/test/java/androidx/wear/watchface/AsyncWatchFaceInitTest.kt
+++ b/wear/watchface/watchface/src/test/java/androidx/wear/watchface/AsyncWatchFaceInitTest.kt
@@ -112,12 +112,11 @@
prefs: WallpaperInteractiveWatchFaceInstanceParams
) {
}
-
- override fun isPreAndroidR() = false
}
-@Config(manifest = Config.NONE)
+@Config(manifest = Config.NONE, sdk = [Build.VERSION_CODES.R])
@RunWith(WatchFaceTestRunner::class)
+@RequiresApi(Build.VERSION_CODES.R)
public class AsyncWatchFaceInitTest {
private val handler = mock<Handler>()
private val surfaceHolder = mock<SurfaceHolder>()
@@ -192,10 +191,10 @@
@After
fun tearDown() {
+ InteractiveInstanceManager.releaseInstance(initParams.instanceId)
assertThat(InteractiveInstanceManager.getInstances()).isEmpty()
}
- @RequiresApi(Build.VERSION_CODES.O_MR1)
@Test
public fun createInteractiveInstanceFailsIfDirectBootWatchFaceCreationIsInProgress() {
val completableWatchFace = CompletableDeferred<WatchFace>()
@@ -236,11 +235,8 @@
runPostedTasksFor(0)
assertThat(pendingException.message).startsWith("WatchFace already exists!")
-
- InteractiveInstanceManager.releaseInstance(initParams.instanceId)
}
- @RequiresApi(Build.VERSION_CODES.O_MR1)
@Test
public fun directBootAndGetExistingInstanceOrSetPendingWallpaperInteractiveWatchFaceInstance() {
val completableDirectBootWatchFace = CompletableDeferred<WatchFace>()
diff --git a/wear/watchface/watchface/src/test/java/androidx/wear/watchface/TestCommon.kt b/wear/watchface/watchface/src/test/java/androidx/wear/watchface/TestCommon.kt
index 67b8777..5ab6d6e 100644
--- a/wear/watchface/watchface/src/test/java/androidx/wear/watchface/TestCommon.kt
+++ b/wear/watchface/watchface/src/test/java/androidx/wear/watchface/TestCommon.kt
@@ -55,7 +55,6 @@
private val watchState: MutableWatchState?,
private val handler: Handler,
private val tapListener: WatchFace.TapListener?,
- private val preAndroidR: Boolean,
private val directBootParams: WallpaperInteractiveWatchFaceInstanceParams?,
private val choreographer: ChoreographerWrapper,
var mockSystemTimeMillis: Long = 0L,
@@ -171,8 +170,6 @@
complicationCache?.set(fileName, byteArray)
}
- override fun isPreAndroidR() = preAndroidR
-
override fun getSystemTimeProvider() = object : SystemTimeProvider {
override fun getSystemTimeMillis() = mockSystemTimeMillis
diff --git a/wear/watchface/watchface/src/test/java/androidx/wear/watchface/WatchFaceServiceTest.kt b/wear/watchface/watchface/src/test/java/androidx/wear/watchface/WatchFaceServiceTest.kt
index 57d6847..aae4c30 100644
--- a/wear/watchface/watchface/src/test/java/androidx/wear/watchface/WatchFaceServiceTest.kt
+++ b/wear/watchface/watchface/src/test/java/androidx/wear/watchface/WatchFaceServiceTest.kt
@@ -16,7 +16,6 @@
package androidx.wear.watchface
-import android.annotation.SuppressLint
import android.app.NotificationManager
import android.app.PendingIntent
import android.content.ComponentName
@@ -50,13 +49,12 @@
import androidx.annotation.Px
import androidx.annotation.RequiresApi
import androidx.test.core.app.ApplicationProvider
-import androidx.test.filters.SdkSuppress
import androidx.wear.watchface.complications.ComplicationSlotBounds
import androidx.wear.watchface.complications.DefaultComplicationDataSourcePolicy
import androidx.wear.watchface.complications.SystemDataSources
-import androidx.wear.watchface.complications.data.ComplicationPersistencePolicies
import androidx.wear.watchface.complications.data.ComplicationDisplayPolicies
import androidx.wear.watchface.complications.data.ComplicationExperimental
+import androidx.wear.watchface.complications.data.ComplicationPersistencePolicies
import androidx.wear.watchface.complications.data.ComplicationType
import androidx.wear.watchface.complications.data.CountUpTimeReference
import androidx.wear.watchface.complications.data.EmptyComplicationData
@@ -92,9 +90,6 @@
import androidx.wear.watchface.style.WatchFaceLayer
import androidx.wear.watchface.style.data.UserStyleWireFormat
import com.google.common.truth.Truth.assertThat
-import org.mockito.kotlin.eq
-import org.mockito.kotlin.mock
-import org.mockito.kotlin.verifyNoMoreInteractions
import java.io.StringWriter
import java.nio.ByteBuffer
import java.time.Instant
@@ -123,15 +118,18 @@
import org.mockito.ArgumentCaptor
import org.mockito.ArgumentMatchers.any
import org.mockito.ArgumentMatchers.anyLong
-import org.mockito.Mockito.`when`
import org.mockito.Mockito.atLeastOnce
import org.mockito.Mockito.doAnswer
import org.mockito.Mockito.reset
import org.mockito.Mockito.times
import org.mockito.Mockito.validateMockitoUsage
import org.mockito.Mockito.verify
-import org.robolectric.annotation.Config
+import org.mockito.Mockito.`when`
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verifyNoMoreInteractions
import org.robolectric.Shadows.shadowOf
+import org.robolectric.annotation.Config
private const val INTERACTIVE_UPDATE_RATE_MS = 16L
private const val LEFT_COMPLICATION_ID = 1000
@@ -547,7 +545,6 @@
watchState,
handler,
tapListener,
- true,
null,
choreographer
)
@@ -613,7 +610,6 @@
userStyleSchema: UserStyleSchema,
wallpaperInteractiveWatchFaceInstanceParams: WallpaperInteractiveWatchFaceInstanceParams,
complicationCache: MutableMap<String, ByteArray>? = null,
- preAndroidR: Boolean = false
) {
testWatchFaceService = TestWatchFaceService(
watchFaceType,
@@ -631,7 +627,6 @@
watchState,
handler,
null,
- preAndroidR,
null,
choreographer,
mockSystemTimeMillis = looperTimeMillis,
@@ -759,6 +754,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun maybeUpdateDrawMode_setsCorrectDrawMode() {
initEngine(
WatchFaceType.ANALOG,
@@ -814,6 +810,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun onDraw_zonedDateTime_setFromSystemTime() {
initEngine(
WatchFaceType.ANALOG,
@@ -828,6 +825,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun onDraw_zonedDateTime_affectedCorrectly_with2xMockTime() {
initEngine(
WatchFaceType.ANALOG,
@@ -856,6 +854,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun onDraw_zonedDateTime_affectedCorrectly_withMockTimeWrapping() {
initEngine(
WatchFaceType.ANALOG,
@@ -927,6 +926,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun singleTaps_correctlyDetected() {
initEngine(
WatchFaceType.ANALOG,
@@ -974,6 +974,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun computeBounds_does_not_mutate_it() {
initEngine(
WatchFaceType.ANALOG,
@@ -1001,6 +1002,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun singleTaps_inMargins_correctlyDetected() {
initEngine(
WatchFaceType.ANALOG,
@@ -1066,6 +1068,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
@Suppress("DEPRECATION") // setDefaultDataSourceType
public fun lowestIdComplicationSelectedWhenMarginsOverlap() {
val complication100 =
@@ -1121,6 +1124,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun singleTaps_onDifferentComplications() {
initEngine(
WatchFaceType.ANALOG,
@@ -1147,6 +1151,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun tapCancel_after_tapDown_CancelsTap() {
initEngine(
WatchFaceType.ANALOG,
@@ -1161,6 +1166,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun edgeComplication_tap() {
initEngine(
WatchFaceType.ANALOG,
@@ -1191,6 +1197,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun edgeComplicationWithBoundingArc_tap() {
initEngine(
WatchFaceType.ANALOG,
@@ -1226,6 +1233,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun tapListener_tap() {
initEngine(
WatchFaceType.ANALOG,
@@ -1250,6 +1258,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun tapListener_tap_viaWallpaperCommand() {
initEngine(
WatchFaceType.ANALOG,
@@ -1300,6 +1309,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun tapListener_tapComplication() {
initEngine(
WatchFaceType.ANALOG,
@@ -1324,6 +1334,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun interactiveFrameRate_reducedWhenBatteryLow() {
initEngine(
WatchFaceType.ANALOG,
@@ -1355,6 +1366,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun interactiveFrameRate_restoreWhenPowerConnectedAfterBatteryLow() {
initEngine(
WatchFaceType.ANALOG,
@@ -1386,6 +1398,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun computeDelayTillNextFrame_accountsForSlowDraw() {
initEngine(
WatchFaceType.ANALOG,
@@ -1404,6 +1417,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun computeDelayTillNextFrame_verySlowDraw() {
initEngine(
WatchFaceType.ANALOG,
@@ -1422,6 +1436,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun computeDelayTillNextFrame_beginFrameTimeInTheFuture() {
initEngine(
WatchFaceType.ANALOG,
@@ -1442,6 +1457,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun computeDelayTillNextFrame_1000ms_update_atTopOfSecond() {
initEngine(
WatchFaceType.ANALOG,
@@ -1463,6 +1479,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun computeDelayTillNextFrame_frame_scheduled_at_near_perfect_time() {
initEngine(
WatchFaceType.ANALOG,
@@ -1484,6 +1501,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun computeDelayTillNextFrame_60000ms_update_atTopOfMinute() {
initEngine(
WatchFaceType.ANALOG,
@@ -1505,6 +1523,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun computeDelayTillNextFrame_60000ms_update_with_stopwatchComplication() {
initEngine(
WatchFaceType.ANALOG,
@@ -1542,6 +1561,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun complicationSlotsManager_getNextChangeInstant() {
initEngine(
WatchFaceType.ANALOG,
@@ -1596,6 +1616,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun getComplicationSlotIdAt_returnsCorrectComplications() {
initEngine(
WatchFaceType.ANALOG,
@@ -1614,6 +1635,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun getBackgroundComplicationSlotId_returnsNull() {
initEngine(
WatchFaceType.ANALOG,
@@ -1627,6 +1649,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun getBackgroundComplicationSlotId_returnsCorrectId() {
initEngine(
WatchFaceType.ANALOG,
@@ -1639,6 +1662,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun getStoredUserStyleNotSupported_userStyle_isPersisted() {
// The style should get persisted in a file because this test is set up using the legacy
// Wear 2.0 APIs.
@@ -1678,7 +1702,6 @@
watchState,
handler,
null,
- true,
null,
choreographer
)
@@ -1701,62 +1724,38 @@
)
}
- @SdkSuppress(maxSdkVersion = 29)
@Test
- public fun onApplyWindowInsetsBeforeR_setsChinHeight() {
- initEngine(
- WatchFaceType.ANALOG,
- emptyList(),
- UserStyleSchema(emptyList())
- )
- // Initially the chin size is set to zero.
- assertThat(engineWrapper.mutableWatchState.chinHeight).isEqualTo(0)
- // When window insets are delivered to the watch face.
- engineWrapper.onApplyWindowInsets(getChinWindowInsetsApi25(chinHeight = 12))
- // Then the chin size is updated.
- assertThat(engineWrapper.mutableWatchState.chinHeight).isEqualTo(12)
- }
-
- @SdkSuppress(minSdkVersion = 30)
- @Test
+ @Config(sdk = [Build.VERSION_CODES.R])
+ @RequiresApi(Build.VERSION_CODES.R)
public fun onApplyWindowInsetsRAndAbove_setsChinHeight() {
- initEngine(
+ initWallpaperInteractiveWatchFaceInstance(
WatchFaceType.ANALOG,
emptyList(),
- UserStyleSchema(emptyList())
+ UserStyleSchema(emptyList()),
+ WallpaperInteractiveWatchFaceInstanceParams(
+ INTERACTIVE_INSTANCE_ID,
+ DeviceConfig(
+ false,
+ false,
+ 0,
+ 0
+ ),
+ WatchUiState(false, 0),
+ UserStyle(emptyMap()).toWireFormat(),
+ null,
+ null
+ )
)
// Initially the chin size is set to zero.
assertThat(engineWrapper.mutableWatchState.chinHeight).isEqualTo(0)
// When window insets are delivered to the watch face.
- engineWrapper.onApplyWindowInsets(getChinWindowInsetsApi30(chinHeight = 12))
+ engineWrapper.onApplyWindowInsets(getChinWindowInsets(chinHeight = 12))
// Then the chin size is updated.
assertThat(engineWrapper.mutableWatchState.chinHeight).isEqualTo(12)
}
@Test
- public fun onApplyWindowInsetsBeforeR_multipleCallsIgnored() {
- initEngine(
- WatchFaceType.ANALOG,
- emptyList(),
- UserStyleSchema(emptyList())
- )
- // Initially the chin size is set to zero.
- assertThat(engineWrapper.mutableWatchState.chinHeight).isEqualTo(0)
- // When window insets are delivered to the watch face.
- engineWrapper.onApplyWindowInsets(getChinWindowInsetsApi25(chinHeight = 12))
- // Then the chin size is updated.
- assertThat(engineWrapper.mutableWatchState.chinHeight).isEqualTo(12)
- // When the same window insets are delivered to the watch face again.
- engineWrapper.onApplyWindowInsets(getChinWindowInsetsApi25(chinHeight = 12))
- // Nothing happens.
- assertThat(engineWrapper.mutableWatchState.chinHeight).isEqualTo(12)
- // When different window insets are delivered to the watch face again.
- engineWrapper.onApplyWindowInsets(getChinWindowInsetsApi25(chinHeight = 24))
- // Nothing happens and the size is unchanged.
- assertThat(engineWrapper.mutableWatchState.chinHeight).isEqualTo(12)
- }
-
- @Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun initWallpaperInteractiveWatchFaceInstanceWithUserStyle() {
initWallpaperInteractiveWatchFaceInstance(
WatchFaceType.ANALOG,
@@ -1794,6 +1793,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun initWallpaperInteractiveWatchFaceInstanceWithUserStyleThatDoesntMatchSchema() {
initWallpaperInteractiveWatchFaceInstance(
WatchFaceType.ANALOG,
@@ -1819,6 +1819,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun wear2ImmutablePropertiesSetCorrectly() {
initEngine(
WatchFaceType.ANALOG,
@@ -1834,6 +1835,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun wear2ImmutablePropertiesSetCorrectly2() {
initEngine(
WatchFaceType.ANALOG,
@@ -1849,6 +1851,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun wallpaperInteractiveWatchFaceImmutablePropertiesSetCorrectly() {
initWallpaperInteractiveWatchFaceInstance(
WatchFaceType.ANALOG,
@@ -1875,6 +1878,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun invalidOldStyleIdReplacedWithDefault() {
initWallpaperInteractiveWatchFaceInstance(
WatchFaceType.ANALOG,
@@ -1894,6 +1898,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun onCreate_calls_setActiveComplications_withCorrectIDs() {
initEngine(
WatchFaceType.ANALOG,
@@ -1908,6 +1913,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun onCreate_calls_setContentDescriptionLabels_withCorrectArgs() {
initEngine(
WatchFaceType.ANALOG,
@@ -1930,6 +1936,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun onCreate_calls_setContentDescriptionLabels_withCorrectArgs_noComplications() {
initEngine(
WatchFaceType.ANALOG,
@@ -1948,6 +1955,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun ContentDescriptionLabels_notMadeForEmptyComplication() {
initEngine(
WatchFaceType.ANALOG,
@@ -1976,6 +1984,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun moveComplications() {
initEngine(
WatchFaceType.ANALOG,
@@ -2039,6 +2048,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun styleChangesAccessibilityTraversalIndex() {
val rightAndSelectComplicationsOption = ComplicationSlotsOption(
Option.Id(RIGHT_AND_LEFT_COMPLICATIONS),
@@ -2153,6 +2163,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun centerX_and_centerY_containUpToDateValues() {
initEngine(WatchFaceType.ANALOG, emptyList(), UserStyleSchema(emptyList()))
@@ -2175,6 +2186,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun requestStyleBeforeSetBinder() {
testWatchFaceService = TestWatchFaceService(
WatchFaceType.ANALOG,
@@ -2191,7 +2203,6 @@
watchState,
handler,
null,
- true,
null,
choreographer
)
@@ -2214,6 +2225,7 @@
@Suppress("DEPRECATION") // setDefaultDataSourceType
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun defaultComplicationDataSourcesWithFallbacks_newApi() {
val dataSource1 = ComponentName("com.app1", "com.app1.App1")
val dataSource2 = ComponentName("com.app2", "com.app2.App2")
@@ -2245,6 +2257,7 @@
@Suppress("DEPRECATION") // setDefaultDataSourceType
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun defaultComplicationDataSourcesWithFallbacks_oldApi() {
val dataSource1 = ComponentName("com.app1", "com.app1.App1")
val dataSource2 = ComponentName("com.app2", "com.app2.App2")
@@ -2285,6 +2298,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun previewReferenceTimeMillisAnalog() {
val instanceParams = WallpaperInteractiveWatchFaceInstanceParams(
INTERACTIVE_INSTANCE_ID,
@@ -2316,6 +2330,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun previewReferenceTimeMillisDigital() {
val instanceParams = WallpaperInteractiveWatchFaceInstanceParams(
INTERACTIVE_INSTANCE_ID,
@@ -2347,6 +2362,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun getComplicationDetails() {
initEngine(
WatchFaceType.ANALOG,
@@ -2404,6 +2420,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun getComplicationDetails_early_init_with_styleOverrides() {
val complicationsStyleSetting = ComplicationSlotsUserStyleSetting(
UserStyleSetting.Id("complications_style_setting"),
@@ -2437,7 +2454,6 @@
watchState,
handler,
null,
- false,
null,
choreographer
)
@@ -2493,6 +2509,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun shouldAnimateOverrideControlsEnteringAmbientMode() {
lateinit var testRenderer: TestRendererWithShouldAnimate
testWatchFaceService = TestWatchFaceService(
@@ -2511,7 +2528,6 @@
watchState,
handler,
null,
- true,
null,
choreographer
)
@@ -2538,6 +2554,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun complicationsUserStyleSettingSelectionAppliesChanges() {
initEngine(
WatchFaceType.DIGITAL,
@@ -2581,6 +2598,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun partialComplicationOverrides() {
initEngine(
WatchFaceType.DIGITAL,
@@ -2612,8 +2630,10 @@
assertFalse(leftComplication.enabled)
assertTrue(rightComplication.enabled)
assertEquals(rightComplication.nameResourceId, NAME_RESOURCE_ID)
- assertEquals(rightComplication.screenReaderNameResourceId,
- SCREEN_READER_NAME_RESOURCE_ID)
+ assertEquals(
+ rightComplication.screenReaderNameResourceId,
+ SCREEN_READER_NAME_RESOURCE_ID
+ )
// Select both complicationSlots.
val mutableUserStyleC = currentUserStyleRepository.userStyle.value.toMutableUserStyle()
@@ -2627,6 +2647,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun partialComplicationOverrideAppliedToInitialStyle() {
val complicationsStyleSetting = ComplicationSlotsUserStyleSetting(
UserStyleSetting.Id("complications_style_setting"),
@@ -2731,11 +2752,8 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.TIRAMISU])
fun hierarchical_complicationsStyleSetting() {
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
- return
- }
-
val option1 = ListUserStyleSetting.ListOption(
Option.Id("1"),
displayName = "1",
@@ -2765,11 +2783,23 @@
WatchFaceLayer.ALL_WATCH_FACE_LAYERS
)
- initEngine(
+ initWallpaperInteractiveWatchFaceInstance(
WatchFaceType.DIGITAL,
listOf(leftComplication, rightComplication),
UserStyleSchema(listOf(choice, complicationsStyleSetting, complicationsStyleSetting2)),
- apiVersion = 4
+ WallpaperInteractiveWatchFaceInstanceParams(
+ INTERACTIVE_INSTANCE_ID,
+ DeviceConfig(
+ false,
+ false,
+ 0,
+ 0
+ ),
+ WatchUiState(false, 0),
+ UserStyle(emptyMap()).toWireFormat(),
+ null,
+ null
+ )
)
currentUserStyleRepository.updateUserStyle(
@@ -2811,6 +2841,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun observeComplicationData() {
initWallpaperInteractiveWatchFaceInstance(
WatchFaceType.ANALOG,
@@ -2872,6 +2903,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun complicationCache() {
val complicationCache = HashMap<String, ByteArray>()
val instanceParams = WallpaperInteractiveWatchFaceInstanceParams(
@@ -2942,7 +2974,6 @@
watchState,
handler,
null,
- true,
null,
choreographer,
complicationCache = complicationCache
@@ -3003,7 +3034,7 @@
}
@Test
- @Suppress("NewApi")
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun complicationCachePolicy() {
val complicationCache = HashMap<String, ByteArray>()
val instanceParams = WallpaperInteractiveWatchFaceInstanceParams(
@@ -3069,7 +3100,6 @@
watchState,
handler,
null,
- true,
null,
choreographer,
complicationCache = complicationCache
@@ -3127,6 +3157,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun complicationCache_timeline() {
val complicationCache = HashMap<String, ByteArray>()
val instanceParams = WallpaperInteractiveWatchFaceInstanceParams(
@@ -3186,7 +3217,6 @@
watchState,
handler,
null,
- true,
null,
choreographer,
complicationCache = complicationCache
@@ -3255,6 +3285,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun complicationsInitialized_with_NoComplicationComplicationData() {
initEngine(
WatchFaceType.DIGITAL,
@@ -3271,8 +3302,9 @@
).isInstanceOf(NoDataComplicationData::class.java)
}
- @RequiresApi(Build.VERSION_CODES.O_MR1)
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
+ @RequiresApi(Build.VERSION_CODES.O_MR1)
public fun headless_complicationsInitialized_with_EmptyComplicationData() {
testWatchFaceService = TestWatchFaceService(
WatchFaceType.ANALOG,
@@ -3289,7 +3321,6 @@
watchState,
handler,
null,
- false, // Allows DirectBoot
WallpaperInteractiveWatchFaceInstanceParams(
"Headless",
DeviceConfig(
@@ -3339,6 +3370,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun complication_isActiveAt() {
initWallpaperInteractiveWatchFaceInstance(
WatchFaceType.ANALOG,
@@ -3406,6 +3438,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun updateInvalidCompliationIdDoesNotCrash() {
initWallpaperInteractiveWatchFaceInstance(
WatchFaceType.ANALOG,
@@ -3453,6 +3486,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun watchStateStateFlowDataMembersHaveValues() {
initWallpaperInteractiveWatchFaceInstance(
WatchFaceType.ANALOG,
@@ -3480,6 +3514,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun isBatteryLowAndNotCharging_modified_by_broadcasts() {
initWallpaperInteractiveWatchFaceInstance(
WatchFaceType.ANALOG,
@@ -3515,6 +3550,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun processBatteryStatus() {
initWallpaperInteractiveWatchFaceInstance(
WatchFaceType.ANALOG,
@@ -3570,6 +3606,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun isAmbientInitalisedEvenWithoutPropertiesSent() {
testWatchFaceService = TestWatchFaceService(
WatchFaceType.ANALOG,
@@ -3586,7 +3623,6 @@
watchState,
handler,
null,
- true,
null,
choreographer
)
@@ -3602,6 +3638,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun ambientToInteractiveTransition() {
initWallpaperInteractiveWatchFaceInstance(
WatchFaceType.ANALOG,
@@ -3647,6 +3684,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun interactiveToAmbientTransition() {
initWallpaperInteractiveWatchFaceInstance(
WatchFaceType.ANALOG,
@@ -3685,6 +3723,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun onDestroy_clearsInstanceRecord() {
val instanceId = INTERACTIVE_INSTANCE_ID
initWallpaperInteractiveWatchFaceInstance(
@@ -3711,6 +3750,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun sendComplicationWallpaperCommandPreRFlow() {
initEngine(
WatchFaceType.ANALOG,
@@ -3737,6 +3777,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun sendComplicationWallpaperCommandIgnoredPostRFlow() {
val instanceId = INTERACTIVE_INSTANCE_ID
initWallpaperInteractiveWatchFaceInstance(
@@ -3785,6 +3826,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun directBoot() {
val instanceId = "DirectBootInstance"
testWatchFaceService = TestWatchFaceService(
@@ -3802,7 +3844,6 @@
watchState,
handler,
null,
- false, // Allows DirectBoot
WallpaperInteractiveWatchFaceInstanceParams(
instanceId,
DeviceConfig(
@@ -3840,6 +3881,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun headlessFlagPreventsDirectBoot() {
val instanceId = "DirectBootInstance"
testWatchFaceService = TestWatchFaceService(
@@ -3857,7 +3899,6 @@
watchState,
handler,
null,
- false, // Allows DirectBoot
WallpaperInteractiveWatchFaceInstanceParams(
instanceId,
DeviceConfig(
@@ -3888,6 +3929,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun firstOnVisibilityChangedIgnoredPostRFlow() {
val instanceId = INTERACTIVE_INSTANCE_ID
initWallpaperInteractiveWatchFaceInstance(
@@ -3941,6 +3983,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun complicationsUserStyleSetting_with_setComplicationBounds() {
val rightComplicationBoundsOption = ComplicationSlotsOption(
Option.Id(RIGHT_COMPLICATION),
@@ -4019,6 +4062,7 @@
@Suppress("DEPRECATION") // DefaultComplicationDataSourcePolicyAndType
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun canvasComplication_onRendererCreated() {
val leftCanvasComplication = mock<CanvasComplication>()
val leftComplication =
@@ -4058,6 +4102,7 @@
@Suppress("DEPRECATION") // DefaultComplicationDataSourcePolicyAndType
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun complicationSlotsWithTheSameRenderer() {
val sameCanvasComplication = mock<CanvasComplication>()
val leftComplication =
@@ -4097,6 +4142,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun additionalContentDescriptionLabelsSetBeforeWatchFaceInitComplete() {
val pendingIntent = PendingIntent.getActivity(
context, 0, Intent("Example"),
@@ -4131,7 +4177,6 @@
watchState,
handler,
null,
- false,
null,
choreographer
)
@@ -4187,6 +4232,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun onAccessibilityStateChanged_preAndroidR() {
initWallpaperInteractiveWatchFaceInstance(
WatchFaceType.ANALOG,
@@ -4205,7 +4251,6 @@
emptyList(),
null
),
- preAndroidR = true
)
engineWrapper.systemViewOfContentDescriptionLabelsIsStale = true
@@ -4218,6 +4263,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun onAccessibilityStateChanged_androidR_or_above() {
initWallpaperInteractiveWatchFaceInstance(
WatchFaceType.ANALOG,
@@ -4236,7 +4282,6 @@
emptyList(),
null
),
- preAndroidR = false
)
engineWrapper.systemViewOfContentDescriptionLabelsIsStale = true
@@ -4250,6 +4295,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun contentDescriptionLabels_contains_ComplicationData() {
initWallpaperInteractiveWatchFaceInstance(
WatchFaceType.ANALOG,
@@ -4318,6 +4364,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun schemaWithTooLargeIcon() {
val tooLargeIcon = Icon.createWithBitmap(
Bitmap.createBitmap(
@@ -4371,6 +4418,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun schemaWithTooLargeWireFormat() {
val longOptionsList = ArrayList<ListUserStyleSetting.ListOption>()
for (i in 0..10000) {
@@ -4417,6 +4465,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun getComplicationSlotMetadataWireFormats_parcelTest() {
initWallpaperInteractiveWatchFaceInstance(
WatchFaceType.ANALOG,
@@ -4463,6 +4512,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
@RequiresApi(Build.VERSION_CODES.O_MR1)
public fun glesRendererLifecycle() {
val eventLog = ArrayList<String>()
@@ -4515,7 +4565,6 @@
null,
handler,
null,
- false,
null,
choreographer,
forceIsVisible = true
@@ -4591,6 +4640,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
@RequiresApi(Build.VERSION_CODES.O_MR1)
public fun assetLifeCycle_CanvasRenderer() {
val eventLog = ArrayList<String>()
@@ -4654,7 +4704,6 @@
null,
handler,
null,
- false,
null,
choreographer,
forceIsVisible = true
@@ -4728,6 +4777,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
@RequiresApi(Build.VERSION_CODES.O_MR1)
public fun assetLifeCycle_GlesRenderer() {
val eventLog = ArrayList<String>()
@@ -4785,7 +4835,6 @@
null,
handler,
null,
- false,
null,
choreographer,
forceIsVisible = true
@@ -4859,6 +4908,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun renderer_onDestroy_called_even_if_init_not_complete() {
val initDeferred = CompletableDeferred<Unit>()
var >
@@ -4889,7 +4939,6 @@
watchState,
handler,
null,
- false,
null,
choreographer
)
@@ -4939,6 +4988,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun dump_androidXFlow() {
// Advance time a little so timestamps are not zero
looperTimeMillis = 1000
@@ -4995,6 +5045,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun dump_wslFlow() {
initEngine(
WatchFaceType.DIGITAL,
@@ -5012,6 +5063,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun uiThreadPriority_interactive() {
testWatchFaceService = TestWatchFaceService(
WatchFaceType.DIGITAL,
@@ -5028,7 +5080,6 @@
watchState,
handler,
null,
- false,
null,
choreographer,
mainThreadPriorityDelegate = mainThreadPriorityDelegate
@@ -5090,8 +5141,9 @@
assertThat(mainThreadPriorityDelegate.priority).isEqualTo(Priority.Normal)
}
- @RequiresApi(Build.VERSION_CODES.O_MR1)
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
+ @RequiresApi(Build.VERSION_CODES.O_MR1)
public fun uiThreadPriority_headless() {
testWatchFaceService = TestWatchFaceService(
WatchFaceType.ANALOG,
@@ -5108,7 +5160,6 @@
watchState,
handler,
null,
- false, // Allows DirectBoot
WallpaperInteractiveWatchFaceInstanceParams(
"Headless",
DeviceConfig(
@@ -5147,6 +5198,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
fun onVisibilityChanged_true_always_renders_a_frame() {
initEngine(
WatchFaceType.ANALOG,
@@ -5165,6 +5217,8 @@
assertThat(renderer.lastOnDrawZonedDateTime!!.toInstant().toEpochMilli()).isEqualTo(2000L)
}
+ @Test
+ @Config(sdk = [Build.VERSION_CODES.R])
@RequiresApi(Build.VERSION_CODES.O_MR1)
public fun headlessId() {
testWatchFaceService = TestWatchFaceService(
@@ -5182,9 +5236,8 @@
watchState,
handler,
null,
- false, // Allows DirectBoot
WallpaperInteractiveWatchFaceInstanceParams(
- "Headless",
+ "wfId-Headless",
DeviceConfig(
false,
false,
@@ -5208,13 +5261,14 @@
DeviceConfig(false, false, 100, 200),
100,
100,
- "Headless-instance"
+ "wfId-Headless-instance"
)
)
- assertThat(watchState.watchFaceInstanceId.value).isEqualTo("Headless-instance")
+ assertThat(watchState.watchFaceInstanceId.value).isEqualTo("wfId-Headless-instance")
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun selectComplicationDataForInstant_overlapping() {
val a = ComplicationData.Builder(ComplicationData.TYPE_SHORT_TEXT)
.setShortText(ComplicationText.plainText("A"))
@@ -5269,6 +5323,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun selectComplicationDataForInstant_disjoint() {
val a = ComplicationData.Builder(ComplicationData.TYPE_SHORT_TEXT)
.setShortText(ComplicationText.plainText("A"))
@@ -5323,6 +5378,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun selectComplicationDataForInstant_timeLineWithPlaceholder() {
val placeholderText =
androidx.wear.watchface.complications.data.ComplicationText.PLACEHOLDER
@@ -5373,6 +5429,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun renderParameters_isScreenshot() {
initWallpaperInteractiveWatchFaceInstance(
WatchFaceType.ANALOG,
@@ -5413,6 +5470,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
@Suppress("Deprecation")
public fun applyComplicationSlotsStyleCategoryOption() {
initWallpaperInteractiveWatchFaceInstance(
@@ -5526,6 +5584,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun onActionScreenOff_preR() {
Settings.Global.putInt(
context.contentResolver,
@@ -5548,7 +5607,6 @@
watchState,
handler,
null,
- true,
null,
choreographer
)
@@ -5597,6 +5655,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun onActionScreenOff_ambientNotEnabled() {
Settings.Global.putInt(
context.contentResolver,
@@ -5619,7 +5678,6 @@
watchState,
handler,
null,
- false,
null,
choreographer
)
@@ -5668,6 +5726,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun onActionScreenOff_onActionScreenOn_ambientEnabled() {
Settings.Global.putInt(
context.contentResolver,
@@ -5690,7 +5749,6 @@
watchState,
handler,
null,
- false,
null,
choreographer
)
@@ -5752,6 +5810,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun onActionTimeTick() {
testWatchFaceService = TestWatchFaceService(
WatchFaceType.DIGITAL,
@@ -5768,7 +5827,6 @@
watchState,
handler,
null,
- false,
null,
choreographer
)
@@ -5830,6 +5888,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.O_MR1])
public fun setComplicationDataListMergesCorrectly() {
initEngine(
WatchFaceType.ANALOG,
@@ -5872,6 +5931,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun updateInstance() {
initWallpaperInteractiveWatchFaceInstance(
WatchFaceType.ANALOG,
@@ -5916,6 +5976,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun updateComplications_after_updateInstance() {
val complicationList = listOf(
IdAndComplicationDataWireFormat(
@@ -5960,21 +6021,25 @@
}
assertThat(leftComplication.complicationData.value).isInstanceOf(
- NoDataComplicationData::class.java)
+ NoDataComplicationData::class.java
+ )
assertThat(rightComplication.complicationData.value).isInstanceOf(
- NoDataComplicationData::class.java)
+ NoDataComplicationData::class.java
+ )
interactiveWatchFaceInstance.updateComplicationData(complicationList)
assertThat(leftComplication.complicationData.value).isInstanceOf(
- LongTextComplicationData::class.java)
+ LongTextComplicationData::class.java
+ )
assertThat(rightComplication.complicationData.value).isInstanceOf(
- ShortTextComplicationData::class.java)
+ ShortTextComplicationData::class.java
+ )
}
@OptIn(WatchFaceExperimental::class)
@Test
- @RequiresApi(27)
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun onComputeColors() {
@Suppress("DEPRECATION")
lateinit var renderer: Renderer.CanvasRenderer
@@ -5999,7 +6064,8 @@
canvas: Canvas,
bounds: Rect,
zonedDateTime: ZonedDateTime
- ) { }
+ ) {
+ }
override fun renderHighlightLayer(
canvas: Canvas,
@@ -6014,7 +6080,6 @@
null,
handler,
null,
- false,
null,
choreographer,
forceIsVisible = true
@@ -6057,7 +6122,7 @@
val listener = object : IWatchfaceListener.Stub() {
override fun getApiVersion() = 1
- override fun onWatchfaceReady() { }
+ override fun onWatchfaceReady() {}
override fun onWatchfaceColorsChanged(watchFaceColors: WatchFaceColorsWireFormat?) {
lastWatchFaceColors = watchFaceColors?.toApiFormat()
@@ -6098,6 +6163,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun onPreviewImageUpdateRequested() {
@Suppress("DEPRECATION")
lateinit var renderer: Renderer.CanvasRenderer
@@ -6117,7 +6183,8 @@
canvas: Canvas,
bounds: Rect,
zonedDateTime: ZonedDateTime
- ) { }
+ ) {
+ }
override fun renderHighlightLayer(
canvas: Canvas,
@@ -6132,7 +6199,6 @@
null,
handler,
null,
- false,
null,
choreographer,
forceIsVisible = true
@@ -6175,7 +6241,7 @@
val listener = object : IWatchfaceListener.Stub() {
override fun getApiVersion() = 1
- override fun onWatchfaceReady() { }
+ override fun onWatchfaceReady() {}
override fun onWatchfaceColorsChanged(watchFaceColors: WatchFaceColorsWireFormat?) {}
@@ -6217,6 +6283,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
public fun onPreviewImageUpdateRequested_earlyCall() {
@Suppress("DEPRECATION")
lateinit var renderer: Renderer.CanvasRenderer
@@ -6256,7 +6323,6 @@
null,
handler,
null,
- false,
null,
choreographer,
forceIsVisible = true
@@ -6322,6 +6388,7 @@
}
@Test
+ @Config(sdk = [Build.VERSION_CODES.R])
@RequiresApi(Build.VERSION_CODES.O_MR1)
public fun sendPreviewImageNeedsUpdateRequest_headlessInstance() {
@Suppress("DEPRECATION")
@@ -6341,11 +6408,13 @@
init {
sendPreviewImageNeedsUpdateRequest()
}
+
override fun render(
canvas: Canvas,
bounds: Rect,
zonedDateTime: ZonedDateTime
- ) { }
+ ) {
+ }
override fun renderHighlightLayer(
canvas: Canvas,
@@ -6360,7 +6429,6 @@
null,
handler,
null,
- false,
null,
choreographer,
forceIsVisible = true
@@ -6388,7 +6456,8 @@
}
@Test
- @Suppress("NewApi")
+ @Config(sdk = [Build.VERSION_CODES.R])
+ @RequiresApi(Build.VERSION_CODES.TIRAMISU)
public fun doNotDisplayComplicationWhenScreenLocked() {
initWallpaperInteractiveWatchFaceInstance(
WatchFaceType.ANALOG,
@@ -6463,15 +6532,8 @@
)
}
- @SuppressLint("NewApi")
- @Suppress("DEPRECATION")
- private fun getChinWindowInsetsApi25(@Px chinHeight: Int): WindowInsets =
- WindowInsets.Builder().setSystemWindowInsets(
- Insets.of(0, 0, 0, chinHeight)
- ).build()
-
- @SuppressLint("NewApi")
- private fun getChinWindowInsetsApi30(@Px chinHeight: Int): WindowInsets =
+ @RequiresApi(Build.VERSION_CODES.R)
+ private fun getChinWindowInsets(@Px chinHeight: Int): WindowInsets =
WindowInsets.Builder().setInsets(
WindowInsets.Type.systemBars(),
Insets.of(Rect().apply { bottom = chinHeight })