From f3ada542aa91d0a2894ccb7557b001a86ebfa548 Mon Sep 17 00:00:00 2001
From: Manuel Martin <manmartin@mozilla.com>
Date: Tue, 27 Aug 2019 19:52:55 +0200
Subject: [PATCH] Adds close button when in private mode and one window is left
 (#1680)

---
 .../vrbrowser/ui/widgets/TopBarWidget.java    | 22 ++++++-
 .../mozilla/vrbrowser/ui/widgets/Windows.java |  1 +
 app/src/main/res/drawable/text_button.xml     | 31 ++++++++++
 .../main/res/drawable/text_button_private.xml | 31 ++++++++++
 app/src/main/res/layout/top_bar.xml           | 62 ++++++++++++-------
 app/src/main/res/values/strings.xml           |  4 ++
 app/src/main/res/values/styles.xml            | 15 +++++
 7 files changed, 144 insertions(+), 22 deletions(-)
 create mode 100644 app/src/main/res/drawable/text_button.xml
 create mode 100644 app/src/main/res/drawable/text_button_private.xml

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TopBarWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TopBarWidget.java
index 6202262ce..d9fdb59bb 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TopBarWidget.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TopBarWidget.java
@@ -7,6 +7,7 @@
 
 import android.content.Context;
 import android.util.AttributeSet;
+import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -16,15 +17,18 @@
 import org.mozilla.vrbrowser.audio.AudioEngine;
 import org.mozilla.vrbrowser.browser.SessionChangeListener;
 import org.mozilla.vrbrowser.ui.views.UIButton;
+import org.mozilla.vrbrowser.ui.views.UITextButton;
 
 public class TopBarWidget extends UIWidget implements SessionChangeListener, WidgetManagerDelegate.UpdateListener {
 
     private UIButton mCloseButton;
     private UIButton mMoveLeftButton;
     private UIButton mMoveRightButton;
+    private UITextButton mClearButton;
     private AudioEngine mAudio;
     private WindowWidget mAttachedWindow;
     private TopBarWidget.Delegate mDelegate;
+    private LinearLayout mMultiWindowControlsContainer;
     private boolean mVisible;
 
     public TopBarWidget(Context aContext) {
@@ -51,6 +55,8 @@ public interface Delegate {
     private void initialize(Context aContext) {
         inflate(aContext, R.layout.top_bar, this);
 
+        mMultiWindowControlsContainer = findViewById(R.id.multiWindowControlsContainer);
+
         mCloseButton = findViewById(R.id.closeWindowButton);
         mCloseButton.setOnClickListener(view -> {
             view.requestFocusFromTouch();
@@ -84,7 +90,16 @@ private void initialize(Context aContext) {
             }
         });
 
-
+        mClearButton = findViewById(R.id.clearButton);
+        mClearButton.setOnClickListener(view -> {
+            view.requestFocusFromTouch();
+            if (mAudio != null) {
+                mAudio.playSound(AudioEngine.Sound.CLICK);
+            }
+            if (mDelegate != null) {
+                mDelegate.onCloseClicked(TopBarWidget.this);
+            }
+        });
 
         mAudio = AudioEngine.fromContext(aContext);
 
@@ -164,6 +179,11 @@ public void setVisible(boolean aIsVisible) {
         }
     }
 
+    public void setClearMode(boolean showClear) {
+        mMultiWindowControlsContainer.setVisibility(showClear ? GONE : VISIBLE);
+        mClearButton.setVisibility(showClear ? VISIBLE : GONE);
+    }
+
     public void setDelegate(TopBarWidget.Delegate aDelegate) {
         mDelegate = aDelegate;
     }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java
index f116c18ea..92fab8785 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java
@@ -662,6 +662,7 @@ private void updateTopBars() {
         boolean visible = mFullscreenWindow == null && (windows.size() > 1 || isInPrivateMode());
         for (WindowWidget window: windows) {
             window.getTopBar().setVisible(visible);
+            window.getTopBar().setClearMode((windows.size() == 1 && isInPrivateMode()));
             if (visible) {
                 window.getTopBar().setMoveLeftButtonEnabled(window != leftWindow);
                 window.getTopBar().setMoveRightButtonEnabled(window != rightWindow);
diff --git a/app/src/main/res/drawable/text_button.xml b/app/src/main/res/drawable/text_button.xml
new file mode 100644
index 000000000..29fcc68c3
--- /dev/null
+++ b/app/src/main/res/drawable/text_button.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/asphalt" />
+            <corners
+                android:radius="20dp" />
+        </shape>
+    </item>
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/void_color" />
+            <corners
+                android:radius="20dp" />
+        </shape>
+    </item>
+    <item android:state_hovered="true" android:state_pressed="false">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/fog" />
+            <corners
+                android:radius="20dp" />
+        </shape>
+    </item>
+    <item android:state_hovered="false" android:state_pressed="false">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/asphalt" />
+            <corners
+                android:radius="20dp" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/text_button_private.xml b/app/src/main/res/drawable/text_button_private.xml
new file mode 100644
index 000000000..0ae770fc7
--- /dev/null
+++ b/app/src/main/res/drawable/text_button_private.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/eggplant" />
+            <corners
+                android:radius="20dp" />
+        </shape>
+    </item>
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/blackberry" />
+            <corners
+                android:radius="20dp" />
+        </shape>
+    </item>
+    <item android:state_hovered="true" android:state_pressed="false">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/fog" />
+            <corners
+                android:radius="20dp" />
+        </shape>
+    </item>
+    <item android:state_hovered="false" android:state_pressed="false">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/eggplant" />
+            <corners
+                android:radius="20dp" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/top_bar.xml b/app/src/main/res/layout/top_bar.xml
index 4b0eafbae..c2b9cb31d 100644
--- a/app/src/main/res/layout/top_bar.xml
+++ b/app/src/main/res/layout/top_bar.xml
@@ -1,26 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <LinearLayout
-        style="?attr/navigationBarStyle"
-        android:id="@+id/fullScreenModeContainer"
+
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:gravity="center_horizontal"
-        android:padding="0dp"
-        android:orientation="horizontal">
-        <org.mozilla.vrbrowser.ui.views.UIButton
-            android:id="@+id/moveWindowLeftButton"
-            style="?attr/fullScreenButtonStyle"
-            android:background="@drawable/fullscreen_button_first"
-            android:src="@drawable/ic_icon_window_left" />
-        <org.mozilla.vrbrowser.ui.views.UIButton
-            android:id="@+id/closeWindowButton"
-            style="?attr/fullScreenButtonStyle"
-            android:src="@drawable/ic_icon_window_exit" />
-        <org.mozilla.vrbrowser.ui.views.UIButton
-            android:id="@+id/moveWindowRightButton"
-            android:background="@drawable/fullscreen_button_last"
-            style="?attr/fullScreenButtonStyle"
-            android:src="@drawable/ic_icon_window_right" />
-    </LinearLayout>
+        android:layout_gravity="center"
+        android:gravity="center_horizontal">
+
+        <LinearLayout
+            android:id="@+id/multiWindowControlsContainer"
+            style="?attr/navigationBarStyle"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center_horizontal"
+            android:orientation="horizontal"
+            android:padding="0dp">
+
+            <org.mozilla.vrbrowser.ui.views.UIButton
+                android:id="@+id/moveWindowLeftButton"
+                style="?attr/fullScreenButtonStyle"
+                android:background="@drawable/fullscreen_button_first"
+                android:src="@drawable/ic_icon_window_left" />
+
+            <org.mozilla.vrbrowser.ui.views.UIButton
+                android:id="@+id/closeWindowButton"
+                style="?attr/fullScreenButtonStyle"
+                android:src="@drawable/ic_icon_window_exit" />
+
+            <org.mozilla.vrbrowser.ui.views.UIButton
+                android:id="@+id/moveWindowRightButton"
+                style="?attr/fullScreenButtonStyle"
+                android:background="@drawable/fullscreen_button_last"
+                android:src="@drawable/ic_icon_window_right" />
+        </LinearLayout>
+
+        <org.mozilla.vrbrowser.ui.views.UITextButton
+            android:id="@+id/clearButton"
+            style="@style/textButtonTheme"
+            android:background="@drawable/text_button_private"
+            android:text="@string/private_clear_button"
+            android:textAllCaps="true"
+            android:textSize="@dimen/text_medium_big_size"
+            android:visibility="gone" />
+    </FrameLayout>
 </merge>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5eb0d26a2..594eb3177 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -901,4 +901,8 @@
 
     <!-- This string is displayed in the URL bar when the user is in the history panel -->
     <string name="url_history_title">History</string>
+
+    <!-- This string is displayed in the Clear button on top of the window when in private mode. It only appears
+         when there is one window left. When clicked, it closes the private session -->
+    <string name="private_clear_button">Clear</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index abba99d94..7fb9e77a4 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -136,6 +136,21 @@
         <item name="privateModeTintColorList">@drawable/main_button_icon_color_private</item>
     </style>
 
+    <style name="textButtonTheme">
+        <item name="android:background">@drawable/text_button_private</item>
+        <item name="android:padding">10dp</item>
+        <item name="android:paddingStart">20dp</item>
+        <item name="android:paddingEnd">20dp</item>
+        <item name="android:layout_gravity">center</item>
+        <item name="android:gravity">center</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">40dp</item>
+        <item name="android:textAlignment">center</item>
+        <item name="tintColorList">@drawable/main_button_icon_color</item>
+        <item name="privateModeTintColorList">@drawable/main_button_icon_color_private</item>
+        <item name="privateModeBackground">@drawable/text_button</item>
+    </style>
+
     <style name="navigationBarTextButtonStartTheme" parent="navigationBarTextButtonTheme">
         <item name="android:background">@drawable/fullscreen_button_first</item>
         <item name="privateModeBackground">@drawable/fullscreen_button_private_first</item>