Skip to content

A fully functional Android app built entirely with Kotlin and Jetpack Compose

Replace global variables with PreviewParameterProvider

Miłosz Moczkowskibcb4d7d59262
diff --git a/core/domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/model/FollowableTopic.kt b/core/domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/model/FollowableTopic.kt
index 121f83098..7b59df412 100644
--- a/core/domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/model/FollowableTopic.kt
+++ b/core/domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/model/FollowableTopic.kt
@@ -17,7 +17,6 @@
package com.google.samples.apps.nowinandroid.core.domain.model
import com.google.samples.apps.nowinandroid.core.model.data.Topic
-import com.google.samples.apps.nowinandroid.core.model.data.previewTopics
/**
* A [topic] with the additional information for whether or not it is followed.
@@ -26,18 +25,3 @@ data class FollowableTopic( // TODO consider changing to UserTopic and flattenin
val topic: Topic,
val isFollowed: Boolean,
)
-
-val previewFollowableTopics = listOf(
- FollowableTopic(
- previewTopics[0],
- isFollowed = false,
- ),
- FollowableTopic(
- previewTopics[1],
- isFollowed = true,
- ),
- FollowableTopic(
- previewTopics[2],
- isFollowed = false,
- ),
-)
diff --git a/core/domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/model/UserNewsResource.kt b/core/domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/model/UserNewsResource.kt
index 7cf511c60..4e12ec95b 100644
--- a/core/domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/model/UserNewsResource.kt
+++ b/core/domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/model/UserNewsResource.kt
@@ -18,16 +18,8 @@ package com.google.samples.apps.nowinandroid.core.domain.model
import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType
-import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Codelab
-import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Unknown
-import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Video
import com.google.samples.apps.nowinandroid.core.model.data.UserData
import kotlinx.datetime.Instant
-import kotlinx.datetime.LocalDateTime
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.toInstant
-
-/* ktlint-disable max-line-length */
/**
* A [NewsResource] with additional user information such as whether the user is following the
@@ -65,65 +57,3 @@ data class UserNewsResource internal constructor(
fun List<NewsResource>.mapToUserNewsResources(userData: UserData): List<UserNewsResource> {
return map { UserNewsResource(it, userData) }
}
-
-val previewUserNewsResources = listOf(
- UserNewsResource(
- id = "1",
- title = "Android Basics with Compose",
- content = "We released the first two units of Android Basics with Compose, our first free course that teaches Android Development with Jetpack Compose to anyone; you do not need any prior programming experience other than basic computer literacy to get started. You’ll learn the fundamentals of programming in Kotlin while building Android apps using Jetpack Compose, Android’s modern toolkit that simplifies and accelerates native UI development. These two units are just the beginning; more will be coming soon. Check out Android Basics with Compose to get started on your Android development journey",
- url = "https://android-developers.googleblog.com/2022/05/new-android-basics-with-compose-course.html",
- headerImageUrl = "https://developer.android.com/images/hero-assets/android-basics-compose.svg",
- publishDate = LocalDateTime(
- year = 2022,
- monthNumber = 5,
- dayOfMonth = 4,
- hour = 23,
- minute = 0,
- second = 0,
- nanosecond = 0,
- ).toInstant(TimeZone.UTC),
- type = Codelab,
- followableTopics = listOf(previewFollowableTopics[1]),
- isSaved = true,
- ),
- UserNewsResource(
- id = "2",
- 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,
- followableTopics = listOf(previewFollowableTopics[0], previewFollowableTopics[1]),
- isSaved = false,
- ),
- UserNewsResource(
- id = "3",
- 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,
- followableTopics = listOf(previewFollowableTopics[2]),
- isSaved = false,
- ),
- UserNewsResource(
- id = "4",
- title = "New Jetpack Release",
- content = "New Jetpack release includes updates to libraries such as CameraX, Benchmark, and" +
- "more!",
- url = "https://developer.android.com/jetpack/androidx/versions/all-channel",
- headerImageUrl = "",
- publishDate = Instant.parse("2022-10-01T00:00:00.000Z"),
- type = Unknown,
- followableTopics = listOf(previewFollowableTopics[2]),
- isSaved = true,
- ),
-)
diff --git a/core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/NewsResource.kt b/core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/NewsResource.kt
index 2f60ca43b..a1d4deb65 100644
--- a/core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/NewsResource.kt
+++ b/core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/NewsResource.kt
@@ -16,15 +16,7 @@
package com.google.samples.apps.nowinandroid.core.model.data
-import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Codelab
-import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Unknown
-import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Video
import kotlinx.datetime.Instant
-import kotlinx.datetime.LocalDateTime
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.toInstant
-
-/* ktlint-disable max-line-length */
/**
* External data layer representation of a fully populated NiA news resource
@@ -39,61 +31,3 @@ data class NewsResource(
val type: NewsResourceType,
val topics: List<Topic>,
)
-
-val previewNewsResources = listOf(
- NewsResource(
- id = "1",
- title = "Android Basics with Compose",
- content = "We released the first two units of Android Basics with Compose, our first free course that teaches Android Development with Jetpack Compose to anyone; you do not need any prior programming experience other than basic computer literacy to get started. You’ll learn the fundamentals of programming in Kotlin while building Android apps using Jetpack Compose, Android’s modern toolkit that simplifies and accelerates native UI development. These two units are just the beginning; more will be coming soon. Check out Android Basics with Compose to get started on your Android development journey",
- url = "https://android-developers.googleblog.com/2022/05/new-android-basics-with-compose-course.html",
- headerImageUrl = "https://developer.android.com/images/hero-assets/android-basics-compose.svg",
- publishDate = LocalDateTime(
- year = 2022,
- monthNumber = 5,
- dayOfMonth = 4,
- hour = 23,
- minute = 0,
- second = 0,
- nanosecond = 0,
- ).toInstant(TimeZone.UTC),
- type = Codelab,
- topics = listOf(previewTopics[1]),
- ),
- NewsResource(
- id = "2",
- 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(previewTopics[0], previewTopics[1]),
- ),
- NewsResource(
- id = "3",
- 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(previewTopics[2]),
- ),
- NewsResource(
- id = "4",
- title = "New Jetpack Release",
- content = "New Jetpack release includes updates to libraries such as CameraX, Benchmark, and" +
- "more!",
- url = "https://developer.android.com/jetpack/androidx/versions/all-channel",
- headerImageUrl = "",
- publishDate = Instant.parse("2022-10-01T00:00:00.000Z"),
- type = Unknown,
- topics = listOf(previewTopics[2]),
- ),
-)
diff --git a/core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/Topic.kt b/core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/Topic.kt
index 03c184e0d..cc45937b6 100644
--- a/core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/Topic.kt
+++ b/core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/Topic.kt
@@ -16,8 +16,6 @@
package com.google.samples.apps.nowinandroid.core.model.data
-/* ktlint-disable max-line-length */
-
/**
* External data layer representation of a NiA Topic
*/
@@ -29,30 +27,3 @@ data class Topic(
val url: String,
val imageUrl: String,
)
-
-val previewTopics = listOf(
- Topic(
- id = "2",
- name = "Headlines",
- shortDescription = "News we want everyone to see",
- longDescription = "Stay up to date with the latest events and announcements from Android!",
- imageUrl = "https://firebasestorage.googleapis.com/v0/b/now-in-android.appspot.com/o/img%2Fic_topic_Headlines.svg?alt=media&token=506faab0-617a-4668-9e63-4a2fb996603f",
- url = "",
- ),
- Topic(
- id = "3",
- name = "UI",
- shortDescription = "Material Design, Navigation, Text, Paging, Accessibility (a11y), Internationalization (i18n), Localization (l10n), Animations, Large Screens, Widgets",
- longDescription = "Learn how to optimize your app's user interface - everything that users can see and interact with. Stay up to date on tocpis such as Material Design, Navigation, Text, Paging, Compose, Accessibility (a11y), Internationalization (i18n), Localization (l10n), Animations, Large Screens, Widgets, and many more!",
- imageUrl = "https://firebasestorage.googleapis.com/v0/b/now-in-android.appspot.com/o/img%2Fic_topic_UI.svg?alt=media&token=0ee1842b-12e8-435f-87ba-a5bb02c47594",
- url = "",
- ),
- Topic(
- id = "4",
- name = "Testing",
- shortDescription = "CI, Espresso, TestLab, etc",
- longDescription = "Testing is an integral part of the app development process. By running tests against your app consistently, you can verify your app's correctness, functional behavior, and usability before you release it publicly. Stay up to date on the latest tricks in CI, Espresso, and Firebase TestLab.",
- imageUrl = "https://firebasestorage.googleapis.com/v0/b/now-in-android.appspot.com/o/img%2Fic_topic_Testing.svg?alt=media&token=a11533c4-7cc8-4b11-91a3-806158ebf428",
- url = "",
- ),
-)
diff --git a/core/testing/build.gradle.kts b/core/testing/build.gradle.kts
index 5c5740eee..5e0c3e409 100644
--- a/core/testing/build.gradle.kts
+++ b/core/testing/build.gradle.kts
@@ -26,8 +26,11 @@ android {
dependencies {
implementation(project(":core:common"))
implementation(project(":core:data"))
+ implementation(project(":core:domain"))
implementation(project(":core:model"))
+ implementation(libs.kotlinx.datetime)
+
api(libs.junit4)
api(libs.androidx.test.core)
api(libs.kotlinx.coroutines.test)
diff --git a/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/data/FollowableTopicTestData.kt b/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/data/FollowableTopicTestData.kt
new file mode 100644
index 000000000..40e9327d3
--- /dev/null
+++ b/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/data/FollowableTopicTestData.kt
@@ -0,0 +1,57 @@
+/*
+ * 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
+ *
+ * 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.testing.data
+
+import com.google.samples.apps.nowinandroid.core.domain.model.FollowableTopic
+import com.google.samples.apps.nowinandroid.core.model.data.Topic
+
+/* ktlint-disable max-line-length */
+val followableTopicTestData: List<FollowableTopic> = listOf(
+ FollowableTopic(
+ topic = Topic(
+ id = "2",
+ name = "Headlines",
+ shortDescription = "News we want everyone to see",
+ longDescription = "Stay up to date with the latest events and announcements from Android!",
+ imageUrl = "https://firebasestorage.googleapis.com/v0/b/now-in-android.appspot.com/o/img%2Fic_topic_Headlines.svg?alt=media&token=506faab0-617a-4668-9e63-4a2fb996603f",
+ url = "",
+ ),
+ isFollowed = false,
+ ),
+ FollowableTopic(
+ topic = Topic(
+ id = "3",
+ name = "UI",
+ shortDescription = "Material Design, Navigation, Text, Paging, Accessibility (a11y), Internationalization (i18n), Localization (l10n), Animations, Large Screens, Widgets",
+ longDescription = "Learn how to optimize your app's user interface - everything that users can see and interact with. Stay up to date on tocpis such as Material Design, Navigation, Text, Paging, Compose, Accessibility (a11y), Internationalization (i18n), Localization (l10n), Animations, Large Screens, Widgets, and many more!",
+ imageUrl = "https://firebasestorage.googleapis.com/v0/b/now-in-android.appspot.com/o/img%2Fic_topic_UI.svg?alt=media&token=0ee1842b-12e8-435f-87ba-a5bb02c47594",
+ url = "",
+ ),
+ isFollowed = true,
+ ),
+ FollowableTopic(
+ topic = Topic(
+ id = "4",
+ name = "Testing",
+ shortDescription = "CI, Espresso, TestLab, etc",
+ longDescription = "Testing is an integral part of the app development process. By running tests against your app consistently, you can verify your app's correctness, functional behavior, and usability before you release it publicly. Stay up to date on the latest tricks in CI, Espresso, and Firebase TestLab.",
+ imageUrl = "https://firebasestorage.googleapis.com/v0/b/now-in-android.appspot.com/o/img%2Fic_topic_Testing.svg?alt=media&token=a11533c4-7cc8-4b11-91a3-806158ebf428",
+ url = "",
+ ),
+ isFollowed = false,
+ ),
+)
diff --git a/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/data/NewsResourcesTestData.kt b/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/data/NewsResourcesTestData.kt
new file mode 100644
index 000000000..bffa7cb79
--- /dev/null
+++ b/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/data/NewsResourcesTestData.kt
@@ -0,0 +1,74 @@
+/*
+ * 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
+ *
+ * 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.testing.data
+
+import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
+import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Codelab
+import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Unknown
+import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Video
+import kotlinx.datetime.Instant
+
+/* ktlint-disable max-line-length */
+val newsResourcesTestData: List<NewsResource> = listOf(
+ NewsResource(
+ id = "1",
+ title = "Android Basics with Compose",
+ content = "We released the first two units of Android Basics with Compose, our first free course that teaches Android Development with Jetpack Compose to anyone; you do not need any prior programming experience other than basic computer literacy to get started. You’ll learn the fundamentals of programming in Kotlin while building Android apps using Jetpack Compose, Android’s modern toolkit that simplifies and accelerates native UI development. These two units are just the beginning; more will be coming soon. Check out Android Basics with Compose to get started on your Android development journey",
+ url = "https://android-developers.googleblog.com/2022/05/new-android-basics-with-compose-course.html",
+ headerImageUrl = "https://developer.android.com/images/hero-assets/android-basics-compose.svg",
+ publishDate = Instant.parse("2021-11-09T00:00:00.000Z"),
+ type = Codelab,
+ topics = listOf(topicsTestData[1]),
+ ),
+ NewsResource(
+ id = "2",
+ 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(topicsTestData[0], topicsTestData[1]),
+ ),
+ NewsResource(
+ id = "3",
+ 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(topicsTestData[2]),
+ ),
+ NewsResource(
+ id = "4",
+ title = "New Jetpack Release",
+ content = "New Jetpack release includes updates to libraries such as CameraX, Benchmark, and" +
+ "more!",
+ url = "https://developer.android.com/jetpack/androidx/versions/all-channel",
+ headerImageUrl = "",
+ publishDate = Instant.parse("2022-10-01T00:00:00.000Z"),
+ type = Unknown,
+ topics = listOf(topicsTestData[2]),
+ ),
+)
diff --git a/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/data/TopicsTestData.kt b/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/data/TopicsTestData.kt
new file mode 100644
index 000000000..eb0bd9e61
--- /dev/null
+++ b/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/data/TopicsTestData.kt
@@ -0,0 +1,47 @@
+/*
+ * 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
+ *
+ * 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.testing.data
+
+import com.google.samples.apps.nowinandroid.core.model.data.Topic
+
+/* ktlint-disable max-line-length */
+val topicsTestData: List<Topic> = listOf(
+ Topic(
+ id = "2",
+ name = "Headlines",
+ shortDescription = "News we want everyone to see",
+ longDescription = "Stay up to date with the latest events and announcements from Android!",
+ imageUrl = "https://firebasestorage.googleapis.com/v0/b/now-in-android.appspot.com/o/img%2Fic_topic_Headlines.svg?alt=media&token=506faab0-617a-4668-9e63-4a2fb996603f",
+ url = "",
+ ),
+ Topic(
+ id = "3",
+ name = "UI",
+ shortDescription = "Material Design, Navigation, Text, Paging, Accessibility (a11y), Internationalization (i18n), Localization (l10n), Animations, Large Screens, Widgets",
+ longDescription = "Learn how to optimize your app's user interface - everything that users can see and interact with. Stay up to date on tocpis such as Material Design, Navigation, Text, Paging, Compose, Accessibility (a11y), Internationalization (i18n), Localization (l10n), Animations, Large Screens, Widgets, and many more!",
+ imageUrl = "https://firebasestorage.googleapis.com/v0/b/now-in-android.appspot.com/o/img%2Fic_topic_UI.svg?alt=media&token=0ee1842b-12e8-435f-87ba-a5bb02c47594",
+ url = "",
+ ),
+ Topic(
+ id = "4",
+ name = "Testing",
+ shortDescription = "CI, Espresso, TestLab, etc",
+ longDescription = "Testing is an integral part of the app development process. By running tests against your app consistently, you can verify your app's correctness, functional behavior, and usability before you release it publicly. Stay up to date on the latest tricks in CI, Espresso, and Firebase TestLab.",
+ imageUrl = "https://firebasestorage.googleapis.com/v0/b/now-in-android.appspot.com/o/img%2Fic_topic_Testing.svg?alt=media&token=a11533c4-7cc8-4b11-91a3-806158ebf428",
+ url = "",
+ ),
+)
diff --git a/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/data/UserNewsResourcesTestData.kt b/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/data/UserNewsResourcesTestData.kt
new file mode 100644
index 000000000..381160006
--- /dev/null
+++ b/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/data/UserNewsResourcesTestData.kt
@@ -0,0 +1,108 @@
+/*
+ * 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
+ *
+ * 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.testing.data
+
+import com.google.samples.apps.nowinandroid.core.domain.model.UserNewsResource
+import com.google.samples.apps.nowinandroid.core.model.data.DarkThemeConfig
+import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
+import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType
+import com.google.samples.apps.nowinandroid.core.model.data.ThemeBrand
+import com.google.samples.apps.nowinandroid.core.model.data.UserData
+import kotlinx.datetime.Instant
+import kotlinx.datetime.LocalDateTime
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.toInstant
+
+/* ktlint-disable max-line-length */
+val userNewsResourcesTestData: List<UserNewsResource> = UserData(
+ bookmarkedNewsResources = setOf("1", "4"),
+ followedTopics = emptySet(),
+ themeBrand = ThemeBrand.ANDROID,
+ darkThemeConfig = DarkThemeConfig.DARK,
+ shouldHideOnboarding = true,
+ useDynamicColor = false,
+).let { userData ->
+ listOf(
+ UserNewsResource(
+ newsResource = NewsResource(
+ id = "1",
+ title = "Android Basics with Compose",
+ content = "We released the first two units of Android Basics with Compose, our first free course that teaches Android Development with Jetpack Compose to anyone; you do not need any prior programming experience other than basic computer literacy to get started. You’ll learn the fundamentals of programming in Kotlin while building Android apps using Jetpack Compose, Android’s modern toolkit that simplifies and accelerates native UI development. These two units are just the beginning; more will be coming soon. Check out Android Basics with Compose to get started on your Android development journey",
+ url = "https://android-developers.googleblog.com/2022/05/new-android-basics-with-compose-course.html",
+ headerImageUrl = "https://developer.android.com/images/hero-assets/android-basics-compose.svg",
+ publishDate = LocalDateTime(
+ year = 2022,
+ monthNumber = 5,
+ dayOfMonth = 4,
+ hour = 23,
+ minute = 0,
+ second = 0,
+ nanosecond = 0,
+ ).toInstant(TimeZone.UTC),
+ type = NewsResourceType.Codelab,
+ topics = listOf(topicsTestData[2]),
+ ),
+ userData = userData,
+ ),
+ UserNewsResource(
+ newsResource = NewsResource(
+ id = "2",
+ 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 = NewsResourceType.Video,
+ topics = topicsTestData.take(2),
+ ),
+ userData = userData,
+ ),
+ UserNewsResource(
+ newsResource = NewsResource(
+ id = "3",
+ 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 = NewsResourceType.Video,
+ topics = listOf(topicsTestData[2]),
+ ),
+ userData = userData,
+ ),
+ UserNewsResource(
+ newsResource = NewsResource(
+ id = "4",
+ title = "New Jetpack Release",
+ content = "New Jetpack release includes updates to libraries such as CameraX, Benchmark, and" +
+ "more!",
+ url = "https://developer.android.com/jetpack/androidx/versions/all-channel",
+ headerImageUrl = "",
+ publishDate = Instant.parse("2022-10-01T00:00:00.000Z"),
+ type = NewsResourceType.Unknown,
+ topics = listOf(topicsTestData[2]),
+ ),
+ userData = userData,
+ ),
+ )
+}
diff --git a/core/ui/src/androidTest/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardTest.kt b/core/ui/src/androidTest/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardTest.kt
index ddcd2644e..927ccfa28 100644
--- a/core/ui/src/androidTest/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardTest.kt
+++ b/core/ui/src/androidTest/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardTest.kt
@@ -21,8 +21,8 @@ import androidx.compose.ui.test.assertContentDescriptionEquals
import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.junit4.createAndroidComposeRule
import androidx.compose.ui.test.onNodeWithText
-import com.google.samples.apps.nowinandroid.core.domain.model.previewFollowableTopics
-import com.google.samples.apps.nowinandroid.core.domain.model.previewUserNewsResources
+import com.google.samples.apps.nowinandroid.core.testing.data.followableTopicTestData
+import com.google.samples.apps.nowinandroid.core.testing.data.userNewsResourcesTestData
import org.junit.Rule
import org.junit.Test
@@ -32,7 +32,7 @@ class NewsResourceCardTest {
@Test
fun testMetaDataDisplay_withCodelabResource() {
- val newsWithKnownResourceType = previewUserNewsResources[0]
+ val newsWithKnownResourceType = userNewsResourcesTestData[0]
var dateFormatted = ""
composeTestRule.setContent {
@@ -59,7 +59,7 @@ class NewsResourceCardTest {
@Test
fun testMetaDataDisplay_withUnknownResource() {
- val newsWithUnknownResourceType = previewUserNewsResources[3]
+ val newsWithUnknownResourceType = userNewsResourcesTestData[3]
var dateFormatted = ""
composeTestRule.setContent {
@@ -81,10 +81,10 @@ class NewsResourceCardTest {
@Test
fun testTopicsChipColorBackground_matchesFollowedState() {
composeTestRule.setContent {
- NewsResourceTopics(topics = previewFollowableTopics)
+ NewsResourceTopics(topics = followableTopicTestData)
}
- for (followableTopic in previewFollowableTopics) {
+ for (followableTopic in followableTopicTestData) {
val topicName = followableTopic.topic.name
val expectedContentDescription = if (followableTopic.isFollowed) {
"$topicName is followed"
diff --git a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/FollowableTopicPreviewParameterProvider.kt b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/FollowableTopicPreviewParameterProvider.kt
new file mode 100644
index 000000000..3c83b973c
--- /dev/null
+++ b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/FollowableTopicPreviewParameterProvider.kt
@@ -0,0 +1,67 @@
+/*
+ * 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
+ *
+ * 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.ui
+
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import com.google.samples.apps.nowinandroid.core.domain.model.FollowableTopic
+import com.google.samples.apps.nowinandroid.core.model.data.Topic
+
+/* ktlint-disable max-line-length */
+/**
+ * This [PreviewParameterProvider](https://developer.android.com/reference/kotlin/androidx/compose/ui/tooling/preview/PreviewParameterProvider)
+ * provides list of [FollowableTopic] for Composable previews.
+ */
+class FollowableTopicPreviewParameterProvider : PreviewParameterProvider<List<FollowableTopic>> {
+ override val values: Sequence<List<FollowableTopic>>
+ get() = sequenceOf(
+ listOf(
+ FollowableTopic(
+ topic = Topic(
+ id = "2",
+ name = "Headlines",
+ shortDescription = "News we want everyone to see",
+ longDescription = "Stay up to date with the latest events and announcements from Android!",
+ imageUrl = "https://firebasestorage.googleapis.com/v0/b/now-in-android.appspot.com/o/img%2Fic_topic_Headlines.svg?alt=media&token=506faab0-617a-4668-9e63-4a2fb996603f",
+ url = "",
+ ),
+ isFollowed = false,
+ ),
+ FollowableTopic(
+ topic = Topic(
+ id = "3",
+ name = "UI",
+ shortDescription = "Material Design, Navigation, Text, Paging, Accessibility (a11y), Internationalization (i18n), Localization (l10n), Animations, Large Screens, Widgets",
+ longDescription = "Learn how to optimize your app's user interface - everything that users can see and interact with. Stay up to date on tocpis such as Material Design, Navigation, Text, Paging, Compose, Accessibility (a11y), Internationalization (i18n), Localization (l10n), Animations, Large Screens, Widgets, and many more!",
+ imageUrl = "https://firebasestorage.googleapis.com/v0/b/now-in-android.appspot.com/o/img%2Fic_topic_UI.svg?alt=media&token=0ee1842b-12e8-435f-87ba-a5bb02c47594",
+ url = "",
+ ),
+ isFollowed = true,
+ ),
+ FollowableTopic(
+ topic = Topic(
+ id = "4",
+ name = "Testing",
+ shortDescription = "CI, Espresso, TestLab, etc",
+ longDescription = "Testing is an integral part of the app development process. By running tests against your app consistently, you can verify your app's correctness, functional behavior, and usability before you release it publicly. Stay up to date on the latest tricks in CI, Espresso, and Firebase TestLab.",
+ imageUrl = "https://firebasestorage.googleapis.com/v0/b/now-in-android.appspot.com/o/img%2Fic_topic_Testing.svg?alt=media&token=a11533c4-7cc8-4b11-91a3-806158ebf428",
+ url = "",
+ ),
+ isFollowed = false,
+ ),
+ ),
+ )
+}
diff --git a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.kt b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.kt
index bbff34e40..73c1a21e4 100644
--- a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.kt
+++ b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.kt
@@ -35,10 +35,10 @@ import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.tooling.preview.Devices
import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.unit.dp
import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
import com.google.samples.apps.nowinandroid.core.domain.model.UserNewsResource
-import com.google.samples.apps.nowinandroid.core.domain.model.previewUserNewsResources
/**
* An extension on [LazyListScope] defining a feed with news resources.
@@ -120,13 +120,14 @@ private fun NewsFeedLoadingPreview() {
@Preview
@Preview(device = Devices.TABLET)
@Composable
-private fun NewsFeedContentPreview() {
+private fun NewsFeedContentPreview(
+ @PreviewParameter(UserNewsResourcePreviewParameterProvider::class)
+ userNewsResources: List<UserNewsResource>,
+) {
NiaTheme {
LazyVerticalGrid(columns = GridCells.Adaptive(300.dp)) {
newsFeed(
- feedState = NewsFeedUiState.Success(
- previewUserNewsResources,
- ),
+ feedState = NewsFeedUiState.Success(userNewsResources),
onNewsResourcesCheckedChanged = { _, _ -> },
)
}
diff --git a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt
index f2ec186e7..ae6cadbfa 100644
--- a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt
+++ b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt
@@ -50,6 +50,7 @@ import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.onClick
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.unit.dp
import coil.compose.AsyncImage
import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaIconToggleButton
@@ -58,7 +59,6 @@ import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
import com.google.samples.apps.nowinandroid.core.domain.model.FollowableTopic
import com.google.samples.apps.nowinandroid.core.domain.model.UserNewsResource
-import com.google.samples.apps.nowinandroid.core.domain.model.previewUserNewsResources
import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType
import kotlinx.datetime.Instant
@@ -297,11 +297,14 @@ private fun BookmarkButtonBookmarkedPreview() {
@Preview("NewsResourceCardExpanded")
@Composable
-private fun ExpandedNewsResourcePreview() {
+private fun ExpandedNewsResourcePreview(
+ @PreviewParameter(UserNewsResourcePreviewParameterProvider::class)
+ userNewsResources: List<UserNewsResource>,
+) {
NiaTheme {
Surface {
NewsResourceCardExpanded(
- userNewsResource = previewUserNewsResources[0],
+ userNewsResource = userNewsResources[0],
isBookmarked = true,
onToggleBookmark = {},
onClick = {},
diff --git a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/UserNewsResourcePreviewParameterProvider.kt b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/UserNewsResourcePreviewParameterProvider.kt
new file mode 100644
index 000000000..e32aa1a57
--- /dev/null
+++ b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/UserNewsResourcePreviewParameterProvider.kt
@@ -0,0 +1,135 @@
+/*
+ * 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
+ *
+ * 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.ui
+
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import com.google.samples.apps.nowinandroid.core.domain.model.UserNewsResource
+import com.google.samples.apps.nowinandroid.core.model.data.DarkThemeConfig
+import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
+import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType
+import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Video
+import com.google.samples.apps.nowinandroid.core.model.data.ThemeBrand
+import com.google.samples.apps.nowinandroid.core.model.data.Topic
+import com.google.samples.apps.nowinandroid.core.model.data.UserData
+import kotlinx.datetime.Instant
+import kotlinx.datetime.LocalDateTime
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.toInstant
+
+/* ktlint-disable max-line-length */
+/**
+ * This [PreviewParameterProvider](https://developer.android.com/reference/kotlin/androidx/compose/ui/tooling/preview/PreviewParameterProvider)
+ * provides list of [UserNewsResource] for Composable previews.
+ */
+class UserNewsResourcePreviewParameterProvider : PreviewParameterProvider<List<UserNewsResource>> {
+ override val values: Sequence<List<UserNewsResource>>
+ get() {
+ val userData: UserData = UserData(
+ bookmarkedNewsResources = setOf("1", "3"),
+ followedTopics = emptySet(),
+ themeBrand = ThemeBrand.ANDROID,
+ darkThemeConfig = DarkThemeConfig.DARK,
+ shouldHideOnboarding = true,
+ useDynamicColor = false,
+ )
+
+ val topics = listOf(
+ Topic(
+ id = "2",
+ name = "Headlines",
+ shortDescription = "News we want everyone to see",
+ longDescription = "Stay up to date with the latest events and announcements from Android!",
+ imageUrl = "https://firebasestorage.googleapis.com/v0/b/now-in-android.appspot.com/o/img%2Fic_topic_Headlines.svg?alt=media&token=506faab0-617a-4668-9e63-4a2fb996603f",
+ url = "",
+ ),
+ Topic(
+ id = "3",
+ name = "UI",
+ shortDescription = "Material Design, Navigation, Text, Paging, Accessibility (a11y), Internationalization (i18n), Localization (l10n), Animations, Large Screens, Widgets",
+ longDescription = "Learn how to optimize your app's user interface - everything that users can see and interact with. Stay up to date on tocpis such as Material Design, Navigation, Text, Paging, Compose, Accessibility (a11y), Internationalization (i18n), Localization (l10n), Animations, Large Screens, Widgets, and many more!",
+ imageUrl = "https://firebasestorage.googleapis.com/v0/b/now-in-android.appspot.com/o/img%2Fic_topic_UI.svg?alt=media&token=0ee1842b-12e8-435f-87ba-a5bb02c47594",
+ url = "",
+ ),
+ Topic(
+ id = "4",
+ name = "Testing",
+ shortDescription = "CI, Espresso, TestLab, etc",
+ longDescription = "Testing is an integral part of the app development process. By running tests against your app consistently, you can verify your app's correctness, functional behavior, and usability before you release it publicly. Stay up to date on the latest tricks in CI, Espresso, and Firebase TestLab.",
+ imageUrl = "https://firebasestorage.googleapis.com/v0/b/now-in-android.appspot.com/o/img%2Fic_topic_Testing.svg?alt=media&token=a11533c4-7cc8-4b11-91a3-806158ebf428",
+ url = "",
+ ),
+ )
+
+ return sequenceOf(
+ listOf(
+ UserNewsResource(
+ newsResource = NewsResource(
+ id = "1",
+ title = "Android Basics with Compose",
+ content = "We released the first two units of Android Basics with Compose, our first free course that teaches Android Development with Jetpack Compose to anyone; you do not need any prior programming experience other than basic computer literacy to get started. You’ll learn the fundamentals of programming in Kotlin while building Android apps using Jetpack Compose, Android’s modern toolkit that simplifies and accelerates native UI development. These two units are just the beginning; more will be coming soon. Check out Android Basics with Compose to get started on your Android development journey",
+ url = "https://android-developers.googleblog.com/2022/05/new-android-basics-with-compose-course.html",
+ headerImageUrl = "https://developer.android.com/images/hero-assets/android-basics-compose.svg",
+ publishDate = LocalDateTime(
+ year = 2022,
+ monthNumber = 5,
+ dayOfMonth = 4,
+ hour = 23,
+ minute = 0,
+ second = 0,
+ nanosecond = 0,
+ ).toInstant(TimeZone.UTC),
+ type = NewsResourceType.Codelab,
+ topics = listOf(topics[2]),
+ ),
+ userData = userData,
+ ),
+ UserNewsResource(
+ newsResource = NewsResource(
+ id = "2",
+ 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 = topics.take(2),
+ ),
+ userData = userData,
+ ),
+ UserNewsResource(
+ newsResource = NewsResource(
+ id = "3",
+ 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(topics[2]),
+ ),
+ userData = userData,
+ ),
+ ),
+ )
+ }
+}
diff --git a/feature/bookmarks/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt b/feature/bookmarks/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt
index 08d4f6c06..f9faca080 100644
--- a/feature/bookmarks/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt
+++ b/feature/bookmarks/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt
@@ -30,7 +30,7 @@ import androidx.compose.ui.test.onNodeWithContentDescription
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
import androidx.compose.ui.test.performScrollToNode
-import com.google.samples.apps.nowinandroid.core.domain.model.previewUserNewsResources
+import com.google.samples.apps.nowinandroid.core.testing.data.userNewsResourcesTestData
import com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState
import org.junit.Rule
import org.junit.Test
@@ -66,7 +66,7 @@ class BookmarksScreenTest {
composeTestRule.setContent {
BookmarksScreen(
feedState = NewsFeedUiState.Success(
- previewUserNewsResources.take(2),
+ userNewsResourcesTestData.take(2),
),
removeFromBookmarks = { },
)
@@ -74,7 +74,7 @@ class BookmarksScreenTest {
composeTestRule
.onNodeWithText(
- previewUserNewsResources[0].title,
+ userNewsResourcesTestData[0].title,
substring = true,
)
.assertExists()
@@ -83,14 +83,14 @@ class BookmarksScreenTest {
composeTestRule.onNode(hasScrollToNodeAction())
.performScrollToNode(
hasText(
- previewUserNewsResources[1].title,
+ userNewsResourcesTestData[1].title,
substring = true,
),
)
composeTestRule
.onNodeWithText(
- previewUserNewsResources[1].title,
+ userNewsResourcesTestData[1].title,
substring = true,
)
.assertExists()
@@ -104,10 +104,10 @@ class BookmarksScreenTest {
composeTestRule.setContent {
BookmarksScreen(
feedState = NewsFeedUiState.Success(
- previewUserNewsResources.take(2),
+ userNewsResourcesTestData.take(2),
),
removeFromBookmarks = { newsResourceId ->
- assertEquals(previewUserNewsResources[0].id, newsResourceId)
+ assertEquals(userNewsResourcesTestData[0].id, newsResourceId)
removeFromBookmarksCalled = true
},
)
@@ -121,7 +121,7 @@ class BookmarksScreenTest {
).filter(
hasAnyAncestor(
hasText(
- previewUserNewsResources[0].title,
+ userNewsResourcesTestData[0].title,
substring = true,
),
),
diff --git a/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt b/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt
index 6b0bca003..1169f5777 100644
--- a/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt
+++ b/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt
@@ -47,6 +47,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
@@ -54,11 +55,12 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaLoadingWheel
import com.google.samples.apps.nowinandroid.core.designsystem.theme.LocalTintTheme
import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
-import com.google.samples.apps.nowinandroid.core.domain.model.previewUserNewsResources
+import com.google.samples.apps.nowinandroid.core.domain.model.UserNewsResource
import com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState
import com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState.Loading
import com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState.Success
import com.google.samples.apps.nowinandroid.core.ui.TrackScrollJank
+import com.google.samples.apps.nowinandroid.core.ui.UserNewsResourcePreviewParameterProvider
import com.google.samples.apps.nowinandroid.core.ui.newsFeed
@OptIn(ExperimentalLifecycleComposeApi::class)
@@ -183,12 +185,13 @@ private fun LoadingStatePreview() {
@Preview
@Composable
-private fun BookmarksGridPreview() {
+private fun BookmarksGridPreview(
+ @PreviewParameter(UserNewsResourcePreviewParameterProvider::class)
+ userNewsResources: List<UserNewsResource>,
+) {
NiaTheme {
BookmarksGrid(
- feedState = Success(
- previewUserNewsResources,
- ),
+ feedState = Success(userNewsResources),
removeFromBookmarks = {},
)
}
diff --git a/feature/bookmarks/src/test/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt b/feature/bookmarks/src/test/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt
index b721218d4..ae4445197 100644
--- a/feature/bookmarks/src/test/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt
+++ b/feature/bookmarks/src/test/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt
@@ -17,7 +17,7 @@
package com.google.samples.apps.nowinandroid.feature.bookmarks
import com.google.samples.apps.nowinandroid.core.domain.GetUserNewsResourcesUseCase
-import com.google.samples.apps.nowinandroid.core.model.data.previewNewsResources
+import com.google.samples.apps.nowinandroid.core.testing.data.newsResourcesTestData
import com.google.samples.apps.nowinandroid.core.testing.repository.TestNewsRepository
import com.google.samples.apps.nowinandroid.core.testing.repository.TestUserDataRepository
import com.google.samples.apps.nowinandroid.core.testing.util.MainDispatcherRule
@@ -66,8 +66,8 @@ class BookmarksViewModelTest {
fun oneBookmark_showsInFeed() = runTest {
val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.feedUiState.collect() }
- newsRepository.sendNewsResources(previewNewsResources)
- userDataRepository.updateNewsResourceBookmark(previewNewsResources[0].id, true)
+ newsRepository.sendNewsResources(newsResourcesTestData)
+ userDataRepository.updateNewsResourceBookmark(newsResourcesTestData[0].id, true)
val item = viewModel.feedUiState.value
assertIs<Success>(item)
assertEquals(item.feed.size, 1)
@@ -79,11 +79,11 @@ class BookmarksViewModelTest {
fun oneBookmark_whenRemoving_removesFromFeed() = runTest {
val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.feedUiState.collect() }
// Set the news resources to be used by this test
- newsRepository.sendNewsResources(previewNewsResources)
+ newsRepository.sendNewsResources(newsResourcesTestData)
// Start with the resource saved
- userDataRepository.updateNewsResourceBookmark(previewNewsResources[0].id, true)
+ userDataRepository.updateNewsResourceBookmark(newsResourcesTestData[0].id, true)
// Use viewModel to remove saved resource
- viewModel.removeFromSavedResources(previewNewsResources[0].id)
+ viewModel.removeFromSavedResources(newsResourcesTestData[0].id)
// Verify list of saved resources is now empty
val item = viewModel.feedUiState.value
assertIs<Success>(item)
diff --git 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
index 9ff4ed8f4..a6be20013 100644
--- 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
@@ -28,9 +28,8 @@ import androidx.compose.ui.test.onFirst
import androidx.compose.ui.test.onNodeWithContentDescription
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performScrollToNode
-import com.google.samples.apps.nowinandroid.core.domain.model.FollowableTopic
-import com.google.samples.apps.nowinandroid.core.domain.model.previewUserNewsResources
-import com.google.samples.apps.nowinandroid.core.model.data.Topic
+import com.google.samples.apps.nowinandroid.core.testing.data.followableTopicTestData
+import com.google.samples.apps.nowinandroid.core.testing.data.userNewsResourcesTestData
import com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState
import org.junit.Rule
import org.junit.Test
@@ -91,13 +90,14 @@ class ForYouScreenTest {
@Test
fun topicSelector_whenNoTopicsSelected_showsTopicChipsAndDisabledDoneButton() {
+ val testData = followableTopicTestData.map { it -> it.copy(isFollowed = false) }
+
composeTestRule.setContent {
BoxWithConstraints {
ForYouScreen(
isSyncing = false,
- onboardingUiState =
- OnboardingUiState.Shown(
- topics = testTopics,
+ onboardingUiState = OnboardingUiState.Shown(
+ topics = testData,
),
feedState = NewsFeedUiState.Success(
feed = emptyList(),
@@ -109,7 +109,7 @@ class ForYouScreenTest {
}
}
- testTopics.forEach { testTopic ->
+ testData.forEach { testTopic ->
composeTestRule
.onNodeWithText(testTopic.topic.name)
.assertExists()
@@ -138,7 +138,7 @@ class ForYouScreenTest {
onboardingUiState =
OnboardingUiState.Shown(
// Follow one topic
- topics = testTopics.mapIndexed { index, testTopic ->
+ topics = followableTopicTestData.mapIndexed { index, testTopic ->
testTopic.copy(isFollowed = index == 1)
},
),
@@ -152,7 +152,7 @@ class ForYouScreenTest {
}
}
- testTopics.forEach { testTopic ->
+ followableTopicTestData.forEach { testTopic ->
composeTestRule
.onNodeWithText(testTopic.topic.name)
.assertExists()
@@ -179,7 +179,7 @@ class ForYouScreenTest {
ForYouScreen(
isSyncing = false,
onboardingUiState =
- OnboardingUiState.Shown(topics = testTopics),
+ OnboardingUiState.Shown(topics = followableTopicTestData),
feedState = NewsFeedUiState.Loading,
onTopicCheckedChanged = { _, _ -> },
saveFollowedTopics = {},
@@ -224,7 +224,7 @@ class ForYouScreenTest {
isSyncing = false,
onboardingUiState = OnboardingUiState.NotShown,
feedState = NewsFeedUiState.Success(
- feed = previewUserNewsResources,
+ feed = userNewsResourcesTestData,
),
onTopicCheckedChanged = { _, _ -> },
saveFollowedTopics = {},
@@ -234,7 +234,7 @@ class ForYouScreenTest {
composeTestRule
.onNodeWithText(
- previewUserNewsResources[0].title,
+ userNewsResourcesTestData[0].title,
substring = true,
)
.assertExists()
@@ -243,40 +243,17 @@ class ForYouScreenTest {
composeTestRule.onNode(hasScrollToNodeAction())
.performScrollToNode(
hasText(
- previewUserNewsResources[1].title,
+ userNewsResourcesTestData[1].title,
substring = true,
),
)
composeTestRule
.onNodeWithText(
- previewUserNewsResources[1].title,
+ userNewsResourcesTestData[1].title,
substring = true,
)
.assertExists()
.assertHasClickAction()
}
}
-
-private val testTopic = Topic(
- id = "",
- name = "",
- shortDescription = "",
- longDescription = "",
- url = "",
- imageUrl = "",
-)
-private val testTopics = listOf(
- FollowableTopic(
- topic = testTopic.copy(id = "0", name = "Headlines"),
- isFollowed = false,
- ),
- FollowableTopic(
- topic = testTopic.copy(id = "1", name = "UI"),
- isFollowed = false,
- ),
- FollowableTopic(
- topic = testTopic.copy(id = "2", name = "Tools"),
- isFollowed = false,
- ),
-)
diff --git a/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt
index 2acf43323..492660142 100644
--- a/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt
+++ b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt
@@ -67,6 +67,7 @@ import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.max
import androidx.compose.ui.unit.sp
@@ -81,12 +82,11 @@ import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaIconT
import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaOverlayLoadingWheel
import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
-import com.google.samples.apps.nowinandroid.core.domain.model.FollowableTopic
-import com.google.samples.apps.nowinandroid.core.domain.model.previewUserNewsResources
-import com.google.samples.apps.nowinandroid.core.model.data.previewTopics
+import com.google.samples.apps.nowinandroid.core.domain.model.UserNewsResource
import com.google.samples.apps.nowinandroid.core.ui.DevicePreviews
import com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState
import com.google.samples.apps.nowinandroid.core.ui.TrackScrollJank
+import com.google.samples.apps.nowinandroid.core.ui.UserNewsResourcePreviewParameterProvider
import com.google.samples.apps.nowinandroid.core.ui.newsFeed
@OptIn(ExperimentalLifecycleComposeApi::class)
@@ -392,14 +392,17 @@ fun TopicIcon(
@DevicePreviews
@Composable
-fun ForYouScreenPopulatedFeed() {
+fun ForYouScreenPopulatedFeed(
+ @PreviewParameter(UserNewsResourcePreviewParameterProvider::class)
+ userNewsResources: List<UserNewsResource>,
+) {
BoxWithConstraints {
NiaTheme {
ForYouScreen(
isSyncing = false,
onboardingUiState = OnboardingUiState.NotShown,
feedState = NewsFeedUiState.Success(
- feed = previewUserNewsResources,
+ feed = userNewsResources,
),
onTopicCheckedChanged = { _, _ -> },
saveFollowedTopics = {},
@@ -411,14 +414,17 @@ fun ForYouScreenPopulatedFeed() {
@DevicePreviews
@Composable
-fun ForYouScreenOfflinePopulatedFeed() {
+fun ForYouScreenOfflinePopulatedFeed(
+ @PreviewParameter(UserNewsResourcePreviewParameterProvider::class)
+ userNewsResources: List<UserNewsResource>,
+) {
BoxWithConstraints {
NiaTheme {
ForYouScreen(
isSyncing = false,
onboardingUiState = OnboardingUiState.NotShown,
feedState = NewsFeedUiState.Success(
- feed = previewUserNewsResources,
+ feed = userNewsResources,
),
onTopicCheckedChanged = { _, _ -> },
saveFollowedTopics = {},
@@ -430,16 +436,19 @@ fun ForYouScreenOfflinePopulatedFeed() {
@DevicePreviews
@Composable
-fun ForYouScreenTopicSelection() {
+fun ForYouScreenTopicSelection(
+ @PreviewParameter(UserNewsResourcePreviewParameterProvider::class)
+ userNewsResources: List<UserNewsResource>,
+) {
BoxWithConstraints {
NiaTheme {
ForYouScreen(
isSyncing = false,
onboardingUiState = OnboardingUiState.Shown(
- topics = previewTopics.map { FollowableTopic(it, false) },
+ topics = userNewsResources.flatMap { news -> news.followableTopics },
),
feedState = NewsFeedUiState.Success(
- feed = previewUserNewsResources,
+ feed = userNewsResources,
),
onTopicCheckedChanged = { _, _ -> },
saveFollowedTopics = {},
@@ -468,14 +477,17 @@ fun ForYouScreenLoading() {
@DevicePreviews
@Composable
-fun ForYouScreenPopulatedAndLoading() {
+fun ForYouScreenPopulatedAndLoading(
+ @PreviewParameter(UserNewsResourcePreviewParameterProvider::class)
+ userNewsResources: List<UserNewsResource>,
+) {
BoxWithConstraints {
NiaTheme {
ForYouScreen(
isSyncing = true,
onboardingUiState = OnboardingUiState.Loading,
feedState = NewsFeedUiState.Success(
- feed = previewUserNewsResources,
+ feed = userNewsResources,
),
onTopicCheckedChanged = { _, _ -> },
saveFollowedTopics = {},
diff --git a/feature/interests/src/androidTest/java/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt b/feature/interests/src/androidTest/java/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt
index 2c5ed4844..7f06eee6b 100644
--- a/feature/interests/src/androidTest/java/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt
+++ b/feature/interests/src/androidTest/java/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt
@@ -22,11 +22,9 @@ import androidx.compose.ui.test.assertCountEquals
import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.junit4.createAndroidComposeRule
import androidx.compose.ui.test.onAllNodesWithContentDescription
-import androidx.compose.ui.test.onAllNodesWithText
import androidx.compose.ui.test.onNodeWithContentDescription
import androidx.compose.ui.test.onNodeWithText
-import com.google.samples.apps.nowinandroid.core.domain.model.FollowableTopic
-import com.google.samples.apps.nowinandroid.core.model.data.Topic
+import com.google.samples.apps.nowinandroid.core.testing.data.followableTopicTestData
import com.google.samples.apps.nowinandroid.feature.interests.InterestsScreen
import com.google.samples.apps.nowinandroid.feature.interests.InterestsUiState
import com.google.samples.apps.nowinandroid.feature.interests.R
@@ -76,24 +74,20 @@ class InterestsScreenTest {
fun interestsWithTopics_whenTopicsFollowed_showFollowedAndUnfollowedTopicsWithInfo() {
composeTestRule.setContent {
InterestsScreen(
- uiState = InterestsUiState.Interests(topics = testTopics),
+ uiState = InterestsUiState.Interests(topics = followableTopicTestData),
)
}
composeTestRule
- .onNodeWithText(TOPIC_1_NAME)
+ .onNodeWithText(followableTopicTestData[0].topic.name)
.assertIsDisplayed()
composeTestRule
- .onNodeWithText(TOPIC_2_NAME)
+ .onNodeWithText(followableTopicTestData[1].topic.name)
.assertIsDisplayed()
composeTestRule
- .onNodeWithText(TOPIC_3_NAME)
+ .onNodeWithText(followableTopicTestData[2].topic.name)
.assertIsDisplayed()
- composeTestRule
- .onAllNodesWithText(TOPIC_SHORT_DESC)
- .assertCountEquals(testTopics.count())
-
composeTestRule
.onAllNodesWithContentDescription(interestsTopicCardFollowButton)
.assertCountEquals(numberOfUnfollowedTopics)
@@ -120,48 +114,4 @@ class InterestsScreenTest {
}
}
-private const val TOPIC_1_NAME = "Headlines"
-private const val TOPIC_2_NAME = "UI"
-private const val TOPIC_3_NAME = "Tools"
-private const val TOPIC_SHORT_DESC = "At vero eos et accusamus."
-private const val TOPIC_LONG_DESC = "At vero eos et accusamus et iusto odio dignissimos ducimus."
-private const val TOPIC_URL = "URL"
-private const val TOPIC_IMAGE_URL = "Image URL"
-
-private val testTopics = listOf(
- FollowableTopic(
- Topic(
- id = "0",
- name = TOPIC_1_NAME,
- shortDescription = TOPIC_SHORT_DESC,
- longDescription = TOPIC_LONG_DESC,
- url = TOPIC_URL,
- imageUrl = TOPIC_IMAGE_URL,
- ),
- isFollowed = true,
- ),
- FollowableTopic(
- Topic(
- id = "1",
- name = TOPIC_2_NAME,
- shortDescription = TOPIC_SHORT_DESC,
- longDescription = TOPIC_LONG_DESC,
- url = TOPIC_URL,
- imageUrl = TOPIC_IMAGE_URL,
- ),
- isFollowed = false,
- ),
- FollowableTopic(
- Topic(
- id = "2",
- name = TOPIC_3_NAME,
- shortDescription = TOPIC_SHORT_DESC,
- longDescription = TOPIC_LONG_DESC,
- url = TOPIC_URL,
- imageUrl = TOPIC_IMAGE_URL,
- ),
- isFollowed = false,
- ),
-)
-
-private val numberOfUnfollowedTopics = testTopics.filter { !it.isFollowed }.size
+private val numberOfUnfollowedTopics = followableTopicTestData.filter { !it.isFollowed }.size
diff --git a/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt
index 4376d55d6..fd45c7608 100644
--- a/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt
+++ b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt
@@ -23,6 +23,7 @@ import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -30,8 +31,8 @@ import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaBackg
import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaLoadingWheel
import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
import com.google.samples.apps.nowinandroid.core.domain.model.FollowableTopic
-import com.google.samples.apps.nowinandroid.core.model.data.previewTopics
import com.google.samples.apps.nowinandroid.core.ui.DevicePreviews
+import com.google.samples.apps.nowinandroid.core.ui.FollowableTopicPreviewParameterProvider
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable
@@ -86,12 +87,15 @@ private fun InterestsEmptyScreen() {
@DevicePreviews
@Composable
-fun InterestsScreenPopulated() {
+fun InterestsScreenPopulated(
+ @PreviewParameter(FollowableTopicPreviewParameterProvider::class)
+ followableTopics: List<FollowableTopic>,
+) {
NiaTheme {
NiaBackground {
InterestsScreen(
uiState = InterestsUiState.Interests(
- topics = previewTopics.map { FollowableTopic(it, false) },
+ topics = followableTopics,
),
followTopic = { _, _ -> },
navigateToTopic = {},
diff --git a/feature/topic/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt b/feature/topic/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt
index 9f984c4a3..626b0e773 100644
--- a/feature/topic/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt
+++ b/feature/topic/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt
@@ -24,13 +24,8 @@ import androidx.compose.ui.test.onFirst
import androidx.compose.ui.test.onNodeWithContentDescription
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performScrollToNode
-import com.google.samples.apps.nowinandroid.core.domain.model.FollowableTopic
-import com.google.samples.apps.nowinandroid.core.domain.model.UserNewsResource
-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.Topic
-import com.google.samples.apps.nowinandroid.core.testing.repository.emptyUserData
-import kotlinx.datetime.Instant
+import com.google.samples.apps.nowinandroid.core.testing.data.followableTopicTestData
+import com.google.samples.apps.nowinandroid.core.testing.data.userNewsResourcesTestData
import org.junit.Before
import org.junit.Rule
import org.junit.Test
@@ -73,7 +68,7 @@ class TopicScreenTest {
@Test
fun topicTitle_whenTopicIsSuccess_isShown() {
- val testTopic = testTopics.first()
+ val testTopic = followableTopicTestData.first()
composeTestRule.setContent {
TopicScreen(
topicUiState = TopicUiState.Success(testTopic),
@@ -100,7 +95,7 @@ class TopicScreenTest {
composeTestRule.setContent {
TopicScreen(
topicUiState = TopicUiState.Loading,
- newsUiState = NewsUiState.Success(sampleUserNewsResources),
+ newsUiState = NewsUiState.Success(userNewsResourcesTestData),
onBackClick = { },
onFollowClick = { },
onBookmarkChanged = { _, _ -> },
@@ -115,12 +110,12 @@ class TopicScreenTest {
@Test
fun news_whenSuccessAndTopicIsSuccess_isShown() {
- val testTopic = testTopics.first()
+ val testTopic = followableTopicTestData.first()
composeTestRule.setContent {
TopicScreen(
topicUiState = TopicUiState.Success(testTopic),
newsUiState = NewsUiState.Success(
- sampleUserNewsResources,
+ userNewsResourcesTestData,
),
onBackClick = { },
onFollowClick = { },
@@ -132,76 +127,6 @@ class TopicScreenTest {
composeTestRule
.onAllNodes(hasScrollToNodeAction())
.onFirst()
- .performScrollToNode(hasText(sampleUserNewsResources.first().title))
+ .performScrollToNode(hasText(userNewsResourcesTestData.first().title))
}
}
-
-private const val TOPIC_1_NAME = "Headlines"
-private const val TOPIC_2_NAME = "UI"
-private const val TOPIC_3_NAME = "Tools"
-private const val TOPIC_DESC = "At vero eos et accusamus et iusto odio dignissimos ducimus qui."
-
-private val testTopics = listOf(
- FollowableTopic(
- Topic(
- id = "0",
- name = TOPIC_1_NAME,
- shortDescription = "",
- longDescription = TOPIC_DESC,
- url = "",
- imageUrl = "",
- ),
- isFollowed = true,
- ),
- FollowableTopic(
- Topic(
- id = "1",
- name = TOPIC_2_NAME,
- shortDescription = "",
- longDescription = TOPIC_DESC,
- url = "",
- imageUrl = "",
- ),
- isFollowed = false,
- ),
- FollowableTopic(
- Topic(
- id = "2",
- name = TOPIC_3_NAME,
- shortDescription = "",
- longDescription = TOPIC_DESC,
- url = "",
- imageUrl = "",
- ),
- isFollowed = false,
- ),
-)
-
-private val sampleUserNewsResources = listOf(
- UserNewsResource(
- newsResource =
- NewsResource(
- id = "1",
- 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 = TOPIC_DESC,
- url = "",
- imageUrl = "",
- ),
- ),
- ),
- userData = emptyUserData.copy(bookmarkedNewsResources = setOf("1")),
- ),
-)
diff --git a/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt b/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt
index b4d31084b..e7b218072 100644
--- a/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt
+++ b/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt
@@ -41,6 +41,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
@@ -52,10 +53,10 @@ import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaLoadi
import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
import com.google.samples.apps.nowinandroid.core.domain.model.FollowableTopic
-import com.google.samples.apps.nowinandroid.core.domain.model.previewUserNewsResources
-import com.google.samples.apps.nowinandroid.core.model.data.previewTopics
+import com.google.samples.apps.nowinandroid.core.domain.model.UserNewsResource
import com.google.samples.apps.nowinandroid.core.ui.DevicePreviews
import com.google.samples.apps.nowinandroid.core.ui.TrackScrollJank
+import com.google.samples.apps.nowinandroid.core.ui.UserNewsResourcePreviewParameterProvider
import com.google.samples.apps.nowinandroid.core.ui.userNewsResourceCardItems
import com.google.samples.apps.nowinandroid.feature.topic.R.string
import com.google.samples.apps.nowinandroid.feature.topic.TopicUiState.Loading
@@ -250,14 +251,15 @@ private fun TopicToolbar(
@DevicePreviews
@Composable
-fun TopicScreenPopulated() {
+fun TopicScreenPopulated(
+ @PreviewParameter(UserNewsResourcePreviewParameterProvider::class)
+ userNewsResources: List<UserNewsResource>,
+) {
NiaTheme {
NiaBackground {
TopicScreen(
- topicUiState = TopicUiState.Success(FollowableTopic(previewTopics[0], false)),
- newsUiState = NewsUiState.Success(
- previewUserNewsResources,
- ),
+ topicUiState = TopicUiState.Success(userNewsResources[0].followableTopics[0]),
+ newsUiState = NewsUiState.Success(userNewsResources),
onBackClick = {},
onFollowClick = {},
onBookmarkChanged = { _, _ -> },