diff options
author | Roman Romanov <rromanov@65gb.net> | 2016-10-21 07:30:16 +0300 |
---|---|---|
committer | Arsentiy Milchakov <milcars@mapswithme.com> | 2016-10-21 20:34:02 +0300 |
commit | c2feaa3387e53b56a38a0637194ab40d0bea3775 (patch) | |
tree | 7d9fd5fb96039bdeb3846ffa27d8844e7f893f59 | |
parent | 7353397a4fa41e3a62fc543668b870fa5120db26 (diff) |
[android] Review fixes
-rw-r--r-- | android/res/drawable-hdpi/ic_opentable.png (renamed from android/res/drawable-hdpi/img_logo_opentable.png) | bin | 720 -> 720 bytes | |||
-rw-r--r-- | android/res/drawable-mdpi/ic_opentable.png (renamed from android/res/drawable-mdpi/img_logo_opentable.png) | bin | 477 -> 477 bytes | |||
-rw-r--r-- | android/res/drawable-xhdpi/ic_opentable.png (renamed from android/res/drawable-xhdpi/img_logo_opentable.png) | bin | 1080 -> 1080 bytes | |||
-rw-r--r-- | android/res/drawable-xxhdpi/ic_opentable.png (renamed from android/res/drawable-xxhdpi/img_logo_opentable.png) | bin | 1832 -> 1832 bytes | |||
-rw-r--r-- | android/res/drawable-xxxhdpi/ic_opentable.png (renamed from android/res/drawable-xxxhdpi/img_logo_opentable.png) | bin | 2695 -> 2695 bytes | |||
-rw-r--r-- | android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java | 2 | ||||
-rw-r--r-- | android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java | 27 |
7 files changed, 15 insertions, 14 deletions
diff --git a/android/res/drawable-hdpi/img_logo_opentable.png b/android/res/drawable-hdpi/ic_opentable.png Binary files differindex fff32a337c..fff32a337c 100644 --- a/android/res/drawable-hdpi/img_logo_opentable.png +++ b/android/res/drawable-hdpi/ic_opentable.png diff --git a/android/res/drawable-mdpi/img_logo_opentable.png b/android/res/drawable-mdpi/ic_opentable.png Binary files differindex ae53c7be0c..ae53c7be0c 100644 --- a/android/res/drawable-mdpi/img_logo_opentable.png +++ b/android/res/drawable-mdpi/ic_opentable.png diff --git a/android/res/drawable-xhdpi/img_logo_opentable.png b/android/res/drawable-xhdpi/ic_opentable.png Binary files differindex 1d7641a1ef..1d7641a1ef 100644 --- a/android/res/drawable-xhdpi/img_logo_opentable.png +++ b/android/res/drawable-xhdpi/ic_opentable.png diff --git a/android/res/drawable-xxhdpi/img_logo_opentable.png b/android/res/drawable-xxhdpi/ic_opentable.png Binary files differindex 2d8fbad633..2d8fbad633 100644 --- a/android/res/drawable-xxhdpi/img_logo_opentable.png +++ b/android/res/drawable-xxhdpi/ic_opentable.png diff --git a/android/res/drawable-xxxhdpi/img_logo_opentable.png b/android/res/drawable-xxxhdpi/ic_opentable.png Binary files differindex 1b1de05206..1b1de05206 100644 --- a/android/res/drawable-xxxhdpi/img_logo_opentable.png +++ b/android/res/drawable-xxxhdpi/ic_opentable.png diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java index 6e3575db51..c9e1335ce4 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java @@ -58,7 +58,7 @@ final class PlacePageButtons @Override int getIcon() { - return R.drawable.img_logo_opentable; + return R.drawable.ic_opentable; } }, diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java index 0d4380230d..bb99e1d3cf 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java @@ -110,9 +110,9 @@ public class PlacePageView extends RelativeLayout private ArrowView mAvDirection; private TextView mTvDistance; private TextView mTvAddress; - private View mHotelInfo; - private TextView mTvHotelRating; - private TextView mTvHotelPrice; + private View mSponsoredInfo; + private TextView mTvSponsoredRating; + private TextView mTvSponsoredPrice; // Details. private ScrollView mDetails; private View mPhone; @@ -265,9 +265,9 @@ public class PlacePageView extends RelativeLayout mTvAddress = (TextView) mPreview.findViewById(R.id.tv__address); - mHotelInfo = mPreview.findViewById(R.id.hotel_info_frame); - mTvHotelRating = (TextView) mHotelInfo.findViewById(R.id.tv__hotel_rating); - mTvHotelPrice = (TextView) mHotelInfo.findViewById(R.id.tv__hotel_price); + mSponsoredInfo = mPreview.findViewById(R.id.hotel_info_frame); + mTvSponsoredRating = (TextView) mSponsoredInfo.findViewById(R.id.tv__hotel_rating); + mTvSponsoredPrice = (TextView) mSponsoredInfo.findViewById(R.id.tv__hotel_price); mDetails = (ScrollView) findViewById(R.id.pp__details); RelativeLayout address = (RelativeLayout) mDetails.findViewById(R.id.ll__place_name); @@ -410,7 +410,7 @@ public class PlacePageView extends RelativeLayout case BOOKING: case OPENTABLE: - onBookingClick(true /* book */); + onSponsoredClick(true /* book */); break; } } @@ -639,7 +639,7 @@ public class PlacePageView extends RelativeLayout // TODO go to selected object on map } - private void onBookingClick(final boolean book) + private void onSponsoredClick(final boolean book) { // TODO (trashkalmar): Set correct text Utils.checkConnection(getActivity(), R.string.common_check_internet_connection_dialog, new Utils.Proc<Boolean>() @@ -685,7 +685,8 @@ public class PlacePageView extends RelativeLayout try { followUrl(book ? info.mUrl : info.mUrlDescription); - } catch (ActivityNotFoundException e) + } + catch (ActivityNotFoundException e) { AlohaHelper.logException(e); } @@ -878,11 +879,11 @@ public class PlacePageView extends RelativeLayout UiUtils.setTextAndHideIfEmpty(mTvAddress, mMapObject.getAddress()); boolean sponsored = (mSponsored != null); - UiUtils.showIf(sponsored, mHotelInfo); + UiUtils.showIf(sponsored, mSponsoredInfo); if (sponsored) { - mTvHotelRating.setText(mSponsored.mRating); - UiUtils.setTextAndHideIfEmpty(mTvHotelPrice, mSponsoredPrice); + UiUtils.setTextAndHideIfEmpty(mTvSponsoredRating, mSponsored.mRating); + UiUtils.setTextAndHideIfEmpty(mTvSponsoredPrice, mSponsoredPrice); } } @@ -1176,7 +1177,7 @@ public class PlacePageView extends RelativeLayout addPlace(); break; case R.id.ll__more: - onBookingClick(false /* book */); + onSponsoredClick(false /* book */); break; case R.id.ll__place_latlon: mIsLatLonDms = !mIsLatLonDms; |