X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Furl_app_bar.xml;h=97aae6080dbd1230c24f9d3f2435d0f4c68a81ec;hb=e065315a36c804626a7dba38d3edad05e9fdb473;hp=48161524661d88e05b8581bfea4473fa20987968;hpb=84989e138cb593d5a2f70be848db4889aaa8da88;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/layout/url_app_bar.xml b/app/src/main/res/layout/url_app_bar.xml
index 48161524..97aae608 100644
--- a/app/src/main/res/layout/url_app_bar.xml
+++ b/app/src/main/res/layout/url_app_bar.xml
@@ -1,34 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2015-2018 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2015-2019,2022-2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
 
-  Privacy Browser is free software: you can redistribute it and/or modify
+  Privacy Browser Android is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
 
-  Privacy Browser is distributed in the hope that it will be useful,
+  Privacy Browser Android is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
+  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<!-- `android:imeOptions="actionGo"` sets the keyboard to have a go key instead of a new line key.  `android:inputType="textUri"` disables spell check in the `EditText`.
-     `android:autofillHints` only applies to API >= 26.  `tools:ignore="UnusedAttribute"` removes the lint warning. -->
-<EditText
+
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/url_edittext"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
-    android:hint="@string/url_or_search_terms"
-    android:imeOptions="actionGo"
-    android:inputType="textUri"
-    android:selectAllOnFocus="true"
-    android:autofillHints=""
-    tools:ignore="UnusedAttribute" />
\ No newline at end of file
+    android:orientation="horizontal" >
+
+    <ImageView
+        android:layout_height="24dp"
+        android:layout_width="24dp"
+        android:layout_gravity="center_vertical"
+        android:layout_marginEnd="10dp"
+        android:src="@drawable/menu"
+        android:contentDescription="@string/navigation_drawer"
+        android:onClick="openNavigationDrawer" />
+
+    <!-- A relative layout is used instead of a linear layout because the app bar does not let `android:layout_weight="1"` cause the URL text bar to fill all the available space.
+    Placing the edit text inside a relative layout also draws a line under the edit text. -->
+    <RelativeLayout
+    android:id="@+id/url_relativelayout"
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:orientation="horizontal" >
+
+    <!-- `android:imeOptions="actionGo"` sets the keyboard to have a go key instead of a new line key.  `android:inputType="textUri"` disables spell check in the `EditText`. -->
+    <EditText
+        android:id="@+id/url_edittext"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:hint="@string/url_or_search_terms"
+        android:imeOptions="actionGo"
+        android:inputType="textUri"
+        android:selectAllOnFocus="true"
+        android:autofillHints="" />
+    </RelativeLayout>
+</LinearLayout>