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

[android] Fixed review notes( https://github.com/mapsme/omim/pull/9640#discussion_r224001590

Browse source
This commit is contained in:
Dmitry Donskoy 2018-10-11 11:25:12 +03:00 • committed by Daria Volvenkova
parent f0ec763516
commit b2975c3f14
1 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -537,7 +537,7 @@ public class PlacePageView extends RelativeLayout
case BOOKMARK:
mBookmarkButtonIcon = icon;
mBookmarkButtonFrame = frame;
updateBookmarkBtn();
updateBookmarkButton();
color = ThemeUtils.getColor(getContext(), R.attr.iconTint);
break;
@ -685,18 +685,6 @@ public class PlacePageView extends RelativeLayout
Viator.setViatorListener(this);
}
private void updateCatalogBookmarkButton()
{
boolean isEditable = isEditableMapObject();
mBookmarkButtonFrame.setEnabled(isEditable);
if (isEditable)
return;
final int resId = PlacePageButtons.Item.BOOKMARK.getIcon().getDisabledStateResId();
Drawable drawable = Graphics.tint(getContext(), resId, R.attr.iconTintDisabled);
mBookmarkButtonIcon.setImageDrawable(drawable);
}
private void initEditMapObjectBtn()
{
boolean isEditSupported = isEditableMapObject();
@ -1354,7 +1342,7 @@ public class PlacePageView extends RelativeLayout
case MapObject.BOOKMARK:
refreshDistanceToObject(mapObject, loc);
showBookmarkDetails(mapObject);
updateBookmarkBtn();
updateBookmarkButton();
setButtons(mapObject, false, true);
break;
case MapObject.POI:
@ -1634,7 +1622,7 @@ public class PlacePageView extends RelativeLayout
mTodayOpeningHours.setTextColor(color);
}
private void updateBookmarkBtn()
private void updateBookmarkButton()
{
if (mBookmarkButtonIcon == null || mBookmarkButtonFrame == null)
return;
@ -1643,14 +1631,22 @@ public class PlacePageView extends RelativeLayout
mBookmarkButtonIcon.setImageResource(R.drawable.ic_bookmarks_on);
else
mBookmarkButtonIcon.setImageDrawable(Graphics.tint(getContext(), R.drawable.ic_bookmarks_off, R.attr.iconTint));
updateCatalogBookmarkButton();
boolean isEditable = isEditableMapObject();
mBookmarkButtonFrame.setEnabled(isEditable);
if (isEditable)
return;
final int resId = PlacePageButtons.Item.BOOKMARK.getIcon().getDisabledStateResId();
Drawable drawable = Graphics.tint(getContext(), resId, R.attr.iconTintDisabled);
mBookmarkButtonIcon.setImageDrawable(drawable);
}
private void hideBookmarkDetails()
{
mBookmarkSet = false;
UiUtils.hide(mBookmarkFrame);
updateBookmarkBtn();
updateBookmarkButton();
}
private void showBookmarkDetails(@NonNull MapObject mapObject)