pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[andorid] Fixed rules for showing ugc view for different POI

Browse source
This commit is contained in:
Александр Зацепин 2017-10-19 13:28:44 +03:00 • committed by r.kuznetsov
parent e2e3480051
commit 465316b7e8
2 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
android/src/com/mapswithme/maps/ugc/UGCController.java
View file

@ -146,6 +146,7 @@ public class UGCController implements View.OnClickListener, UGC.UGCListener
public void clear()
{
UiUtils.hide(mUgcRootView, mLeaveReviewButton, mPreviewUgcInfoView);
mUGCReviewAdapter.setItems(new ArrayList<UGC.Review>());
mUGCRatingRecordsAdapter.setItems(new ArrayList<UGC.Rating>());
mUGCUserRatingRecordsAdapter.setItems(new ArrayList<UGC.Rating>());
@ -179,16 +180,11 @@ public class UGCController implements View.OnClickListener, UGC.UGCListener
public void getUGC(@NonNull MapObject mapObject)
{
if (!mapObject.shouldShowUGC())
return;
mMapObject = mapObject;
if (mapObject.shouldShowUGC())
{
UiUtils.show(mUgcRootView);
UGC.requestUGC(mMapObject.getFeatureId());
}
else
{
UiUtils.hide(mUgcRootView);
}
UGC.requestUGC(mMapObject.getFeatureId());
}
public boolean isLeaveReviewButtonTouched(@NonNull MotionEvent event)
@ -200,6 +196,7 @@ public class UGCController implements View.OnClickListener, UGC.UGCListener
public void onUGCReceived(@Nullable UGC ugc, @Nullable UGCUpdate ugcUpdate, @UGC.Impress int impress,
@NonNull String rating)
{
UiUtils.show(mUgcRootView);
UiUtils.showIf(ugc != null || canUserRate(ugcUpdate) || ugcUpdate != null, mPreviewUgcInfoView);
UiUtils.showIf(canUserRate(ugcUpdate), mLeaveReviewButton, mUgcAddRatingView);
UiUtils.showIf(ugc != null, mSummaryRootView, mUgcMoreReviews);

3
android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
View file

@ -1481,8 +1481,7 @@ public class PlacePageView extends RelativeLayout
mTvSponsoredPrice.setText(mSponsoredPrice);
UiUtils.showIf(!isPriceEmpty, mTvSponsoredPrice);
UiUtils.showIf((!isRatingEmpty || !isPriceEmpty) &&
mSponsored.getType() != Sponsored.TYPE_THOR &&
mSponsored.getType() != Sponsored.TYPE_HALLOWEEN, mPreviewRatingInfo);
mSponsored.getType() == Sponsored.TYPE_BOOKING, mPreviewRatingInfo);
}
}