Merge branch 'main' into room-gradle-plugin

Author: dturner

.editorconfig

@@ -4,3 +4,4 @@
 [*.{kt,kts}]
 ij_kotlin_allow_trailing_comma=true
 ij_kotlin_allow_trailing_comma_on_call_site=true
+ktlint_function_naming_ignore_when_annotated_with=Composable, Test

app/src/benchmark/res/values-night/colors.xml

@@ -15,6 +15,8 @@
      limitations under the License.
 -->
 <resources>
+    <!-- Allow users to distinguish between build variants by having a different background color
+        for the launcher icon. See https://github.com/android/nowinandroid/pull/989. -->
     <color name="ic_launcher_background_tint">#FFFFFF</color>
     <color name="ic_launcher_foreground_tint">#FF006780</color>
 </resources>

app/src/benchmark/res/values/colors.xml

@@ -15,6 +15,8 @@
      limitations under the License.
 -->
 <resources>
+    <!-- Allow users to distinguish between build variants by having a different background color
+        for the launcher icon. See https://github.com/android/nowinandroid/pull/989. -->
     <color name="ic_launcher_background_tint">#000000</color>
     <color name="ic_launcher_foreground_tint">#FF006780</color>
 </resources>

app/src/debug/res/values-night/colors.xml

@@ -15,6 +15,8 @@
      limitations under the License.
 -->
 <resources>
+    <!-- Allow users to distinguish between build variants by having a different background color
+    for the launcher icon. See https://github.com/android/nowinandroid/pull/989. -->
     <color name="ic_launcher_background_tint">#FFFFFF</color>
     <color name="ic_launcher_foreground_tint">#FFA23F16</color>
 </resources>

app/src/debug/res/values/colors.xml

@@ -15,6 +15,8 @@
      limitations under the License.
 -->
 <resources>
+    <!-- Allow users to distinguish between build variants by having a different background color
+    for the launcher icon. See https://github.com/android/nowinandroid/pull/989. -->
     <color name="ic_launcher_background_tint">#000000</color>
     <color name="ic_launcher_foreground_tint">#FFA23F16</color>
 </resources>

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}")

app/src/main/kotlin/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
@@ -41,7 +41,7 @@ fun NiaNavHost(
     appState: NiaAppState,
     onShowSnackbar: suspend (String, String?) -> Boolean,
     modifier: Modifier = Modifier,
-    startDestination: String = forYouNavigationRoute,
+    startDestination: String = FOR_YOU_ROUTE,
 ) {
     val navController = appState.navController
     NavHost(

app/src/main/kotlin/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
-            bookmarksRoute -> BOOKMARKS
-            interestsRoute -> INTERESTS
+            FOR_YOU_ROUTE -> FOR_YOU
+            BOOKMARKS_ROUTE -> BOOKMARKS
+            INTERESTS_ROUTE -> INTERESTS
             else -> null
         }
 

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()

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
+        }
     }
 }