Skip to content

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.kt
index 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.s
import androidx.core.content.ContextCompat
import androidx.hilt.navigation.compose.hiltViewModel
import coil.compose.AsyncImage
- import com.google.samples.apps.nowinandroid.core.model.data.Author
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.NewsResource
- import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Video
import 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.JankMetricEffect
import com.google.samples.apps.nowinandroid.core.ui.LoadingWheel
import com.google.samples.apps.nowinandroid.core.ui.NewsResourceCardExpanded
import com.google.samples.apps.nowinandroid.core.ui.component.NiaFilledButton
diff --cc feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt
index 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.getValu
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
+ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import 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.JankMetricDisposableEffect
import com.google.samples.apps.nowinandroid.core.ui.LoadingWheel
+ import com.google.samples.apps.nowinandroid.core.ui.component.NiaBackground
import com.google.samples.apps.nowinandroid.core.ui.component.NiaTab
import com.google.samples.apps.nowinandroid.core.ui.component.NiaTabRow
import com.google.samples.apps.nowinandroid.core.ui.component.NiaTopAppBar
diff --cc gradle/libs.versions.toml
index af60436ed,78724ff06..96e869293
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@@ -14,18 -14,16 +14,18 @@@ androidxHiltNavigationCompose = "1.0.0
androidxLifecycle = "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"