A fully functional Android app built entirely with Kotlin and Jetpack Compose
Merge branch 'main' into bw/initialMetrics
Ben Weissfa16a25ac83b
diff --cc feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.ktindex f6bfc63bf,cd996c3f3..1a61163eb--- a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt+++ b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt@@@ -82,14 -79,12 +82,14 @@@ import androidx.compose.ui.unit.simport androidx.core.content.ContextCompatimport androidx.hilt.navigation.compose.hiltViewModelimport coil.compose.AsyncImage- import com.google.samples.apps.nowinandroid.core.model.data.Authorimport com.google.samples.apps.nowinandroid.core.model.data.FollowableAuthorimport com.google.samples.apps.nowinandroid.core.model.data.FollowableTopic- import com.google.samples.apps.nowinandroid.core.model.data.NewsResource- import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Videoimport com.google.samples.apps.nowinandroid.core.model.data.SaveableNewsResource+ import com.google.samples.apps.nowinandroid.core.model.data.previewAuthors+ import com.google.samples.apps.nowinandroid.core.model.data.previewNewsResources+ import com.google.samples.apps.nowinandroid.core.model.data.previewTopics+import com.google.samples.apps.nowinandroid.core.model.data.Topic+import com.google.samples.apps.nowinandroid.core.ui.JankMetricEffectimport com.google.samples.apps.nowinandroid.core.ui.LoadingWheelimport com.google.samples.apps.nowinandroid.core.ui.NewsResourceCardExpandedimport com.google.samples.apps.nowinandroid.core.ui.component.NiaFilledButtondiff --cc feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.ktindex 3a1c3ac7b,fa47eb26e..61b160f5c--- a/feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt+++ b/feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt@@@ -34,10 -34,15 +34,16 @@@ import androidx.compose.runtime.getValuimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.ui.res.stringResource+ import androidx.compose.ui.tooling.preview.Previewimport androidx.compose.ui.unit.dpimport androidx.hilt.navigation.compose.hiltViewModel+ import com.google.samples.apps.nowinandroid.core.model.data.FollowableAuthor+ import com.google.samples.apps.nowinandroid.core.model.data.FollowableTopic+ import com.google.samples.apps.nowinandroid.core.model.data.previewAuthors+ import com.google.samples.apps.nowinandroid.core.model.data.previewTopics+import com.google.samples.apps.nowinandroid.core.ui.JankMetricDisposableEffectimport com.google.samples.apps.nowinandroid.core.ui.LoadingWheel+ import com.google.samples.apps.nowinandroid.core.ui.component.NiaBackgroundimport com.google.samples.apps.nowinandroid.core.ui.component.NiaTabimport com.google.samples.apps.nowinandroid.core.ui.component.NiaTabRowimport com.google.samples.apps.nowinandroid.core.ui.component.NiaTopAppBardiff --cc gradle/libs.versions.tomlindex af60436ed,78724ff06..96e869293--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@@ -14,18 -14,16 +14,18 @@@ androidxHiltNavigationCompose = "1.0.0androidxLifecycle = "2.5.0-rc01"androidxMacroBenchmark = "1.1.0-rc03"androidxNavigation = "2.4.2"+androidxMetrics = "1.0.0-alpha01"- androidxProfileinstaller = "1.2.0-beta01"+ androidxProfileinstaller = "1.2.0-beta03"androidxSavedState = "1.1.0"androidxStartup = "1.1.1"androidxWindowManager = "1.0.0"androidxTest = "1.4.0"androidxTestExt = "1.1.3"+androidxTracing = "1.1.0"androidxUiAutomator = "2.2.0"androidxWork = "2.7.1"- coil = "2.0.0-rc01"- hilt = "2.41"+ coil = "2.1.0"+ hilt = "2.42"hiltExt = "1.0.0"jacoco = "0.8.7"junit4 = "4.13.2"