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

[android][booking] fix: Review fixes.

Browse source
This commit is contained in:
Alexander Marchuk 2016-05-31 16:27:42 +03:00
parent 8bfe925750
commit ee3d63d54b
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/src/com/mapswithme/maps/downloader/MigrationFragment.java
View file

@ -68,7 +68,7 @@ public class MigrationFragment extends BaseMwmFragment
return;
if (getActivity() instanceof MwmActivity)
((MwmActivity)getActivity()).closeSidePanel();
((MwmActivity) getActivity()).closeSidePanel();
else
getActivity().finish();
}

16
android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java
View file

@ -1,3 +1,4 @@
package com.mapswithme.maps.widget.placepage;
import android.support.annotation.DrawableRes;
@ -196,27 +197,26 @@ final class PlacePageButtons
bs.tint().show();
}
private View createButton(final List<Item> items, int id)
private View createButton(final List<Item> items, final Item current)
{
final Item item = items.get(id);
View res = LayoutInflater.from(mPlacePage.getContext()).inflate(R.layout.place_page_button, mFrame, false);
ImageView icon = (ImageView) res.findViewById(R.id.icon);
TextView title = (TextView) res.findViewById(R.id.title);
icon.setImageResource(item.getIcon());
title.setText(item.getTitle());
mItemListener.onPrepareVisibleView(item, res, icon, title);
icon.setImageResource(current.getIcon());
title.setText(current.getTitle());
mItemListener.onPrepareVisibleView(current, res, icon, title);
res.setOnClickListener(new View.OnClickListener()
{
@Override
public void onClick(View v)
{
if (item == Item.MORE)
if (current == Item.MORE)
showPopup(items);
else
mItemListener.onItemClick(item);
mItemListener.onItemClick(current);
}
});
@ -233,7 +233,7 @@ final class PlacePageButtons
mFrame.removeAllViews();
int count = Math.min(buttons.size(), MAX_BUTTONS);
for (int i = 0; i < count; i++)
mFrame.addView(createButton(buttons, i));
mFrame.addView(createButton(buttons, buttons.get(i)));
mPrevItems = buttons;
}

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

@ -362,7 +362,8 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
request.setPointData(mMapObject.getLat(), mMapObject.getLon(), mMapObject.getTitle(), "");
request.sendResponseAndFinish(getActivity(), true);
} else
}
else
getActivity().finish();
break;