Adjust map and map bar UX

- Add ripple to map button bar
- Fix drawable tint color for generic ride icon
- Fix margins for map button bar
- Map zoom is closer to spec, but layout still WIP

Change-Id: I77c9a570aea1462f91d85c2bd149aac895712caa
Issue-Id: RIDE-246, RIDE-241, RIDE-243

5 files changed, 46 insertions, 33 deletions

diff --git a/res/drawable/directions_button_background.xml b/res/drawable/directions_button_background.xml
index a40b30f..d7f56d6 100644
--- a/res/drawable/directions_button_background.xml
+++ b/res/drawable/directions_button_background.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-    <corners android:bottomRightRadius="2dp" android:topRightRadius="2dp" />
-    <solid android:color="@color/white_54" />
-</shape>
\ No newline at end of file
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="?android:colorControlHighlight">
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:bottomLeftRadius="2dp" android:topLeftRadius="2dp" />
+            <solid android:color="@color/white_54" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/res/drawable/ic_generic_transport_icon.xml b/res/drawable/ic_generic_transport_icon.xml
index 7bd5e2e..dd26431 100644
--- a/res/drawable/ic_generic_transport_icon.xml
+++ b/res/drawable/ic_generic_transport_icon.xml
@@ -21,7 +21,7 @@
         android:viewportHeight="24">
 
     <path
-            android:fillColor="#000000"
+            android:fillColor="@color/black_54"
             android:pathData="M18.9,6c-0.2-0.6-0.8-1-1.4-1h-11C5.8,5,5.3,5.4,5.1,6L3,12v8c0,0.5,0.5,1,1,1h1c0.6,0,1-0.5,1-1v-1h12v1c0,0.5,0.5,1,1,1h1
 c0.5,0,1-0.5,1-1v-8L18.9,6z
 M6.5,16C5.7,16,5,15.3,5,14.5S5.7,13,6.5,13S8,13.7,8,14.5S7.3,16,6.5,16z M17.5,16
diff --git a/res/drawable/request_ride_button_background.xml b/res/drawable/request_ride_button_background.xml
index ff3ba2e..d7f56d6 100644
--- a/res/drawable/request_ride_button_background.xml
+++ b/res/drawable/request_ride_button_background.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-    <corners android:bottomLeftRadius="2dp" android:topLeftRadius="2dp" />
-    <solid android:color="@color/white_54" />
-</shape>
\ No newline at end of file
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="?android:colorControlHighlight">
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:bottomLeftRadius="2dp" android:topLeftRadius="2dp" />
+            <solid android:color="@color/white_54" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/res/layout/attachment_maps.xml b/res/layout/attachment_maps.xml
index 4cb691f..aa5b353 100644
--- a/res/layout/attachment_maps.xml
+++ b/res/layout/attachment_maps.xml
@@ -21,28 +21,46 @@
     android:layout_height="@dimen/conversation_maps_height">
     <ImageView
         android:id="@+id/maps_image"
-        android:layout_width="@dimen/conversation_maps_width"
-        android:layout_height="@dimen/conversation_maps_height"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:minWidth="@dimen/conversation_maps_width"
         android:minHeight="@dimen/conversation_maps_height"
         android:adjustViewBounds="true"
-        android:scaleType="centerInside"
+        android:scaleType="fitCenter"
         android:layout_gravity="center_vertical"/>
     <RelativeLayout
         android:background="@drawable/maps_button_container_background"
         android:elevation="@dimen/maps_button_elevation"
-        android:layout_width="@dimen/maps_button_width"
+        android:layout_width="match_parent"
         android:layout_height="@dimen/maps_button_height"
         android:layout_alignParentBottom="true"
         android:layout_marginLeft="@dimen/conversation_maps_margin"
         android:layout_marginBottom="@dimen/conversation_maps_margin"
-        android:layout_marginRight="@dimen/conversation_maps_margin">
+        android:layout_marginRight="@dimen/conversation_maps_margin"
+        android:minWidth="@dimen/maps_button_width">
+
+        <ImageView
+            android:id="@+id/directions_button"
+            android:layout_width="@dimen/directions_button_width"
+            android:layout_height="match_parent"
+            android:background="@drawable/directions_button_background"
+            android:layout_alignParentRight="true"
+            android:padding="@dimen/directions_button_padding"
+            android:layout_centerVertical="true"
+            android:src="@drawable/ic_get_directions"/>
+        <View
+            android:id="@+id/button_divider"
+            android:layout_toLeftOf="@id/directions_button"
+            android:layout_width="@dimen/maps_button_divider_width"
+            android:layout_height="match_parent"
+            android:background="@color/transparent_gray" />
         <Button
             style="?android:attr/borderlessButtonStyle"
             android:id="@+id/request_ride_button"
             android:background="@drawable/request_ride_button_background"
             android:layout_alignParentLeft="true"
-            android:layout_width="@dimen/request_ride_button_width"
+            android:layout_toLeftOf="@id/button_divider"
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:paddingLeft="28dp"
             android:paddingRight="50dp"
@@ -50,6 +68,7 @@
             android:textSize="@dimen/request_ride_text_size"
             android:fontFamily="sans-serif-medium"
             android:text="@string/request_ride"/>
+
         <ImageView
             android:id="@+id/brand_image"
             android:layout_width="@dimen/brand_image_width"
@@ -61,21 +80,5 @@
             android:focusable="false"
             android:clickable="false"
             android:src="@drawable/ic_generic_transport_icon"/>
-        <ImageView
-            android:id="@+id/directions_button"
-            android:layout_width="@dimen/directions_button_width"
-            android:layout_height="match_parent"
-            android:background="@drawable/directions_button_background"
-            android:layout_alignParentRight="true"
-            android:padding="@dimen/directions_button_padding"
-            android:layout_centerVertical="true"
-            android:src="@drawable/ic_get_directions"/>
-        <View
-            android:id="@+id/button_divider"
-            android:layout_toRightOf="@id/request_ride_button"
-            android:layout_toLeftOf="@id/directions_button"
-            android:layout_width="@dimen/maps_button_divider_width"
-            android:layout_height="match_parent"
-            android:background="@color/transparent_gray" />
     </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/values/cm_dimens.xml b/res/values/cm_dimens.xml
index f367e0c..9ce1bf5 100644
--- a/res/values/cm_dimens.xml
+++ b/res/values/cm_dimens.xml
@@ -38,4 +38,6 @@
     <dimen name="maps_error_icon_width">1dp</dimen>
     <dimen name="maps_error_icon_height">1dp</dimen>
     <dimen name="maps_corner_radius">3dp</dimen>
+    <dimen name="map_request_width">221px</dimen>
+    <dimen name="map_request_height">144px</dimen>
 </resources>