From c38e98a49bbda29b4e94f7fb1419c63dff0702d8 Mon Sep 17 00:00:00 2001
From: veyndan <veyndan@gmail.com>
Date: Fri, 30 Jun 2017 21:43:45 +0100
Subject: [PATCH] Redesign Nearby Places list items

---
 app/src/main/res/layout/item_place.xml | 120 +++++++++++++------------
 app/src/main/res/values/colors.xml     |   1 -
 app/src/main/res/values/dimens.xml     |   3 -
 3 files changed, 61 insertions(+), 63 deletions(-)

diff --git a/app/src/main/res/layout/item_place.xml b/app/src/main/res/layout/item_place.xml
index 1c83aef53..88784857b 100644
--- a/app/src/main/res/layout/item_place.xml
+++ b/app/src/main/res/layout/item_place.xml
@@ -1,66 +1,68 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:foreground="?attr/selectableItemBackground"
-    android:layout_height="@dimen/icon_size"
+    android:layout_height="wrap_content"
+    android:foreground="?selectableItemBackground"
+    android:minHeight="72dp"
     >
 
-    <RelativeLayout
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:background="@android:color/white"
+        android:contentDescription="@string/no_image_found"
+        android:scaleType="centerCrop"
+        android:src="@drawable/empty_photo"
+        />
+
+    <TextView
+        android:id="@+id/distance"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginTop="16dp"
+        android:textAppearance="@style/TextAppearance.AppCompat.Caption"
+        tools:text="@string/placeholder_place_distance"
+        />
+
+    <TextView
+        android:id="@+id/tvName"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        >
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@id/distance"
+        android:layout_marginLeft="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_toEndOf="@id/icon"
+        android:layout_toLeftOf="@id/distance"
+        android:layout_toRightOf="@id/icon"
+        android:layout_toStartOf="@id/distance"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:textAppearance="@style/TextAppearance.AppCompat.Body2"
+        tools:text="@string/placeholder_place_name"
+        />
 
-        <ImageView
-            android:id="@+id/icon"
-            android:layout_width="@dimen/icon_size"
-            android:layout_height="match_parent"
-            android:src="@drawable/empty_photo"
-            android:background="#ffffff"
-            android:scaleType="centerCrop"
-            android:contentDescription="@string/no_image_found"
-            />
+    <TextView
+        android:id="@+id/tvDesc"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignEnd="@id/distance"
+        android:layout_alignLeft="@id/tvName"
+        android:layout_alignRight="@id/distance"
+        android:layout_alignStart="@id/tvName"
+        android:layout_below="@id/tvName"
+        android:layout_marginBottom="16dp"
+        android:ellipsize="end"
+        android:maxLines="4"
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+        tools:text="@string/placeholder_place_description"
+        />
 
-        <TextView
-            android:id="@+id/distance"
-            android:layout_width="@dimen/icon_size"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/icon"
-            android:gravity="center"
-            android:padding="@dimen/tiny_margin"
-            style="?android:textAppearanceSmallInverse"
-            android:textColor="#ffffff"
-            android:background="@color/text_background"
-            tools:text="@string/placeholder_place_distance"
-            />
-
-        <TextView
-            android:id="@+id/tvName"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_toEndOf="@+id/icon"
-            android:layout_toRightOf="@+id/icon"
-            android:paddingTop="@dimen/small_margin"
-            android:paddingLeft="@dimen/small_margin"
-            android:paddingRight="@dimen/small_margin"
-            android:maxLines="2"
-            android:ellipsize="none"
-            style="?android:textAppearanceMedium"
-            tools:text="@string/placeholder_place_name"
-            />
-
-        <TextView
-            android:id="@+id/tvDesc"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_toEndOf="@+id/icon"
-            android:layout_toRightOf="@+id/icon"
-            android:layout_below="@+id/tvName"
-            android:padding="@dimen/small_margin"
-            android:ellipsize="none"
-            android:maxLines="4"
-            style="?android:textAppearanceSmall"
-            tools:text="@string/placeholder_place_description"
-            />
-
-    </RelativeLayout>
-</FrameLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 01401aa47..828d5a600 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,7 +3,6 @@
     <!-- Some colours are same for dark/light themes. They are written two times in case
     we want to change light ones later.
       -->
-    <color name="text_background">#90000000</color>
     <color name="item_white_background">#ffffffff</color>
     <color name="main_background_dark">#000000</color>
     <color name="main_background_light">#ffffff</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index fe2674a9a..40c859118 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,7 +1,4 @@
 <resources>
-    <dimen name="icon_size">120dp</dimen>
-    <dimen name="tiny_margin">4dp</dimen>
-    <dimen name="small_margin">8dp</dimen>
     <dimen name="bottom_peak_height">240dp</dimen>
     <dimen name="overflow_button_dimen">48dp</dimen>
 </resources>