From eca73a0e9530f0ded0bcaf20c48ea56fc46c5cbe 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: Thu, 21 Sep 2017 13:32:49 +0300
Subject: [PATCH] [android] Added User's rating records UI

---
 android/res/layout/item_ugc_rating.xml        |  2 +-
 .../res/layout/place_page_rating_records.xml  |  8 +++--
 android/res/layout/place_page_ugc.xml         |  2 +-
 android/res/values/styles.xml                 |  2 --
 android/src/com/mapswithme/maps/ugc/UGC.java  | 17 ++++++++++-
 .../maps/widget/placepage/PlacePageView.java  | 30 ++++++++++++++++++-
 6 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/android/res/layout/item_ugc_rating.xml b/android/res/layout/item_ugc_rating.xml
index 229ec34241..a784f50cf2 100644
--- a/android/res/layout/item_ugc_rating.xml
+++ b/android/res/layout/item_ugc_rating.xml
@@ -26,7 +26,7 @@
     android:id="@+id/rb__rate"
     style="@style/MwmWidget.RatingBar.Ugc"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
+    android:layout_height="24dp"
     android:layout_alignParentRight="true"
     android:layout_alignParentEnd="true"
     android:numStars="5"
diff --git a/android/res/layout/place_page_rating_records.xml b/android/res/layout/place_page_rating_records.xml
index 8d908e8d48..45fcc546e4 100644
--- a/android/res/layout/place_page_rating_records.xml
+++ b/android/res/layout/place_page_rating_records.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge
+<LinearLayout
   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="?cardBackground"
+  android:orientation="vertical"
   tools:showIn="@layout/place_page_ugc">
   <View
     android:layout_width="match_parent"
@@ -24,4 +28,4 @@
     android:layout_width="match_parent"
     android:layout_height="1dp"
     android:background="?dividerHorizontal"/>
-</merge>
+</LinearLayout>
diff --git a/android/res/layout/place_page_ugc.xml b/android/res/layout/place_page_ugc.xml
index 99eb89e44d..cea6d266a9 100644
--- a/android/res/layout/place_page_ugc.xml
+++ b/android/res/layout/place_page_ugc.xml
@@ -15,11 +15,11 @@
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?cardBackground"
     android:orientation="vertical">
     <RelativeLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
+      android:background="?cardBackground"
       android:paddingLeft="@dimen/margin_base"
       android:paddingStart="@dimen/margin_base"
       android:paddingRight="@dimen/margin_base"
diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml
index 98b68c7f6a..834d6345b3 100644
--- a/android/res/values/styles.xml
+++ b/android/res/values/styles.xml
@@ -233,8 +233,6 @@
   <style name="MwmWidget.RatingBar" parent="android:Widget.RatingBar">
     <item name="android:progressDrawable">@drawable/rating_bar</item>
     <item name="android:indeterminateDrawable">@drawable/rating_bar</item>
-    <item name="android:minHeight">24dp</item>
-    <item name="android:maxHeight">24dp</item>
   </style>
 
   <style name="MwmWidget.RatingBarSmall" parent="android:Widget.RatingBar">
diff --git a/android/src/com/mapswithme/maps/ugc/UGC.java b/android/src/com/mapswithme/maps/ugc/UGC.java
index 5d8397ff28..f98d1d1eb9 100644
--- a/android/src/com/mapswithme/maps/ugc/UGC.java
+++ b/android/src/com/mapswithme/maps/ugc/UGC.java
@@ -10,6 +10,7 @@ import java.io.Serializable;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -50,6 +51,20 @@ public class UGC implements Serializable
     return Collections.synchronizedList(Arrays.asList(mRatings));
   }
 
+  //TODO: remove it after core is ready.
+  @NonNull
+  public List<Rating> getUserRatings()
+  {
+    return new ArrayList<Rating>(){
+      {
+        add(new Rating("service", 8.3f));
+        add(new Rating("food", 3.4f));
+        add(new Rating("quality", 5.0f));
+        add(new Rating("cleaning", 7.9f));
+      }
+    };
+  }
+
   @Nullable
   public List<Review> getReviews()
   {
@@ -78,7 +93,7 @@ public class UGC implements Serializable
     private final String mName;
     private float mValue;
 
-    private Rating(@NonNull String name, float value)
+    Rating(@NonNull String name, float value)
     {
       mName = name;
       mValue = value;
diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
index 781102cf7f..0562643427 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
@@ -246,6 +246,8 @@ public class PlacePageView extends RelativeLayout
   private final UGCReviewAdapter mUGCReviewAdapter = new UGCReviewAdapter();
   @NonNull
   private final UGCRatingRecordsAdapter mUGCRatingRecordsAdapter = new UGCRatingRecordsAdapter();
+  @NonNull
+  private final UGCRatingRecordsAdapter mUGCUserRatingRecordsAdapter = new UGCRatingRecordsAdapter();
 
   // Downloader`s stuff
   private DownloaderStatusIcon mDownloaderIcon;
@@ -306,6 +308,7 @@ public class PlacePageView extends RelativeLayout
     if (ugc.getReviews() != null)
       mUGCReviewAdapter.setItems(ugc.getReviews());
     mUGCRatingRecordsAdapter.setItems(ugc.getRatings());
+    mUGCUserRatingRecordsAdapter.setItems(ugc.getUserRatings());
     UiUtils.show(mUgcView);
   }
 
@@ -686,7 +689,8 @@ public class PlacePageView extends RelativeLayout
     rvHotelReview.setHasFixedSize(false);
     rvHotelReview.setAdapter(mUGCReviewAdapter);
 
-    RecyclerView rvRatingRecords = (RecyclerView) findViewById(R.id.rv__summary_rating_records);
+    View summaryRatingContainer = findViewById(R.id.summary_rating_records);
+    RecyclerView rvRatingRecords = (RecyclerView) summaryRatingContainer.findViewById(R.id.rv__summary_rating_records);
     rvRatingRecords.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false));
     rvRatingRecords.getLayoutManager().setAutoMeasureEnabled(true);
     rvRatingRecords.setNestedScrollingEnabled(false);
@@ -694,6 +698,30 @@ public class PlacePageView extends RelativeLayout
     rvRatingRecords.addItemDecoration(
         ItemDecoratorFactory.createRatingRecordDecorator(getContext(), LinearLayoutManager.HORIZONTAL));
     rvRatingRecords.setAdapter(mUGCRatingRecordsAdapter);
+
+    View userReviewContainer = findViewById(R.id.user_rating_records);
+    RecyclerView rvUserRatingRecords = (RecyclerView) userReviewContainer.findViewById(R.id.rv__summary_rating_records);
+    rvUserRatingRecords.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false));
+    rvUserRatingRecords.getLayoutManager().setAutoMeasureEnabled(true);
+    rvUserRatingRecords.setNestedScrollingEnabled(false);
+    rvUserRatingRecords.setHasFixedSize(false);
+    rvUserRatingRecords.addItemDecoration(
+        ItemDecoratorFactory.createRatingRecordDecorator(getContext(), LinearLayoutManager.HORIZONTAL));
+    rvUserRatingRecords.setAdapter(mUGCUserRatingRecordsAdapter);
+
+    View userComment = findViewById(R.id.rl_user_review);
+    TextView name = (TextView) userComment.findViewById(R.id.name);
+    TextView date = (TextView) userComment.findViewById(R.id.date);
+    TextView review = (TextView) userComment.findViewById(R.id.review);
+    //TODO: remove it after core is ready.
+    name.setText("Your review");
+    date.setText("10 May 2017");
+    review.setText("Go first thing in the morning when they open...You will get in right" +
+                   "away if you do..." +
+                   "" +
+                   "Amazing food...");
+    userComment.findViewById(R.id.rating).setVisibility(GONE);
+
   }
 
   private void initHotelRatingView()