Resources and layouts.

12 files changed, 71 insertions, 43 deletions

diff --git a/android/flavors/lite/res/layout/map_bottom_vertical_toolbar.xml b/android/flavors/lite/res/layout/map_bottom_vertical_toolbar.xml
index 207723a6b4..5deb018162 100644
--- a/android/flavors/lite/res/layout/map_bottom_vertical_toolbar.xml
+++ b/android/flavors/lite/res/layout/map_bottom_vertical_toolbar.xml
@@ -32,42 +32,42 @@
       style="@style/drawerSeparatorMediumPadded"/>
 
   <TextView
-      android:id="@+id/btn_share"
+      android:id="@+id/btn_settings"
       android:layout_width="match_parent"
       android:layout_height="@dimen/bottom_panel_height"
       android:background="@drawable/bg_toolbar_button_selector"
-      android:drawableLeft="@drawable/ic_menu_send_my_location"
+      android:drawableLeft="@drawable/ic_menu_settings"
       android:gravity="center_vertical"
       android:paddingLeft="10dp"
-      android:text="@string/share"
+      android:text="@string/settings"
       android:textColor="@android:color/white"/>
 
   <View
       style="@style/drawerSeparatorMediumPadded"/>
 
   <TextView
-      android:id="@+id/btn_more_apps"
+      android:id="@+id/btn_share"
       android:layout_width="match_parent"
       android:layout_height="@dimen/bottom_panel_height"
       android:background="@drawable/bg_toolbar_button_selector"
-      android:drawableLeft="@drawable/ic_menu_more_apps"
+      android:drawableLeft="@drawable/ic_menu_send_my_location"
       android:gravity="center_vertical"
       android:paddingLeft="10dp"
-      android:text="@string/more_apps_title"
+      android:text="@string/share"
       android:textColor="@android:color/white"/>
 
   <View
       style="@style/drawerSeparatorMediumPadded"/>
 
   <TextView
-      android:id="@+id/btn_settings"
+      android:id="@+id/btn_more_apps"
       android:layout_width="match_parent"
       android:layout_height="@dimen/bottom_panel_height"
       android:background="@drawable/bg_toolbar_button_selector"
-      android:drawableLeft="@drawable/ic_menu_settings"
+      android:drawableLeft="@drawable/ic_menu_more_apps"
       android:gravity="center_vertical"
       android:paddingLeft="10dp"
-      android:text="@string/settings"
+      android:text="@string/more_apps_title"
       android:textColor="@android:color/white"/>
 
 
diff --git a/android/res/drawable/bg_search_item_green.xml b/android/res/drawable/bg_search_item_green.xml
new file mode 100644
index 0000000000..90b295dd74
--- /dev/null
+++ b/android/res/drawable/bg_search_item_green.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+  <item
+      android:left="@dimen/margin_small"
+      android:right="@dimen/margin_small">
+    <shape>
+      <solid android:color="@color/bg_search_green"/>
+    </shape>
+  </item>
+</layer-list>
\ No newline at end of file
diff --git a/android/res/drawable/bg_search_item_green_selected.xml b/android/res/drawable/bg_search_item_green_selected.xml
new file mode 100644
index 0000000000..5a943b31aa
--- /dev/null
+++ b/android/res/drawable/bg_search_item_green_selected.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+  <item
+      android:left="@dimen/margin_small"
+      android:right="@dimen/margin_small">
+    <shape>
+      <solid android:color="@color/bg_search_green_pressed"/>
+    </shape>
+  </item>
+</layer-list>
\ No newline at end of file
diff --git a/android/res/drawable/bg_search_item_green_selector.xml b/android/res/drawable/bg_search_item_green_selector.xml
new file mode 100644
index 0000000000..5307f1c6f6
--- /dev/null
+++ b/android/res/drawable/bg_search_item_green_selector.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/bg_search_item_green_selected" android:state_pressed="true"/>
+    <item android:drawable="@drawable/bg_search_item_green"/>
+
+</selector>
\ No newline at end of file
diff --git a/android/res/layout/map.xml b/android/res/layout/map.xml
index 29f10ea881..c681a8d3bf 100644
--- a/android/res/layout/map.xml
+++ b/android/res/layout/map.xml
@@ -15,7 +15,7 @@
       android:id="@+id/search_box"
       layout="@layout/search_box"
       android:layout_width="match_parent"
-      android:layout_height="wrap_content"/>
+      android:layout_height="@dimen/search_box_height"/>
 
   <com.mapswithme.maps.widget.MapInfoView
       android:id="@+id/info_box"
diff --git a/android/res/layout/map_bottom_vertical_toolbar.xml b/android/res/layout/map_bottom_vertical_toolbar.xml
index d2debe440f..343e11a110 100644
--- a/android/res/layout/map_bottom_vertical_toolbar.xml
+++ b/android/res/layout/map_bottom_vertical_toolbar.xml
@@ -27,42 +27,42 @@
       style="@style/drawerSeparatorMediumPadded"/>
 
   <TextView
-      android:id="@+id/btn_share"
+      android:id="@+id/btn_settings"
       android:layout_width="match_parent"
       android:layout_height="@dimen/bottom_panel_height"
       android:background="@drawable/bg_toolbar_button_selector"
-      android:drawableLeft="@drawable/ic_menu_send_my_location"
+      android:drawableLeft="@drawable/ic_menu_settings"
       android:gravity="center_vertical"
       android:paddingLeft="10dp"
-      android:text="@string/share"
+      android:text="@string/settings"
       android:textColor="@android:color/white"/>
 
   <View
       style="@style/drawerSeparatorMediumPadded"/>
 
   <TextView
-      android:id="@+id/btn_more_apps"
+      android:id="@+id/btn_share"
       android:layout_width="match_parent"
       android:layout_height="@dimen/bottom_panel_height"
       android:background="@drawable/bg_toolbar_button_selector"
-      android:drawableLeft="@drawable/ic_menu_more_apps"
+      android:drawableLeft="@drawable/ic_menu_send_my_location"
       android:gravity="center_vertical"
       android:paddingLeft="10dp"
-      android:text="@string/more_apps_title"
+      android:text="@string/share"
       android:textColor="@android:color/white"/>
 
   <View
       style="@style/drawerSeparatorMediumPadded"/>
 
   <TextView
-      android:id="@+id/btn_settings"
+      android:id="@+id/btn_more_apps"
       android:layout_width="match_parent"
       android:layout_height="@dimen/bottom_panel_height"
       android:background="@drawable/bg_toolbar_button_selector"
-      android:drawableLeft="@drawable/ic_menu_settings"
+      android:drawableLeft="@drawable/ic_menu_more_apps"
       android:gravity="center_vertical"
       android:paddingLeft="10dp"
-      android:text="@string/settings"
+      android:text="@string/more_apps_title"
       android:textColor="@android:color/white"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android/res/layout/search_box.xml b/android/res/layout/search_box.xml
index 325c318410..ce2a89952d 100644
--- a/android/res/layout/search_box.xml
+++ b/android/res/layout/search_box.xml
@@ -4,7 +4,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_page_preview"
+    android:background="@color/pp_bg_start"
     android:gravity="center_vertical"
     android:orientation="horizontal"
     android:padding="@dimen/margin_small">
@@ -12,9 +12,11 @@
   <LinearLayout
       android:layout_width="0dp"
       android:layout_height="wrap_content"
-      android:gravity="center_vertical"
+      android:layout_marginLeft="@dimen/margin_small"
       android:layout_weight="1"
-      android:background="@drawable/bg_search_rounded">
+      android:background="@drawable/bg_search_rounded"
+      android:gravity="center_vertical"
+      android:orientation="horizontal">
 
     <FrameLayout
         android:id="@+id/container_progress_search"
@@ -42,15 +44,13 @@
         style="@style/Holo.TextAppearance.Large.Light"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
         android:layout_weight="1"
         android:background="@null"
         android:fontFamily="@string/robotoRegular"
         android:imeOptions="actionDone"
         android:inputType="text"
-        android:paddingBottom="@dimen/dp_x_1"
-        android:paddingLeft="@dimen/dp_x_2"
-        android:paddingRight="@dimen/dp_x_2"
-        android:paddingTop="@dimen/dp_x_2"
+        android:padding="@dimen/margin_tiny"
         android:singleLine="true"
         android:textColor="@android:color/white"/>
 
diff --git a/android/res/layout/search_item.xml b/android/res/layout/search_item.xml
index 0edaaa7418..43d3632686 100644
--- a/android/res/layout/search_item.xml
+++ b/android/res/layout/search_item.xml
@@ -18,9 +18,9 @@
 
   <LinearLayout
       android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      android:layout_weight="1"
+      android:layout_height="match_parent"
       android:layout_marginLeft="@dimen/margin_small"
+      android:layout_weight="1"
       android:gravity="left|center_vertical"
       android:orientation="vertical">
 
@@ -44,8 +44,9 @@
 
   <LinearLayout
       android:layout_width="wrap_content"
-      android:layout_height="match_parent"
+      android:layout_height="wrap_content"
       android:layout_weight="0"
+      android:gravity="right"
       android:orientation="vertical">
 
     <TextView
@@ -54,7 +55,7 @@
         android:layout_height="wrap_content"
         android:fontFamily="@string/robotoRegular"
         android:textAppearance="@style/Holo.TextAppearance.Medium.Light"
-        android:textColor="@color/text_search_item"
+        android:textColor="@color/text_search_item_greyed"
         android:textSize="12sp"/>
 
     <TextView
diff --git a/android/res/layout/search_list_view.xml b/android/res/layout/search_list_view.xml
index dbda286adc..0e7dc24b19 100644
--- a/android/res/layout/search_list_view.xml
+++ b/android/res/layout/search_list_view.xml
@@ -9,7 +9,7 @@
   <include
       layout="@layout/search_box"
       android:layout_width="match_parent"
-      android:layout_height="wrap_content"/>
+      android:layout_height="@dimen/search_box_height"/>
 
   <ListView
       android:id="@android:id/list"
diff --git a/android/res/layout/search_message_item.xml b/android/res/layout/search_message_item.xml
index fa80758bfb..fd046d9a8f 100644
--- a/android/res/layout/search_message_item.xml
+++ b/android/res/layout/search_message_item.xml
@@ -2,10 +2,14 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="match_parent"
               android:layout_height="@dimen/search_item_height"
+              android:background="@drawable/bg_toolbar_button_selector"
               android:gravity="center_vertical"
-              android:orientation="vertical">
+              android:orientation="horizontal"
+              android:paddingLeft="@dimen/margin_medium"
+              android:paddingRight="@dimen/margin_medium">
 
   <ImageView
+      android:id="@+id/iv_search_image"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:src="@drawable/ic_menu_about"/>
@@ -18,12 +22,4 @@
       android:textAppearance="@style/Holo.TextAppearance.Medium.Light"
       android:textColor="@color/text_search_item"/>
 
-  <TextView
-      android:id="@+id/tv_search_item_subtitle"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:fontFamily="@string/robotoRegular"
-      android:textAppearance="@style/Holo.TextAppearance.Small.Light"
-      android:textColor="@color/text_search_item"/>
-
 </LinearLayout>
\ No newline at end of file
diff --git a/android/res/values/colors.xml b/android/res/values/colors.xml
index 909447599d..f04a93b17d 100644
--- a/android/res/values/colors.xml
+++ b/android/res/values/colors.xml
@@ -45,14 +45,15 @@
   <color name="green">#0F0</color>
   <color name="blue">#00F</color>
 
-
   <color name="pp_bg_start">#15c783</color>
   <color name="pp_bg_preview_end">#15ca82</color>
   <color name="pp_bg_end">#15d080</color>
-
   <color name="bg_menu">#e6414451</color>
   <color name="bg_bottom_toolbar">#444651</color>
   <color name="bg_bottom_toolbar_pressed">#15d081</color>
   <color name="text_search_item">@android:color/white</color>
+  <color name="text_search_item_greyed">@android:color/darker_gray</color>
+  <color name="bg_search_green">#15d080</color>
+  <color name="bg_search_green_pressed">#99ff99</color>
 
 </resources>
diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml
index 6ca359d85c..4ab71cf676 100644
--- a/android/res/values/dimens.xml
+++ b/android/res/values/dimens.xml
@@ -37,5 +37,6 @@
   <dimen name="zoom_margin_right">4dp</dimen>
   <dimen name="map_controls_margin">7dp</dimen>
   <dimen name="bottom_panel_height">46dp</dimen>
-  <dimen name="search_item_height">@dimen/dp_x_14</dimen>
+  <dimen name="search_item_height">56dp</dimen>
+  <dimen name="search_box_height">56dp</dimen>
 </resources>