Merge branch 'main' into update/kotlin-1.8.20

android · Apr 26, 2023 · dc64dbe · dc64dbe
2 parents 063e015 + ad1ec28
commit dc64dbe
Show file tree

Hide file tree

Showing 117 changed files with 3,934 additions and 416 deletions.
diff --git a/app-nia-catalog/build.gradle.kts b/app-nia-catalog/build.gradle.kts
@@ -67,6 +67,5 @@ android {
 dependencies {
     implementation(project(":core:designsystem"))
     implementation(project(":core:ui"))
-    implementation(libs.accompanist.flowlayout)
     implementation(libs.androidx.activity.compose)
 }
diff --git a/app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/ui/Catalog.kt b/app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/ui/Catalog.kt
@@ -17,6 +17,8 @@
 package com.google.samples.apps.niacatalog.ui
 
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.add
 import androidx.compose.foundation.layout.asPaddingValues
@@ -36,7 +38,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
-import com.google.accompanist.flowlayout.FlowRow
 import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaButton
 import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaFilterChip
 import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaIconToggleButton
@@ -54,6 +55,7 @@ import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
 /**
  * Now in Android component catalog.
  */
+@OptIn(ExperimentalLayoutApi::class)
 @Composable
 fun NiaCatalog() {
     NiaTheme {
@@ -75,7 +77,7 @@ fun NiaCatalog() {
                 }
                 item { Text("Buttons", Modifier.padding(top = 16.dp)) }
                 item {
-                    FlowRow(mainAxisSpacing = 16.dp) {
+                    FlowRow(horizontalArrangement = Arrangement.spacedBy(16.dp)) {
                         NiaButton(onClick = {}) {
                             Text(text = "Enabled")
                         }
@@ -89,7 +91,7 @@ fun NiaCatalog() {
                 }
                 item { Text("Disabled buttons", Modifier.padding(top = 16.dp)) }
                 item {
-                    FlowRow(mainAxisSpacing = 16.dp) {
+                    FlowRow(horizontalArrangement = Arrangement.spacedBy(16.dp)) {
                         NiaButton(
                             onClick = {},
                             enabled = false,
@@ -112,7 +114,7 @@ fun NiaCatalog() {
                 }
                 item { Text("Buttons with leading icons", Modifier.padding(top = 16.dp)) }
                 item {
-                    FlowRow(mainAxisSpacing = 16.dp) {
+                    FlowRow(horizontalArrangement = Arrangement.spacedBy(16.dp)) {
                         NiaButton(
                             onClick = {},
                             text = { Text(text = "Enabled") },
@@ -138,7 +140,7 @@ fun NiaCatalog() {
                 }
                 item { Text("Disabled buttons with leading icons", Modifier.padding(top = 16.dp)) }
                 item {
-                    FlowRow(mainAxisSpacing = 16.dp) {
+                    FlowRow(horizontalArrangement = Arrangement.spacedBy(16.dp)) {
                         NiaButton(
                             onClick = {},
                             enabled = false,
@@ -168,7 +170,7 @@ fun NiaCatalog() {
                 item { Text("Dropdown menus", Modifier.padding(top = 16.dp)) }
                 item { Text("Chips", Modifier.padding(top = 16.dp)) }
                 item {
-                    FlowRow(mainAxisSpacing = 16.dp) {
+                    FlowRow(horizontalArrangement = Arrangement.spacedBy(16.dp)) {
                         var firstChecked by remember { mutableStateOf(false) }
                         NiaFilterChip(
                             selected = firstChecked,
@@ -197,7 +199,7 @@ fun NiaCatalog() {
                 }
                 item { Text("Icon buttons", Modifier.padding(top = 16.dp)) }
                 item {
-                    FlowRow(mainAxisSpacing = 16.dp) {
+                    FlowRow(horizontalArrangement = Arrangement.spacedBy(16.dp)) {
                         var firstChecked by remember { mutableStateOf(false) }
                         NiaIconToggleButton(
                             checked = firstChecked,
@@ -270,7 +272,7 @@ fun NiaCatalog() {
                 }
                 item { Text("View toggle", Modifier.padding(top = 16.dp)) }
                 item {
-                    FlowRow(mainAxisSpacing = 16.dp) {
+                    FlowRow(horizontalArrangement = Arrangement.spacedBy(16.dp)) {
                         var firstExpanded by remember { mutableStateOf(false) }
                         NiaViewToggleButton(
                             expanded = firstExpanded,
@@ -296,7 +298,7 @@ fun NiaCatalog() {
                 }
                 item { Text("Tags", Modifier.padding(top = 16.dp)) }
                 item {
-                    FlowRow(mainAxisSpacing = 16.dp) {
+                    FlowRow(horizontalArrangement = Arrangement.spacedBy(16.dp)) {
                         NiaTopicTag(
                             followed = true,
                             onClick = {},

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -83,6 +83,7 @@ dependencies {
     implementation(project(":feature:foryou"))
     implementation(project(":feature:bookmarks"))
     implementation(project(":feature:topic"))
+    implementation(project(":feature:search"))
     implementation(project(":feature:settings"))
 
     implementation(project(":core:common"))

diff --git a/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NavigationUiTest.kt b/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NavigationUiTest.kt
@@ -25,7 +25,10 @@ import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import com.google.accompanist.testharness.TestHarness
+import com.google.samples.apps.nowinandroid.core.data.repository.CompositeUserNewsResourceRepository
 import com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitor
+import com.google.samples.apps.nowinandroid.core.testing.repository.TestNewsRepository
+import com.google.samples.apps.nowinandroid.core.testing.repository.TestUserDataRepository
 import com.google.samples.apps.nowinandroid.uitesthiltmanifest.HiltComponentActivity
 import dagger.hilt.android.testing.BindValue
 import dagger.hilt.android.testing.HiltAndroidRule
@@ -63,6 +66,11 @@ class NavigationUiTest {
     @get:Rule(order = 2)
     val composeTestRule = createAndroidComposeRule<HiltComponentActivity>()
 
+    val userNewsResourceRepository = CompositeUserNewsResourceRepository(
+        newsRepository = TestNewsRepository(),
+        userDataRepository = TestUserDataRepository(),
+    )
+
     @Inject
     lateinit var networkMonitor: NetworkMonitor
 
@@ -81,6 +89,7 @@ class NavigationUiTest {
                             DpSize(maxWidth, maxHeight),
                         ),
                         networkMonitor = networkMonitor,
+                        userNewsResourceRepository = userNewsResourceRepository,
                     )
                 }
             }
@@ -100,6 +109,7 @@ class NavigationUiTest {
                             DpSize(maxWidth, maxHeight),
                         ),
                         networkMonitor = networkMonitor,
+                        userNewsResourceRepository = userNewsResourceRepository,
                     )
                 }
             }
@@ -119,6 +129,7 @@ class NavigationUiTest {
                             DpSize(maxWidth, maxHeight),
                         ),
                         networkMonitor = networkMonitor,
+                        userNewsResourceRepository = userNewsResourceRepository,
                     )
                 }
             }
@@ -138,6 +149,7 @@ class NavigationUiTest {
                             DpSize(maxWidth, maxHeight),
                         ),
                         networkMonitor = networkMonitor,
+                        userNewsResourceRepository = userNewsResourceRepository,
                     )
                 }
             }
@@ -157,6 +169,7 @@ class NavigationUiTest {
                             DpSize(maxWidth, maxHeight),
                         ),
                         networkMonitor = networkMonitor,
+                        userNewsResourceRepository = userNewsResourceRepository,
                     )
                 }
             }
@@ -176,6 +189,7 @@ class NavigationUiTest {
                             DpSize(maxWidth, maxHeight),
                         ),
                         networkMonitor = networkMonitor,
+                        userNewsResourceRepository = userNewsResourceRepository,
                     )
                 }
             }
@@ -195,6 +209,7 @@ class NavigationUiTest {
                             DpSize(maxWidth, maxHeight),
                         ),
                         networkMonitor = networkMonitor,
+                        userNewsResourceRepository = userNewsResourceRepository,
                     )
                 }
             }
@@ -214,6 +229,7 @@ class NavigationUiTest {
                             DpSize(maxWidth, maxHeight),
                         ),
                         networkMonitor = networkMonitor,
+                        userNewsResourceRepository = userNewsResourceRepository,
                     )
                 }
             }
@@ -233,6 +249,7 @@ class NavigationUiTest {
                             DpSize(maxWidth, maxHeight),
                         ),
                         networkMonitor = networkMonitor,
+                        userNewsResourceRepository = userNewsResourceRepository,
                     )
                 }
             }

diff --git a/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NiaAppStateTest.kt b/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NiaAppStateTest.kt
@@ -30,6 +30,9 @@ import androidx.navigation.compose.ComposeNavigator
 import androidx.navigation.compose.composable
 import androidx.navigation.createGraph
 import androidx.navigation.testing.TestNavHostController
+import com.google.samples.apps.nowinandroid.core.data.repository.CompositeUserNewsResourceRepository
+import com.google.samples.apps.nowinandroid.core.testing.repository.TestNewsRepository
+import com.google.samples.apps.nowinandroid.core.testing.repository.TestUserDataRepository
 import com.google.samples.apps.nowinandroid.core.testing.util.TestNetworkMonitor
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
@@ -56,6 +59,9 @@ class NiaAppStateTest {
     // Create the test dependencies.
     private val networkMonitor = TestNetworkMonitor()
 
+    private val userNewsResourceRepository =
+        CompositeUserNewsResourceRepository(TestNewsRepository(), TestUserDataRepository())
+
     // Subject under test.
     private lateinit var state: NiaAppState
 
@@ -67,10 +73,11 @@ class NiaAppStateTest {
             val navController = rememberTestNavController()
             state = remember(navController) {
                 NiaAppState(
-                    windowSizeClass = getCompactWindowClass(),
                     navController = navController,
-                    networkMonitor = networkMonitor,
                     coroutineScope = backgroundScope,
+                    windowSizeClass = getCompactWindowClass(),
+                    networkMonitor = networkMonitor,
+                    userNewsResourceRepository = userNewsResourceRepository,
                 )
             }
 
@@ -92,6 +99,7 @@ class NiaAppStateTest {
             state = rememberNiaAppState(
                 windowSizeClass = getCompactWindowClass(),
                 networkMonitor = networkMonitor,
+                userNewsResourceRepository = userNewsResourceRepository,
             )
         }
 
@@ -105,10 +113,11 @@ class NiaAppStateTest {
     fun niaAppState_showBottomBar_compact() = runTest {
         composeTestRule.setContent {
             state = NiaAppState(
-                windowSizeClass = getCompactWindowClass(),
                 navController = NavHostController(LocalContext.current),
-                networkMonitor = networkMonitor,
                 coroutineScope = backgroundScope,
+                windowSizeClass = getCompactWindowClass(),
+                networkMonitor = networkMonitor,
+                userNewsResourceRepository = userNewsResourceRepository,
             )
         }
 
@@ -120,10 +129,11 @@ class NiaAppStateTest {
     fun niaAppState_showNavRail_medium() = runTest {
         composeTestRule.setContent {
             state = NiaAppState(
-                windowSizeClass = WindowSizeClass.calculateFromSize(DpSize(800.dp, 800.dp)),
                 navController = NavHostController(LocalContext.current),
-                networkMonitor = networkMonitor,
                 coroutineScope = backgroundScope,
+                windowSizeClass = WindowSizeClass.calculateFromSize(DpSize(800.dp, 800.dp)),
+                networkMonitor = networkMonitor,
+                userNewsResourceRepository = userNewsResourceRepository,
             )
         }
 
@@ -135,10 +145,11 @@ class NiaAppStateTest {
     fun niaAppState_showNavRail_large() = runTest {
         composeTestRule.setContent {
             state = NiaAppState(
-                windowSizeClass = WindowSizeClass.calculateFromSize(DpSize(900.dp, 1200.dp)),
                 navController = NavHostController(LocalContext.current),
-                networkMonitor = networkMonitor,
                 coroutineScope = backgroundScope,
+                windowSizeClass = WindowSizeClass.calculateFromSize(DpSize(900.dp, 1200.dp)),
+                networkMonitor = networkMonitor,
+                userNewsResourceRepository = userNewsResourceRepository,
             )
         }
 
@@ -150,10 +161,11 @@ class NiaAppStateTest {
     fun stateIsOfflineWhenNetworkMonitorIsOffline() = runTest(UnconfinedTestDispatcher()) {
         composeTestRule.setContent {
             state = NiaAppState(
-                windowSizeClass = WindowSizeClass.calculateFromSize(DpSize(900.dp, 1200.dp)),
                 navController = NavHostController(LocalContext.current),
-                networkMonitor = networkMonitor,
                 coroutineScope = backgroundScope,
+                windowSizeClass = WindowSizeClass.calculateFromSize(DpSize(900.dp, 1200.dp)),
+                networkMonitor = networkMonitor,
+                userNewsResourceRepository = userNewsResourceRepository,
             )
         }
 

diff --git a/app/src/main/java/com/google/samples/apps/nowinandroid/MainActivity.kt b/app/src/main/java/com/google/samples/apps/nowinandroid/MainActivity.kt
@@ -40,6 +40,7 @@ import com.google.samples.apps.nowinandroid.MainActivityUiState.Loading
 import com.google.samples.apps.nowinandroid.MainActivityUiState.Success
 import com.google.samples.apps.nowinandroid.core.analytics.AnalyticsHelper
 import com.google.samples.apps.nowinandroid.core.analytics.LocalAnalyticsHelper
+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.designsystem.theme.NiaTheme
 import com.google.samples.apps.nowinandroid.core.model.data.DarkThemeConfig
@@ -67,6 +68,9 @@ class MainActivity : ComponentActivity() {
     @Inject
     lateinit var analyticsHelper: AnalyticsHelper
 
+    @Inject
+    lateinit var userNewsResourceRepository: UserNewsResourceRepository
+
     val viewModel: MainActivityViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -119,6 +123,7 @@ class MainActivity : ComponentActivity() {
                     NiaApp(
                         networkMonitor = networkMonitor,
                         windowSizeClass = calculateWindowSizeClass(this),
+                        userNewsResourceRepository = userNewsResourceRepository,
                     )
                 }
             }

diff --git a/app/src/main/java/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt b/app/src/main/java/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt
@@ -18,14 +18,16 @@ package com.google.samples.apps.nowinandroid.navigation
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.navigation.NavHostController
 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.forYouScreen
 import com.google.samples.apps.nowinandroid.feature.interests.navigation.interestsGraph
+import com.google.samples.apps.nowinandroid.feature.search.navigation.searchScreen
 import com.google.samples.apps.nowinandroid.feature.topic.navigation.navigateToTopic
 import com.google.samples.apps.nowinandroid.feature.topic.navigation.topicScreen
+import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination.INTERESTS
+import com.google.samples.apps.nowinandroid.ui.NiaAppState
 
 /**
  * Top-level navigation graph. Navigation is organized as explained at
@@ -36,10 +38,11 @@ import com.google.samples.apps.nowinandroid.feature.topic.navigation.topicScreen
  */
 @Composable
 fun NiaNavHost(
-    navController: NavHostController,
+    appState: NiaAppState,
     modifier: Modifier = Modifier,
     startDestination: String = forYouNavigationRoute,
 ) {
+    val navController = appState.navController
     NavHost(
         navController = navController,
         startDestination = startDestination,
@@ -48,6 +51,11 @@ fun NiaNavHost(
         // TODO: handle topic clicks from each top level destination
         forYouScreen(onTopicClick = {})
         bookmarksScreen(onTopicClick = {})
+        searchScreen(
+            onBackClick = navController::popBackStack,
+            onInterestsClick = { appState.navigateToTopLevelDestination(INTERESTS) },
+            onTopicClick = navController::navigateToTopic,
+        )
         interestsGraph(
             onTopicClick = { topicId ->
                 navController.navigateToTopic(topicId)