For #2834: Delete all Private Tabs redesign

mozilla-mobile · Aug 16, 2019 · b07cca0 · b07cca0
1 parent 727457f
commit b07cca0
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 7 deletions.
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt
@@ -5,7 +5,9 @@
 package org.mozilla.fenix.components.toolbar
 
 import android.content.Context
+import android.graphics.PorterDuff
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
 import androidx.navigation.NavOptions
 import androidx.navigation.Navigation
 import androidx.navigation.fragment.FragmentNavigator
@@ -22,6 +24,7 @@ import mozilla.components.support.base.feature.LifecycleAwareFeature
 import mozilla.components.support.ktx.android.view.hideKeyboard
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ThemeManager
+import org.mozilla.fenix.browser.BrowserFragmentDirections
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.nav
 import org.mozilla.fenix.utils.Settings
@@ -53,6 +56,29 @@ class ToolbarIntegration(
                     return@run
                 }
 
+                if (isPrivate) {
+                    val deleteIcon = context.getDrawable(R.drawable.ic_delete)
+                    deleteIcon?.setColorFilter(
+                        ContextCompat.getColor(
+                            context,
+                            ThemeManager.resolveAttribute(R.attr.primaryText, context)
+                        ), PorterDuff.Mode.SRC_IN
+                    )
+                    deleteIcon?.let {
+                        val deleteSessions = BrowserToolbar.Button(
+                            deleteIcon,
+                            context.getString(R.string.private_browsing_delete_session),
+                            listener = {
+                                Navigation.findNavController(toolbar)
+                                    .navigate(BrowserFragmentDirections.actionBrowserFragmentToHomeFragment(
+                                        closeAllPrivateTabs = true
+                                    ))
+                            }
+                        )
+                        toolbar.addNavigationAction(deleteSessions)
+                    }
+                }
+
                 val tabsAction = TabCounterToolbarButton(
                     sessionManager,
                     {

diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -305,6 +305,16 @@ class HomeFragment : Fragment(), AccountObserver {
         (activity as AppCompatActivity).supportActionBar?.hide()
 
         requireComponents.backgroundServices.accountManager.register(this, owner = this)
+
+        val closeAllPrivateTabs = arguments
+            ?.let(HomeFragmentArgs.Companion::fromBundle)
+            ?.let { it.closeAllPrivateTabs } ?: false
+
+        arguments = null
+
+        if (closeAllPrivateTabs) {
+            handleTabAction(TabAction.CloseAll(true))
+        }
     }
 
     override fun onStart() {

diff --git a/app/src/main/res/layout/private_browsing_description.xml b/app/src/main/res/layout/private_browsing_description.xml
@@ -9,13 +9,6 @@
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
         android:orientation="vertical">
-    <TextView
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
-            android:textColor="?primaryText"
-            android:text="@string/private_browsing_title"
-            android:layout_marginBottom="8dp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
     <TextView
             android:id="@+id/private_session_description"
             android:layout_width="match_parent"

diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
@@ -29,6 +29,10 @@
         android:id="@+id/homeFragment"
         android:name="org.mozilla.fenix.home.HomeFragment"
         tools:layout="@layout/fragment_home">
+        <argument
+            android:name="closeAllPrivateTabs"
+            app:argType="boolean"
+            android:defaultValue="false" />
         <action
             android:id="@+id/action_homeFragment_to_turnOnSyncFragment"
             app:destination="@+id/turnOnSyncFragment" />