Skip to content

A fully functional Android app built entirely with Kotlin and Jetpack Compose

Merge branch 'main' into bw/initialMetrics

Ben Weiss6509b6ac9d46
diff --cc app/src/main/java/com/google/samples/apps/nowinandroid/navigation/NiaTopLevelNavigation.kt
index e76918eae,6023982e8..54d7bd402
--- a/app/src/main/java/com/google/samples/apps/nowinandroid/navigation/NiaTopLevelNavigation.kt
+++ b/app/src/main/java/com/google/samples/apps/nowinandroid/navigation/NiaTopLevelNavigation.kt
@@@ -16,15 -16,12 +16,13 @@@
package com.google.samples.apps.nowinandroid.navigation
- import androidx.compose.material.icons.Icons
- import androidx.compose.material.icons.filled.Grid3x3
- import androidx.compose.material.icons.filled.Upcoming
- import androidx.compose.material.icons.outlined.Grid3x3
- import androidx.compose.material.icons.outlined.Upcoming
- import androidx.compose.ui.graphics.vector.ImageVector
import androidx.navigation.NavGraph.Companion.findStartDestination
import androidx.navigation.NavHostController
+import androidx.tracing.trace
+ import com.google.samples.apps.nowinandroid.core.designsystem.icon.Icon
+ import com.google.samples.apps.nowinandroid.core.designsystem.icon.Icon.DrawableResourceIcon
+ import com.google.samples.apps.nowinandroid.core.designsystem.icon.Icon.ImageVectorIcon
+ import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
import com.google.samples.apps.nowinandroid.feature.foryou.R.string.for_you
import com.google.samples.apps.nowinandroid.feature.foryou.navigation.ForYouDestination
import com.google.samples.apps.nowinandroid.feature.interests.R.string.interests
diff --cc app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt
index bedd20704,02196574e..c0f5c1b20
--- a/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt
+++ b/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt
@@@ -44,16 -41,20 +41,22 @@@ import androidx.compose.runtime.getValu
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
+ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
- import androidx.compose.ui.unit.dp
+import androidx.navigation.NavController
import androidx.navigation.NavDestination
import androidx.navigation.NavDestination.Companion.hierarchy
import androidx.navigation.compose.currentBackStackEntryAsState
import androidx.navigation.compose.rememberNavController
+ import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaBackground
+ import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigationBar
+ import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigationBarItem
+ import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigationRail
+ import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigationRailItem
+ import com.google.samples.apps.nowinandroid.core.designsystem.icon.Icon.DrawableResourceIcon
+ import com.google.samples.apps.nowinandroid.core.designsystem.icon.Icon.ImageVectorIcon
+ import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
+import com.google.samples.apps.nowinandroid.core.ui.JankMetricDisposableEffect
- import com.google.samples.apps.nowinandroid.core.ui.component.NiaBackground
- import com.google.samples.apps.nowinandroid.core.ui.theme.NiaTheme
import com.google.samples.apps.nowinandroid.navigation.NiaNavHost
import com.google.samples.apps.nowinandroid.navigation.NiaTopLevelNavigation
import com.google.samples.apps.nowinandroid.navigation.TOP_LEVEL_DESTINATIONS
diff --cc feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/AuthorsCarousel.kt
index 1544d7dad,f36b09f57..687cdbbd8
--- a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/AuthorsCarousel.kt
+++ b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/AuthorsCarousel.kt
@@@ -28,11 -30,8 +28,9 @@@ import androidx.compose.foundation.layo
import androidx.compose.foundation.layout.sizeIn
import androidx.compose.foundation.lazy.LazyRow
import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.selection.toggleable
import androidx.compose.foundation.shape.CircleShape
- import androidx.compose.material.icons.Icons
- import androidx.compose.material.icons.filled.Person
import androidx.compose.material.ripple.rememberRipple
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
@@@ -54,12 -52,11 +52,14 @@@ import androidx.compose.ui.text.style.T
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import coil.compose.AsyncImage
+ import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaToggleButton
+ import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
+ import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
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.ui.FollowButton
+import com.google.samples.apps.nowinandroid.core.ui.JankMetricEffect
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.combine
@Composable
fun AuthorsCarousel(
diff --cc feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt
index f52e887bb,c2fea6834..0a997d894
--- 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
@@@ -44,14 -45,9 +45,11 @@@ import androidx.compose.foundation.lazy
import androidx.compose.foundation.lazy.grid.GridCells
import androidx.compose.foundation.lazy.grid.LazyHorizontalGrid
import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.foundation.lazy.grid.rememberLazyGridState
import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.shape.CornerSize
import androidx.compose.foundation.shape.RoundedCornerShape
- import androidx.compose.material.icons.Icons
- import androidx.compose.material.icons.filled.Search
- import androidx.compose.material.icons.outlined.AccountCircle
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
@@@ -88,19 -90,8 +93,11 @@@ import com.google.samples.apps.nowinand
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.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
- import com.google.samples.apps.nowinandroid.core.ui.component.NiaGradientBackground
- import com.google.samples.apps.nowinandroid.core.ui.component.NiaToggleButton
- import com.google.samples.apps.nowinandroid.core.ui.component.NiaTopAppBar
- import com.google.samples.apps.nowinandroid.core.ui.icon.NiaIcons
- import com.google.samples.apps.nowinandroid.core.ui.theme.NiaTheme
- import com.google.samples.apps.nowinandroid.core.ui.theme.NiaTypography
import kotlin.math.floor
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.combine
@Composable
fun ForYouRoute(
diff --cc feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt
index 61b160f5c,f8a462a5a..e7dabb09b
--- 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
@@@ -41,13 -43,6 +43,7 @@@ import com.google.samples.apps.nowinand
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
- import com.google.samples.apps.nowinandroid.core.ui.theme.NiaTheme
@Composable
fun InterestsRoute(
diff --cc gradle/libs.versions.toml
index 96e869293,c37b6388e..d8cd0cf88
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@@ -11,11 -11,10 +11,11 @@@ androidxCustomView = "1.0.0-rc01
androidxDataStore = "1.0.0"
androidxEspresso = "3.4.0"
androidxHiltNavigationCompose = "1.0.0"
- androidxLifecycle = "2.5.0-rc01"
- androidxMacroBenchmark = "1.1.0-rc03"
+ androidxLifecycle = "2.5.0-rc02"
+ androidxMacroBenchmark = "1.1.0"
androidxNavigation = "2.4.2"
+androidxMetrics = "1.0.0-alpha01"
- androidxProfileinstaller = "1.2.0-beta03"
+ androidxProfileinstaller = "1.2.0-rc01"
androidxSavedState = "1.1.0"
androidxStartup = "1.1.1"
androidxWindowManager = "1.0.0"