From 0f5f4c0362af91da476b6e02ca19a9955db9f496 Mon Sep 17 00:00:00 2001
From: Songlin Jiang <sjiang@igalia.com>
Date: Sun, 6 Aug 2023 22:59:13 +0300
Subject: [PATCH] Update tray UI

Signed-off-by: Songlin Jiang <sjiang@igalia.com>
---
 .../drawable/tray_background_left_round.xml   |  9 +++++
 .../drawable/tray_background_right_round.xml  |  9 +++++
 app/src/main/res/layout/tray.xml              | 36 +++++++++++--------
 app/src/main/res/values/dimen.xml             |  2 +-
 4 files changed, 40 insertions(+), 16 deletions(-)
 create mode 100644 app/src/main/res/drawable/tray_background_left_round.xml
 create mode 100644 app/src/main/res/drawable/tray_background_right_round.xml

diff --git a/app/src/main/res/drawable/tray_background_left_round.xml b/app/src/main/res/drawable/tray_background_left_round.xml
new file mode 100644
index 00000000000..cfe61b72a45
--- /dev/null
+++ b/app/src/main/res/drawable/tray_background_left_round.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:topLeftRadius="10dp"/>
+            <solid android:color="@color/asphalt"/>
+        </shape>
+    </item>
+</selector>
diff --git a/app/src/main/res/drawable/tray_background_right_round.xml b/app/src/main/res/drawable/tray_background_right_round.xml
new file mode 100644
index 00000000000..3562f730833
--- /dev/null
+++ b/app/src/main/res/drawable/tray_background_right_round.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:topRightRadius="10dp" android:bottomRightRadius="10dp" />
+            <solid android:color="@color/asphalt"/>
+        </shape>
+    </item>
+</selector>
diff --git a/app/src/main/res/layout/tray.xml b/app/src/main/res/layout/tray.xml
index 98307bf0043..66a45dba770 100644
--- a/app/src/main/res/layout/tray.xml
+++ b/app/src/main/res/layout/tray.xml
@@ -22,7 +22,7 @@
             android:layout_height="20dp"
             android:layout_alignStart="@+id/tray_buttons"
             android:layout_alignEnd="@+id/tray_buttons"
-            android:background="@drawable/tray_background_top"
+            android:background="@drawable/tray_background_left_round"
             android:paddingStart="10dp"
             android:paddingEnd="10dp">
             <LinearLayout
@@ -171,17 +171,6 @@
                 app:regularModeBackground="@{traymodel.isMaxWindows ? @drawable/tray_background_unchecked_start : @drawable/tray_background_unchecked_middle}"
                 app:privateModeBackground="@{traymodel.isMaxWindows ? @drawable/tray_background_start_private : @drawable/tray_background_middle_private}"
                 app:activeModeBackground="@{traymodel.isMaxWindows ? @drawable/tray_background_checked_start : @drawable/tray_background_checked_middle}"/>
-
-            <com.igalia.wolvic.ui.views.UIButton
-                android:id="@+id/privateButton"
-                style="@style/trayButtonMiddleTheme"
-                android:tooltipText="@{viewmodel.isPrivateSession? @string/private_browsing_exit_tooltip : @string/private_browsing_enter_tooltip}"
-                app:tooltipDensity="@dimen/tray_tooltip_density"
-                app:tooltipPosition="bottom"
-                app:tooltipLayout="@layout/tooltip_tray"
-                android:src="@{viewmodel.isPrivateSession ? @drawable/ic_icon_tray_private_browsing_on_v2 : @drawable/ic_icon_tray_private_browsing_v2}"
-                app:privateMode="@{viewmodel.isPrivateSession}"/>
-
             <com.igalia.wolvic.ui.views.UIButton
                 android:id="@+id/libraryButton"
                 style="@style/trayButtonMiddleTheme"
@@ -226,6 +215,16 @@
                     visibleGone="@{traymodel.downloadsNumber > 0}"/>
             </RelativeLayout>
 
+            <com.igalia.wolvic.ui.views.UIButton
+                android:id="@+id/privateButton"
+                style="@style/trayButtonMiddleTheme"
+                android:tooltipText="@{viewmodel.isPrivateSession? @string/private_browsing_exit_tooltip : @string/private_browsing_enter_tooltip}"
+                app:tooltipDensity="@dimen/tray_tooltip_density"
+                app:tooltipPosition="bottom"
+                app:tooltipLayout="@layout/tooltip_tray"
+                android:src="@{viewmodel.isPrivateSession ? @drawable/ic_icon_tray_private_browsing_on_v2 : @drawable/ic_icon_tray_private_browsing_v2}"
+                app:privateMode="@{viewmodel.isPrivateSession}"/>
+
             <com.igalia.wolvic.ui.views.UIButton
                 android:id="@+id/settingsButton"
                 style="@style/trayButtonMiddleTheme"
@@ -234,10 +233,17 @@
                 app:tooltipPosition="bottom"
                 app:tooltipLayout="@layout/tooltip_tray"
                 android:src="@drawable/ic_icon_tray_settings_v3"/>
-
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_toRightOf="@id/status_bar"
+            android:gravity="center_vertical"
+            android:background="@drawable/tray_background_right_round"
+            android:orientation="horizontal">
             <View
                 android:layout_width="1dp"
-                android:layout_height="20dp"
+                android:layout_height="@dimen/tray_height"
                 android:layout_gravity="center_vertical"
                 android:background="@android:color/darker_gray"/>
 
@@ -275,7 +281,7 @@
 
             <com.igalia.wolvic.ui.views.UIButton
                 android:id="@+id/webAppsButton"
-                style="@style/trayButtonEndTheme"
+                style="@style/trayButtonMiddleTheme"
                 android:tooltipText="@{viewmodel.isWebAppsVisible ? @string/close_webapps_tooltip : @string/open_webapps_tooltip}"
                 app:tooltipDensity="@dimen/tray_tooltip_density"
                 app:tooltipPosition="bottom"
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index 2a7ab0e12b3..c7e25ce3aab 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -127,7 +127,7 @@
     <item name="tray_world_z" format="float" type="dimen">-2.5</item>
     <item name="tray_world_width" format="float" type="dimen">1.2</item>
     <dimen name="tray_width">408dp</dimen>
-    <dimen name="tray_height">66dp</dimen>
+    <dimen name="tray_height">62dp</dimen>
     <item name="tray_tooltip_density" format="float" type="dimen">3.0</item>
     <dimen name="tray_tooltip_padding_h">20dp</dimen>
     <dimen name="tray_tooltip_padding_v">10dp</dimen>