[#1082] Remove Side Navigation Drawer menu

- Closes #1082 - Closes #1086 - Added TODO links to the missing Settings actions - Fixed About screen versionCode displaying - Added app name to the About screen debug menu, as the Home screen does not contain it anymore - Changelog updated
Electric-Coin-Company · Dec 4, 2023 · 671b509 · 671b509
1 parent ff0757b
commit 671b509
Show file tree

Hide file tree

Showing 14 changed files with 97 additions and 333 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,9 @@ directly impact users rather than highlighting other key architectural updates.*
 
 ## [Unreleased]
 
+### Removed
+- Home screen side menu navigation was removed in favor of the Settings screen
+
 ## [2.0.2 (491)] - 2023-12-01
 
 ### Changed

diff --git a/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/home/HomeTestSetup.kt b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/home/HomeTestSetup.kt
@@ -13,34 +13,16 @@ class HomeTestSetup(
     private val isShowFiatConversion: Boolean,
     private val isCircularProgressBar: Boolean
 ) {
-    private val onAboutCount = AtomicInteger(0)
-    private val onSeedCount = AtomicInteger(0)
     private val onSettingsCount = AtomicInteger(0)
-    private val onSupportCount = AtomicInteger(0)
     private val onReceiveCount = AtomicInteger(0)
     private val onSendCount = AtomicInteger(0)
     private val onHistoryCount = AtomicInteger(0)
 
-    fun getOnAboutCount(): Int {
-        composeTestRule.waitForIdle()
-        return onAboutCount.get()
-    }
-
     fun getOnSettingsCount(): Int {
         composeTestRule.waitForIdle()
         return onSettingsCount.get()
     }
 
-    fun getOnSupportCount(): Int {
-        composeTestRule.waitForIdle()
-        return onSupportCount.get()
-    }
-
-    fun getOnSeedCount(): Int {
-        composeTestRule.waitForIdle()
-        return onSeedCount.get()
-    }
-
     fun getOnReceiveCount(): Int {
         composeTestRule.waitForIdle()
         return onReceiveCount.get()
@@ -64,7 +46,6 @@ class HomeTestSetup(
     @Composable
     @Suppress("TestFunctionName")
     fun DefaultContent() {
-        val drawerValues = drawerBackHandler()
         Home(
             walletSnapshot,
             isUpdateAvailable = false,
@@ -74,15 +55,6 @@ class HomeTestSetup(
             goSettings = {
                 onSettingsCount.incrementAndGet()
             },
-            goSeedPhrase = {
-                onSeedCount.incrementAndGet()
-            },
-            goSupport = {
-                onSupportCount.incrementAndGet()
-            },
-            goAbout = {
-                onAboutCount.incrementAndGet()
-            },
             goReceive = {
                 onReceiveCount.incrementAndGet()
             },
@@ -92,8 +64,6 @@ class HomeTestSetup(
             goHistory = {
                 onHistoryCount.incrementAndGet()
             },
-            drawerState = drawerValues.drawerState,
-            scope = drawerValues.scope
         )
     }
 

diff --git a/...src/androidTest/java/co/electriccoin/zcash/ui/screen/home/integration/HomeActivityTest.kt b/...src/androidTest/java/co/electriccoin/zcash/ui/screen/home/integration/HomeActivityTest.kt
diff --git a/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/home/view/HomeViewTest.kt b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/home/view/HomeViewTest.kt
@@ -133,70 +133,18 @@ class HomeViewTest : UiTestPrerequisites() {
         assertEquals(1, testSetup.getOnHistoryCount())
     }
 
-    @Test
-    @MediumTest
-    fun hamburger_seed() {
-        val testSetup = newTestSetup()
-
-        assertEquals(0, testSetup.getOnReceiveCount())
-
-        composeTestRule.openNavigationDrawer()
-
-        composeTestRule.onNodeWithText(getStringResource(R.string.home_menu_seed_phrase)).also {
-            it.performClick()
-        }
-
-        assertEquals(1, testSetup.getOnSeedCount())
-    }
-
     @Test
     @MediumTest
     fun hamburger_settings() {
         val testSetup = newTestSetup()
 
         assertEquals(0, testSetup.getOnReceiveCount())
 
-        composeTestRule.openNavigationDrawer()
-
-        composeTestRule.onNodeWithText(getStringResource(R.string.home_menu_settings)).also {
-            it.performClick()
-        }
+        composeTestRule.openSettings()
 
         assertEquals(1, testSetup.getOnSettingsCount())
     }
 
-    @Test
-    @MediumTest
-    fun hamburger_support() {
-        val testSetup = newTestSetup()
-
-        assertEquals(0, testSetup.getOnReceiveCount())
-
-        composeTestRule.openNavigationDrawer()
-
-        composeTestRule.onNodeWithText(getStringResource(R.string.home_menu_support)).also {
-            it.performClick()
-        }
-
-        assertEquals(1, testSetup.getOnSupportCount())
-    }
-
-    @Test
-    @MediumTest
-    fun hamburger_about() {
-        val testSetup = newTestSetup()
-
-        assertEquals(0, testSetup.getOnReceiveCount())
-
-        composeTestRule.openNavigationDrawer()
-
-        composeTestRule.onNodeWithText(getStringResource(R.string.home_menu_about)).also {
-            it.performClick()
-        }
-
-        assertEquals(1, testSetup.getOnAboutCount())
-    }
-
     private fun newTestSetup(
         isShowFiatConversion: Boolean = true,
         isCircularProgressBar: Boolean = true,
@@ -211,7 +159,7 @@ class HomeViewTest : UiTestPrerequisites() {
     }
 }
 
-private fun ComposeContentTestRule.openNavigationDrawer() {
+private fun ComposeContentTestRule.openSettings() {
     onNodeWithContentDescription(getStringResource(R.string.home_menu_content_description)).also {
         it.performClick()
     }

diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/Navigation.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/Navigation.kt
@@ -52,13 +52,10 @@ internal fun MainActivity.Navigation() {
     NavHost(navController = navController, startDestination = HOME) {
         composable(HOME) {
             WrapHome(
-                goAbout = { navController.navigateJustOnce(ABOUT) },
                 goHistory = { navController.navigateJustOnce(HISTORY) },
                 goReceive = { navController.navigateJustOnce(RECEIVE) },
-                goSeedPhrase = { navController.navigateJustOnce(SEED_RECOVERY) },
                 goSend = { navController.navigateJustOnce(SEND) },
                 goSettings = { navController.navigateJustOnce(SETTINGS) },
-                goSupport = { navController.navigateJustOnce(SUPPORT) },
             )
 
             if (ConfigurationEntries.IS_APP_UPDATE_CHECK_ENABLED.getValue(RemoteConfig.current)) {
@@ -80,9 +77,20 @@ internal fun MainActivity.Navigation() {
                 goBack = {
                     navController.popBackStackJustOnce(SETTINGS)
                 },
+                goDocumentation = {
+                    // TODO [#1084]: Documentation screen
+                    // TODO [#1084]: https://github.com/Electric-Coin-Company/zashi-android/issues/1084
+                },
                 goExportPrivateData = {
                     navController.navigateJustOnce(EXPORT_PRIVATE_DATA)
                 },
+                goFeedback = {
+                    navController.navigateJustOnce(SUPPORT)
+                },
+                goPrivacyPolicy = {
+                    // TODO [#1083]: Privacy Policy screen
+                    // TODO [#1083]: https://github.com/Electric-Coin-Company/zashi-android/issues/1083
+                },
                 goSeedRecovery = {
                     navController.navigateJustOnce(SEED_RECOVERY)
                 }

diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/about/view/AboutView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/about/view/AboutView.kt
@@ -122,6 +122,12 @@ private fun DebugMenu(
             DropdownMenuItem(
                 text = {
                     Column {
+                        Text(
+                            stringResource(
+                                id = R.string.about_debug_menu_app_name,
+                                stringResource(id = R.string.app_name)
+                            )
+                        )
                         Text(stringResource(R.string.about_debug_menu_build, versionInfo.gitSha))
                         Text(configInfo.toSupportString())
                     }
@@ -167,8 +173,7 @@ fun AboutMainContent(
         Text(
             text = stringResource(
                 R.string.about_version_format,
-                versionInfo.versionName,
-                versionInfo.versionCode
+                versionInfo.versionName
             ),
             style = ZcashTheme.typography.primary.titleSmall
         )

diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/AndroidHome.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/AndroidHome.kt
@@ -26,20 +26,14 @@ import kotlinx.coroutines.CoroutineScope
 @Composable
 @Suppress("LongParameterList")
 internal fun MainActivity.WrapHome(
-    goSeedPhrase: () -> Unit,
     goSettings: () -> Unit,
-    goSupport: () -> Unit,
-    goAbout: () -> Unit,
     goReceive: () -> Unit,
     goSend: () -> Unit,
     goHistory: () -> Unit
 ) {
     WrapHome(
         this,
-        goSeedPhrase = goSeedPhrase,
         goSettings = goSettings,
-        goSupport = goSupport,
-        goAbout = goAbout,
         goReceive = goReceive,
         goSend = goSend,
         goHistory = goHistory,
@@ -50,10 +44,7 @@ internal fun MainActivity.WrapHome(
 @Suppress("LongParameterList")
 internal fun WrapHome(
     activity: ComponentActivity,
-    goSeedPhrase: () -> Unit,
     goSettings: () -> Unit,
-    goSupport: () -> Unit,
-    goAbout: () -> Unit,
     goReceive: () -> Unit,
     goSend: () -> Unit,
     goHistory: () -> Unit,
@@ -82,23 +73,16 @@ internal fun WrapHome(
     if (null == walletSnapshot) {
         // Display loading indicator
     } else {
-        val drawerValues = drawerBackHandler()
-
         Home(
             walletSnapshot = walletSnapshot,
             isUpdateAvailable = updateAvailable,
             isKeepScreenOnDuringSync = isKeepScreenOnWhileSyncing,
             isFiatConversionEnabled = isFiatConversionEnabled,
             isCircularProgressBarEnabled = isCircularProgressBarEnabled,
-            goSeedPhrase = goSeedPhrase,
             goSettings = goSettings,
-            goSupport = goSupport,
-            goAbout = goAbout,
             goReceive = goReceive,
             goSend = goSend,
-            goHistory = goHistory,
-            drawerState = drawerValues.drawerState,
-            scope = drawerValues.scope
+            goHistory = goHistory
         )
 
         activity.reportFullyDrawn()

diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/HomeTag.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/HomeTag.kt
@@ -8,6 +8,5 @@ object HomeTag {
     const val PROGRESS = "progress_bar"
     const val SINGLE_LINE_TEXT = "single_line_text"
     const val FIAT_CONVERSION = "fiat_conversion"
-    const val DRAWER_MENU = "drawer_menu"
-    const val DRAWER_MENU_OPEN_BUTTON = "drawer_menu_open_button"
+    const val SETTINGS_TOP_BAR_BUTTON = "settings_top_bar_button"
 }