Merge pull request #330 from android/jv/theme-switcher-ui

Add settings dialog which allows user to select theme and view licenses

Author: dturner

app/LICENSES.md

@@ -82,9 +82,13 @@ dependencies {
     implementation(project(":feature:foryou"))
     implementation(project(":feature:bookmarks"))
     implementation(project(":feature:topic"))
+    implementation(project(":feature:settings"))
 
+    implementation(project(":core:common"))
     implementation(project(":core:ui"))
     implementation(project(":core:designsystem"))
+    implementation(project(":core:data"))
+    implementation(project(":core:model"))
 
     implementation(project(":sync:work"))
     implementation(project(":sync:sync-test"))
@@ -96,11 +100,13 @@ dependencies {
     androidTestImplementation(libs.androidx.navigation.testing)
     debugImplementation(libs.androidx.compose.ui.testManifest)
 
+    implementation(libs.accompanist.systemuicontroller)
     implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.core.splashscreen)
     implementation(libs.androidx.compose.runtime)
+    implementation(libs.androidx.lifecycle.runtimeCompose)
     implementation(libs.androidx.compose.runtime.tracing)
     implementation(libs.androidx.compose.material3.windowSizeClass)
     implementation(libs.androidx.hilt.navigation.compose)

app/build.gradle.kts

@@ -16,17 +16,23 @@
 
 package com.google.samples.apps.nowinandroid.ui
 
+import androidx.compose.ui.test.assertCountEquals
 import androidx.compose.ui.test.assertIsOn
 import androidx.compose.ui.test.assertIsSelected
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.onAllNodesWithText
+import androidx.compose.ui.test.onLast
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.test.espresso.Espresso
 import androidx.test.espresso.NoActivityResumedException
 import com.google.samples.apps.nowinandroid.MainActivity
+import com.google.samples.apps.nowinandroid.R
+import com.google.samples.apps.nowinandroid.feature.bookmarks.R as BookmarksR
 import com.google.samples.apps.nowinandroid.feature.foryou.R as FeatureForyouR
 import com.google.samples.apps.nowinandroid.feature.interests.R as FeatureInterestsR
+import com.google.samples.apps.nowinandroid.feature.settings.R as SettingsR
 import dagger.hilt.android.testing.BindValue
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
@@ -67,6 +73,11 @@ class NavigationTest {
     private lateinit var forYou: String
     private lateinit var interests: String
     private lateinit var sampleTopic: String
+    private lateinit var appName: String
+    private lateinit var saved: String
+    private lateinit var settings: String
+    private lateinit var brand: String
+    private lateinit var ok: String
 
     @Before
     fun setup() {
@@ -77,6 +88,11 @@ class NavigationTest {
             forYou = getString(FeatureForyouR.string.for_you)
             interests = getString(FeatureInterestsR.string.interests)
             sampleTopic = "Headlines"
+            appName = getString(R.string.app_name)
+            saved = getString(BookmarksR.string.saved)
+            settings = getString(SettingsR.string.top_app_bar_action_icon_description)
+            brand = getString(SettingsR.string.brand_android)
+            ok = getString(SettingsR.string.dismiss_dialog_button_text)
         }
     }
 
@@ -146,6 +162,62 @@ class NavigationTest {
         }
     }
 
+    @Test
+    fun topLevelDestinations_showTopBarWithTitle() {
+        composeTestRule.apply {
+
+            // Verify that the top bar contains the app name on the first screen.
+            onNodeWithText(appName).assertExists()
+
+            // Go to the saved tab, verify that the top bar contains "saved". This means
+            // we'll have 2 elements with the text "saved" on screen. One in the top bar, and
+            // one in the bottom navigation.
+            onNodeWithText(saved).performClick()
+            onAllNodesWithText(saved).assertCountEquals(2)
+
+            // As above but for the interests tab.
+            onNodeWithText(interests).performClick()
+            onAllNodesWithText(interests).assertCountEquals(2)
+        }
+    }
+
+    @Test
+    fun topLevelDestinations_showSettingsIcon() {
+        composeTestRule.apply {
+            onNodeWithContentDescription(settings).assertExists()
+
+            onNodeWithText(saved).performClick()
+            onNodeWithContentDescription(settings).assertExists()
+
+            onNodeWithText(interests).performClick()
+            onNodeWithContentDescription(settings).assertExists()
+        }
+    }
+
+    @Test
+    fun whenSettingsIconIsClicked_settingsDialogIsShown() {
+        composeTestRule.apply {
+            onNodeWithContentDescription(settings).performClick()
+
+            // Check that one of the settings is actually displayed.
+            onNodeWithText(brand).assertExists()
+        }
+    }
+
+    @Test
+    fun whenSettingsDialogDismissed_previousScreenIsDisplayed() {
+        composeTestRule.apply {
+
+            // Navigate to the saved screen, open the settings dialog, then close it.
+            onNodeWithText(saved).performClick()
+            onNodeWithContentDescription(settings).performClick()
+            onNodeWithText(ok).performClick()
+
+            // Check that the saved screen is still visible and selected.
+            onAllNodesWithText(saved).onLast().assertIsSelected()
+        }
+    }
+
     /*
      * There should always be at most one instance of a top-level destination at the same time.
      */

app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt

@@ -30,6 +30,11 @@ 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.testing.util.TestNetworkMonitor
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+import kotlinx.coroutines.test.runTest
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
@@ -48,18 +53,24 @@ class NiaAppStateTest {
     @get:Rule
     val composeTestRule = createComposeRule()
 
+    // Create the test dependencies.
+    private val networkMonitor = TestNetworkMonitor()
+
+    // Subject under test.
     private lateinit var state: NiaAppState
 
     @Test
-    fun niaAppState_currentDestination() {
+    fun niaAppState_currentDestination() = runTest {
         var currentDestination: String? = null
 
         composeTestRule.setContent {
             val navController = rememberTestNavController()
             state = remember(navController) {
                 NiaAppState(
                     windowSizeClass = getCompactWindowClass(),
-                    navController = navController
+                    navController = navController,
+                    networkMonitor = networkMonitor,
+                    coroutineScope = backgroundScope
                 )
             }
 
@@ -76,9 +87,12 @@ class NiaAppStateTest {
     }
 
     @Test
-    fun niaAppState_destinations() {
+    fun niaAppState_destinations() = runTest {
         composeTestRule.setContent {
-            state = rememberNiaAppState(getCompactWindowClass())
+            state = rememberNiaAppState(
+                windowSizeClass = getCompactWindowClass(),
+                networkMonitor = networkMonitor
+            )
         }
 
         assertEquals(3, state.topLevelDestinations.size)
@@ -88,11 +102,13 @@ class NiaAppStateTest {
     }
 
     @Test
-    fun niaAppState_showBottomBar_compact() {
+    fun niaAppState_showBottomBar_compact() = runTest {
         composeTestRule.setContent {
             state = NiaAppState(
                 windowSizeClass = getCompactWindowClass(),
-                navController = NavHostController(LocalContext.current)
+                navController = NavHostController(LocalContext.current),
+                networkMonitor = networkMonitor,
+                coroutineScope = backgroundScope
             )
         }
 
@@ -101,11 +117,13 @@ class NiaAppStateTest {
     }
 
     @Test
-    fun niaAppState_showNavRail_medium() {
+    fun niaAppState_showNavRail_medium() = runTest {
         composeTestRule.setContent {
             state = NiaAppState(
                 windowSizeClass = WindowSizeClass.calculateFromSize(DpSize(800.dp, 800.dp)),
-                navController = NavHostController(LocalContext.current)
+                navController = NavHostController(LocalContext.current),
+                networkMonitor = networkMonitor,
+                coroutineScope = backgroundScope
             )
         }
 
@@ -114,18 +132,41 @@ class NiaAppStateTest {
     }
 
     @Test
-    fun niaAppState_showNavRail_large() {
+    fun niaAppState_showNavRail_large() = runTest {
+
         composeTestRule.setContent {
             state = NiaAppState(
                 windowSizeClass = WindowSizeClass.calculateFromSize(DpSize(900.dp, 1200.dp)),
-                navController = NavHostController(LocalContext.current)
+                navController = NavHostController(LocalContext.current),
+                networkMonitor = networkMonitor,
+                coroutineScope = backgroundScope
             )
         }
 
         assertTrue(state.shouldShowNavRail)
         assertFalse(state.shouldShowBottomBar)
     }
 
+    @Test
+    fun stateIsOfflineWhenNetworkMonitorIsOffline() = runTest(UnconfinedTestDispatcher()) {
+
+        composeTestRule.setContent {
+            state = NiaAppState(
+                windowSizeClass = WindowSizeClass.calculateFromSize(DpSize(900.dp, 1200.dp)),
+                navController = NavHostController(LocalContext.current),
+                networkMonitor = networkMonitor,
+                coroutineScope = backgroundScope
+            )
+        }
+
+        backgroundScope.launch { state.isOffline.collect() }
+        networkMonitor.setConnected(false)
+        assertEquals(
+            true,
+            state.isOffline.value
+        )
+    }
+
     private fun getCompactWindowClass() = WindowSizeClass.calculateFromSize(DpSize(500.dp, 300.dp))
 }