From 8493ed369aa325fe8fe5a61b9bd2e2da407f8192 Mon Sep 17 00:00:00 2001 From: Andrei Shkrob Date: Sun, 20 Jul 2025 19:41:14 +0200 Subject: [PATCH] [android] Fix collor selector issue Signed-off-by: Andrei Shkrob --- .../widget/placepage/BookmarkColorDialogFragment.java | 4 ++-- .../organicmaps/widget/placepage/EditBookmarkFragment.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java index 87310f7c8..15a1449d5 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java @@ -60,9 +60,9 @@ public class BookmarkColorDialogFragment extends BaseMwmDialogFragment final GridView gView = (GridView) LayoutInflater.from(requireActivity()).inflate(R.layout.fragment_color_grid, null); gView.setAdapter(adapter); - gView.setOnItemClickListener((parent, view, predefinedColor, id) -> { + gView.setOnItemClickListener((parent, view, pos, id) -> { if (mColorSetListener != null) - mColorSetListener.onBookmarkColorSet(predefinedColor); + mColorSetListener.onBookmarkColorSet(adapter.getItem(pos)); dismiss(); }); diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java index ec586ffaf..a63fbc72a 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java @@ -318,7 +318,7 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View. { case TYPE_BOOKMARK -> dialogFragment.setOnColorSetListener(colorPos -> { - if (mIcon != null & mIcon.getColor() == colorPos) + if (mIcon != null && mIcon.getColor() == colorPos) return; mIcon = new Icon(colorPos);