Unify const naming conventions

Change-Id: I481d97778f599ead624164057fbafb36c3ea2c55

app/src/main/java/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt

@@ -20,7 +20,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.navigation.compose.NavHost
 import 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_ROUTE
 import com.google.samples.apps.nowinandroid.feature.foryou.navigation.forYouScreen
 import com.google.samples.apps.nowinandroid.feature.interests.navigation.interestsGraph
 import com.google.samples.apps.nowinandroid.feature.search.navigation.searchScreen
@@ -40,7 +40,7 @@ import com.google.samples.apps.nowinandroid.ui.NiaAppState
 fun NiaNavHost(
     appState: NiaAppState,
     modifier: Modifier = Modifier,
-    startDestination: String = forYouNavigationRoute,
+    startDestination: String = FOR_YOU_ROUTE,
 ) {
     val navController = appState.navController
     NavHost(

app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt

@@ -33,11 +33,11 @@ import androidx.tracing.trace
 import com.google.samples.apps.nowinandroid.core.data.repository.UserNewsResourceRepository
 import com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitor
 import 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_ROUTE
 import 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_ROUTE
 import 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_ROUTE
 import com.google.samples.apps.nowinandroid.feature.interests.navigation.navigateToInterestsGraph
 import com.google.samples.apps.nowinandroid.feature.search.navigation.navigateToSearch
 import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination
@@ -91,9 +91,9 @@ class NiaAppState(
 
     val currentTopLevelDestination: TopLevelDestination?
         @Composable get() = when (currentDestination?.route) {
-            forYouNavigationRoute -> FOR_YOU
+            FOR_YOU_ROUTE -> FOR_YOU
-            bookmarksRoute -> BOOKMARKS
+            BOOKMARKS_ROUTE -> BOOKMARKS
-            interestsRoute -> INTERESTS
+            INTERESTS_ROUTE -> INTERESTS
             else -> null
         }
 

core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Button.kt

@@ -31,6 +31,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 
+private const val DISABLED_OUTLINED_BUTTON_BORDER_ALPHA = 0.12f
+private val outlinedButtonBorderWidth = 1.dp
+
 /**
  * Now in Android filled button with generic content slot. Wraps Material 3 [Button].
  *
@@ -124,12 +127,12 @@ fun NiaOutlinedButton(
             contentColor = MaterialTheme.colorScheme.onBackground,
         ),
         border = BorderStroke(
-            width = NiaButtonDefaults.OutlinedButtonBorderWidth,
+            width = outlinedButtonBorderWidth,
             color = if (enabled) {
                 MaterialTheme.colorScheme.outline
             } else {
                 MaterialTheme.colorScheme.onSurface.copy(
-                    alpha = NiaButtonDefaults.DisabledOutlinedButtonBorderAlpha,
+                    alpha = DISABLED_OUTLINED_BUTTON_BORDER_ALPHA,
                 )
             },
         ),
@@ -259,16 +262,3 @@ private fun NiaButtonContent(
         text()
     }
 }
-
-/**
- * Now in Android button default values.
- */
-object NiaButtonDefaults {
-    // TODO: File bug
-    // OutlinedButton border color doesn't respect disabled state by default
-    const val DisabledOutlinedButtonBorderAlpha = 0.12f
-
-    // TODO: File bug
-    // OutlinedButton default border width isn't exposed via ButtonDefaults
-    val OutlinedButtonBorderWidth = 1.dp
-}

core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.kt

@@ -29,6 +29,10 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
 
+private const val DISABLED_CHIP_CONTAINER_ALPHA = 0.12f
+private const val DISABLED_CHIP_CONTENT_ALPHA = 0.38f
+private val chipBorderWidth = 1.dp
+
 /**
  * Now in Android filter chip with included leading checked icon as well as text content slot.
  *
@@ -73,28 +77,28 @@ fun NiaFilterChip(
             borderColor = MaterialTheme.colorScheme.onBackground,
             selectedBorderColor = MaterialTheme.colorScheme.onBackground,
             disabledBorderColor = MaterialTheme.colorScheme.onBackground.copy(
-                alpha = NiaChipDefaults.DisabledChipContentAlpha,
+                alpha = DISABLED_CHIP_CONTENT_ALPHA,
             ),
             disabledSelectedBorderColor = MaterialTheme.colorScheme.onBackground.copy(
-                alpha = NiaChipDefaults.DisabledChipContentAlpha,
+                alpha = DISABLED_CHIP_CONTENT_ALPHA,
             ),
-            selectedBorderWidth = NiaChipDefaults.ChipBorderWidth,
+            selectedBorderWidth = chipBorderWidth,
         ),
         colors = FilterChipDefaults.filterChipColors(
             labelColor = MaterialTheme.colorScheme.onBackground,
             iconColor = MaterialTheme.colorScheme.onBackground,
             disabledContainerColor = if (selected) {
                 MaterialTheme.colorScheme.onBackground.copy(
-                    alpha = NiaChipDefaults.DisabledChipContainerAlpha,
+                    alpha = DISABLED_CHIP_CONTAINER_ALPHA,
                 )
             } else {
                 Color.Transparent
             },
             disabledLabelColor = MaterialTheme.colorScheme.onBackground.copy(
-                alpha = NiaChipDefaults.DisabledChipContentAlpha,
+                alpha = DISABLED_CHIP_CONTENT_ALPHA,
             ),
             disabledLeadingIconColor = MaterialTheme.colorScheme.onBackground.copy(
-                alpha = NiaChipDefaults.DisabledChipContentAlpha,
+                alpha = DISABLED_CHIP_CONTENT_ALPHA,
             ),
             selectedContainerColor = MaterialTheme.colorScheme.primaryContainer,
             selectedLabelColor = MaterialTheme.colorScheme.onBackground,
@@ -102,14 +106,3 @@ fun NiaFilterChip(
         ),
     )
 }
-
-/**
- * Now in Android chip default values.
- */
-object NiaChipDefaults {
-    // TODO: File bug
-    // FilterChip default values aren't exposed via FilterChipDefaults
-    const val DisabledChipContainerAlpha = 0.12f
-    const val DisabledChipContentAlpha = 0.38f
-    val ChipBorderWidth = 1.dp
-}

core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/IconButton.kt

@@ -24,6 +24,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 
+private const val DISABLED_ICON_BUTTON_CONTAINER_ALPHA = 0.12f
+
 /**
  * Now in Android toggle button with icon and checked icon content slots. Wraps Material 3
  * [IconButton].
@@ -57,7 +59,7 @@ fun NiaIconToggleButton(
             checkedContentColor = MaterialTheme.colorScheme.onPrimaryContainer,
             disabledContainerColor = if (checked) {
                 MaterialTheme.colorScheme.onBackground.copy(
-                    alpha = NiaIconButtonDefaults.DisabledIconButtonContainerAlpha,
+                    alpha = DISABLED_ICON_BUTTON_CONTAINER_ALPHA,
                 )
             } else {
                 Color.Transparent
@@ -67,12 +69,3 @@ fun NiaIconToggleButton(
         if (checked) checkedIcon() else icon()
     }
 }
-
-/**
- * Now in Android icon button default values.
- */
-object NiaIconButtonDefaults {
-    // TODO: File bug
-    // IconToggleButton disabled container alpha not exposed by IconButtonDefaults
-    const val DisabledIconButtonContainerAlpha = 0.12f
-}

core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Tag.kt

@@ -25,6 +25,9 @@ import androidx.compose.material3.contentColorFor
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 
+private const val UNFOLLOWED_TOPIC_TAG_CONTAINER_ALPHA = 0.5f
+private const val DISABLED_TOPIC_TAG_CONTAINER_ALPHA = 0.12f
+
 @Composable
 fun NiaTopicTag(
     modifier: Modifier = Modifier,
@@ -38,7 +41,7 @@ fun NiaTopicTag(
             MaterialTheme.colorScheme.primaryContainer
         } else {
             MaterialTheme.colorScheme.surfaceVariant.copy(
-                alpha = NiaTagDefaults.UnfollowedTopicTagContainerAlpha,
+                alpha = UNFOLLOWED_TOPIC_TAG_CONTAINER_ALPHA,
             )
         }
         TextButton(
@@ -48,7 +51,7 @@ fun NiaTopicTag(
                 containerColor = containerColor,
                 contentColor = contentColorFor(backgroundColor = containerColor),
                 disabledContainerColor = MaterialTheme.colorScheme.onSurface.copy(
-                    alpha = NiaTagDefaults.DisabledTopicTagContainerAlpha,
+                    alpha = DISABLED_TOPIC_TAG_CONTAINER_ALPHA,
                 ),
             ),
         ) {
@@ -58,14 +61,3 @@ fun NiaTopicTag(
         }
     }
 }
-
-/**
- * Now in Android tag default values.
- */
-object NiaTagDefaults {
-    const val UnfollowedTopicTagContainerAlpha = 0.5f
-
-    // TODO: File bug
-    // Button disabled container alpha value not exposed by ButtonDefaults
-    const val DisabledTopicTagContainerAlpha = 0.12f
-}

core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/retrofit/RetrofitNiaNetwork.kt

@@ -57,10 +57,8 @@ private interface RetrofitNiaNetworkApi {
     ): List<NetworkChangeList>
 }
 
-private const val NiaBaseUrl = BuildConfig.BACKEND_URL
-
 /**
- * Wrapper for data provided from the [NiaBaseUrl]
+ * Wrapper for data provided from the [BuildConfig.BACKEND_URL]
  */
 @Serializable
 private data class NetworkResponse<T>(
@@ -77,7 +75,7 @@ class RetrofitNiaNetwork @Inject constructor(
 ) : NiaNetworkDataSource {
 
     private val networkApi = Retrofit.Builder()
-        .baseUrl(NiaBaseUrl)
+        .baseUrl(BuildConfig.BACKEND_URL)
         .callFactory(okhttpCallFactory)
         .addConverterFactory(
             networkJson.asConverterFactory("application/json".toMediaType()),

feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.kt

@@ -22,14 +22,14 @@ import androidx.navigation.NavOptions
 import androidx.navigation.compose.composable
 import 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) {
-    composable(route = bookmarksRoute) {
+    composable(route = BOOKMARKS_ROUTE) {
         BookmarksRoute(onTopicClick)
     }
 }

feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt

@@ -26,17 +26,17 @@ import androidx.navigation.navDeepLink
 import com.google.samples.apps.nowinandroid.feature.foryou.ForYouRoute
 
 const val LINKED_NEWS_RESOURCE_ID = "linkedNewsResourceId"
-const val forYouNavigationRoute = "for_you_route/{$LINKED_NEWS_RESOURCE_ID}"
+const val FOR_YOU_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_ROUTE, navOptions)
 }
 
 fun NavGraphBuilder.forYouScreen(onTopicClick: (String) -> Unit) {
     composable(
-        route = forYouNavigationRoute,
+        route = FOR_YOU_ROUTE,
         deepLinks = listOf(
             navDeepLink { uriPattern = DEEP_LINK_URI_PATTERN },
         ),

feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt

@@ -23,11 +23,11 @@ import androidx.navigation.compose.composable
 import androidx.navigation.navigation
 import com.google.samples.apps.nowinandroid.feature.interests.InterestsRoute
 
-private const val interestsGraphRoutePattern = "interests_graph"
+private 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(interestsGraphRoutePattern, navOptions)
+    this.navigate(INTERESTS_GRAPH_ROUTE_PATTERN, navOptions)
 }
 
 fun NavGraphBuilder.interestsGraph(
@@ -35,10 +35,10 @@ fun NavGraphBuilder.interestsGraph(
     nestedGraphs: NavGraphBuilder.() -> Unit,
 ) {
     navigation(
-        route = interestsGraphRoutePattern,
+        route = INTERESTS_GRAPH_ROUTE_PATTERN,
-        startDestination = interestsRoute,
+        startDestination = INTERESTS_ROUTE,
     ) {
-        composable(route = interestsRoute) {
+        composable(route = INTERESTS_ROUTE) {
             InterestsRoute(onTopicClick)
         }
         nestedGraphs()

feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/navigation/SearchNavigation.kt

@@ -22,10 +22,10 @@ import androidx.navigation.NavOptions
 import androidx.navigation.compose.composable
 import 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,

feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt

@@ -28,11 +28,11 @@ import com.google.samples.apps.nowinandroid.core.decoder.StringDecoder
 import com.google.samples.apps.nowinandroid.feature.topic.TopicRoute
 
 @VisibleForTesting
-internal const val topicIdArg = "topicId"
+internal const val TOPIC_ID_ARG = "topicId"
 
 internal class TopicArgs(val topicId: String) {
     constructor(savedStateHandle: SavedStateHandle, stringDecoder: StringDecoder) :
-        this(stringDecoder.decodeString(checkNotNull(savedStateHandle[topicIdArg])))
+        this(stringDecoder.decodeString(checkNotNull(savedStateHandle[TOPIC_ID_ARG])))
 }
 
 fun NavController.navigateToTopic(topicId: String) {
@@ -47,9 +47,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)

feature/topic/src/test/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt

@@ -27,7 +27,7 @@ import com.google.samples.apps.nowinandroid.core.testing.repository.TestNewsRepo
 import com.google.samples.apps.nowinandroid.core.testing.repository.TestTopicsRepository
 import com.google.samples.apps.nowinandroid.core.testing.repository.TestUserDataRepository
 import 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_ARG
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.first
@@ -62,7 +62,7 @@ class TopicViewModelTest {
     @Before
     fun setup() {
         viewModel = TopicViewModel(
-            savedStateHandle = SavedStateHandle(mapOf(topicIdArg to testInputTopics[0].topic.id)),
+            savedStateHandle = SavedStateHandle(mapOf(TOPIC_ID_ARG to testInputTopics[0].topic.id)),
             stringDecoder = FakeStringDecoder(),
             userDataRepository = userDataRepository,
             topicsRepository = topicsRepository,

sync/work/src/main/java/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 time
             enqueueUniqueWork(
-                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"

sync/work/src/main/java/com/google/samples/apps/nowinandroid/sync/status/WorkManagerSyncManager.kt

@@ -24,7 +24,7 @@ import androidx.work.WorkInfo
 import androidx.work.WorkInfo.State
 import androidx.work.WorkManager
 import 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_NAME
 import com.google.samples.apps.nowinandroid.sync.workers.SyncWorker
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.Flow
@@ -38,7 +38,7 @@ class WorkManagerSyncManager @Inject constructor(
     @ApplicationContext private val context: Context,
 ) : SyncManager {
     override val isSyncing: Flow<Boolean> =
-        WorkManager.getInstance(context).getWorkInfosForUniqueWorkLiveData(SyncWorkName)
+        WorkManager.getInstance(context).getWorkInfosForUniqueWorkLiveData(SYNC_WORK_NAME)
             .map(MutableList<WorkInfo>::anyRunning)
             .asFlow()
             .conflate()
@@ -47,7 +47,7 @@ class WorkManagerSyncManager @Inject constructor(
         val workManager = WorkManager.getInstance(context)
         // Run sync on app startup and ensure only one sync worker runs at any time
         workManager.enqueueUniqueWork(
-            SyncWorkName,
+            SYNC_WORK_NAME,
             ExistingWorkPolicy.KEEP,
             SyncWorker.startUpSyncWork(),
         )