X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Furl_app_bar.xml;h=da8fcea3f072758fbbbf33f559d74399350eb34c;hb=70da2a558d6e35c38adb596479c36f7e451dc9a5;hp=66cf287af5c16ad5e004e53fdad95f4fd4db6a58;hpb=5781d8f90b5c5bcce2e8d242117dccedb452f407;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 66cf287a..da8fcea3 100644
--- a/app/src/main/res/layout/url_app_bar.xml
+++ b/app/src/main/res/layout/url_app_bar.xml
@@ -1,52 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2015-2017 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/>. -->
 
-<!-- `RelativeLayout` is used instead of a `LinearLayout` because `supportAppBar` does not let `android:layout_weight="1"` cause `urlTextBox` to fill all the available space. -->
-<RelativeLayout
-    android:id="@+id/url_app_bar_relativelayout"
+
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
-    tools:context=".activities.MainWebViewActivity" >
+    android:orientation="horizontal" >
 
-    <!-- Set `@drawable/world` as the initial `favoriteIcon`.
-        `layout_height` and `layout_width` of 26dp matches the `AppBar` icons. -->
     <ImageView
-        android:id="@+id/favorite_icon"
-        android:src="@drawable/world"
-        android:layout_height="26dp"
-        android:layout_width="26dp"
-        android:layout_centerVertical="true"
-        android:layout_marginStart="4dp"
-        android:onClick="viewSslCertificate"
-        android:contentDescription="@string/favorite_icon" />
-
-    <!-- `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: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`.
+        `android:autofillHints` only applies to API >= 26.  `tools:ignore="UnusedAttribute"` removes the lint warning. -->
     <EditText
         android:id="@+id/url_edittext"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:layout_toEndOf="@id/favorite_icon"
         android:hint="@string/url_or_search_terms"
         android:imeOptions="actionGo"
-        android:inputType="textUri" />
-</RelativeLayout>
\ No newline at end of file
+        android:inputType="textUri"
+        android:selectAllOnFocus="true"
+        android:autofillHints=""
+        tools:ignore="UnusedAttribute" />
+    </RelativeLayout>
+</LinearLayout>