Apply ComposeScreenshot plugin

app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt

@@ -183,7 +183,7 @@ class NiaAppState(
  * Stores information about navigation events to be used with JankStats
  */
 @Composable
-private fun NavigationTrackingSideEffect(navController: NavHostController) {
+internal fun NavigationTrackingSideEffect(navController: NavHostController) {
     TrackDisposableJank(navController) { metricsHolder ->
         val listener = NavController.OnDestinationChangedListener { _, destination, _ ->
             metricsHolder.state?.putState("Navigation", destination.route.toString())

build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt

@@ -16,6 +16,7 @@
 
 import com.android.build.api.dsl.ApplicationExtension
 import com.google.samples.apps.nowinandroid.configureAndroidCompose
+import com.google.samples.apps.nowinandroid.configureAndroidComposeScreenshotTest
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
@@ -26,9 +27,11 @@ class AndroidApplicationComposeConventionPlugin : Plugin<Project> {
         with(target) {
             apply(plugin = "com.android.application")
             apply(plugin = "org.jetbrains.kotlin.plugin.compose")
+            apply(plugin = "com.android.compose.screenshot")
 
             val extension = extensions.getByType<ApplicationExtension>()
             configureAndroidCompose(extension)
+            configureAndroidComposeScreenshotTest(extension)
         }
     }
 

build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt

@@ -16,6 +16,7 @@
 
 import com.android.build.gradle.LibraryExtension
 import com.google.samples.apps.nowinandroid.configureAndroidCompose
+import com.google.samples.apps.nowinandroid.configureAndroidComposeScreenshotTest
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
@@ -26,9 +27,11 @@ class AndroidLibraryComposeConventionPlugin : Plugin<Project> {
         with(target) {
             apply(plugin = "com.android.library")
             apply(plugin = "org.jetbrains.kotlin.plugin.compose")
+            apply(plugin = "com.android.compose.screenshot")
 
             val extension = extensions.getByType<LibraryExtension>()
             configureAndroidCompose(extension)
+            configureAndroidComposeScreenshotTest(extension)
         }
     }
 

build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidComposeScreenshotTest.kt

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024 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
+ *
+ *     https://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 com.google.samples.apps.nowinandroid
+
+import com.android.build.api.dsl.CommonExtension
+import org.gradle.api.Project
+
+/**
+ * Configure project to enable compose screenshot test.
+ */
+internal fun Project.configureAndroidComposeScreenshotTest(
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
+) {
+    commonExtension.apply {
+        experimentalProperties["android.experimental.enableScreenshotTest"] = true
+    }
+}

build.gradle.kts

@@ -49,6 +49,7 @@ plugins {
     alias(libs.plugins.android.test) apply false
     alias(libs.plugins.baselineprofile) apply false
     alias(libs.plugins.compose) apply false
+    alias(libs.plugins.compose.screenshot.test) apply false
     alias(libs.plugins.kotlin.jvm) apply false
     alias(libs.plugins.kotlin.serialization) apply false
     alias(libs.plugins.dependencyGuard) apply false

core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Background.kt

@@ -19,7 +19,6 @@ package com.google.samples.apps.nowinandroid.core.designsystem.component
 import android.content.res.Configuration
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.size
 import androidx.compose.material3.LocalAbsoluteTonalElevation
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
@@ -37,7 +36,6 @@ import androidx.compose.ui.unit.dp
 import com.google.samples.apps.nowinandroid.core.designsystem.theme.GradientColors
 import com.google.samples.apps.nowinandroid.core.designsystem.theme.LocalBackgroundTheme
 import com.google.samples.apps.nowinandroid.core.designsystem.theme.LocalGradientColors
-import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
 import kotlin.math.tan
 
 /**
@@ -146,51 +144,3 @@ fun NiaGradientBackground(
 @Preview(uiMode = Configuration.UI_MODE_NIGHT_NO, name = "Light theme")
 @Preview(uiMode = Configuration.UI_MODE_NIGHT_YES, name = "Dark theme")
 annotation class ThemePreviews
-
-@ThemePreviews
-@Composable
-fun BackgroundDefault() {
-    NiaTheme(disableDynamicTheming = true) {
-        NiaBackground(Modifier.size(100.dp), content = {})
-    }
-}
-
-@ThemePreviews
-@Composable
-fun BackgroundDynamic() {
-    NiaTheme(disableDynamicTheming = false) {
-        NiaBackground(Modifier.size(100.dp), content = {})
-    }
-}
-
-@ThemePreviews
-@Composable
-fun BackgroundAndroid() {
-    NiaTheme(androidTheme = true) {
-        NiaBackground(Modifier.size(100.dp), content = {})
-    }
-}
-
-@ThemePreviews
-@Composable
-fun GradientBackgroundDefault() {
-    NiaTheme(disableDynamicTheming = true) {
-        NiaGradientBackground(Modifier.size(100.dp), content = {})
-    }
-}
-
-@ThemePreviews
-@Composable
-fun GradientBackgroundDynamic() {
-    NiaTheme(disableDynamicTheming = false) {
-        NiaGradientBackground(Modifier.size(100.dp), content = {})
-    }
-}
-
-@ThemePreviews
-@Composable
-fun GradientBackgroundAndroid() {
-    NiaTheme(androidTheme = true) {
-        NiaGradientBackground(Modifier.size(100.dp), content = {})
-    }
-}

core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Button.kt

@@ -242,7 +242,7 @@ fun NiaTextButton(
  * @param leadingIcon The button leading icon content. Default is `null` for no leading icon.Ï
  */
 @Composable
-private fun NiaButtonContent(
+internal fun NiaButtonContent(
     text: @Composable () -> Unit,
     leadingIcon: @Composable (() -> Unit)? = null,
 ) {

core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/TopAppBar.kt

@@ -32,9 +32,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
-import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -73,18 +70,3 @@ fun NiaTopAppBar(
         modifier = modifier.testTag("niaTopAppBar"),
     )
 }
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Preview("Top App Bar")
-@Composable
-private fun NiaTopAppBarPreview() {
-    NiaTheme {
-        NiaTopAppBar(
-            titleRes = android.R.string.untitled,
-            navigationIcon = NiaIcons.Search,
-            navigationIconContentDescription = "Navigation icon",
-            actionIcon = NiaIcons.MoreVert,
-            actionIconContentDescription = "Action icon",
-        )
-    }
-}

core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/ViewToggle.kt

@@ -24,15 +24,11 @@ import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ProvideTextStyle
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
-import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
 
 /**
  * Now in Android view toggle button with included trailing icon as well as compact and expanded
@@ -84,7 +80,7 @@ fun NiaViewToggleButton(
  * @param trailingIcon The button trailing icon content. Default is `null` for no trailing icon.
  */
 @Composable
-private fun NiaViewToggleButtonContent(
+internal fun NiaViewToggleButtonContent(
     text: @Composable () -> Unit,
     trailingIcon: @Composable (() -> Unit)? = null,
 ) {
@@ -109,36 +105,6 @@ private fun NiaViewToggleButtonContent(
     }
 }
 
-@ThemePreviews
-@Composable
-fun ViewTogglePreviewExpanded() {
-    NiaTheme {
-        Surface {
-            NiaViewToggleButton(
-                expanded = true,
-                onExpandedChange = { },
-                compactText = { Text(text = "Compact view") },
-                expandedText = { Text(text = "Expanded view") },
-            )
-        }
-    }
-}
-
-@Preview
-@Composable
-fun ViewTogglePreviewCompact() {
-    NiaTheme {
-        Surface {
-            NiaViewToggleButton(
-                expanded = false,
-                onExpandedChange = { },
-                compactText = { Text(text = "Compact view") },
-                expandedText = { Text(text = "Expanded view") },
-            )
-        }
-    }
-}
-
 /**
  * Now in Android view toggle default values.
  */

core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/AppScrollbars.kt

@@ -128,7 +128,7 @@ fun ScrollableState.DecorativeScrollbar(
  * A scrollbar thumb that is intended to also be a touch target for fast scrolling.
  */
 @Composable
-private fun ScrollableState.DraggableScrollbarThumb(
+internal fun ScrollableState.DraggableScrollbarThumb(
     interactionSource: InteractionSource,
     orientation: Orientation,
 ) {
@@ -148,7 +148,7 @@ private fun ScrollableState.DraggableScrollbarThumb(
  * A decorative scrollbar thumb used solely for communicating a user's position in a list.
  */
 @Composable
-private fun ScrollableState.DecorativeScrollbarThumb(
+internal fun ScrollableState.DecorativeScrollbarThumb(
     interactionSource: InteractionSource,
     orientation: Orientation,
 ) {
@@ -168,7 +168,7 @@ private fun ScrollableState.DecorativeScrollbarThumb(
 // remove when project is upgraded
 @SuppressLint("ComposableModifierFactory")
 @Composable
-private fun Modifier.scrollThumb(
+internal fun Modifier.scrollThumb(
     scrollableState: ScrollableState,
     interactionSource: InteractionSource,
 ): Modifier {
@@ -214,7 +214,7 @@ private class ScrollThumbNode(var colorProducer: ColorProducer) : DrawModifierNo
  * @param interactionSource source of interactions in the scrolling container
  */
 @Composable
-private fun scrollbarThumbColor(
+internal fun scrollbarThumbColor(
     scrollableState: ScrollableState,
     interactionSource: InteractionSource,
 ): State<Color> {

core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/ThumbExt.kt

@@ -71,7 +71,7 @@ fun LazyStaggeredGridState.rememberDraggableScroller(
  * @param scroll a function to be invoked when an index has been identified to scroll to.
  */
 @Composable
-private inline fun rememberDraggableScroller(
+internal inline fun rememberDraggableScroller(
     itemsAvailable: Int,
     crossinline scroll: suspend (index: Int) -> Unit,
 ): (Float) -> Unit {

core/designsystem/src/screenshotTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/BackgroundScreenshotTest.kt

@@ -0,0 +1,71 @@
+/*
+ * Copyright 2024 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
+ *
+ *     https://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 com.google.samples.apps.nowinandroid.core.designsystem.component
+import androidx.compose.foundation.layout.size
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
+
+@ThemePreviews
+@Composable
+fun BackgroundDefault() {
+    NiaTheme(disableDynamicTheming = true) {
+        NiaBackground(Modifier.size(100.dp), content = {})
+    }
+}
+
+@ThemePreviews
+@Composable
+fun BackgroundDynamic() {
+    NiaTheme(disableDynamicTheming = false) {
+        NiaBackground(Modifier.size(100.dp), content = {})
+    }
+}
+
+@ThemePreviews
+@Composable
+fun BackgroundAndroid() {
+    NiaTheme(androidTheme = true) {
+        NiaBackground(Modifier.size(100.dp), content = {})
+    }
+}
+
+@ThemePreviews
+@Composable
+fun GradientBackgroundDefault() {
+    NiaTheme(disableDynamicTheming = true) {
+        NiaGradientBackground(Modifier.size(100.dp), content = {})
+    }
+}
+
+@ThemePreviews
+@Composable
+fun GradientBackgroundDynamic() {
+    NiaTheme(disableDynamicTheming = false) {
+        NiaGradientBackground(Modifier.size(100.dp), content = {})
+    }
+}
+
+@ThemePreviews
+@Composable
+fun GradientBackgroundAndroid() {
+    NiaTheme(androidTheme = true) {
+        NiaGradientBackground(Modifier.size(100.dp), content = {})
+    }
+}