From ce81c3676ad4766160e3551ed3b40aea57c85b72 Mon Sep 17 00:00:00 2001
From: Roman Romanov <rromanov@65gb.net>
Date: Thu, 22 Sep 2016 07:58:05 +0400
Subject: [PATCH] [android] added single comment to review

---
 android/jni/com/mapswithme/maps/SponsoredHotel.cpp |  3 ++-
 android/res/layout/item_comment.xml                | 14 ++++++++++++++
 android/src/com/mapswithme/maps/review/Review.java | 12 +++++++++++-
 .../com/mapswithme/maps/review/ReviewAdapter.java  |  7 +++++++
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/android/jni/com/mapswithme/maps/SponsoredHotel.cpp b/android/jni/com/mapswithme/maps/SponsoredHotel.cpp
index 2f9e65301e..eabef51cbc 100644
--- a/android/jni/com/mapswithme/maps/SponsoredHotel.cpp
+++ b/android/jni/com/mapswithme/maps/SponsoredHotel.cpp
@@ -40,7 +40,7 @@ void PrepareClassRefs(JNIEnv * env, jclass hotelClass)
   g_facilityConstructor = jni::GetConstructorID(env, g_facilityTypeClass, "(Ljava/lang/String;Ljava/lang/String;)V");
   g_nearbyConstructor = jni::GetConstructorID(env, g_nearbyObjectClass, "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;DD)V");
   g_imageConstructor = jni::GetConstructorID(env, g_imageClass, "(Ljava/lang/String;Ljava/lang/String;)V");
-  g_reviewConstructor = jni::GetConstructorID(env, g_reviewClass, "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;FJ)V");
+  g_reviewConstructor = jni::GetConstructorID(env, g_reviewClass, "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;FJ)V");
   g_hotelInfoConstructor = jni::GetConstructorID(env, g_hotelInfoClass, "(Ljava/lang/String;[Lcom/mapswithme/maps/gallery/Image;[Lcom/mapswithme/maps/widget/placepage/SponsoredHotel$FacilityType;[Lcom/mapswithme/maps/review/Review;[Lcom/mapswithme/maps/widget/placepage/SponsoredHotel$NearbyObject;)V");
 
   // SponsoredHotel(String rating, String price, String urlBook, String urlDescription)
@@ -129,6 +129,7 @@ Java_com_mapswithme_maps_widget_placepage_SponsoredHotel_nativeRequestInfo(JNIEn
                                                  [](JNIEnv * env, BookingApi::HotelReview const & item)
                                                  {
                                                    return env->NewObject(g_reviewClass, g_reviewConstructor,
+                                                        jni::ToJavaString(env, item.m_reviewPositive),
                                                         jni::ToJavaString(env, item.m_reviewPositive),
                                                         jni::ToJavaString(env, item.m_reviewNegative),
                                                         jni::ToJavaString(env, item.m_author),
diff --git a/android/res/layout/item_comment.xml b/android/res/layout/item_comment.xml
index b8342956a1..6718f94d4c 100644
--- a/android/res/layout/item_comment.xml
+++ b/android/res/layout/item_comment.xml
@@ -49,6 +49,20 @@
           android:textAppearance="@style/MwmTextAppearance.Headline"
           tools:text="9.2"/>
 
+  <TextView
+          android:id="@+id/tv__review"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_marginLeft="@dimen/margin_base"
+          android:layout_marginStart="@dimen/margin_base"
+          android:layout_marginRight="@dimen/margin_base"
+          android:layout_marginEnd="@dimen/margin_base"
+          android:layout_marginBottom="@dimen/margin_base"
+          android:layout_below="@id/tv__comment_date"
+          android:textAppearance="@style/MwmTextAppearance.Body3.Primary"
+          android:visibility="gone"
+          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."/>
+
   <LinearLayout
           android:id="@+id/ll__positive_review"
           android:orientation="horizontal"
diff --git a/android/src/com/mapswithme/maps/review/Review.java b/android/src/com/mapswithme/maps/review/Review.java
index 249e9a237a..f7cb7ae5ab 100644
--- a/android/src/com/mapswithme/maps/review/Review.java
+++ b/android/src/com/mapswithme/maps/review/Review.java
@@ -5,6 +5,8 @@ import android.os.Parcelable;
 
 public class Review implements Parcelable {
 
+  private final String mReview;
+
   private final String mReviewPositive;
 
   private final String mReviewNegative;
@@ -17,8 +19,10 @@ public class Review implements Parcelable {
 
   private final long mDate;
 
-  public Review(String reviewPositive, String reviewNegative, String author, String authorAvatar,
+  public Review(String review, String reviewPositive, String reviewNegative, String author,
+          String authorAvatar,
           float rating, long date) {
+    mReview = review;
     mReviewPositive = reviewPositive;
     mReviewNegative = reviewNegative;
     mAuthor = author;
@@ -28,6 +32,7 @@ public class Review implements Parcelable {
   }
 
   protected Review(Parcel in) {
+    mReview = in.readString();
     mReviewPositive = in.readString();
     mReviewNegative = in.readString();
     mAuthor = in.readString();
@@ -38,6 +43,7 @@ public class Review implements Parcelable {
 
   @Override
   public void writeToParcel(Parcel dest, int flags) {
+    dest.writeString(mReview);
     dest.writeString(mReviewPositive);
     dest.writeString(mReviewNegative);
     dest.writeString(mAuthor);
@@ -63,6 +69,10 @@ public class Review implements Parcelable {
     }
   };
 
+  public String getReview() {
+    return mReview;
+  }
+
   public String getReviewPositive() {
     return mReviewPositive;
   }
diff --git a/android/src/com/mapswithme/maps/review/ReviewAdapter.java b/android/src/com/mapswithme/maps/review/ReviewAdapter.java
index 920d730d91..130b2ea9f5 100644
--- a/android/src/com/mapswithme/maps/review/ReviewAdapter.java
+++ b/android/src/com/mapswithme/maps/review/ReviewAdapter.java
@@ -117,6 +117,7 @@ class ReviewAdapter extends RecyclerView.Adapter<ReviewAdapter.BaseViewHolder> {
     final TextView mUserName;
     final TextView mCommentDate;
     final TextView mRating;
+    final TextView mReview;
     final View mPositiveReview;
     final TextView mTvPositiveReview;
     final View mNegativeReview;
@@ -128,6 +129,7 @@ class ReviewAdapter extends RecyclerView.Adapter<ReviewAdapter.BaseViewHolder> {
       mUserName = (TextView) itemView.findViewById(R.id.tv__user_name);
       mCommentDate = (TextView) itemView.findViewById(R.id.tv__comment_date);
       mRating = (TextView) itemView.findViewById(R.id.tv__user_rating);
+      mReview = (TextView) itemView.findViewById(R.id.tv__review);
       mPositiveReview = itemView.findViewById(R.id.ll__positive_review);
       mTvPositiveReview = (TextView) itemView.findViewById(R.id.tv__positive_review);
       mNegativeReview = itemView.findViewById(R.id.ll__negative_review);
@@ -154,6 +156,11 @@ class ReviewAdapter extends RecyclerView.Adapter<ReviewAdapter.BaseViewHolder> {
         UiUtils.show(mNegativeReview);
         mTvNegativeReview.setText(item.getReviewNegative());
       }
+      if (UiUtils.isHidden(mNegativeReview) && UiUtils.isHidden(mPositiveReview)) {
+        UiUtils.showIf(!TextUtils.isEmpty(item.getReview()), mReview);
+      } else {
+        UiUtils.hide(mReview);
+      }
     }
   }