[android] Simlifyed UGC layout in PP

2 files changed, 98 insertions, 92 deletions

diff --git a/android/res/layout/item_ugc_comment.xml b/android/res/layout/item_ugc_comment.xml
index 5c231ff46c..5af22c6743 100644
--- a/android/res/layout/item_ugc_comment.xml
+++ b/android/res/layout/item_ugc_comment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:tools="http://schemas.android.com/tools"
+                android:background="?cardBackground"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
@@ -47,69 +48,10 @@
     android:layout_marginRight="@dimen/margin_base"
     android:layout_marginEnd="@dimen/margin_base"
     android:layout_marginTop="@dimen/margin_half_plus"
+    android:layout_marginBottom="@dimen/margin_base"
     android:layout_below="@id/tv__user_name"
     android:textAppearance="@style/MwmTextAppearance.Body3.Primary"
     android:visibility="gone"
     tools:visibility="visible"
     tools:text="Interesting place among SoHo, Little Italy and China town. Modern design. Great view from roof. Near subway. Free refreshment every afternoon. The staff was very friendly."/>
-
-  <ImageView
-    android:id="@+id/like"
-    android:layout_marginLeft="@dimen/margin_base"
-    android:layout_marginStart="@dimen/margin_base"
-    android:layout_marginTop="@dimen/margin_base"
-    android:src="@android:drawable/star_on"
-    android:layout_below="@id/tv__review"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"/>
-
-  <TextView
-    android:id="@+id/like_count"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_toRightOf="@id/like"
-    android:layout_toEndOf="@id/like"
-    android:layout_alignBottom="@id/like"
-    android:layout_marginLeft="@dimen/margin_quarter_plus"
-    android:layout_marginStart="@dimen/margin_quarter_plus"
-    android:textAppearance="@style/MwmTextAppearance.Body3"
-    tools:text="2"/>
-
-  <ImageView
-    android:id="@+id/dislike"
-    android:layout_marginLeft="@dimen/margin_base"
-    android:layout_marginStart="@dimen/margin_base"
-    android:layout_marginTop="@dimen/margin_base"
-    android:layout_toRightOf="@id/like_count"
-    android:layout_toEndOf="@id/like_count"
-    android:src="@android:drawable/star_on"
-    android:layout_below="@id/tv__review"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"/>
-
-  <TextView
-    android:id="@+id/dislike_count"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_toRightOf="@id/dislike"
-    android:layout_toEndOf="@id/dislike"
-    android:layout_alignBottom="@id/dislike"
-    android:layout_marginLeft="@dimen/margin_quarter_plus"
-    android:layout_marginStart="@dimen/margin_quarter_plus"
-    android:layout_toLeftOf="@+id/tv__original"
-    android:layout_toStartOf="@+id/tv__original"
-    android:textAppearance="@style/MwmTextAppearance.Body3"
-    tools:text="0"/>
-
-  <TextView
-    android:id="@+id/tv__original"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    style="@style/MwmTextAppearance.Body4"
-    android:layout_alignParentEnd="true"
-    android:layout_alignParentRight="true"
-    android:layout_alignBottom="@id/dislike_count"
-    android:layout_marginEnd="@dimen/margin_base"
-    android:layout_marginRight="@dimen/margin_base"
-    android:text="Show original"/>
 </RelativeLayout>
diff --git a/android/res/layout/place_page_ugc.xml b/android/res/layout/place_page_ugc.xml
index 78974ffb69..48ca43525a 100644
--- a/android/res/layout/place_page_ugc.xml
+++ b/android/res/layout/place_page_ugc.xml
@@ -14,64 +14,128 @@
     android:layout_height="158dp"
     android:padding="@dimen/margin_base"
     android:gravity="center_horizontal"
-    android:background="?ppRatingBackground">
+    android:background="?cardBackground">
     <TextView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginTop="@dimen/margin_base"
-      android:textAppearance="@style/MwmTextAppearance.Body1"
-      android:textColor="?ppRatingText"
-      tools:text="How was it? Tap to rate."/>
+      android:textAppearance="@style/MwmTextAppearance.Body3"
+      android:textStyle="bold"
+      tools:text="Tap to rate &amp; review this place"/>
     <LinearLayout
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginTop="@dimen/margin_base"
+      android:layout_marginBottom="@dimen/margin_half"
       android:orientation="horizontal">
-      <ImageButton
-        android:id="@+id/one_star"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
+      <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
         android:layout_marginRight="@dimen/margin_half"
-        android:layout_marginEnd="@dimen/margin_half"/>
-      <ImageButton
-        android:id="@+id/two_stars"
+        android:layout_marginEnd="@dimen/margin_half"
+        android:gravity="center_horizontal">
+        <ImageView
+          android:id="@+id/iv__horrible"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:src="@drawable/ic_rating_horrible_normal_light"/>
+        <TextView
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:textSize="@dimen/text_size_icon_title"
+          android:textColor="?secondary"
+          android:layout_marginTop="@dimen/margin_half"
+          android:text="Horrible"/>
+      </LinearLayout>
+      <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
         android:layout_marginLeft="@dimen/margin_half"
         android:layout_marginStart="@dimen/margin_half"
         android:layout_marginRight="@dimen/margin_half"
         android:layout_marginEnd="@dimen/margin_half"
-        android:layout_width="40dp"
-        android:layout_height="40dp"/>
-      <ImageButton
-        android:id="@+id/three_stars"
+        android:gravity="center_horizontal">
+        <ImageView
+          android:id="@+id/iv__bad"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:src="@drawable/ic_rating_bad_normal_light"/>
+        <TextView
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:textSize="@dimen/text_size_icon_title"
+          android:textColor="?secondary"
+          android:layout_marginTop="@dimen/margin_half"
+          android:text="Bad"/>
+      </LinearLayout>
+      <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
         android:layout_marginLeft="@dimen/margin_half"
         android:layout_marginStart="@dimen/margin_half"
         android:layout_marginRight="@dimen/margin_half"
         android:layout_marginEnd="@dimen/margin_half"
-        android:layout_width="40dp"
-        android:layout_height="40dp"/>
-      <ImageButton
-        android:id="@+id/four_stars"
+        android:gravity="center_horizontal">
+        <ImageView
+          android:id="@+id/iv__normal"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:src="@drawable/ic_rating_avarage_normal_light"/>
+        <TextView
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:textSize="@dimen/text_size_icon_title"
+          android:textColor="?secondary"
+          android:layout_marginTop="@dimen/margin_half"
+          android:text="Normal"/>
+      </LinearLayout>
+      <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
         android:layout_marginLeft="@dimen/margin_half"
         android:layout_marginStart="@dimen/margin_half"
         android:layout_marginRight="@dimen/margin_half"
         android:layout_marginEnd="@dimen/margin_half"
-        android:layout_width="40dp"
-        android:layout_height="40dp"/>
-      <ImageButton
-        android:id="@+id/five_stars"
+        android:gravity="center_horizontal">
+        <ImageView
+          android:id="@+id/iv__good"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:src="@drawable/ic_rating_good_normal_light"/>
+        <TextView
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:textSize="@dimen/text_size_icon_title"
+          android:textColor="?secondary"
+          android:layout_marginTop="@dimen/margin_half"
+          android:text="Good"/>
+      </LinearLayout>
+      <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
         android:layout_marginLeft="@dimen/margin_half"
         android:layout_marginStart="@dimen/margin_half"
-        android:layout_width="40dp"
-        android:layout_height="40dp"/>
+        android:gravity="center_horizontal">
+        <ImageView
+          android:id="@+id/iv__excellent"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:src="@drawable/ic_rating_exellent_normal_light"/>
+        <TextView
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:textSize="@dimen/text_size_icon_title"
+          android:textColor="?secondary"
+          android:layout_marginTop="@dimen/margin_half"
+          android:text="Excellent"/>
+      </LinearLayout>
     </LinearLayout>
-    <Button
-      android:id="@+id/write_review"
-      android:layout_width="match_parent"
-      android:layout_height="36dp"
-      android:textAllCaps="true"
-      android:text="Write a review"/>
   </LinearLayout>
-
   <android.support.v7.widget.RecyclerView
     android:id="@+id/rv__place_ugc_review"
     android:layout_width="match_parent"