From 53cd9e762c0a7605c546a396b3aba7c1b303f5b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?=
 =?UTF-8?q?=D0=97=D0=B0=D1=86=D0=B5=D0=BF=D0=B8=D0=BD?= <az@mapswithme.com>
Date: Wed, 20 Sep 2017 17:09:54 +0300
Subject: [PATCH] [android] Added user review block for ugc

---
 .../res/layout/place_page_rating_records.xml  | 27 +++++++++++++++
 android/res/layout/place_page_ugc.xml         | 34 +++++++------------
 2 files changed, 40 insertions(+), 21 deletions(-)
 create mode 100644 android/res/layout/place_page_rating_records.xml

diff --git a/android/res/layout/place_page_rating_records.xml b/android/res/layout/place_page_rating_records.xml
new file mode 100644
index 0000000000..8d908e8d48
--- /dev/null
+++ b/android/res/layout/place_page_rating_records.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  tools:showIn="@layout/place_page_ugc">
+  <View
+    android:layout_width="match_parent"
+    android:layout_height="1dp"
+    android:layout_marginLeft="@dimen/margin_base"
+    android:layout_marginStart="@dimen/margin_base"
+    android:background="?dividerHorizontal"/>
+  <android.support.v7.widget.RecyclerView
+    android:id="@+id/rv__summary_rating_records"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingLeft="@dimen/margin_base"
+    android:paddingStart="@dimen/margin_base"
+    android:paddingRight="@dimen/margin_base"
+    android:paddingEnd="@dimen/margin_base"
+    android:paddingTop="@dimen/margin_half_plus"
+    android:paddingBottom="@dimen/margin_half_plus"
+    tools:listitem="@layout/item_ugc_rating_record"/>
+  <View
+    android:layout_width="match_parent"
+    android:layout_height="1dp"
+    android:background="?dividerHorizontal"/>
+</merge>
diff --git a/android/res/layout/place_page_ugc.xml b/android/res/layout/place_page_ugc.xml
index 87dbe2aa67..99eb89e44d 100644
--- a/android/res/layout/place_page_ugc.xml
+++ b/android/res/layout/place_page_ugc.xml
@@ -67,27 +67,9 @@
         android:layout_centerVertical="true"
         app:rating="normal"/>
     </RelativeLayout>
-    <View
-      android:layout_width="match_parent"
-      android:layout_height="1dp"
-      android:layout_marginLeft="@dimen/margin_base"
-      android:layout_marginStart="@dimen/margin_base"
-      android:background="?dividerHorizontal"/>
-    <android.support.v7.widget.RecyclerView
-      android:id="@+id/rv__summary_rating_records"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:paddingLeft="@dimen/margin_base"
-      android:paddingStart="@dimen/margin_base"
-      android:paddingRight="@dimen/margin_base"
-      android:paddingEnd="@dimen/margin_base"
-      android:paddingTop="@dimen/margin_half_plus"
-      android:paddingBottom="@dimen/margin_half_plus"
-      tools:listitem="@layout/item_ugc_rating_record"/>
-    <View
-      android:layout_width="match_parent"
-      android:layout_height="1dp"
-      android:background="?dividerHorizontal"/>
+    <include
+      android:id="@+id/summary_rating_records"
+      layout="@layout/place_page_rating_records"/>
   </LinearLayout>
   <LinearLayout
     android:id="@+id/ll__pp_ugc_rating"
@@ -233,6 +215,16 @@
 
   <include layout="@layout/place_page_fat_shadow"/>
 
+  <!-- User review block -->
+  <include
+    layout="@layout/item_ugc_comment"
+    android:id="@+id/rl_user_review"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"/>
+  <include
+    android:id="@+id/user_rating_records"
+    layout="@layout/place_page_rating_records"/>
+
   <android.support.v7.widget.RecyclerView
     android:id="@+id/rv__pp_ugc_reviews"
     android:layout_width="match_parent"