organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

Open edit bookmark fragment on long press save button

Browse source 
Signed-off-by: Kiryl Razhdzestvenski <kirill.rozh@gmail.com>
This commit is contained in:
Kiryl Razhdzestvenski 2024-05-14 18:49:17 +03:00
parent f072762075
commit 2092d56f23
4 changed files with 136 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
android/app/src/main/cpp/app/organicmaps/bookmarks/data/BookmarkManager.cpp
View file

@ -400,6 +400,15 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeAddBookmark(
return AddBookmark(env, lat, lon, categoryId);
}
JNIEXPORT jstring JNICALL
Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetNewBookmarkName(
JNIEnv * env, jobject)
{
place_page::Info const & info = g_framework->GetPlacePageInfo();
std::string newName = GetPreferredBookmarkStr(info.FormatNewBookmarkName());
return jni::ToJavaString(env,newName);
}
JNIEXPORT jlong JNICALL
Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetLastEditedCategory(
JNIEnv *, jobject)

22
android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkManager.java
View file

@ -145,6 +145,18 @@ public enum BookmarkManager
return nativeAddBookmark(lat, lon, cotegoryId);
}
@Nullable
public long getLastEditedCategory()
{
return nativeGetLastEditedCategory();
}
@Nullable
public String getNewBookmarkName()
{
return nativeGetNewBookmarkName();
}
public void addLoadingListener(@NonNull BookmarksLoadingListener listener)
{
mListeners.add(listener);
@ -418,6 +430,10 @@ public enum BookmarkManager
@Icon.PredefinedColor
public int getLastEditedColor() { return nativeGetLastEditedColor(); }
public Icon getIconByColor(int colorId) {
return ICONS.stream().filter(icon -> icon.getColor()==colorId).findFirst().orElse(null);
}
@MainThread
public void loadBookmarksFile(@NonNull String path, boolean isTemporaryFile)
{
@ -825,6 +841,12 @@ public enum BookmarkManager
@Nullable
private native Bookmark nativeAddBookmark(double lat, double lon, long catedoryId);
@Nullable
private native String nativeGetNewBookmarkName();
@Nullable
private native long nativeGetLastEditedCategory();
@Icon.PredefinedColor
private native int nativeGetLastEditedColor();

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

@ -25,6 +25,7 @@ import app.organicmaps.R;
import app.organicmaps.base.BaseMwmDialogFragment;
import app.organicmaps.bookmarks.ChooseBookmarkCategoryFragment;
import app.organicmaps.bookmarks.ChooseBookmarkCategoryFragment.Listener;
import app.organicmaps.bookmarks.data.Bookmark;
import app.organicmaps.bookmarks.data.BookmarkCategory;
import app.organicmaps.bookmarks.data.BookmarkInfo;
import app.organicmaps.bookmarks.data.BookmarkManager;
@ -41,7 +42,8 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
{
public static final String EXTRA_CATEGORY_ID = "CategoryId";
public static final String EXTRA_BOOKMARK_ID = "BookmarkId";
public static final String EXTRA_BOOKMARK_LAT = "BookmarkLat";
public static final String EXTRA_BOOKMARK_LON = "BookmarkLon";
private TextInputEditText mEtDescription;
private TextInputEditText mEtName;
@NonNull
@ -68,6 +70,23 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
final Bundle args = new Bundle();
args.putLong(EXTRA_CATEGORY_ID, categoryId);
args.putLong(EXTRA_BOOKMARK_ID, bookmarkId);
showView(args, context, manager, listener);
}
public static void createBookmark(double lat, double lon, @NonNull Context context,
@NonNull FragmentManager manager,
@Nullable EditBookmarkListener listener)
{
final Bundle args = new Bundle();
args.putDouble(EXTRA_BOOKMARK_LAT, lat);
args.putDouble(EXTRA_BOOKMARK_LON, lon);
showView(args, context, manager, listener);
}
public static void showView(Bundle args, @NonNull Context context,
@NonNull FragmentManager manager,
@Nullable EditBookmarkListener listener)
{
String name = EditBookmarkFragment.class.getName();
final FragmentFactory factory = manager.getFragmentFactory();
final EditBookmarkFragment fragment = (EditBookmarkFragment) factory.instantiate(context.getClassLoader(), name);
@ -91,16 +110,8 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
return inflater.inflate(R.layout.fragment_edit_bookmark, container, false);
}
@Override
public void onViewCreated(@NonNull View view, Bundle savedInstanceState)
private void InitViewElements(@NonNull View view)
{
final Bundle args = getArguments();
long categoryId = args.getLong(EXTRA_CATEGORY_ID);
mBookmarkCategory = BookmarkManager.INSTANCE.getCategoryById(categoryId);
long bookmarkId = args.getLong(EXTRA_BOOKMARK_ID);
mBookmark = BookmarkManager.INSTANCE.getBookmarkInfo(bookmarkId);
if (mBookmark != null)
mIcon = mBookmark.getIcon();
mEtName = view.findViewById(R.id.et__bookmark_name);
clearNameBtn = view.findViewById(R.id.edit_bookmark_name_input);
clearNameBtn.setEndIconOnClickListener(v -> clearAndFocus(mEtName));
@ -123,6 +134,36 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
mTvBookmarkGroup.setOnClickListener(this);
mIvColor = view.findViewById(R.id.iv__bookmark_color);
mIvColor.setOnClickListener(this);
if (mBookmark == null) {
int lastUsedColor = BookmarkManager.INSTANCE.getLastEditedColor();
mIcon = BookmarkManager.INSTANCE.getIconByColor(lastUsedColor);
}
else {
mIcon = mBookmark.getIcon();
}
}
@Override
public void onViewCreated(@NonNull View view, Bundle savedInstanceState)
{
final Bundle args = getArguments();
long categoryId = -1;
if (args.containsKey(EXTRA_CATEGORY_ID))
categoryId = args.getLong(EXTRA_CATEGORY_ID);
else
categoryId = BookmarkManager.INSTANCE.getLastEditedCategory();
mBookmarkCategory = BookmarkManager.INSTANCE.getCategoryById(categoryId);
if (args.containsKey(EXTRA_BOOKMARK_ID))
{
long bookmarkId = args.getLong(EXTRA_BOOKMARK_ID);
mBookmark = BookmarkManager.INSTANCE.getBookmarkInfo(bookmarkId);
}
InitViewElements(view);
refreshBookmark();
initToolbar(view);
}
@ -158,6 +199,14 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
}
private void saveBookmark()
{
if (mBookmark == null)
createBookmark();
else
updateBookmark();
}
private void updateBookmark()
{
if (mBookmark == null)
{
@ -168,13 +217,30 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
if (movedFromCategory)
BookmarkManager.INSTANCE.notifyCategoryChanging(mBookmark, mBookmarkCategory.getId());
BookmarkManager.INSTANCE.notifyParametersUpdating(mBookmark, mEtName.getText().toString(),
mIcon, mEtDescription.getText().toString());
mIcon, mEtDescription.getText().toString());
if (mListener != null)
mListener.onBookmarkSaved(mBookmark.getBookmarkId(), movedFromCategory);
dismiss();
}
private void createBookmark()
{
if (mBookmarkCategory == null)
return;
final Bundle args = getArguments();
double lat = args.getDouble(EXTRA_BOOKMARK_LAT);
double lon = args.getDouble(EXTRA_BOOKMARK_LON);
Bookmark bookmark = BookmarkManager.INSTANCE.addNewBookmark(lat,lon,mBookmarkCategory.getId());
BookmarkManager.INSTANCE.setBookmarkParams(bookmark.getBookmarkId(), mEtName.getText().toString(), mIcon.getColor(), mEtDescription.getText().toString());
if (mListener != null)
mListener.onBookmarkSaved(bookmark.getBookmarkId(), false);
dismiss();
}
@Override
public void onClick(View v)
{
@ -187,9 +253,6 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
private void selectBookmarkSet()
{
if (mBookmark == null)
return;
final Bundle args = new Bundle();
final List<BookmarkCategory> categories = BookmarkManager.INSTANCE.getCategories();
final int index = categories.indexOf(mBookmarkCategory);
@ -253,16 +316,22 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
private void refreshBookmark()
{
if (mBookmark == null)
return;
if (TextUtils.isEmpty(mEtName.getText()))
mEtName.setText(mBookmark.getName());
if (TextUtils.isEmpty(mEtDescription.getText()))
{
mEtDescription.setText(
BookmarkManager.INSTANCE.getBookmarkDescription(mBookmark.getBookmarkId()));
if (TextUtils.isEmpty(mEtName.getText()))
mEtName.setText(BookmarkManager.INSTANCE.getNewBookmarkName());
}
else
{
if (TextUtils.isEmpty(mEtName.getText()))
mEtName.setText(mBookmark.getName());
if (TextUtils.isEmpty(mEtDescription.getText()))
{
mEtDescription.setText(
BookmarkManager.INSTANCE.getBookmarkDescription(mBookmark.getBookmarkId()));
}
}
refreshCategory();
refreshColorMarker();
}

15
android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
View file

@ -37,6 +37,8 @@ import app.organicmaps.util.UiUtils;
import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
import app.organicmaps.util.bottomsheet.MenuBottomSheetItem;
import app.organicmaps.util.log.Logger;
import app.organicmaps.widget.placepage.sections.PlacePageBookmarkFragment;
import com.google.android.material.bottomsheet.BottomSheetBehavior;
import java.util.ArrayList;
@ -47,6 +49,7 @@ public class PlacePageController extends Fragment implements
PlacePageButtons.PlacePageButtonClickListener,
PlacePageButtons.PlacePageButtonLongClickListener,
MenuBottomSheetFragment.MenuBottomSheetInterface,
EditBookmarkFragment.EditBookmarkListener,
Observer<MapObject>
{
private static final String TAG = PlacePageController.class.getSimpleName();
@ -400,7 +403,11 @@ public class PlacePageController extends Fragment implements
private void onBookmarkBtnLongClicked()
{
final FragmentActivity activity = requireActivity();
EditBookmarkFragment.createBookmark(mMapObject.getLat(), mMapObject.getLon(),
activity,
activity.getSupportFragmentManager(),
this);
}
private void onBackBtnClicked()
@ -637,6 +644,12 @@ public class PlacePageController extends Fragment implements
mViewModel.getMapObject().removeObserver(this);
mViewModel.getPlacePageDistanceToTop().removeObserver(mPlacePageDistanceToTopObserver);
}
@Override
public void onBookmarkSaved(long bookmarkId, boolean movedFromCategory) {
}
public interface PlacePageRouteSettingsListener
{
void onPlacePageRequestToggleRouteSettings(@NonNull RoadType roadType);