[android] Added new icons for PP, changed layout a bit

android/res/layout-w600dp-port/place_page_details.xml

@@ -48,11 +48,13 @@
 
           <include layout="@layout/place_page_placename"/>
 
+          <include layout="@layout/place_page_entrance"/>
+
           <include layout="@layout/place_page_phone"/>
 
           <include layout="@layout/place_page_website"/>
 
-          <include layout="@layout/place_page_schedule"/>
+          <include layout="@layout/place_page_wiki"/>
 
         </LinearLayout>
 
@@ -63,14 +65,18 @@
             android:layout_toRightOf="@id/anchor_center"
             android:orientation="vertical">
 
+          <include layout="@layout/place_page_email"/>
+
+          <include layout="@layout/place_page_schedule"/>
+
           <include layout="@layout/place_page_latlon"/>
 
           <include layout="@layout/place_page_wifi"/>
 
-          <include layout="@layout/place_page_email"/>
-
           <include layout="@layout/place_page_operator"/>
 
+          <include layout="@layout/place_page_cuisine"/>
+
         </LinearLayout>
 
       </RelativeLayout>

android/res/layout/place_page_cuisine.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  android:id="@+id/ll__place_cuisine"
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:background="?attr/clickableBackground"
+  android:gravity="center_vertical"
+  android:orientation="horizontal"
+  android:paddingBottom="@dimen/margin_half"
+  android:paddingTop="@dimen/margin_half"
+  android:tag="schedule"
+  android:visibility="gone"
+  tools:visibility="visible">
+
+  <ImageView
+    android:id="@+id/iv__place_cuisine"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginRight="@dimen/margin_base"
+    android:src="@drawable/ic_cuisine"/>
+
+  <TextView
+    android:id="@+id/tv__place_cuisine"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:textColor="@color/text_place_page"
+    android:textSize="@dimen/text_size_body_1"
+    tools:text="Japan, European"/>
+</LinearLayout>

android/res/layout/place_page_details.xml

@@ -25,20 +25,26 @@
 
       <include layout="@layout/place_page_placename"/>
 
+      <include layout="@layout/place_page_entrance"/>
+
       <include layout="@layout/place_page_phone"/>
 
       <include layout="@layout/place_page_website"/>
 
+      <include layout="@layout/place_page_wiki"/>
+
+      <include layout="@layout/place_page_email"/>
+
       <include layout="@layout/place_page_schedule"/>
 
       <include layout="@layout/place_page_latlon"/>
 
       <include layout="@layout/place_page_wifi"/>
 
-      <include layout="@layout/place_page_email"/>
-
       <include layout="@layout/place_page_operator"/>
 
+      <include layout="@layout/place_page_cuisine"/>
+
       <View
           android:layout_width="match_parent"
           android:layout_height="0px"

android/res/layout/place_page_email.xml

@@ -19,7 +19,7 @@
       android:id="@+id/iv__place_email"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginRight="@dimen/margin_double"
+      android:layout_marginRight="@dimen/margin_base"
       android:src="@drawable/ic_email"/>
 
   <TextView

android/res/layout/place_page_entrance.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  android:id="@+id/ll__place_entrance"
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:background="?attr/clickableBackground"
+  android:gravity="center_vertical"
+  android:paddingBottom="@dimen/margin_half"
+  android:paddingTop="@dimen/margin_half"
+  android:visibility="gone"
+  tools:background="#6000FF00"
+  tools:visibility="visible">
+
+  <ImageView
+    android:id="@+id/iv__place_entrance"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginRight="@dimen/margin_base"
+    android:src="@drawable/ic_entrance"/>
+
+  <TextView
+    android:id="@+id/tv__place_entrance"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:textColor="@color/text_place_page"
+    android:textSize="@dimen/text_size_body_1"
+    tools:text="150 - 200"/>
+
+</LinearLayout>

android/res/layout/place_page_latlon.xml

@@ -17,8 +17,8 @@
       android:id="@+id/iv__place_latlon"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginRight="@dimen/margin_double"
-      android:src="@drawable/ic_text_position"/>
+      android:layout_marginRight="@dimen/margin_base"
+      android:src="@drawable/ic_coordinates"/>
 
   <TextView
       android:id="@+id/tv__place_latlon"

android/res/layout/place_page_operator.xml

@@ -19,8 +19,8 @@
       android:id="@+id/iv__place_operator"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginRight="@dimen/margin_double"
-      android:src="@drawable/ic_bank_operator"/>
+      android:layout_marginRight="@dimen/margin_base"
+      android:src="@drawable/ic_bank"/>
 
   <TextView
       android:id="@+id/tv__place_operator"

android/res/layout/place_page_phone.xml

@@ -19,8 +19,8 @@
       android:id="@+id/iv__place_phone"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginRight="@dimen/margin_double"
-      android:src="@drawable/ic_text_phone"/>
+      android:layout_marginRight="@dimen/margin_base"
+      android:src="@drawable/ic_phone"/>
 
   <TextView
       android:id="@+id/tv__place_phone"

android/res/layout/place_page_placename.xml

@@ -1,31 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/ll__place_name"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/clickableBackground"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:paddingBottom="@dimen/margin_half"
-    android:paddingTop="@dimen/margin_half"
-    android:visibility="gone"
-    tools:visibility="visible"
-    tools:background="#6000FF00">
+<RelativeLayout
+  android:id="@+id/ll__place_name"
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:background="?attr/clickableBackground"
+  android:gravity="center_vertical"
+  android:paddingBottom="@dimen/margin_half"
+  android:paddingTop="@dimen/margin_half"
+  android:visibility="gone"
+  tools:background="#6000FF00"
+  tools:visibility="visible">
 
   <ImageView
-      android:id="@+id/iv__place_name"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginRight="@dimen/margin_double"
-      android:src="@drawable/ic_text_adress"/>
+    android:id="@+id/iv__place_name"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_centerVertical="true"
+    android:layout_marginRight="@dimen/margin_base"
+    android:src="@drawable/ic_adress"/>
 
   <TextView
-      android:id="@+id/tv__place_address"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:textColor="@color/text_place_page"
-      android:textSize="@dimen/text_size_body_1"
-      tools:text="Sample place"/>
-</LinearLayout>
+    android:id="@+id/tv__place_address"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_toRightOf="@id/iv__place_name"
+    android:textColor="@color/text_place_page"
+    android:textSize="@dimen/text_size_body_1"
+    tools:text="Sample place"/>
+
+  <TextView
+    android:id="@+id/tv__place_post_address"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_alignLeft="@id/tv__place_address"
+    android:layout_below="@id/tv__place_address"
+    android:textAppearance="@style/MwmTextAppearance.Body3"
+    tools:text="Post address"/>
+</RelativeLayout>

android/res/layout/place_page_preview_common.xml

@@ -2,79 +2,79 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
   <RelativeLayout
-      android:layout_width="0dp"
+    android:layout_width="0dp"
+    android:layout_height="wrap_content"
+    android:layout_weight="1">
+
+    <TextView
+      android:id="@+id/tv__title"
+      android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:layout_weight="1">
+      android:ellipsize="end"
+      android:maxLines="@integer/pp_title_lines"
+      android:textColor="@color/text_place_page"
+      android:textSize="@dimen/text_size_headline"/>
 
     <TextView
-        android:id="@+id/tv__title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="@integer/pp_title_lines"
-        android:textColor="@color/text_place_page"
-        android:textSize="@dimen/text_size_headline"/>
+      android:id="@+id/tv__subtitle"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_below="@id/tv__title"
+      android:layout_marginRight="@dimen/margin_base"
+      android:textColor="@color/text_place_page_subtitle"
+      android:textSize="@dimen/text_size_body_1"/>
 
     <TextView
-        android:id="@+id/tv__subtitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/tv__title"
-        android:layout_marginRight="@dimen/margin_base"
-        android:textColor="@color/text_place_page_subtitle"
-        android:textSize="@dimen/text_size_body_1"/>
-
-    <TextView
-        android:id="@+id/tv__opened_till"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/tv__subtitle"
-        android:gravity="center_vertical"
-        android:textColor="@color/text_place_page_subtitle"
-        android:textSize="@dimen/text_size_body_1"
-        android:visibility="gone"/>
+      android:id="@+id/tv__opened_till"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_below="@id/tv__subtitle"
+      android:gravity="center_vertical"
+      android:textColor="@color/text_place_page_subtitle"
+      android:textSize="@dimen/text_size_body_1"
+      android:visibility="gone"/>
 
     <RatingBar
-        android:id="@+id/rb__stars"
-        style="?android:attr/ratingBarStyleSmall"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@id/tv__subtitle"
-        android:layout_marginBottom="@dimen/margin_eighth"
-        android:layout_toRightOf="@id/tv__subtitle"
-        android:numStars="5"
-        android:progressDrawable="@drawable/rating_bar_stars"
-        android:stepSize="1"
-        android:visibility="gone"/>
+      android:id="@+id/rb__stars"
+      style="?android:attr/ratingBarStyleSmall"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignBottom="@id/tv__subtitle"
+      android:layout_marginBottom="@dimen/margin_eighth"
+      android:layout_toRightOf="@id/tv__subtitle"
+      android:numStars="5"
+      android:progressDrawable="@drawable/rating_bar_stars"
+      android:stepSize="1"
+      android:visibility="gone"/>
 
     <TextView
-        android:id="@+id/tv__peak_elevation"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@id/tv__subtitle"
-        android:layout_toRightOf="@id/tv__subtitle"
-        android:drawableLeft="@drawable/ic_high_mountain"
-        android:textColor="@color/text_place_page_subtitle"
-        android:textSize="@dimen/text_size_body_1"
-        android:visibility="gone"/>
+      android:id="@+id/tv__peak_elevation"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignBottom="@id/tv__subtitle"
+      android:layout_toRightOf="@id/tv__subtitle"
+      android:drawableLeft="@drawable/ic_high_mountain"
+      android:textColor="@color/text_place_page_subtitle"
+      android:textSize="@dimen/text_size_body_1"
+      android:visibility="gone"/>
 
   </RelativeLayout>
 
   <TextView
-      android:id="@+id/tv__straight_distance"
-      android:layout_width="72dp"
-      android:layout_height="wrap_content"
-      android:gravity="right"
-      android:textColor="@color/text_place_page"
-      android:textSize="@dimen/text_size_body_1"/>
+    android:id="@+id/tv__straight_distance"
+    android:layout_width="72dp"
+    android:layout_height="wrap_content"
+    android:gravity="right"
+    android:textColor="@color/text_place_page"
+    android:textSize="@dimen/text_size_body_1"/>
 
   <com.mapswithme.maps.widget.ArrowView
-      android:id="@+id/av__direction"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginRight="-8dp"
-      android:clickable="true"
-      android:padding="@dimen/margin_half"/>
+    android:id="@+id/av__direction"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginRight="-8dp"
+    android:clickable="true"
+    android:padding="@dimen/margin_half"/>
 
 </merge>
 

android/res/layout/place_page_schedule.xml

@@ -1,28 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-    android:id="@+id/ll__place_schedule"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/clickableBackground"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:paddingBottom="@dimen/margin_half"
-    android:paddingTop="@dimen/margin_half"
-    android:tag="schedule"
-    android:visibility="gone">
+  android:id="@+id/ll__place_schedule"
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:background="?attr/clickableBackground"
+  android:gravity="center_vertical"
+  android:orientation="horizontal"
+  android:paddingBottom="@dimen/margin_half"
+  android:paddingTop="@dimen/margin_half"
+  android:tag="schedule"
+  android:visibility="gone"
+  tools:visibility="visible">
 
   <ImageView
-      android:id="@+id/iv__place_schedule"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginRight="@dimen/margin_double"
-      android:src="@drawable/ic_text_worktime"/>
+    android:id="@+id/iv__place_schedule"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginRight="@dimen/margin_base"
+    android:src="@drawable/ic_operating_hours"/>
 
   <TextView
-      android:id="@+id/tv__place_schedule"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:textColor="@color/text_place_page"
-      android:textSize="@dimen/text_size_body_1"/>
+    android:id="@+id/tv__place_schedule"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:textColor="@color/text_place_page"
+    android:textSize="@dimen/text_size_body_1"
+    tools:text="Today 16:00-18.00"/>
 </LinearLayout>

android/res/layout/place_page_website.xml

@@ -19,8 +19,8 @@
       android:id="@+id/iv__place_website"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginRight="@dimen/margin_double"
-      android:src="@drawable/ic_text_link"/>
+      android:layout_marginRight="@dimen/margin_base"
+      android:src="@drawable/ic_web"/>
 
   <TextView
       android:id="@+id/tv__place_website"
@@ -28,5 +28,5 @@
       android:layout_height="wrap_content"
       android:textColor="@color/text_place_page_blue"
       android:textSize="@dimen/text_size_body_1"
-      tools:text="Sample website"/>
+      tools:text="osm.org"/>
 </LinearLayout>

android/res/layout/place_page_wifi.xml

@@ -18,8 +18,8 @@
       android:id="@+id/iv__place_wifi"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginRight="@dimen/margin_double"
-      android:src="@drawable/ic_text_wifi"/>
+      android:layout_marginRight="@dimen/margin_base"
+      android:src="@drawable/ic_wifi"/>
 
   <TextView
       android:id="@+id/tv__place_wifi"
@@ -27,5 +27,5 @@
       android:layout_height="wrap_content"
       android:textColor="@color/text_place_page"
       android:textSize="@dimen/text_size_body_1"
-      tools:text="Wi-Fi"/>
+      android:text="@string/WiFi_available"/>
 </LinearLayout>

android/res/layout/place_page_wiki.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/ll__place_wiki"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/clickableBackground"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:paddingBottom="@dimen/margin_half"
+    android:paddingTop="@dimen/margin_half"
+    android:tag="website"
+    android:visibility="gone"
+    tools:visibility="visible"
+    tools:background="#20FF0000">
+
+  <ImageView
+      android:id="@+id/iv__place_wiki"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginRight="@dimen/margin_base"
+      android:src="@drawable/ic_wiki"/>
+
+  <TextView
+      android:id="@+id/tv__place_wiki"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:textColor="@color/text_place_page_blue"
+      android:textSize="@dimen/text_size_body_1"
+      tools:text="https://en.wikipedia.org/"/>
+</LinearLayout>