From 1967aacb7200b18fe130bd1520552518aa98cd18 Mon Sep 17 00:00:00 2001
From: Dmitry Kunin <dkunin@mapswith.me>
Date: Thu, 23 May 2013 17:42:57 +0300
Subject: [PATCH] [android] Holo for SearchAct.

---
 .../library/res/layout/simple_spinner_item.xml        | 11 ++++++++++-
 android/res/layout/search_category_item.xml           |  4 ++--
 android/res/layout/search_item.xml                    |  8 ++++----
 android/res/layout/search_list_view.xml               |  2 +-
 android/res/layout/search_message_item.xml            |  4 ++--
 android/src/com/mapswithme/maps/ArrowImage.java       |  3 ++-
 android/src/com/mapswithme/maps/SearchActivity.java   |  4 ++--
 7 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/android/3rd_party/HoloEverywhere/library/res/layout/simple_spinner_item.xml b/android/3rd_party/HoloEverywhere/library/res/layout/simple_spinner_item.xml
index f8586599b6..9e11a31716 100644
--- a/android/3rd_party/HoloEverywhere/library/res/layout/simple_spinner_item.xml
+++ b/android/3rd_party/HoloEverywhere/library/res/layout/simple_spinner_item.xml
@@ -1 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?><TextView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" style="?spinnerItemStyle" android:ellipsize="marquee" android:singleLine="true" android:layout_height="wrap_content" android:id="@android:id/text1"></TextView>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    style="?spinnerItemStyle"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:ellipsize="marquee"
+    android:singleLine="true" >
+
+</TextView>
\ No newline at end of file
diff --git a/android/res/layout/search_category_item.xml b/android/res/layout/search_category_item.xml
index 4986a4af49..0d19998954 100644
--- a/android/res/layout/search_category_item.xml
+++ b/android/res/layout/search_category_item.xml
@@ -22,7 +22,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
-        android:src="@drawable/cell_arrow_white"/>
+        android:src="@drawable/cell_arrow_black"/>
 
     <TextView
         android:id="@+id/name"
@@ -31,6 +31,6 @@
         android:layout_toLeftOf="@id/disclosure_image"
         android:layout_toRightOf="@+id/country_flag"
         android:layout_centerVertical="true"
-        android:textAppearance="?android:attr/textAppearanceLarge"/>
+        android:textAppearance="@style/Holo.TextAppearance.Large.Light"/>
 
 </RelativeLayout>
diff --git a/android/res/layout/search_item.xml b/android/res/layout/search_item.xml
index 620ed948f3..0c7fa97333 100644
--- a/android/res/layout/search_item.xml
+++ b/android/res/layout/search_item.xml
@@ -29,7 +29,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="right"
-            android:textAppearance="?android:attr/textAppearanceSmall"/>
+            android:textAppearance="@style/Holo.TextAppearance.Small.Light"/>
 
         <!-- Amenity -->
         <TextView
@@ -39,7 +39,7 @@
             android:layout_gravity="right"            
             android:gravity="right"
             android:ellipsize="end"
-            android:textAppearance="?android:attr/textAppearanceSmall"/>
+            android:textAppearance="@style/Holo.TextAppearance.Small.Light"/>
 
     </LinearLayout>
     
@@ -57,14 +57,14 @@
             android:id="@+id/name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"/>
+            android:textAppearance="@style/Holo.TextAppearance.Large.Light"/>
 
         <!-- Long Country Name -->
         <TextView
             android:id="@+id/country"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"/>
+            android:textAppearance="@style/Holo.TextAppearance.Small.Light"/>
 
     </LinearLayout>
 
diff --git a/android/res/layout/search_list_view.xml b/android/res/layout/search_list_view.xml
index ea4a5fc12c..e78ce9a3aa 100644
--- a/android/res/layout/search_list_view.xml
+++ b/android/res/layout/search_list_view.xml
@@ -23,7 +23,7 @@
                      android:layout_centerVertical="true"
                      android:layout_alignParentRight="true"
                      android:layout_marginRight="8dp"
-                     style="@android:style/Widget.ProgressBar.Small"
+                     style="@style/Holo.ProgressBar.Small"
                      android:visibility="gone"/>
 
     </RelativeLayout>
diff --git a/android/res/layout/search_message_item.xml b/android/res/layout/search_message_item.xml
index c6781b482f..e0860c4241 100644
--- a/android/res/layout/search_message_item.xml
+++ b/android/res/layout/search_message_item.xml
@@ -12,12 +12,12 @@
         android:id="@+id/name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceLarge"/>
+        android:textAppearance="@style/Holo.TextAppearance.Large.Light"/>
 
     <TextView
         android:id="@+id/country"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall"/>
+        android:textAppearance="@style/Holo.TextAppearance.Small.Light"/>
 
 </LinearLayout>
diff --git a/android/src/com/mapswithme/maps/ArrowImage.java b/android/src/com/mapswithme/maps/ArrowImage.java
index 457ec70b3a..bd8e7826bc 100644
--- a/android/src/com/mapswithme/maps/ArrowImage.java
+++ b/android/src/com/mapswithme/maps/ArrowImage.java
@@ -27,7 +27,8 @@ public class ArrowImage extends ImageView
     m_paint = new Paint();
     m_paint.setFlags(m_paint.getFlags() | Paint.ANTI_ALIAS_FLAG);
     m_paint.setStyle(Style.FILL);
-    m_paint.setColor(Color.WHITE);
+    //TODO set from resources
+    m_paint.setColor(Color.BLACK);
 
     m_path = new Path();
   }
diff --git a/android/src/com/mapswithme/maps/SearchActivity.java b/android/src/com/mapswithme/maps/SearchActivity.java
index aae5437b89..d175338f4a 100644
--- a/android/src/com/mapswithme/maps/SearchActivity.java
+++ b/android/src/com/mapswithme/maps/SearchActivity.java
@@ -431,8 +431,8 @@ public class SearchActivity extends ListActivity implements LocationService.List
     m_modesSpinner = (Spinner) findViewById(R.id.search_modes_spinner);
 
     ArrayAdapter<CharSequence> adapter =
-        ArrayAdapter.createFromResource(this, R.array.search_modes, android.R.layout.simple_spinner_item);
-    adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        ArrayAdapter.createFromResource(this, R.array.search_modes, R.layout.simple_spinner_item);
+    adapter.setDropDownViewResource(R.layout.simple_spinner_dropdown_item);
     m_modesSpinner.setAdapter(adapter);
 
     // Default mode is AROUND_POSITION