Skip to content

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

Remove violations: discouraged-comment-location

lihengguif8f932705a71
diff --git a/benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/startup/StartupBenchmark.kt b/benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/startup/StartupBenchmark.kt
index ace7f14e4..96bea89b8 100644
--- a/benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/startup/StartupBenchmark.kt
+++ b/benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/startup/StartupBenchmark.kt
@@ -60,7 +60,8 @@ class StartupBenchmark {
packageName = PACKAGE_NAME,
metrics = listOf(StartupTimingMetric()),
compilationMode = compilationMode,
- iterations = 20, // More iterations result in higher statistical significance.
+ // More iterations result in higher statistical significance.
+ iterations = 20,
startupMode = COLD,
setupBlock = {
pressHome()
diff --git a/core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/FollowableTopic.kt b/core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/FollowableTopic.kt
index cef319c5f..ae1d525c5 100644
--- a/core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/FollowableTopic.kt
+++ b/core/model/src/main/kotlin/com/google/samples/apps/nowinandroid/core/model/data/FollowableTopic.kt
@@ -19,7 +19,8 @@ package com.google.samples.apps.nowinandroid.core.model.data
/**
* A [topic] with the additional information for whether or not it is followed.
*/
-data class FollowableTopic( // TODO consider changing to UserTopic and flattening
+// TODO consider changing to UserTopic and flattening
+data class FollowableTopic(
val topic: Topic,
val isFollowed: Boolean,
)
diff --git a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt b/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt
index e84fe7d33..0f00ff16d 100644
--- a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt
+++ b/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt
@@ -38,8 +38,10 @@ import org.robolectric.RuntimeEnvironment
val DefaultRoborazziOptions =
RoborazziOptions(
- compareOptions = CompareOptions(changeThreshold = 0f), // Pixel-perfect matching
- recordOptions = RecordOptions(resizeScale = 0.5), // Reduce the size of the PNGs
+ // Pixel-perfect matching
+ compareOptions = CompareOptions(changeThreshold = 0f),
+ // Reduce the size of the PNGs
+ recordOptions = RecordOptions(resizeScale = 0.5),
)
enum class DefaultTestDevices(val description: String, val spec: String) {
diff --git a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt
index de4aec9d7..114e845d4 100644
--- a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt
+++ b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt
@@ -186,7 +186,8 @@ fun NewsResourceHeaderImage(
painterResource(drawable.ic_placeholder_default)
},
// TODO b/226661685: Investigate using alt text of image to populate content description
- contentDescription = null, // decorative image,
+ // decorative image,
+ contentDescription = null,
)
}
}
@@ -295,7 +296,8 @@ fun NewsResourceTopics(
modifier: Modifier = Modifier,
) {
Row(
- modifier = modifier.horizontalScroll(rememberScrollState()), // causes narrow chips
+ // causes narrow chips
+ modifier = modifier.horizontalScroll(rememberScrollState()),
horizontalArrangement = Arrangement.spacedBy(4.dp),
) {
for (followableTopic in topics) {
diff --git a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt b/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt
index 65b5ecbc4..f0899b448 100644
--- a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt
+++ b/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt
@@ -437,7 +437,8 @@ fun TopicIcon(
DynamicAsyncImage(
placeholder = painterResource(R.drawable.ic_icon_placeholder),
imageUrl = imageUrl,
- contentDescription = null, // decorative
+ // decorative
+ contentDescription = null,
modifier = modifier
.padding(10.dp)
.size(32.dp),
diff --git a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt b/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt
index 7456ba92b..a9e329e9c 100644
--- a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt
+++ b/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt
@@ -99,7 +99,8 @@ private fun InterestsIcon(topicImageUrl: String, modifier: Modifier = Modifier)
.background(MaterialTheme.colorScheme.surface)
.padding(4.dp),
imageVector = NiaIcons.Person,
- contentDescription = null, // decorative image
+ // decorative image
+ contentDescription = null,
)
} else {
DynamicAsyncImage(
diff --git a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt b/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt
index 65b65f61d..72842ec61 100644
--- a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt
+++ b/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt
@@ -328,7 +328,8 @@ private fun SearchResultBody(
topics.forEach { followableTopic ->
val topicId = followableTopic.topic.id
item(
- key = "topic-$topicId", // Append a prefix to distinguish a key for news resources
+ // Append a prefix to distinguish a key for news resources
+ key = "topic-$topicId",
span = StaggeredGridItemSpan.FullLine,
) {
InterestsItem(
diff --git a/gradle/init.gradle.kts b/gradle/init.gradle.kts
index a06d659fa..f2e6114aa 100644
--- a/gradle/init.gradle.kts
+++ b/gradle/init.gradle.kts
@@ -39,7 +39,6 @@ rootProject {
mapOf(
"android" to "true",
"ktlint_standard_property-naming" to "disabled",
- "ktlint_standard_discouraged-comment-location" to "disabled",
),
)
licenseHeaderFile(rootProject.file("spotless/copyright.kt"))