Add a back arrow to the header of the bookmarks drawer. https://redmine.stoutner...

[PrivacyBrowserAndroid.git] / app / src / main / res / layout / bookmarks_drawer.xml

diff --git a/app/src/main/res/layout/bookmarks_drawer.xml b/app/src/main/res/layout/bookmarks_drawer.xml
index 87b9d0daca6a80462782a96fcda4ac1998d93cbd..62955c55308f9d6ec7a9c1517dae15cf8a665d9b 100644 (file)
--- a/app/src/main/res/layout/bookmarks_drawer.xml
+++ b/app/src/main/res/layout/bookmarks_drawer.xml
@@ -19,11 +19,13 @@
   along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
 
 <FrameLayout
   along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
 
 <FrameLayout

-    xmlns:android="http://schemas.android.com/apk/res/android"

     android:id="@+id/bookmarks_framelayout"
     android:id="@+id/bookmarks_framelayout"

+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"

     android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_width="match_parent"

-    android:layout_gravity="end" >
+    android:layout_gravity="end">

 
     <LinearLayout
         android:layout_height="match_parent"
 
     <LinearLayout
         android:layout_height="match_parent"


@@ -31,14 +33,34 @@
         android:orientation="vertical"
         android:background="?android:attr/colorBackground" >
 
         android:orientation="vertical"
         android:background="?android:attr/colorBackground" >
 

-        <TextView
-            android:id="@+id/bookmarks_title_textview"
+        <!-- A compound drawable doesn't work well because only the image view should execute the `onClick()`. -->
+        <LinearLayout

             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"

-            android:textStyle="bold"
-            android:textSize="20sp"
-            android:textColor="?android:attr/textColorPrimary"
-            android:layout_margin="10dp" />
+            android:orientation="horizontal"
+            tools:ignore="UseCompoundDrawables" >
+
+            <ImageView
+                android:layout_height="match_parent"
+                android:layout_width="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:paddingStart="15dp"
+                android:paddingEnd="15dp"
+                android:src="@drawable/back"
+                android:background="?attr/selectableItemBackground"
+                android:onClick="bookmarksBack"
+                android:contentDescription="@string/back"
+                app:tint="?android:attr/textColorPrimary" />
+
+            <TextView
+                android:id="@+id/bookmarks_title_textview"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:textStyle="bold"
+                android:textSize="20sp"
+                android:textColor="?android:attr/textColorPrimary"
+                android:layout_margin="10dp" />
+        </LinearLayout>

 
         <ListView
             android:id="@+id/bookmarks_drawer_listview"
 
         <ListView
             android:id="@+id/bookmarks_drawer_listview"