From a70ba76cc9427a2286b15f528bfcec93fd029c3b Mon Sep 17 00:00:00 2001 From: David Walsh Date: Thu, 28 May 2020 15:29:38 -0500 Subject: [PATCH] Provided unique no tabs message per mode --- .../org/mozilla/fenix/tabtray/TabTrayView.kt | 23 ++++++++++++++----- app/src/main/res/values/strings.xml | 2 ++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt index 5184f2430c..254d8c7124 100644 --- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt +++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt @@ -145,13 +145,24 @@ class TabTrayView( } fun updateState(state: BrowserState) { - val hasNoTabs = if (isPrivateModeSelected) { - state.privateTabs.isEmpty() - } else { - state.normalTabs.isEmpty() + view.let { + val hasNoTabs = if (isPrivateModeSelected) { + state.privateTabs.isEmpty() + } else { + state.normalTabs.isEmpty() + } + + view.tab_tray_empty_view.isVisible = hasNoTabs + if (hasNoTabs) { + view.tab_tray_empty_view.text = if (isPrivateModeSelected) { + view.context.getString(R.string.no_private_tabs_description) + } else { + view.context?.getString(R.string.no_open_tabs_description) + } + } + + view.tab_tray_overflow.isVisible = !hasNoTabs } - view?.tab_tray_empty_view?.isVisible = hasNoTabs - view?.tab_tray_overflow?.isVisible = !hasNoTabs } override fun onTabClosed(tab: Tab) { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3d5cb1ba0c..1ded5605b9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -19,6 +19,8 @@ No open tabs Your open tabs will be shown here. + + Your private tabs will be shown here. %1$s is produced by Mozilla.