Skip to content

Code Enhancement (Explore Map) #6293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Apr 21, 2025
Merged

Code Enhancement (Explore Map) #6293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3c0e148
Exclude past locations (P585) from Nearby query
khushbuk0711 Apr 13, 2025
210e58a
Merge branch 'main' into main
khushbuk0711 Apr 13, 2025
7bb63a6
Merge branch 'commons-app:main' into main
khushbuk0711 Apr 14, 2025
cd952d4
"Send" button text should be white
khushbuk0711 Apr 14, 2025
6d7e006
Merge remote-tracking branch 'origin/main'
khushbuk0711 Apr 19, 2025
2cbda3a
Merge remote-tracking branch 'origin/main'
khushbuk0711 Apr 19, 2025
a6f499a
Custom picker: logic
khushbuk0711 Apr 19, 2025
abf1c76
Revert back changes
khushbuk0711 Apr 20, 2025
efdff5e
Enhancement :- Explore Map information
khushbuk0711 Apr 21, 2025
1b67b86
Enhancement :- Explore Map information
khushbuk0711 Apr 21, 2025
b8b9359
Style
nicolas-raoul Apr 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,12 +348,12 @@ class ImageAdapter(
scope.launch(ioDispatcher) {
val imageSHA1 = imageLoader.getSHA1(image, defaultDispatcher)
withContext(Dispatchers.Main) {
if (holder.isItemUploaded()) {
Toast.makeText(context, R.string.custom_selector_already_uploaded_image_text, Toast.LENGTH_SHORT).show()
if (holder.isItemUploaded()) {
Toast.makeText(context, R.string.custom_selector_already_uploaded_image_text, Toast.LENGTH_SHORT).show()
return@withContext
}

if (imageSHA1.isNotEmpty() && imageLoader.getFromUploaded(imageSHA1) != null) {
if (imageSHA1.isNotEmpty() && imageLoader.getFromUploaded(imageSHA1) != null) {
holder.itemUploaded()
Toast.makeText(context, R.string.custom_selector_already_uploaded_image_text, Toast.LENGTH_SHORT).show()
return@withContext
Expand All @@ -369,7 +369,7 @@ class ImageAdapter(
selectedImages.add(image)
notifyItemChanged(position, ImageSelectedOrUpdated())

imageSelectListener.onSelectedImagesChanged(selectedImages, numberOfSelectedImagesMarkedAsNotForUpload)
imageSelectListener.onSelectedImagesChanged(selectedImages, numberOfSelectedImagesMarkedAsNotForUpload)
}
}
}
Expand Down
16 changes: 14 additions & 2 deletions app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,8 +717,20 @@ private void addMarkerToMap(BaseMarker nearbyBaseMarker) {
authorUser = Html.fromHtml(authorUser, Html.FROM_HTML_MODE_LEGACY).toString();
}

OverlayItem item = new OverlayItem(nearbyBaseMarker.getPlace().name,
authorUser, point);
String title = nearbyBaseMarker.getPlace().name;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does getPlace() have something like .caption or .label? That would be better, though that can be split to a different issue.

Copy link
Contributor Author

@khushbuk0711 khushbuk0711 Apr 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getLabel() is causing some issue and there is nothing like .caption

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What issue exactly?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The app is getting crashed

// Remove "File:" if present at start
if (title.startsWith("File:")) {
title = title.substring(5);
}
// Remove extensions like .jpg, .jpeg, .png, .svg (case insensitive)
title = title.replaceAll("(?i)\\.(jpg|jpeg|png|svg)$", "");
title = title.replace("_", " ");
//Truncate if too long because it doesn't fit the screen
if (title.length() > 43) {
title = title.substring(0, 40) + "…";
}

OverlayItem item = new OverlayItem(title, authorUser, point);
item.setMarker(d);
items.add(item);
ItemizedOverlayWithFocus overlay = new ItemizedOverlayWithFocus(items,
Expand Down