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

[android] Review fixes

Browse source
This commit is contained in:
Roman Romanov 2016-10-05 15:04:32 +04:00
parent 4931943b57
commit e666c1dad9
10 changed files with 635 additions and 623 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/res/layout/fragment_gallery.xml
View file

@ -13,5 +13,4 @@
android:paddingRight="@dimen/margin_half"
android:paddingTop="@dimen/margin_half_plus"
tools:listitem="@layout/item_image"/>
</LinearLayout>

1218
android/res/values/strings.xml
View file

File diff suppressed because it is too large Load diff

6
android/src/com/mapswithme/maps/gallery/FullScreenGalleryActivity.java
View file

@ -157,7 +157,9 @@ public class FullScreenGalleryActivity extends BaseMwmFragmentActivity
UiUtils.show(mDate);
}
else
{
UiUtils.hide(mDate);
}
}
private void updateUserAvatar(Image image)
@ -191,8 +193,12 @@ public class FullScreenGalleryActivity extends BaseMwmFragmentActivity
&& UiUtils.isHidden(mSource)
&& UiUtils.isHidden(mDate)
&& UiUtils.isHidden(mAvatar))
{
UiUtils.hide(mUserBlock);
}
else
{
UiUtils.show(mUserBlock);
}
}
}

1
android/src/com/mapswithme/maps/review/Review.java
View file

@ -7,7 +7,6 @@ import android.support.annotation.Nullable;
public class Review implements Parcelable
{
@Nullable
private final String mReview;
@Nullable

7
android/src/com/mapswithme/maps/review/ReviewAdapter.java
View file

@ -157,21 +157,27 @@ class ReviewAdapter extends RecyclerView.Adapter<ReviewAdapter.BaseViewHolder>
mCommentDate.setText(DateFormat.getMediumDateFormat(mCommentDate.getContext()).format(date));
mRating.setText(String.format(Locale.getDefault(), "%.1f", item.getRating()));
if (TextUtils.isEmpty(item.getReviewPositive()))
{
UiUtils.hide(mPositiveReview);
}
else
{
UiUtils.show(mPositiveReview);
mTvPositiveReview.setText(item.getReviewPositive());
}
if (TextUtils.isEmpty(item.getReviewNegative()))
{
UiUtils.hide(mNegativeReview);
}
else
{
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);
@ -181,7 +187,6 @@ class ReviewAdapter extends RecyclerView.Adapter<ReviewAdapter.BaseViewHolder>
private static class MoreHolder extends BaseViewHolder
{
MoreHolder(View itemView, RecyclerClickListener listener)
{
super(itemView, listener);

1
android/src/com/mapswithme/maps/widget/LineCountTextView.java
View file

@ -8,7 +8,6 @@ import android.widget.TextView;
public class LineCountTextView extends TextView
{
public interface OnLineCountCalculatedListener
{

1
android/src/com/mapswithme/maps/widget/StaticGridView.java
View file

@ -6,7 +6,6 @@ import android.widget.GridView;
public class StaticGridView extends GridView
{
public StaticGridView(Context context)
{
super(context);

11
android/src/com/mapswithme/maps/widget/placepage/GalleryAdapter.java
View file

@ -94,7 +94,7 @@ class GalleryAdapter extends RecyclerView.Adapter<GalleryAdapter.ViewHolder>
private void loadImages()
{
int size = mItems.size() > MAX_COUNT ? MAX_COUNT : mItems.size();
int size = Math.min(mItems.size(), MAX_COUNT);
for (int i = 0; i < size; i++)
{
@ -155,14 +155,7 @@ class GalleryAdapter extends RecyclerView.Adapter<GalleryAdapter.ViewHolder>
{
mPosition = position;
mImage.setImageBitmap(item.getBitmap());
if (item.isShowMore())
{
UiUtils.show(mMore);
}
else
{
UiUtils.hide(mMore);
}
UiUtils.showIf(item.isShowMore(), mMore);
}
}

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

@ -543,7 +543,9 @@ public class PlacePageView extends RelativeLayout
private void updateHotelRating(@NonNull SponsoredHotel.HotelInfo info)
{
if (info.mReviews == null || info.mReviews.length == 0)
{
UiUtils.hide(mHotelReview);
}
else
{
UiUtils.show(mHotelReview);
@ -557,7 +559,9 @@ public class PlacePageView extends RelativeLayout
private void updateHotelNearby(@NonNull SponsoredHotel.HotelInfo info)
{
if (info.mNearby == null || info.mNearby.length == 0)
{
UiUtils.hide(mHotelNearby);
}
else
{
UiUtils.show(mHotelNearby);
@ -568,7 +572,9 @@ public class PlacePageView extends RelativeLayout
private void updateHotelGallery(@NonNull SponsoredHotel.HotelInfo info)
{
if (info.mPhotos == null || info.mPhotos.length == 0)
{
UiUtils.hide(mHotelGallery);
}
else
{
UiUtils.show(mHotelGallery);
@ -580,7 +586,9 @@ public class PlacePageView extends RelativeLayout
private void updateHotelFacilities(@NonNull SponsoredHotel.HotelInfo info)
{
if (info.mFacilities == null || info.mFacilities.length == 0)
{
UiUtils.hide(mHotelFacilities);
}
else
{
UiUtils.show(mHotelFacilities);
@ -601,7 +609,7 @@ public class PlacePageView extends RelativeLayout
@Override
public void onLineCountCalculated(boolean grater)
{
mHotelMoreDescription.setVisibility(grater ? VISIBLE : GONE);
UiUtils.showIf(grater, mHotelMoreDescription);
}
@Override

2
android/src/com/mapswithme/maps/widget/placepage/ReviewAdapter.java
View file

@ -27,7 +27,7 @@ class ReviewAdapter extends BaseAdapter
@Override
public int getCount()
{
return mItems.size() > MAX_COUNT ? MAX_COUNT : mItems.size();
return Math.min(mItems.size(), MAX_COUNT);
}
@Override