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

Select bookmark set and refresh bookmark color in PP.

Browse source
This commit is contained in:
Dmitry Yunitsky 2015-02-27 17:44:47 +03:00 • committed by Alex Zolotarev
parent 578cc4695e
commit bcf1992111
2 changed files with 33 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
android/src/com/mapswithme/maps/MWMActivity.java
View file

@ -1633,14 +1633,22 @@ public class MWMActivity extends NvEventQueueActivity
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data)
{
if (requestCode == BookmarkActivity.REQUEST_CODE_EDIT_BOOKMARK && resultCode == RESULT_OK)
if (resultCode == RESULT_OK)
{
final Point bmk = ((ParcelablePoint) data.getParcelableExtra(BookmarkActivity.PIN)).getPoint();
onBookmarkActivated(bmk.x, bmk.y);
if (requestCode == BookmarkActivity.REQUEST_CODE_EDIT_BOOKMARK)
{
final Point bmk = ((ParcelablePoint) data.getParcelableExtra(BookmarkActivity.PIN)).getPoint();
onBookmarkActivated(bmk.x, bmk.y);
}
else if (requestCode == BookmarkActivity.REQUEST_CODE_SET)
{
final Point pin = ((ParcelablePoint) data.getParcelableExtra(BookmarkActivity.PIN)).getPoint();
final Bookmark bookmark = BookmarkManager.INSTANCE.getBookmark(pin.x, pin.y);
mPlacePage.setMapObject(bookmark);
}
super.onActivityResult(requestCode, resultCode, data);
}
super.onActivityResult(requestCode, resultCode, data);
}
@Override

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

@ -30,6 +30,8 @@ import android.widget.TextView;
import com.mapswithme.maps.Framework;
import com.mapswithme.maps.R;
import com.mapswithme.maps.api.ParsedMmwRequest;
import com.mapswithme.maps.bookmarks.BookmarkActivity;
import com.mapswithme.maps.bookmarks.ChooseBookmarkCategoryActivity;
import com.mapswithme.maps.bookmarks.data.Bookmark;
import com.mapswithme.maps.bookmarks.data.BookmarkManager;
import com.mapswithme.maps.bookmarks.data.DistanceAndAzimut;
@ -38,6 +40,7 @@ import com.mapswithme.maps.bookmarks.data.MapObject;
import com.mapswithme.maps.bookmarks.data.MapObject.MapObjectType;
import com.mapswithme.maps.bookmarks.data.MapObject.Poi;
import com.mapswithme.maps.bookmarks.data.Metadata;
import com.mapswithme.maps.bookmarks.data.ParcelablePoint;
import com.mapswithme.maps.location.LocationHelper;
import com.mapswithme.maps.widget.ArrowView;
import com.mapswithme.util.ShareAction;
@ -155,6 +158,7 @@ public class PlacePageView extends LinearLayout implements View.OnClickListener,
mEtBookmarkNotes = (EditText) mPpDetails.findViewById(R.id.et__bookmark_notes);
mEtBookmarkNotes.setOnEditorActionListener(this);
mTvBookmarkGroup = (TextView) mPpDetails.findViewById(R.id.tv__bookmark_group);
mTvBookmarkGroup.setOnClickListener(this);
ViewGroup ppButtons = (ViewGroup) mView.findViewById(R.id.pp__buttons);
mRlApiBack = (RelativeLayout) ppButtons.findViewById(R.id.rl__api_back);
@ -281,6 +285,7 @@ public class PlacePageView extends LinearLayout implements View.OnClickListener,
mEtBookmarkName.setText(bookmark.getName());
mEtBookmarkNotes.setText(bookmark.getBookmarkDescription());
mTvBookmarkGroup.setText(bookmark.getCategoryName(getContext()));
mIvColor.setImageResource(bookmark.getIcon().getSelectedResId());
mIvBookmark.setImageResource(R.drawable.ic_bookmark_on);
}
else
@ -418,7 +423,7 @@ public class PlacePageView extends LinearLayout implements View.OnClickListener,
setMapObject(null);
// FIXME
// mAnimationController.hidePlacePage();
// mAnimationController.hidePlacePage();
}
}
@ -520,11 +525,24 @@ public class PlacePageView extends LinearLayout implements View.OnClickListener,
case R.id.ll__place_schedule:
// TODO expand/collapse schedule if needed
break;
case R.id.tv__bookmark_group:
selectBookmarkSet();
break;
default:
break;
}
}
private void selectBookmarkSet()
{
final Activity activity = (Activity) getContext();
final Bookmark bookmark = (Bookmark) mMapObject;
final Intent intent = new Intent(activity, ChooseBookmarkCategoryActivity.class)
.putExtra(BookmarkActivity.PIN_SET, bookmark.getCategoryId())
.putExtra(BookmarkActivity.PIN, new ParcelablePoint(bookmark.getCategoryId(), bookmark.getBookmarkId()));
activity.startActivityForResult(intent, BookmarkActivity.REQUEST_CODE_SET);
}
private void selectBookmarkColor()
{
final Bundle args = new Bundle();