Skip to content
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

Add hint label to note text #5440

Merged
merged 3 commits into from
Jan 13, 2024
Merged

Add hint label to note text #5440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8c153b
add english hint label to note text
Helium314 Jan 11, 2024
95846de
use – to separate title and hint
Helium314 Jan 13, 2024
588f438
adjust quotes position and use – instead of for
Helium314 Jan 13, 2024
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
7 changes: 6 additions & 1 deletion app/src/main/java/de/westnordost/streetcomplete/overlays/AbstractOverlayForm.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,12 @@ abstract class AbstractOverlayForm :

protected fun composeNote(element: Element) {
val overlayTitle = englishResources.getString(overlay.title)
val leaveNoteContext = "In context of \"$overlayTitle\" overlay"
val hintLabel = getNameAndLocationLabel(element, englishResources, featureDictionary)
val leaveNoteContext = if (hintLabel.isNullOrBlank()) {
"In context of overlay \"$overlayTitle\""
} else {
"In context of overlay \"$overlayTitle\" – $hintLabel"
}
listener?.onComposeNote(overlay, element, geometry, leaveNoteContext)
}

Expand Down
7 changes: 6 additions & 1 deletion app/src/main/java/de/westnordost/streetcomplete/quests/AbstractOsmQuestForm.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,12 @@ abstract class AbstractOsmQuestForm<T> : AbstractQuestForm(), IsShowingQuestDeta

protected fun composeNote() {
val questTitle = englishResources.getQuestTitle(osmElementQuestType, element.tags)
val leaveNoteContext = "Unable to answer \"$questTitle\""
val hintLabel = getNameAndLocationLabel(element, englishResources, featureDictionary)
val leaveNoteContext = if (hintLabel.isNullOrBlank()) {
"Unable to answer \"$questTitle\""
} else {
"Unable to answer \"$questTitle\" – $hintLabel"
}
listener?.onComposeNote(osmElementQuestType, element, geometry, leaveNoteContext)
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/de/westnordost/streetcomplete/quests/LeaveNoteInsteadFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class LeaveNoteInsteadFragment : AbstractCreateNoteFragment() {
override fun onComposedNote(text: String, imagePaths: List<String>) {
val fullText = mutableListOf<String>()
leaveNoteContext?.let { fullText += it }
fullText += "for https://osm.org/${elementType.name.lowercase()}/$elementId"
fullText += "– https://osm.org/${elementType.name.lowercase()}/$elementId"
fullText += "via ${ApplicationConstants.USER_AGENT}:\n\n$text"

viewLifecycleScope.launch {
Expand Down