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

[android] Retain bookmark color/category edits across screen rotations

Browse source 
Resolves #2419

Signed-off-by: savsch <119003089+savsch@users.noreply.github.com>
This commit is contained in:
Tanmay Gupta 2025-02-15 18:33:06 +05:30 • committed by Konstantin Pastbin
parent 04eb9642bb
commit 9240602fa5
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
View file

@ -43,6 +43,9 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
public static final String EXTRA_CATEGORY_ID = "CategoryId";
public static final String EXTRA_ID = "BookmarkTrackId";
public static final String EXTRA_BOOKMARK_TYPE = "BookmarkType";
public static final String STATE_ICON = "icon";
public static final String STATE_BOOKMARK_CATEGORY = "bookmark_category";
public static final String STATE_COLOR = "color";
public static final int TYPE_BOOKMARK = 1;
public static final int TYPE_TRACK = 2;
@ -142,8 +145,13 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
mIvColor.setOnClickListener(this);
//For tracks an bookmarks same category is used so this portion is common for both
long categoryId = args.getLong(EXTRA_CATEGORY_ID);
mBookmarkCategory = BookmarkManager.INSTANCE.getCategoryById(categoryId);
if (savedInstanceState != null && savedInstanceState.getParcelable(STATE_BOOKMARK_CATEGORY) != null)
mBookmarkCategory = savedInstanceState.getParcelable(STATE_BOOKMARK_CATEGORY);
else
{
long categoryId = args.getLong(EXTRA_CATEGORY_ID);
mBookmarkCategory = BookmarkManager.INSTANCE.getCategoryById(categoryId);
}
long id = args.getLong(EXTRA_ID);
switch (mType)
@ -151,7 +159,9 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
case TYPE_BOOKMARK ->
{
mBookmark = BookmarkManager.INSTANCE.getBookmarkInfo(id);
if (mBookmark != null)
if (savedInstanceState != null && savedInstanceState.getParcelable(STATE_ICON) != null)
mIcon = savedInstanceState.getParcelable(STATE_ICON);
else if (mBookmark != null)
mIcon = mBookmark.getIcon();
refreshBookmark();
}
@ -159,6 +169,8 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
{
mTrack = BookmarkManager.INSTANCE.getTrack(id);
mColor = mTrack.getColor();
if (savedInstanceState != null)
mColor = savedInstanceState.getInt(STATE_COLOR, mColor);
refreshTrack();
}
}
@ -240,6 +252,15 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
dismiss();
}
@Override
public void onSaveInstanceState(@NonNull Bundle outState)
{
super.onSaveInstanceState(outState);
outState.putParcelable(STATE_ICON, mIcon);
outState.putParcelable(STATE_BOOKMARK_CATEGORY, mBookmarkCategory);
outState.putInt(STATE_COLOR, mColor);
}
@Override
public void onClick(View v)
{