Update icons. Release 1.0.

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

diff --git a/app/src/main/res/layout/url_bar.xml b/app/src/main/res/layout/url_bar.xml
index 8ff3f3ed17bb3e8c79a2162027f6410a0b97a78d..b9ac404f31e5323aadd24c4a71b9f9843821aeeb 100644 (file)
--- a/app/src/main/res/layout/url_bar.xml
+++ b/app/src/main/res/layout/url_bar.xml
@@ -1,7 +1,7 @@
 <?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/>.
 
@@ -25,32 +25,34 @@
     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. -->
+        <!-- layout_width and layout_height 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_width="26dp"
+            android:layout_height="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. -->
-        <!-- android:layout_weight="1" makes urlTextBox take up all the remaining space. -->
+        <!-- android:layout_toEndOf requires API >= 17, but is compatible with right-to-left layouts.  android:layout_toRightOf is required for previous APIs. -->
         <EditText
             android:id="@+id/urlTextBox"
-            android:layout_width="0dp"
-            android:layout_weight="1"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_toEndOf="@id/favoriteIcon"
+            android:layout_toRightOf="@id/favoriteIcon"
             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. -->
@@ -61,7 +63,8 @@
         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