From c1117732c6dd365065a928afa2e8552fe8030fb0 Mon Sep 17 00:00:00 2001
From: Patrick Honkonen <phonkonen@bitwarden.com>
Date: Sat, 20 Apr 2024 17:44:55 -0400
Subject: [PATCH] Remove Import button from empty item listing screen

---
 .../feature/itemlisting/ItemListingGraphNavigation.kt  | 10 ++++------
 .../feature/itemlisting/ItemListingNavigation.kt       |  4 +---
 .../feature/itemlisting/ItemListingScreen.kt           |  9 ---------
 app/src/main/res/values/strings.xml                    |  1 -
 4 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/app/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingGraphNavigation.kt b/app/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingGraphNavigation.kt
index cdc2f6227..578ced4b5 100644
--- a/app/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingGraphNavigation.kt
+++ b/app/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingGraphNavigation.kt
@@ -34,12 +34,10 @@ fun NavGraphBuilder.itemListingGraph(
             onNavigateToSearch = navigateToSearch,
             onNavigateToQrCodeScanner = navigateToQrCodeScanner,
             onNavigateToManualKeyEntry = navigateToManualKeyEntry,
-            onNavigateToEditItemScreen = navigateToEditItem,
-            onNavigateToSyncWithBitwardenScreen = {
-                /*navController.navigateToSyncWithBitwardenScreen()*/
-            },
-            onNavigateToImportScreen = { /*navController.navigateToImportScreen()*/ }
-        )
+            onNavigateToEditItemScreen = navigateToEditItem
+        ) {
+            /*navController.navigateToSyncWithBitwardenScreen()*/
+        }
         editItemDestination(
             onNavigateBack = { navController.popBackStack() },
         )
diff --git a/app/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingNavigation.kt b/app/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingNavigation.kt
index 52c2f4640..5b1a74f96 100644
--- a/app/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingNavigation.kt
+++ b/app/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingNavigation.kt
@@ -15,7 +15,6 @@ fun NavGraphBuilder.itemListingDestination(
     onNavigateToManualKeyEntry: () -> Unit = { },
     onNavigateToEditItemScreen: (id: String) -> Unit = { },
     onNavigateToSyncWithBitwardenScreen: () -> Unit = { },
-    onNavigateToImportScreen: () -> Unit = { },
 ) {
     composableWithPushTransitions(
         route = ITEM_LIST_ROUTE,
@@ -26,8 +25,7 @@ fun NavGraphBuilder.itemListingDestination(
             onNavigateToQrCodeScanner = onNavigateToQrCodeScanner,
             onNavigateToManualKeyEntry = onNavigateToManualKeyEntry,
             onNavigateToEditItemScreen = onNavigateToEditItemScreen,
-            onNavigateToSyncWithBitwardenScreen = onNavigateToSyncWithBitwardenScreen,
-            onNavigateToImportScreen = onNavigateToImportScreen
+            onNavigateToSyncWithBitwardenScreen = onNavigateToSyncWithBitwardenScreen
         )
     }
 }
diff --git a/app/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingScreen.kt b/app/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingScreen.kt
index 71943ac61..a8cc3d1c6 100644
--- a/app/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingScreen.kt
+++ b/app/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingScreen.kt
@@ -82,7 +82,6 @@ fun ItemListingScreen(
     onNavigateToManualKeyEntry: () -> Unit,
     onNavigateToEditItemScreen: (id: String) -> Unit,
     onNavigateToSyncWithBitwardenScreen: () -> Unit,
-    onNavigateToImportScreen: () -> Unit,
 ) {
     val state by viewModel.stateFlow.collectAsStateWithLifecycle()
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
@@ -279,7 +278,6 @@ fun ItemListingScreen(
                     EmptyItemListingContent(
                         onAddCodeClick = onNavigateToQrCodeScanner,
                         onSyncWithBitwardenClick = onNavigateToSyncWithBitwardenScreen,
-                        onImportItemsClick = onNavigateToImportScreen,
                     )
                 }
             }
@@ -338,7 +336,6 @@ fun EmptyItemListingContent(
     modifier: Modifier = Modifier,
     onAddCodeClick: () -> Unit = {},
     onSyncWithBitwardenClick: () -> Unit = {},
-    onImportItemsClick: () -> Unit = {},
 ) {
     Column(
         modifier = modifier
@@ -380,12 +377,6 @@ fun EmptyItemListingContent(
             label = stringResource(id = R.string.sync_items_with_bitwarden),
             onClick = onSyncWithBitwardenClick,
         )
-
-        Spacer(modifier = Modifier.height(16.dp))
-        BitwardenTextButton(
-            label = stringResource(id = R.string.import_items),
-            onClick = onImportItemsClick,
-        )
     }
 }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 89f2e6f1e..6e847d2a9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -33,7 +33,6 @@
     <string name="empty_item_list_instruction">Add a new code, sync an existing account, or import codes to secure your accounts.</string>
     <string name="add_code">Add code</string>
     <string name="sync_items_with_bitwarden">Sync items from Bitwarden</string>
-    <string name="import_items">Import items</string>
     <string name="account_name">Account Name</string>
     <string name="totp_code">TOTP Code</string>
     <string name="type">Type</string>