X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Furl_bar.xml;h=4ee8cbdaf5aec342f92bcc7a9c4ece155e9e90d9;hb=c4ad9f457f41cbc86391e0099629cd94a235258a;hp=e912cf2b62178e680bdf967e5fcf15541d7bc652;hpb=90ec377a834698621227ec37ca7ed37ae7f69851;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/layout/url_bar.xml b/app/src/main/res/layout/url_bar.xml
index e912cf2b..4ee8cbda 100644
--- a/app/src/main/res/layout/url_bar.xml
+++ b/app/src/main/res/layout/url_bar.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2015 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2015-2016 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser <https://privacybrowser.stoutner.com/>.
+  This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
   Privacy Browser is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -18,42 +18,44 @@
   You should have received a copy of the GNU General Public License
   along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<!-- FrameLayout lets the ProgressBar float on top of urlTextBox. -->
+<!-- FrameLayout lets the ProgressBar float on top of `urlTextBox`. -->
 <FrameLayout
     android:id="@+id/addressBarFrameLayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <LinearLayout
-        android:id="@+id/addressBarLinearLayout"
+    <!-- RelativeLayout is used instead of a LinearLayout because supportAppBar does not let android:layout_weight="1" to cause urlTextBox to fill all the available space. -->
+    <RelativeLayout
+        android:id="@+id/addressBarRelativeLayout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal" >
+        android:layout_height="wrap_content">
 
-        <!-- Set the program icon as the initial favoriteIcon. -->
+        <!-- Set the program icon as the initial favoriteIcon.
+            `layout_height` and `layout_width` and of 26dp matches the AppBar icons. -->
         <ImageView
             android:id="@+id/favoriteIcon"
-            android:src="@drawable/ic_language_black_24dp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
+            android:src="@drawable/world"
+            android:layout_height="26dp"
+            android:layout_width="26dp"
+            android:layout_centerVertical="true"
             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 and changes the "go" key from a check mark to an arrow. -->
-        <!-- For some reason, android:layout_weight="1" doesdn't makes urlTextBox take up all the remaining space when it is inside a SupportActionBar.
-            layout_width="2000" is less elegant, but it does the trick. -->
+        <!-- `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.
+            We can't use `android:imeOptions=flagNoExtractUi"` because it disables tapping to select in landscape orientation on small devices. -->
         <EditText
             android:id="@+id/urlTextBox"
-            android:layout_width="2000dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_toEndOf="@id/favoriteIcon"
+            android:hint="@string/url_or_search_terms"
             android:imeOptions="actionGo"
             android:inputType="textUri" />
-    </LinearLayout>
+    </RelativeLayout>
 
-    <!-- android:max changes the maximum ProgressBar value from 10000 to 100 to match progress percentage. -->
-    <!-- android:layout_height="2dp" works best for API 23 "Marshmallow", but "3dp" is required for visibility on API <= 22. -->
+    <!-- android:max changes the maximum ProgressBar value from 10000 to 100 to match progress percentage.
+        android:layout_height="2dp" works best for API 23 "Marshmallow", but "3dp" is required for visibility on API <= 22. -->
     <ProgressBar
         android:id="@+id/progressBar"
         style="?android:attr/progressBarStyleHorizontal"
@@ -61,7 +63,7 @@
         android:layout_height="3dp"
         android:layout_gravity="bottom"
         android:max="100"
-        android:progressTint="@color/light_blue"
+        android:progressTint="@color/blue"
         android:progressBackgroundTint="@color/white"
         android:visibility="gone" />
 </FrameLayout>
\ No newline at end of file