android: Use custom styles for widgets.

1 files changed, 44 insertions, 35 deletions

diff --git a/android/res/layout/buttons.xml b/android/res/layout/buttons.xml
index fe6b27f1..642e6e6a 100644
--- a/android/res/layout/buttons.xml
+++ b/android/res/layout/buttons.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
@@ -14,20 +15,30 @@
             android:id="@+id/topBar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="0dp"
-            android:paddingLeft="0dp"
-            android:paddingRight="0dp"
-            android:paddingTop="0dp"
-            android:background="@color/bar" >
+            android:background="@color/toolbar" >
+
+            <TextView
+                android:id="@+id/docNameText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toLeftOf="@+id/linkButton"
+                android:layout_alignParentLeft="true"
+                android:paddingLeft="16dp"
+                android:singleLine="true"
+                android:textColor="#FFFFFF"
+                android:textStyle="bold"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
 
             <ImageButton
-                android:id="@+id/searchButton"
+                android:id="@+id/linkButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
-                android:contentDescription="@string/search_document"
-                android:src="@drawable/ic_magnifying_glass" />
+                android:layout_toLeftOf="@+id/outlineButton"
+                android:contentDescription="@string/link_control"
+                android:background="@drawable/button"
+                android:src="@drawable/ic_link" />
 
             <ImageButton
                 android:id="@+id/outlineButton"
@@ -36,27 +47,18 @@
                 android:layout_centerVertical="true"
                 android:layout_toLeftOf="@+id/searchButton"
                 android:contentDescription="@string/search_document"
+                android:background="@drawable/button"
                 android:src="@drawable/ic_list" />
 
             <ImageButton
-                android:id="@+id/linkButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_toLeftOf="@+id/outlineButton"
-                android:contentDescription="@string/link_control"
-                android:src="@drawable/ic_link" />
-
-            <TextView
-                android:id="@+id/docNameText"
+                android:id="@+id/searchButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
                 android:layout_centerVertical="true"
-                android:layout_toLeftOf="@+id/linkButton"
-                android:paddingLeft="15dp"
-                android:singleLine="true"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
+                android:layout_alignParentRight="true"
+                android:contentDescription="@string/search_document"
+                android:background="@drawable/button"
+                android:src="@drawable/ic_magnifying_glass" />
 
         </RelativeLayout>
 
@@ -64,29 +66,26 @@
             android:id="@+id/topBar2"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="0dp"
-            android:paddingLeft="0dp"
-            android:paddingRight="0dp"
-            android:paddingTop="0dp"
-            android:background="@color/bar" >
+            android:background="@color/toolbar" >
 
             <ImageButton
                 android:id="@+id/cancel"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
                 android:layout_centerVertical="true"
+                android:layout_alignParentLeft="true"
                 android:contentDescription="@string/cancel"
+                android:background="@drawable/button"
                 android:src="@drawable/ic_cancel" />
 
             <EditText
                 android:id="@+id/searchText"
+                android:background="@drawable/search"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
                 android:layout_centerVertical="true"
-                android:layout_toLeftOf="@+id/searchBack"
                 android:layout_toRightOf="@+id/cancel"
+                android:layout_toLeftOf="@+id/searchBack"
                 android:inputType="text"
                 android:hint="Search"
                 android:singleLine="true" />
@@ -98,15 +97,17 @@
                 android:layout_centerVertical="true"
                 android:layout_toLeftOf="@+id/searchForward"
                 android:contentDescription="@string/search_backwards"
+                android:background="@drawable/button"
                 android:src="@drawable/ic_arrow_left" />
 
             <ImageButton
                 android:id="@+id/searchForward"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
+                android:layout_alignParentRight="true"
                 android:contentDescription="@string/search_forwards"
+                android:background="@drawable/button"
                 android:src="@drawable/ic_arrow_right" />
 
         </RelativeLayout>
@@ -127,7 +128,14 @@
             android:layout_alignParentBottom="true"
             android:layout_centerHorizontal="true"
             android:layout_margin="0dp"
-            android:background="@drawable/slider" />
+            android:thumb="@drawable/seek_thumb"
+            android:progressDrawable="@drawable/seek_progress"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:paddingTop="12dp"
+            android:paddingBottom="8dp"
+            android:background="@color/toolbar"
+            />
 
         <TextView
             android:id="@+id/pageNumber"
@@ -135,8 +143,9 @@
             android:layout_height="wrap_content"
             android:layout_above="@+id/pageSlider"
             android:layout_centerHorizontal="true"
-            android:layout_marginBottom="10dp"
+            android:layout_marginBottom="16dp"
             android:background="@drawable/page_num"
+            android:textColor="#FFFFFF"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
     </RelativeLayout>