From e8ef05d17a4510611dfb9aa370681f8181814b44 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?= Date: Tue, 17 Oct 2017 12:11:17 +0300 Subject: [PATCH] [android] Refactored UGCController a little bit --- android/src/com/mapswithme/maps/ugc/UGCController.java | 9 +++------ .../com/mapswithme/maps/ugc/UGCRatingRecordsAdapter.java | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/android/src/com/mapswithme/maps/ugc/UGCController.java b/android/src/com/mapswithme/maps/ugc/UGCController.java index cafa6a8378..5a5d4d8579 100644 --- a/android/src/com/mapswithme/maps/ugc/UGCController.java +++ b/android/src/com/mapswithme/maps/ugc/UGCController.java @@ -84,8 +84,6 @@ public class UGCController implements View.OnClickListener, UGC.UGCListener @Nullable private MapObject mMapObject; - @Nullable - private UGC mUgc; public UGCController(@NonNull final PlacePageView placePage) { @@ -203,8 +201,7 @@ public class UGCController implements View.OnClickListener, UGC.UGCListener UiUtils.showIf(canUserRate(ugcUpdate), mLeaveReviewButton, mUgcAddRatingView); UiUtils.showIf(ugc != null, mSummaryRootView, mUgcMoreReviews); RatingView ratingView = (RatingView) mPreviewUgcInfoView.findViewById(R.id.rating_view); - mUgc = ugc; - if (mUgc == null) + if (ugc == null) { mReviewCount.setText(ugcUpdate != null ? R.string.placepage_reviewed : R.string.placepage_no_reviews); ratingView.setRating(ugcUpdate == null ? Impress.NONE : Impress.COMING_SOON, rating); @@ -214,9 +211,9 @@ public class UGCController implements View.OnClickListener, UGC.UGCListener Context context = mPlacePage.getContext(); mReviewCount.setText(context.getString(R.string.placepage_summary_rating_description, - String.valueOf(mUgc.getBasedOnCount()))); + String.valueOf(ugc.getBasedOnCount()))); ratingView.setRating(Impress.values()[impress], rating); - setSummaryViews(mUgc, impress, rating); + setSummaryViews(ugc, impress, rating); setUserReviewAndRatingsView(ugcUpdate); List reviews = ugc.getReviews(); if (reviews != null) diff --git a/android/src/com/mapswithme/maps/ugc/UGCRatingRecordsAdapter.java b/android/src/com/mapswithme/maps/ugc/UGCRatingRecordsAdapter.java index fbad115d37..1c117e8eed 100644 --- a/android/src/com/mapswithme/maps/ugc/UGCRatingRecordsAdapter.java +++ b/android/src/com/mapswithme/maps/ugc/UGCRatingRecordsAdapter.java @@ -13,7 +13,7 @@ import com.mapswithme.maps.R; import java.util.ArrayList; import java.util.List; -public class UGCRatingRecordsAdapter extends RecyclerView.Adapter +class UGCRatingRecordsAdapter extends RecyclerView.Adapter { @NonNull private ArrayList mItems = new ArrayList<>();