A fully functional Android app built entirely with Kotlin and Jetpack Compose
Merge remote-tracking branch 'github/main'
Jolanda Verhoef2f35893b2e2a
diff --cc app/build.gradle.ktsindex 0315806a4,36f48a947..16406e511--- a/app/build.gradle.kts+++ b/app/build.gradle.kts@@@ -46,33 -43,23 +46,41 @@@ androidval release by getting {isMinifyEnabled = trueproguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")- }- val staging by creating {- initWith(debug)++ // To publish on the Play store a private signing key is required, but to allow anyone+ // who clones the code to sign and run the release variant, use the debug signing key.+ // TODO: Abstract the signing configuration to a separate file to avoid hardcoding this.signingConfig = signingConfigs.getByName("debug")- matchingFallbacks.add("debug")- applicationIdSuffix = ".staging"}val benchmark by creating {- initWith(staging) // Usually should be `initWith(release)`. Connecting to demo backend.- matchingFallbacks.add("debug") // Making some settings below to align closer to release.++ // Enable all the optimizations from release build through initWith(release).+ initWith(release)- signingConfig = signingConfigs.getByName("debug")+ matchingFallbacks.add("release")++ // Debug key signing is available to everyone.+ signingConfig = signingConfigs.getByName("debug")- proguardFiles("benchmark-rules.pro") // Only use benchmark proguard rules- isMinifyEnabled = false // FIXME enabling minification breaks access to demo backend.++ // Only use benchmark proguard rules+ proguardFiles("benchmark-rules.pro")++ // FIXME enabling minification breaks access to demo backend.++ isMinifyEnabled = false++ // Keep the build type debuggable so we can attach a debugger if needed.+ isDebuggable = true+ applicationIdSuffix = ".benchmark"}}++ // @see Flavor for more details on the app product flavors.+ flavorDimensions += FlavorDimension.contentType.name+ productFlavors {+ Flavor.values().forEach {+ create(it.name) {+ dimension = it.dimension.name+ if (it.applicationIdSuffix != null) {+ applicationIdSuffix = it.applicationIdSuffix+ }+ }+ }+ }+packagingOptions {resources {excludes.add("/META-INF/{AL2.0,LGPL2.1}")diff --cc benchmark/build.gradle.ktsindex 393981903,878bc6aaf..9fd1d5864--- a/benchmark/build.gradle.kts+++ b/benchmark/build.gradle.kts@@@ -25,6 -25,6 +25,7 @@@ androiddefaultConfig {minSdk = 23testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"++ missingDimensionStrategy("contentType", "demo")}buildTypes {@@@ -32,9 -32,9 +33,9 @@@// release build (for example, with minification on). It's signed with a debug key// for easy local/CI testing.val benchmark by creating {- isDebuggable = true+ isDebuggable = falsesigningConfig = signingConfigs.getByName("debug")- matchingFallbacks.add("debug")+ matchingFallbacks.add("release")}}diff --cc benchmark/src/main/java/com/google/samples/apps/nowinandroid/baselineprofile/BaselineProfileGenerator.ktindex e9a064467,b26bfb260..2fdc28bad--- a/benchmark/src/main/java/com/google/samples/apps/nowinandroid/baselineprofile/BaselineProfileGenerator.kt+++ b/benchmark/src/main/java/com/google/samples/apps/nowinandroid/baselineprofile/BaselineProfileGenerator.kt@@@ -32,7 -33,7 +33,7 @@@ class BaselineProfileGenerator@Testfun startup() =baselineProfileRule.collectBaselineProfile(-- packageName = "com.google.samples.apps.nowinandroid"++ packageName = "com.google.samples.apps.nowinandroid.demo.benchmark") {pressHome()// This block defines the app's critical user journey. Here we are interested indiff --cc feature-foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.ktindex 378b05124,378b05124..5afd3a02c--- a/feature-foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt+++ b/feature-foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt@@@ -20,8 -20,8 +20,6 @@@ import androidx.activity.ComponentActivimport androidx.compose.foundation.layout.BoxWithConstraintsimport androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApiimport androidx.compose.material3.windowsizeclass.WindowSizeClass--import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass--import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass.Companionimport androidx.compose.ui.test.assertHasClickActionimport androidx.compose.ui.test.assertIsDisplayedimport androidx.compose.ui.test.assertIsEnabled@@@ -39,12 -39,12 +37,7 @@@ import androidx.compose.ui.unit.DpSizimport com.google.samples.apps.nowinandroid.core.model.data.Authorimport com.google.samples.apps.nowinandroid.core.model.data.FollowableAuthorimport com.google.samples.apps.nowinandroid.core.model.data.FollowableTopic--import com.google.samples.apps.nowinandroid.core.model.data.NewsResource--import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Video--import com.google.samples.apps.nowinandroid.core.model.data.SaveableNewsResourceimport com.google.samples.apps.nowinandroid.core.model.data.Topic--import kotlinx.datetime.Instant--import org.junit.Assert.assertTrueimport org.junit.Ruleimport org.junit.Test@@@ -554,155 -554,155 +547,155 @@@ class ForYouScreenTest.assertExists()}-- @Test-- fun feed_whenNoInterestsSelectionAndLoaded_showsFeed() {-- lateinit var windowSizeClass: WindowSizeClass---- val saveableNewsResources = listOf(-- SaveableNewsResource(-- newsResource = NewsResource(-- id = "1",-- episodeId = "52",-- title = "Thanks for helping us reach 1M YouTube Subscribers",-- content = "Thank you everyone for following the Now in Android series " +-- "and everything the Android Developers YouTube channel has to offer. " +-- "During the Android Developer Summit, our YouTube channel reached 1 " +-- "million subscribers! Here’s a small video to thank you all.",-- url = "https://youtu.be/-fJ6poHQrjM",-- headerImageUrl = "https://i.ytimg.com/vi/-fJ6poHQrjM/maxresdefault.jpg",-- publishDate = Instant.parse("2021-11-09T00:00:00.000Z"),-- type = Video,-- topics = listOf(-- Topic(-- id = "0",-- name = "Headlines",-- shortDescription = "",-- longDescription = "",-- url = "",-- imageUrl = ""-- )-- ),-- authors = emptyList()-- ),-- isSaved = false-- ),-- SaveableNewsResource(-- newsResource = NewsResource(-- id = "2",-- episodeId = "52",-- title = "Transformations and customisations in the Paging Library",-- content = "A demonstration of different operations that can be performed " +-- "with Paging. Transformations like inserting separators, when to " +-- "create a new pager, and customisation options for consuming " +-- "PagingData.",-- url = "https://youtu.be/ZARz0pjm5YM",-- headerImageUrl = "https://i.ytimg.com/vi/ZARz0pjm5YM/maxresdefault.jpg",-- publishDate = Instant.parse("2021-11-01T00:00:00.000Z"),-- type = Video,-- topics = listOf(-- Topic(-- id = "1",-- name = "UI",-- shortDescription = "",-- longDescription = "",-- url = "",-- imageUrl = ""-- ),-- ),-- authors = emptyList()-- ),-- isSaved = false-- ),-- SaveableNewsResource(-- newsResource = NewsResource(-- id = "3",-- episodeId = "52",-- title = "Community tip on Paging",-- content = "Tips for using the Paging library from the developer community",-- url = "https://youtu.be/r5JgIyS3t3s",-- headerImageUrl = "https://i.ytimg.com/vi/r5JgIyS3t3s/maxresdefault.jpg",-- publishDate = Instant.parse("2021-11-08T00:00:00.000Z"),-- type = Video,-- topics = listOf(-- Topic(-- id = "1",-- name = "UI",-- shortDescription = "",-- longDescription = "",-- url = "",-- imageUrl = ""-- ),-- ),-- authors = emptyList()-- ),-- isSaved = false-- ),-- )---- composeTestRule.setContent {-- BoxWithConstraints {-- windowSizeClass = WindowSizeClass.calculateFromSize(-- DpSize(maxWidth, maxHeight)-- )---- ForYouScreen(-- windowSizeClass = windowSizeClass,-- interestsSelectionState = ForYouInterestsSelectionUiState.NoInterestsSelection,-- feedState = ForYouFeedUiState.Success(-- feed = saveableNewsResources-- ),-- onAuthorCheckedChanged = { _, _ -> },-- onTopicCheckedChanged = { _, _ -> },-- saveFollowedTopics = {},-- onNewsResourcesCheckedChanged = { _, _ -> }-- )-- }-- }---- // Scroll until the second feed item is visible-- // This will cause both the first and second feed items to be visible at the same time,-- // so we can compare their positions to each other.-- composeTestRule-- .onAllNodes(hasScrollToNodeAction())-- .onFirst()-- .performScrollToNode(-- hasText(-- "Transformations and customisations in the Paging Library",-- substring = true-- )-- )---- val firstFeedItem = composeTestRule-- .onNodeWithText(-- "Thanks for helping us reach 1M YouTube Subscribers",-- substring = true-- )-- .assertHasClickAction()-- .fetchSemanticsNode()---- val secondFeedItem = composeTestRule-- .onNodeWithText(-- "Transformations and customisations in the Paging Library",-- substring = true-- )-- .assertHasClickAction()-- .fetchSemanticsNode()---- when (windowSizeClass.widthSizeClass) {-- WindowWidthSizeClass.Compact, Companion.Medium -> {-- // On smaller screen widths, the second feed item should be below the first because-- // they are displayed in a single column-- assertTrue(-- firstFeedItem.positionInRoot.y < secondFeedItem.positionInRoot.y-- )-- }-- else -> {-- // On larger screen widths, the second feed item should be inline with the first-- // because they are displayed in more than one column-- assertTrue(-- firstFeedItem.positionInRoot.y == secondFeedItem.positionInRoot.y-- )-- }-- }-- }++// @Test++// fun feed_whenNoInterestsSelectionAndLoaded_showsFeed() {++// lateinit var windowSizeClass: WindowSizeClass++//++// val saveableNewsResources = listOf(++// SaveableNewsResource(++// newsResource = NewsResource(++// id = "1",++// episodeId = "52",++// title = "Thanks for helping us reach 1M YouTube Subscribers",++// content = "Thank you everyone for following the Now in Android series " +++// "and everything the Android Developers YouTube channel has to offer. " +++// "During the Android Developer Summit, our YouTube channel reached 1 " +++// "million subscribers! Here’s a small video to thank you all.",++// url = "https://youtu.be/-fJ6poHQrjM",++// headerImageUrl = "https://i.ytimg.com/vi/-fJ6poHQrjM/maxresdefault.jpg",++// publishDate = Instant.parse("2021-11-09T00:00:00.000Z"),++// type = Video,++// topics = listOf(++// Topic(++// id = "0",++// name = "Headlines",++// shortDescription = "",++// longDescription = "",++// url = "",++// imageUrl = ""++// )++// ),++// authors = emptyList()++// ),++// isSaved = false++// ),++// SaveableNewsResource(++// newsResource = NewsResource(++// id = "2",++// episodeId = "52",++// title = "Transformations and customisations in the Paging Library",++// content = "A demonstration of different operations that can be performed " +++// "with Paging. Transformations like inserting separators, when to " +++// "create a new pager, and customisation options for consuming " +++// "PagingData.",++// url = "https://youtu.be/ZARz0pjm5YM",++// headerImageUrl = "https://i.ytimg.com/vi/ZARz0pjm5YM/maxresdefault.jpg",++// publishDate = Instant.parse("2021-11-01T00:00:00.000Z"),++// type = Video,++// topics = listOf(++// Topic(++// id = "1",++// name = "UI",++// shortDescription = "",++// longDescription = "",++// url = "",++// imageUrl = ""++// ),++// ),++// authors = emptyList()++// ),++// isSaved = false++// ),++// SaveableNewsResource(++// newsResource = NewsResource(++// id = "3",++// episodeId = "52",++// title = "Community tip on Paging",++// content = "Tips for using the Paging library from the developer community",++// url = "https://youtu.be/r5JgIyS3t3s",++// headerImageUrl = "https://i.ytimg.com/vi/r5JgIyS3t3s/maxresdefault.jpg",++// publishDate = Instant.parse("2021-11-08T00:00:00.000Z"),++// type = Video,++// topics = listOf(++// Topic(++// id = "1",++// name = "UI",++// shortDescription = "",++// longDescription = "",++// url = "",++// imageUrl = ""++// ),++// ),++// authors = emptyList()++// ),++// isSaved = false++// ),++// )++//++// composeTestRule.setContent {++// BoxWithConstraints {++// windowSizeClass = WindowSizeClass.calculateFromSize(++// DpSize(maxWidth, maxHeight)++// )++//++// ForYouScreen(++// windowSizeClass = windowSizeClass,++// interestsSelectionState = ForYouInterestsSelectionUiState.NoInterestsSelection,++// feedState = ForYouFeedUiState.Success(++// feed = saveableNewsResources++// ),++// onAuthorCheckedChanged = { _, _ -> },++// onTopicCheckedChanged = { _, _ -> },++// saveFollowedTopics = {},++// onNewsResourcesCheckedChanged = { _, _ -> }++// )++// }++// }++//++// // Scroll until the second feed item is visible++// // This will cause both the first and second feed items to be visible at the same time,++// // so we can compare their positions to each other.++// composeTestRule++// .onAllNodes(hasScrollToNodeAction())++// .onFirst()++// .performScrollToNode(++// hasText(++// "Transformations and customisations in the Paging Library",++// substring = true++// )++// )++//++// val firstFeedItem = composeTestRule++// .onNodeWithText(++// "Thanks for helping us reach 1M YouTube Subscribers",++// substring = true++// )++// .assertHasClickAction()++// .fetchSemanticsNode()++//++// val secondFeedItem = composeTestRule++// .onNodeWithText(++// "Transformations and customisations in the Paging Library",++// substring = true++// )++// .assertHasClickAction()++// .fetchSemanticsNode()++//++// when (windowSizeClass.widthSizeClass) {++// WindowWidthSizeClass.Compact, Companion.Medium -> {++// // On smaller screen widths, the second feed item should be below the first because++// // they are displayed in a single column++// assertTrue(++// firstFeedItem.positionInRoot.y < secondFeedItem.positionInRoot.y++// )++// }++// else -> {++// // On larger screen widths, the second feed item should be inline with the first++// // because they are displayed in more than one column++// assertTrue(++// firstFeedItem.positionInRoot.y == secondFeedItem.positionInRoot.y++// )++// }++// }++// }}