A fully functional Android app built entirely with Kotlin and Jetpack Compose
Spotless
lihengguifb5bd225be83
diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.ktindex 7fe1bc674..1f2bc49b9 100644--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt@@ -179,7 +179,7 @@ class MainActivity : ComponentActivity() {To see quick turnaround of the ProfileVerifier, we recommend using `speed-profile`.If you don't do either of these steps, you might only see the profile status reported as"enqueued for compilation" when running the sample locally.- */+ */withContext(Dispatchers.IO) {val status = ProfileVerifier.getCompilationStatusAsync().await()Log.d(TAG, "ProfileInstaller status code: ${status.profileInstallResultCode}")diff --git a/core/analytics/src/prod/kotlin/com/google/samples/apps/nowinandroid/core/analytics/AnalyticsModule.kt b/core/analytics/src/prod/kotlin/com/google/samples/apps/nowinandroid/core/analytics/AnalyticsModule.ktindex 9f875ae6d..0d2e0e274 100644--- a/core/analytics/src/prod/kotlin/com/google/samples/apps/nowinandroid/core/analytics/AnalyticsModule.kt+++ b/core/analytics/src/prod/kotlin/com/google/samples/apps/nowinandroid/core/analytics/AnalyticsModule.kt@@ -35,6 +35,8 @@ abstract class AnalyticsModule {companion object {@Provides@Singleton- fun provideFirebaseAnalytics(): FirebaseAnalytics { return Firebase.analytics }+ fun provideFirebaseAnalytics(): FirebaseAnalytics {+ return Firebase.analytics+ }}}diff --git a/core/common/src/test/kotlin/com/google/samples/apps/nowinandroid/core/result/ResultKtTest.kt b/core/common/src/test/kotlin/com/google/samples/apps/nowinandroid/core/result/ResultKtTest.ktindex 4f1229e9d..512a1a2f2 100644--- a/core/common/src/test/kotlin/com/google/samples/apps/nowinandroid/core/result/ResultKtTest.kt+++ b/core/common/src/test/kotlin/com/google/samples/apps/nowinandroid/core/result/ResultKtTest.kt@@ -25,7 +25,7 @@ import kotlin.test.assertEqualsclass ResultKtTest {@Test- fun Result_catches_errors() = runTest {+ fun result_catches_errors() = runTest {flow {emit(1)throw Exception("Test Done")diff --git a/core/datastore/src/test/kotlin/com/google/samples/apps/nowinandroid/core/datastore/IntToStringIdsMigrationTest.kt b/core/datastore/src/test/kotlin/com/google/samples/apps/nowinandroid/core/datastore/IntToStringIdsMigrationTest.ktindex 8b97cff34..392ca2550 100644--- a/core/datastore/src/test/kotlin/com/google/samples/apps/nowinandroid/core/datastore/IntToStringIdsMigrationTest.kt+++ b/core/datastore/src/test/kotlin/com/google/samples/apps/nowinandroid/core/datastore/IntToStringIdsMigrationTest.kt@@ -27,7 +27,7 @@ import kotlin.test.assertTrueclass IntToStringIdsMigrationTest {@Test- fun IntToStringIdsMigration_should_migrate_topic_ids() = runTest {+ fun intToStringIdsMigration_should_migrate_topic_ids() = runTest {// Set up existing preferences with topic int idsval preMigrationUserPreferences = userPreferences {deprecatedIntFollowedTopicIds.addAll(listOf(1, 2, 3))@@ -56,7 +56,7 @@ class IntToStringIdsMigrationTest {}@Test- fun IntToStringIdsMigration_should_migrate_author_ids() = runTest {+ fun intToStringIdsMigration_should_migrate_author_ids() = runTest {// Set up existing preferences with author int idsval preMigrationUserPreferences = userPreferences {deprecatedIntFollowedAuthorIds.addAll(listOf(4, 5, 6))diff --git a/core/datastore/src/test/kotlin/com/google/samples/apps/nowinandroid/core/datastore/ListToMapMigrationTest.kt b/core/datastore/src/test/kotlin/com/google/samples/apps/nowinandroid/core/datastore/ListToMapMigrationTest.ktindex f7e083b45..41404d6a9 100644--- a/core/datastore/src/test/kotlin/com/google/samples/apps/nowinandroid/core/datastore/ListToMapMigrationTest.kt+++ b/core/datastore/src/test/kotlin/com/google/samples/apps/nowinandroid/core/datastore/ListToMapMigrationTest.kt@@ -24,7 +24,7 @@ import kotlin.test.assertTrueclass ListToMapMigrationTest {@Test- fun ListToMapMigration_should_migrate_topic_ids() = runTest {+ fun listToMapMigration_should_migrate_topic_ids() = runTest {// Set up existing preferences with topic idsval preMigrationUserPreferences = userPreferences {deprecatedFollowedTopicIds.addAll(listOf("1", "2", "3"))@@ -50,7 +50,7 @@ class ListToMapMigrationTest {}@Test- fun ListToMapMigration_should_migrate_author_ids() = runTest {+ fun listToMapMigration_should_migrate_author_ids() = runTest {// Set up existing preferences with author idsval preMigrationUserPreferences = userPreferences {deprecatedFollowedAuthorIds.addAll(listOf("4", "5", "6"))@@ -76,7 +76,7 @@ class ListToMapMigrationTest {}@Test- fun ListToMapMigration_should_migrate_bookmarks() = runTest {+ fun listToMapMigration_should_migrate_bookmarks() = runTest {// Set up existing preferences with bookmarksval preMigrationUserPreferences = userPreferences {deprecatedBookmarkedNewsResourceIds.addAll(listOf("7", "8", "9"))diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Button.kt b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Button.ktindex 966014fd9..a5ecc86c1 100644--- a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Button.kt+++ b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Button.kt@@ -278,7 +278,7 @@ fun NiaButtonPreview() {@ThemePreviews@Composablefun NiaOutlinedButtonPreview() {- NiaTheme() {+ NiaTheme {NiaBackground(modifier = Modifier.size(150.dp, 50.dp)) {NiaOutlinedButton(onClick = {}, text = { Text("Test button") })}diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/AppScrollbars.kt b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/AppScrollbars.ktindex fe14bce14..c8102073a 100644--- a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/AppScrollbars.kt+++ b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/scrollbar/AppScrollbars.kt@@ -251,5 +251,7 @@ private fun scrollbarThumbColor(}private enum class ThumbState {- Active, Inactive, Dormant+ Active,+ Inactive,+ Dormant,}diff --git a/core/designsystem/src/test/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/LoadingWheelScreenshotTests.kt b/core/designsystem/src/test/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/LoadingWheelScreenshotTests.ktindex 75a4aec3a..9f80d04e5 100644--- a/core/designsystem/src/test/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/LoadingWheelScreenshotTests.kt+++ b/core/designsystem/src/test/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/LoadingWheelScreenshotTests.kt@@ -66,7 +66,7 @@ class LoadingWheelScreenshotTests() {fun loadingWheelAnimation() {composeTestRule.mainClock.autoAdvance = falsecomposeTestRule.setContent {- NiaTheme() {+ NiaTheme {NiaLoadingWheel(contentDesc = "")}}diff --git a/core/designsystem/src/test/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TagScreenshotTests.kt b/core/designsystem/src/test/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TagScreenshotTests.ktindex d9edfd6c6..16ed71aeb 100644--- a/core/designsystem/src/test/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TagScreenshotTests.kt+++ b/core/designsystem/src/test/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TagScreenshotTests.kt@@ -47,7 +47,7 @@ class TagScreenshotTests() {val composeTestRule = createAndroidComposeRule<ComponentActivity>()@Test- fun Tag_multipleThemes() {+ fun tag_multipleThemes() {composeTestRule.captureMultiTheme("Tag") {NiaTopicTag(followed = true, onClick = {}) {Text("TOPIC")diff --git a/core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/DarkThemeConfig.kt b/core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/DarkThemeConfig.ktindex f130a70db..dcbcaa531 100644--- a/core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/DarkThemeConfig.kt+++ b/core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/DarkThemeConfig.kt@@ -17,5 +17,7 @@package com.google.samples.apps.nowinandroid.core.model.dataenum class DarkThemeConfig {- FOLLOW_SYSTEM, LIGHT, DARK+ FOLLOW_SYSTEM,+ LIGHT,+ DARK,}diff --git a/core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/ThemeBrand.kt b/core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/ThemeBrand.ktindex d8953df3c..431d4b573 100644--- a/core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/ThemeBrand.kt+++ b/core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/ThemeBrand.kt@@ -17,5 +17,6 @@package com.google.samples.apps.nowinandroid.core.model.dataenum class ThemeBrand {- DEFAULT, ANDROID+ DEFAULT,+ ANDROID,}diff --git a/core/network/src/test/kotlin/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSourceTest.kt b/core/network/src/test/kotlin/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSourceTest.ktindex 76c2accf2..147252cf1 100644--- a/core/network/src/test/kotlin/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSourceTest.kt+++ b/core/network/src/test/kotlin/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSourceTest.kt@@ -45,46 +45,46 @@ class FakeNiaNetworkDataSourceTest {}@Test- fun testDeserializationOfTopics() = runTest(testDispatcher) {- assertEquals(- /* ktlint-disable max-line-length */- NetworkTopic(- id = "1",- name = "Headlines",- shortDescription = "News you'll definitely be interested in",- longDescription = "The latest events and announcements from the world of Android development.",- url = "",- 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",- ),- /* ktlint-enable max-line-length */- subject.getTopics().first(),- )- }+ fun testDeserializationOfTopics() =+ @Suppress("ktlint:standard:max-line-length")+ runTest(testDispatcher) {+ assertEquals(+ NetworkTopic(+ id = "1",+ name = "Headlines",+ shortDescription = "News you'll definitely be interested in",+ longDescription = "The latest events and announcements from the world of Android development.",+ url = "",+ 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",+ ),+ subject.getTopics().first(),+ )+ }@Test- fun testDeserializationOfNewsResources() = runTest(testDispatcher) {- assertEquals(- /* ktlint-disable max-line-length */- NetworkNewsResource(- id = "125",- 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. ",- 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("2", "3", "10"),- ),- /* ktlint-enable max-line-length */- subject.getNewsResources().find { it.id == "125" },- )- }+ fun testDeserializationOfNewsResources() =+ @Suppress("ktlint:standard:max-line-length")+ runTest(testDispatcher) {+ assertEquals(+ NetworkNewsResource(+ id = "125",+ 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. ",+ 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("2", "3", "10"),+ ),+ subject.getNewsResources().find { it.id == "125" },+ )+ }}diff --git a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/FollowableTopicTestData.kt b/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/FollowableTopicTestData.ktindex a96326a62..9b85516e7 100644--- a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/FollowableTopicTestData.kt+++ b/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/FollowableTopicTestData.kt@@ -14,12 +14,13 @@* limitations under the License.*/+@file:Suppress("ktlint:standard:max-line-length")+package com.google.samples.apps.nowinandroid.core.testing.dataimport com.google.samples.apps.nowinandroid.core.model.data.FollowableTopicimport com.google.samples.apps.nowinandroid.core.model.data.Topic-/* ktlint-disable max-line-length */val followableTopicTestData: List<FollowableTopic> = listOf(FollowableTopic(topic = Topic(diff --git a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/NewsResourcesTestData.kt b/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/NewsResourcesTestData.ktindex ef845dc58..b3fff7ca0 100644--- a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/NewsResourcesTestData.kt+++ b/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/NewsResourcesTestData.kt@@ -14,12 +14,13 @@* limitations under the License.*/+@file:Suppress("ktlint:standard:max-line-length")+package com.google.samples.apps.nowinandroid.core.testing.dataimport com.google.samples.apps.nowinandroid.core.model.data.NewsResourceimport kotlinx.datetime.Instant-/* ktlint-disable max-line-length */val newsResourcesTestData: List<NewsResource> = listOf(NewsResource(id = "1",diff --git a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/TopicsTestData.kt b/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/TopicsTestData.ktindex 90e9166a5..fc6ef62a6 100644--- a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/TopicsTestData.kt+++ b/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/TopicsTestData.kt@@ -14,11 +14,12 @@* limitations under the License.*/+@file:Suppress("ktlint:standard:max-line-length")+package com.google.samples.apps.nowinandroid.core.testing.dataimport com.google.samples.apps.nowinandroid.core.model.data.Topic-/* ktlint-disable max-line-length */val topicsTestData: List<Topic> = listOf(Topic(id = "2",diff --git a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/UserNewsResourcesTestData.kt b/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/UserNewsResourcesTestData.ktindex 97acad088..4174391df 100644--- a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/UserNewsResourcesTestData.kt+++ b/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/data/UserNewsResourcesTestData.kt@@ -14,6 +14,8 @@* limitations under the License.*/+@file:Suppress("ktlint:standard:max-line-length")+package com.google.samples.apps.nowinandroid.core.testing.dataimport com.google.samples.apps.nowinandroid.core.model.data.DarkThemeConfig@@ -26,7 +28,6 @@ import kotlinx.datetime.LocalDateTimeimport kotlinx.datetime.TimeZoneimport kotlinx.datetime.toInstant-/* ktlint-disable max-line-length */val userNewsResourcesTestData: List<UserNewsResource> = UserData(bookmarkedNewsResources = setOf("1", "4"),viewedNewsResources = setOf("1", "2", "4"),diff --git a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/FollowableTopicPreviewParameterProvider.kt b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/FollowableTopicPreviewParameterProvider.ktindex 2132f5b16..16ae1eced 100644--- a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/FollowableTopicPreviewParameterProvider.kt+++ b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/FollowableTopicPreviewParameterProvider.kt@@ -14,13 +14,14 @@* limitations under the License.*/+@file:Suppress("ktlint:standard:max-line-length")+package com.google.samples.apps.nowinandroid.core.uiimport androidx.compose.ui.tooling.preview.PreviewParameterProviderimport com.google.samples.apps.nowinandroid.core.model.data.FollowableTopicimport 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.diff --git a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/UserNewsResourcePreviewParameterProvider.kt b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/UserNewsResourcePreviewParameterProvider.ktindex 493788314..3189e8403 100644--- a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/UserNewsResourcePreviewParameterProvider.kt+++ b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/UserNewsResourcePreviewParameterProvider.kt@@ -14,6 +14,8 @@* limitations under the License.*/+@file:Suppress("ktlint:standard:max-line-length")+package com.google.samples.apps.nowinandroid.core.uiimport androidx.compose.ui.tooling.preview.PreviewParameterProvider@@ -29,7 +31,6 @@ import kotlinx.datetime.LocalDateTimeimport kotlinx.datetime.TimeZoneimport 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.diff --git a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchUiStatePreviewParameterProvider.kt b/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchUiStatePreviewParameterProvider.ktindex 4268893da..257d8b68e 100644--- a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchUiStatePreviewParameterProvider.kt+++ b/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchUiStatePreviewParameterProvider.kt@@ -14,6 +14,8 @@* limitations under the License.*/+@file:Suppress("ktlint:standard:max-line-length")+package com.google.samples.apps.nowinandroid.feature.searchimport androidx.compose.ui.tooling.preview.PreviewParameterProvider@@ -21,7 +23,6 @@ import com.google.samples.apps.nowinandroid.core.model.data.FollowableTopicimport com.google.samples.apps.nowinandroid.core.ui.PreviewParameterData.newsResourcesimport com.google.samples.apps.nowinandroid.core.ui.PreviewParameterData.topics-/* ktlint-disable max-line-length *//*** This [PreviewParameterProvider](https://developer.android.com/reference/kotlin/androidx/compose/ui/tooling/preview/PreviewParameterProvider)* provides list of [SearchResultUiState] for Composable previews.diff --git a/feature/settings/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt b/feature/settings/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.ktindex 01ec30e74..b6ce77d1a 100644--- a/feature/settings/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt+++ b/feature/settings/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt@@ -14,6 +14,8 @@* limitations under the License.*/+@file:Suppress("ktlint:standard:max-line-length")+package com.google.samples.apps.nowinandroid.feature.settingsimport android.content.Intent@@ -316,7 +318,6 @@ private fun PreviewSettingsDialogLoading() {}}-/* ktlint-disable max-line-length */private const val PRIVACY_POLICY_URL = "https://policies.google.com/privacy"private const val BRAND_GUIDELINES_URL = "https://developer.android.com/distribute/marketing-tools/brand-guidelines"private const val FEEDBACK_URL = "https://goo.gle/nia-app-feedback"