A fully functional Android app built entirely with Kotlin and Jetpack Compose
Remove violations: property-naming
lihenggui32e1ec044729
diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.ktindex 3d58ed5a6..70651ed12 100644--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt@@ -20,7 +20,7 @@ import androidx.compose.runtime.Composableimport androidx.compose.ui.Modifierimport androidx.navigation.compose.NavHostimport com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.bookmarksScreen-import com.google.samples.apps.nowinandroid.feature.foryou.navigation.forYouNavigationRoute+import com.google.samples.apps.nowinandroid.feature.foryou.navigation.FOR_YOU_NAVIGATION_ROUTEimport com.google.samples.apps.nowinandroid.feature.foryou.navigation.forYouScreenimport com.google.samples.apps.nowinandroid.feature.interests.navigation.interestsGraphimport com.google.samples.apps.nowinandroid.feature.search.navigation.searchScreen@@ -41,7 +41,7 @@ fun NiaNavHost(appState: NiaAppState,onShowSnackbar: suspend (String, String?) -> Boolean,modifier: Modifier = Modifier,- startDestination: String = forYouNavigationRoute,+ startDestination: String = FOR_YOU_NAVIGATION_ROUTE,) {val navController = appState.navControllerNavHost(diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.ktindex 09e70069e..9c587cc5c 100644--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt@@ -33,11 +33,11 @@ import androidx.tracing.traceimport com.google.samples.apps.nowinandroid.core.data.repository.UserNewsResourceRepositoryimport com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitorimport com.google.samples.apps.nowinandroid.core.ui.TrackDisposableJank-import com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.bookmarksRoute+import com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.BOOKMARKS_ROUTEimport com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.navigateToBookmarks-import com.google.samples.apps.nowinandroid.feature.foryou.navigation.forYouNavigationRoute+import com.google.samples.apps.nowinandroid.feature.foryou.navigation.FOR_YOU_NAVIGATION_ROUTEimport com.google.samples.apps.nowinandroid.feature.foryou.navigation.navigateToForYou-import com.google.samples.apps.nowinandroid.feature.interests.navigation.interestsRoute+import com.google.samples.apps.nowinandroid.feature.interests.navigation.INTERESTS_ROUTEimport com.google.samples.apps.nowinandroid.feature.interests.navigation.navigateToInterestsGraphimport com.google.samples.apps.nowinandroid.feature.search.navigation.navigateToSearchimport com.google.samples.apps.nowinandroid.navigation.TopLevelDestination@@ -91,9 +91,9 @@ class NiaAppState(val currentTopLevelDestination: TopLevelDestination?@Composable get() = when (currentDestination?.route) {- forYouNavigationRoute -> FOR_YOU- bookmarksRoute -> BOOKMARKS- interestsRoute -> INTERESTS+ FOR_YOU_NAVIGATION_ROUTE -> FOR_YOU+ BOOKMARKS_ROUTE -> BOOKMARKS+ INTERESTS_ROUTE -> INTERESTSelse -> null}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 a5ecc86c1..d490ff13e 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@@ -134,7 +134,7 @@ fun NiaOutlinedButton(MaterialTheme.colorScheme.outline} else {MaterialTheme.colorScheme.onSurface.copy(- alpha = NiaButtonDefaults.DisabledOutlinedButtonBorderAlpha,+ alpha = NiaButtonDefaults.DISABLED_OUTLINED_BUTTON_BORDER_ALPHA,)},),@@ -315,7 +315,7 @@ fun NiaButtonLeadingIconPreview() {object NiaButtonDefaults {// TODO: File bug// OutlinedButton border color doesn't respect disabled state by default- const val DisabledOutlinedButtonBorderAlpha = 0.12f+ const val DISABLED_OUTLINED_BUTTON_BORDER_ALPHA = 0.12f// TODO: File bug// OutlinedButton default border width isn't exposed via ButtonDefaultsdiff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.kt b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.ktindex d1b7d124d..106f0b839 100644--- a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.kt+++ b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.kt@@ -76,10 +76,10 @@ fun NiaFilterChip(borderColor = MaterialTheme.colorScheme.onBackground,selectedBorderColor = MaterialTheme.colorScheme.onBackground,disabledBorderColor = MaterialTheme.colorScheme.onBackground.copy(- alpha = NiaChipDefaults.DisabledChipContentAlpha,+ alpha = NiaChipDefaults.DISABLED_CHIP_CONTENT_ALPHA,),disabledSelectedBorderColor = MaterialTheme.colorScheme.onBackground.copy(- alpha = NiaChipDefaults.DisabledChipContentAlpha,+ alpha = NiaChipDefaults.DISABLED_CHIP_CONTENT_ALPHA,),selectedBorderWidth = NiaChipDefaults.ChipBorderWidth,),@@ -88,16 +88,16 @@ fun NiaFilterChip(iconColor = MaterialTheme.colorScheme.onBackground,disabledContainerColor = if (selected) {MaterialTheme.colorScheme.onBackground.copy(- alpha = NiaChipDefaults.DisabledChipContainerAlpha,+ alpha = NiaChipDefaults.DISABLED_CHIP_CONTAINER_ALPHA,)} else {Color.Transparent},disabledLabelColor = MaterialTheme.colorScheme.onBackground.copy(- alpha = NiaChipDefaults.DisabledChipContentAlpha,+ alpha = NiaChipDefaults.DISABLED_CHIP_CONTENT_ALPHA,),disabledLeadingIconColor = MaterialTheme.colorScheme.onBackground.copy(- alpha = NiaChipDefaults.DisabledChipContentAlpha,+ alpha = NiaChipDefaults.DISABLED_CHIP_CONTENT_ALPHA,),selectedContainerColor = MaterialTheme.colorScheme.primaryContainer,selectedLabelColor = MaterialTheme.colorScheme.onBackground,@@ -124,7 +124,7 @@ fun ChipPreview() {object NiaChipDefaults {// TODO: File bug// FilterChip default values aren't exposed via FilterChipDefaults- const val DisabledChipContainerAlpha = 0.12f- const val DisabledChipContentAlpha = 0.38f+ const val DISABLED_CHIP_CONTAINER_ALPHA = 0.12f+ const val DISABLED_CHIP_CONTENT_ALPHA = 0.38fval ChipBorderWidth = 1.dp}diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/IconButton.kt b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/IconButton.ktindex 503342d30..43ec11f0b 100644--- a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/IconButton.kt+++ b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/IconButton.kt@@ -60,7 +60,7 @@ fun NiaIconToggleButton(checkedContentColor = MaterialTheme.colorScheme.onPrimaryContainer,disabledContainerColor = if (checked) {MaterialTheme.colorScheme.onBackground.copy(- alpha = NiaIconButtonDefaults.DisabledIconButtonContainerAlpha,+ alpha = NiaIconButtonDefaults.DISABLED_ICON_BUTTON_CONTAINER_ALPHA,)} else {Color.Transparent@@ -123,5 +123,5 @@ fun IconButtonPreviewUnchecked() {object NiaIconButtonDefaults {// TODO: File bug// IconToggleButton disabled container alpha not exposed by IconButtonDefaults- const val DisabledIconButtonContainerAlpha = 0.12f+ const val DISABLED_ICON_BUTTON_CONTAINER_ALPHA = 0.12f}diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Tag.kt b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Tag.ktindex 8ca1588a8..290845936 100644--- a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Tag.kt+++ b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Tag.kt@@ -40,7 +40,7 @@ fun NiaTopicTag(MaterialTheme.colorScheme.primaryContainer} else {MaterialTheme.colorScheme.surfaceVariant.copy(- alpha = NiaTagDefaults.UnfollowedTopicTagContainerAlpha,+ alpha = NiaTagDefaults.UNFOLLOWED_TOPIC_TAG_CONTAINER_ALPHA,)}TextButton(@@ -50,7 +50,7 @@ fun NiaTopicTag(containerColor = containerColor,contentColor = contentColorFor(backgroundColor = containerColor),disabledContainerColor = MaterialTheme.colorScheme.onSurface.copy(- alpha = NiaTagDefaults.DisabledTopicTagContainerAlpha,+ alpha = NiaTagDefaults.DISABLED_TOPIC_TAG_CONTAINER_ALPHA,),),) {@@ -75,9 +75,9 @@ fun TagPreview() {* Now in Android tag default values.*/object NiaTagDefaults {- const val UnfollowedTopicTagContainerAlpha = 0.5f+ const val UNFOLLOWED_TOPIC_TAG_CONTAINER_ALPHA = 0.5f// TODO: File bug// Button disabled container alpha value not exposed by ButtonDefaults- const val DisabledTopicTagContainerAlpha = 0.12f+ const val DISABLED_TOPIC_TAG_CONTAINER_ALPHA = 0.12f}diff --git a/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.kt b/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.ktindex ebcde4ab1..81fa114e2 100644--- a/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.kt+++ b/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.kt@@ -22,17 +22,17 @@ import androidx.navigation.NavOptionsimport androidx.navigation.compose.composableimport com.google.samples.apps.nowinandroid.feature.bookmarks.BookmarksRoute-const val bookmarksRoute = "bookmarks_route"+const val BOOKMARKS_ROUTE = "bookmarks_route"fun NavController.navigateToBookmarks(navOptions: NavOptions? = null) {- this.navigate(bookmarksRoute, navOptions)+ this.navigate(BOOKMARKS_ROUTE, navOptions)}fun NavGraphBuilder.bookmarksScreen(onTopicClick: (String) -> Unit,onShowSnackbar: suspend (String, String?) -> Boolean,) {- composable(route = bookmarksRoute) {+ composable(route = BOOKMARKS_ROUTE) {BookmarksRoute(onTopicClick, onShowSnackbar)}}diff --git a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt b/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.ktindex 705495cc2..264345be4 100644--- a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt+++ b/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt@@ -26,17 +26,17 @@ import androidx.navigation.navDeepLinkimport com.google.samples.apps.nowinandroid.feature.foryou.ForYouRouteconst val LINKED_NEWS_RESOURCE_ID = "linkedNewsResourceId"-const val forYouNavigationRoute = "for_you_route/{$LINKED_NEWS_RESOURCE_ID}"+const val FOR_YOU_NAVIGATION_ROUTE = "for_you_route/{$LINKED_NEWS_RESOURCE_ID}"private const val DEEP_LINK_URI_PATTERN ="https://www.nowinandroid.apps.samples.google.com/foryou/{$LINKED_NEWS_RESOURCE_ID}"fun NavController.navigateToForYou(navOptions: NavOptions? = null) {- this.navigate(forYouNavigationRoute, navOptions)+ this.navigate(FOR_YOU_NAVIGATION_ROUTE, navOptions)}fun NavGraphBuilder.forYouScreen(onTopicClick: (String) -> Unit) {composable(- route = forYouNavigationRoute,+ route = FOR_YOU_NAVIGATION_ROUTE,deepLinks = listOf(navDeepLink { uriPattern = DEEP_LINK_URI_PATTERN },),diff --git a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt b/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.ktindex 7558ec48d..831247e27 100644--- a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt+++ b/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt@@ -24,7 +24,7 @@ import androidx.navigation.navigationimport com.google.samples.apps.nowinandroid.feature.interests.InterestsRouteprivate const val INTERESTS_GRAPH_ROUTE_PATTERN = "interests_graph"-const val interestsRoute = "interests_route"+const val INTERESTS_ROUTE = "interests_route"fun NavController.navigateToInterestsGraph(navOptions: NavOptions? = null) {this.navigate(INTERESTS_GRAPH_ROUTE_PATTERN, navOptions)@@ -36,9 +36,9 @@ fun NavGraphBuilder.interestsGraph() {navigation(route = INTERESTS_GRAPH_ROUTE_PATTERN,- startDestination = interestsRoute,+ startDestination = INTERESTS_ROUTE,) {- composable(route = interestsRoute) {+ composable(route = INTERESTS_ROUTE) {InterestsRoute(onTopicClick)}nestedGraphs()diff --git a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/navigation/SearchNavigation.kt b/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/navigation/SearchNavigation.ktindex 42bf3f475..a449600b2 100644--- a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/navigation/SearchNavigation.kt+++ b/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/navigation/SearchNavigation.kt@@ -22,10 +22,10 @@ import androidx.navigation.NavOptionsimport androidx.navigation.compose.composableimport com.google.samples.apps.nowinandroid.feature.search.SearchRoute-const val searchRoute = "search_route"+const val SEARCH_ROUTE = "search_route"fun NavController.navigateToSearch(navOptions: NavOptions? = null) {- this.navigate(searchRoute, navOptions)+ this.navigate(SEARCH_ROUTE, navOptions)}fun NavGraphBuilder.searchScreen(@@ -35,7 +35,7 @@ fun NavGraphBuilder.searchScreen() {// TODO: Handle back stack for each top-level destination. At the moment each top-level// destination may have own search screen's back stack.- composable(route = searchRoute) {+ composable(route = SEARCH_ROUTE) {SearchRoute(onBackClick = onBackClick,onInterestsClick = onInterestsClick,diff --git a/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt b/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.ktindex c29b57d47..8052f766e 100644--- a/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt+++ b/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt@@ -31,11 +31,11 @@ import kotlin.text.Charsets.UTF_8private val URL_CHARACTER_ENCODING = UTF_8.name()@VisibleForTesting-internal const val topicIdArg = "topicId"+internal const val TOPIC_ID_ARG = "topicId"internal class TopicArgs(val topicId: String) {constructor(savedStateHandle: SavedStateHandle) :- this(URLDecoder.decode(checkNotNull(savedStateHandle[topicIdArg]), URL_CHARACTER_ENCODING))+ this(URLDecoder.decode(checkNotNull(savedStateHandle[TOPIC_ID_ARG]), URL_CHARACTER_ENCODING))}fun NavController.navigateToTopic(topicId: String) {@@ -50,9 +50,9 @@ fun NavGraphBuilder.topicScreen(onTopicClick: (String) -> Unit,) {composable(- route = "topic_route/{$topicIdArg}",+ route = "topic_route/{$TOPIC_ID_ARG}",arguments = listOf(- navArgument(topicIdArg) { type = NavType.StringType },+ navArgument(TOPIC_ID_ARG) { type = NavType.StringType },),) {TopicRoute(onBackClick = onBackClick, onTopicClick = onTopicClick)diff --git a/feature/topic/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt b/feature/topic/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.ktindex 8c6253d60..a9c9d96dc 100644--- a/feature/topic/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt+++ b/feature/topic/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt@@ -25,7 +25,7 @@ import com.google.samples.apps.nowinandroid.core.testing.repository.TestNewsRepoimport com.google.samples.apps.nowinandroid.core.testing.repository.TestTopicsRepositoryimport com.google.samples.apps.nowinandroid.core.testing.repository.TestUserDataRepositoryimport com.google.samples.apps.nowinandroid.core.testing.util.MainDispatcherRule-import com.google.samples.apps.nowinandroid.feature.topic.navigation.topicIdArg+import com.google.samples.apps.nowinandroid.feature.topic.navigation.TOPIC_ID_ARGimport kotlinx.coroutines.flow.collectimport kotlinx.coroutines.flow.combineimport kotlinx.coroutines.flow.first@@ -60,7 +60,7 @@ class TopicViewModelTest {@Beforefun setup() {viewModel = TopicViewModel(- savedStateHandle = SavedStateHandle(mapOf(topicIdArg to testInputTopics[0].topic.id)),+ savedStateHandle = SavedStateHandle(mapOf(TOPIC_ID_ARG to testInputTopics[0].topic.id)),userDataRepository = userDataRepository,topicsRepository = topicsRepository,userNewsResourceRepository = userNewsResourceRepository,diff --git a/gradle/init.gradle.kts b/gradle/init.gradle.ktsindex f2e6114aa..fe79fa01e 100644--- a/gradle/init.gradle.kts+++ b/gradle/init.gradle.kts@@ -38,7 +38,6 @@ rootProject {ktlint(ktlintVersion).editorConfigOverride(mapOf("android" to "true",- "ktlint_standard_property-naming" to "disabled",),)licenseHeaderFile(rootProject.file("spotless/copyright.kt"))diff --git a/sync/work/src/main/kotlin/com/google/samples/apps/nowinandroid/sync/initializers/SyncInitializer.kt b/sync/work/src/main/kotlin/com/google/samples/apps/nowinandroid/sync/initializers/SyncInitializer.ktindex 00f61f17d..0a631534b 100644--- a/sync/work/src/main/kotlin/com/google/samples/apps/nowinandroid/sync/initializers/SyncInitializer.kt+++ b/sync/work/src/main/kotlin/com/google/samples/apps/nowinandroid/sync/initializers/SyncInitializer.kt@@ -28,7 +28,7 @@ object Sync {WorkManager.getInstance(context).apply {// Run sync on app startup and ensure only one sync worker runs at any timeenqueueUniqueWork(- SyncWorkName,+ SYNC_WORK_NAME,ExistingWorkPolicy.KEEP,SyncWorker.startUpSyncWork(),)@@ -37,4 +37,4 @@ object Sync {}// This name should not be changed otherwise the app may have concurrent sync requests running-internal const val SyncWorkName = "SyncWorkName"+internal const val SYNC_WORK_NAME = "SyncWorkName"diff --git a/sync/work/src/main/kotlin/com/google/samples/apps/nowinandroid/sync/status/WorkManagerSyncManager.kt b/sync/work/src/main/kotlin/com/google/samples/apps/nowinandroid/sync/status/WorkManagerSyncManager.ktindex 9131e4888..1d251588e 100644--- a/sync/work/src/main/kotlin/com/google/samples/apps/nowinandroid/sync/status/WorkManagerSyncManager.kt+++ b/sync/work/src/main/kotlin/com/google/samples/apps/nowinandroid/sync/status/WorkManagerSyncManager.kt@@ -22,7 +22,7 @@ import androidx.work.WorkInfoimport androidx.work.WorkInfo.Stateimport androidx.work.WorkManagerimport com.google.samples.apps.nowinandroid.core.data.util.SyncManager-import com.google.samples.apps.nowinandroid.sync.initializers.SyncWorkName+import com.google.samples.apps.nowinandroid.sync.initializers.SYNC_WORK_NAMEimport com.google.samples.apps.nowinandroid.sync.workers.SyncWorkerimport dagger.hilt.android.qualifiers.ApplicationContextimport kotlinx.coroutines.flow.Flow@@ -37,7 +37,7 @@ class WorkManagerSyncManager @Inject constructor(@ApplicationContext private val context: Context,) : SyncManager {override val isSyncing: Flow<Boolean> =- WorkManager.getInstance(context).getWorkInfosForUniqueWorkFlow(SyncWorkName)+ WorkManager.getInstance(context).getWorkInfosForUniqueWorkFlow(SYNC_WORK_NAME).map(List<WorkInfo>::anyRunning).conflate()@@ -45,7 +45,7 @@ class WorkManagerSyncManager @Inject constructor(val workManager = WorkManager.getInstance(context)// Run sync on app startup and ensure only one sync worker runs at any timeworkManager.enqueueUniqueWork(- SyncWorkName,+ SYNC_WORK_NAME,ExistingWorkPolicy.KEEP,SyncWorker.startUpSyncWork(),)