Merge pull request #121 from mapzen/ecgreb/style-home-screen

[WIP] Style home screen

app/src/main/kotlin/com/mapzen/erasermap/view/MainActivity.kt

@@ -1,17 +1,21 @@
 package com.mapzen.erasermap.view
 
+import android.content.Context
 import android.content.Intent
 import android.location.Location
 import android.os.Bundle
 import android.os.Handler
 import android.preference.PreferenceManager
 import android.support.v4.view.MenuItemCompat
 import android.support.v7.app.AppCompatActivity
+import android.util.DisplayMetrics
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.MotionEvent
 import android.view.View
+import android.view.WindowManager
+import android.view.inputmethod.EditorInfo
 import android.widget.Button
 import android.widget.ImageButton
 import android.widget.RadioButton
@@ -101,6 +105,7 @@ public class MainActivity : AppCompatActivity(), MainViewController, RouteCallba
         initReverseButton()
         presenter?.onCreate()
         presenter?.onRestoreViewState()
+        supportActionBar?.setDisplayShowTitleEnabled(false)
     }
 
     private fun initViews() {
@@ -216,8 +221,17 @@ public class MainActivity : AppCompatActivity(), MainViewController, RouteCallba
             searchView.setPelias(Pelias.getPelias())
             searchView.setCallback(PeliasCallback())
             searchView.setOnSubmitListener({ presenter?.onQuerySubmit() })
+            searchView.setIconifiedByDefault(false)
+
+            val windowManager = getSystemService(Context.WINDOW_SERVICE) as WindowManager
+            val display = windowManager.defaultDisplay
+            val metrics = DisplayMetrics()
+            display.getMetrics(metrics)
+            searchView.maxWidth = display.width - (32 * metrics.density.toInt())
+            searchView.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI
+            searchView.queryHint = "Search for place or address"
             listView.emptyView = emptyView
-            restoreCurrentSearchTerm()
+            restoreCurrentSearchTerm(searchView)
         }
 
         return true
@@ -276,21 +290,17 @@ public class MainActivity : AppCompatActivity(), MainViewController, RouteCallba
     private fun saveCurrentSearchTerm() {
         val menuItem = optionsMenu?.findItem(R.id.action_search)
         val actionView = menuItem?.actionView
-        val isExpanded = menuItem?.isActionViewExpanded ?: false
-        if (actionView is PeliasSearchView && isExpanded) {
+        if (actionView is PeliasSearchView) {
             presenter?.currentSearchTerm = actionView.query.toString()
         }
     }
 
-    private fun restoreCurrentSearchTerm() {
-        val menuItem = optionsMenu?.findItem(R.id.action_search)
-        val actionView = menuItem?.actionView as PeliasSearchView
+    private fun restoreCurrentSearchTerm(searchView: PeliasSearchView) {
         val term = presenter?.currentSearchTerm
         if (term != null) {
-            menuItem?.expandActionView()
-            actionView.setQuery(term, false)
+            searchView.setQuery(term, false)
             if (findViewById(R.id.search_results).visibility == View.VISIBLE) {
-                actionView.clearFocus()
+                searchView.clearFocus()
                 showActionViewAll()
             }
             presenter?.currentSearchTerm = null

app/src/main/res/drawable/ic_find_me.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_pressed="true" android:drawable="@drawable/ic_find_me_pressed" />
+    <item android:drawable="@drawable/ic_find_me_normal" />
+</selector>

app/src/main/res/layout/activity_main.xml

@@ -18,7 +18,9 @@
             android:layout_alignParentRight="true"
             android:layout_marginBottom="16dp"
             android:layout_marginRight="16dp"
-            android:src="@android:drawable/ic_menu_compass" />
+            android:background="@drawable/bg_route_header"
+            android:padding="8dp"
+            android:src="@drawable/ic_find_me" />
 
     <RelativeLayout
         android:id="@+id/progress"

app/src/main/res/layout/view_route_preview.xml

@@ -28,21 +28,21 @@
                 android:id="@+id/distance_preview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="#88C092"
+                android:textColor="@color/color_accent"
                 android:textSize="@dimen/font_small" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="#88C092"
+                android:textColor="@color/color_accent"
                 android:textSize="@dimen/font_small"
                 android:text=" | " />
 
             <com.mapzen.erasermap.view.TimeView
                 android:id="@+id/time_preview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="#88C092"
+                android:textColor="@color/color_accent"
                 android:textSize="@dimen/font_small" />
         </LinearLayout>
 

app/src/main/res/menu/menu_main.xml

@@ -5,7 +5,7 @@
         android:id="@+id/action_search"
         android:icon="@drawable/ic_search"
         android:title="@string/action_search"
-        app:showAsAction="collapseActionView|ifRoom"
+        app:showAsAction="always"
         app:actionViewClass="com.mapzen.pelias.widget.PeliasSearchView" />
 
     <item

app/src/main/res/values/colors.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="color_primary">#FFF</color>
+    <color name="color_primary_dark">#666</color>
+    <color name="color_accent">#88C092</color>
+
     <color name="transparent_light_gray">#99CECECE</color>
     <color name="transparent_white">#E6FFFFFF</color>
     <color name="you_have_arrived">#FF0000</color>
-</resources>
+ </resources>

app/src/main/res/values/styles.xml

@@ -2,11 +2,18 @@
 
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light">
-        <item name="searchViewStyle">@style/PrivateMaps.Widget.AppCompat.SearchView</item>
+        <item name="colorPrimary">@color/color_primary</item>
+        <item name="colorPrimaryDark">@color/color_primary_dark</item>
+        <item name="colorAccent">@color/color_accent</item>
+        <item name="searchViewStyle">@style/EraserMapSearchViewStyle</item>
+        <item name="actionBarStyle">@style/EraserMapActionBarStyle</item>
     </style>
 
-    <style name="PrivateMaps.Widget.AppCompat.SearchView" parent="Widget.AppCompat.SearchView">
+    <style name="EraserMapActionBarStyle" parent="Widget.AppCompat.Light.ActionBar">
+        <item name="contentInsetStart">0dp</item>
+    </style>
+
+    <style name="EraserMapSearchViewStyle" parent="Widget.AppCompat.SearchView">
         <item name="searchIcon">@drawable/ic_search</item>
     </style>
-
 </resources>