From bacbfdbec8e62e2a3696ba9650234f5d3425dc58 Mon Sep 17 00:00:00 2001
From: Kai Michael Poppe <kai.michael.poppe@gmail.com>
Date: Tue, 10 Sep 2024 10:43:20 +0200
Subject: [PATCH 01/11] Display object note in hint - v1

If it exists, the `note` tag for an object is shown in the QuestHint.
---
 .../quests/existence/CheckExistenceForm.kt          | 13 +++++++++++++
 .../quests/opening_hours/AddOpeningHoursForm.kt     |  4 ++++
 .../quests/place_name/AddPlaceNameForm.kt           | 12 ++++++++++++
 .../AddPostboxCollectionTimesForm.kt                |  4 ++++
 .../quests/postbox_ref/AddPostboxRefForm.kt         |  8 ++++++++
 .../streetcomplete/quests/shop_type/ShopTypeForm.kt |  8 ++++++++
 app/src/main/res/values/strings.xml                 |  1 +
 7 files changed, 50 insertions(+)

diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/existence/CheckExistenceForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/existence/CheckExistenceForm.kt
index a7340bea64..aaacbaaf81 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/quests/existence/CheckExistenceForm.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/existence/CheckExistenceForm.kt
@@ -1,11 +1,24 @@
 package de.westnordost.streetcomplete.quests.existence
 
+import android.os.Bundle
+import android.view.View
 import de.westnordost.streetcomplete.R
 import de.westnordost.streetcomplete.quests.AbstractOsmQuestForm
 import de.westnordost.streetcomplete.quests.AnswerItem
 
 class CheckExistenceForm : AbstractOsmQuestForm<Unit>() {
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        initStateFromTags()
+    }
+
+    private fun initStateFromTags() {
+        val objectNote = element.tags["note"]
+        if (objectNote != null) {
+            this.setHint(getString(R.string.note_for_object) + " " + objectNote)
+        }
+    }
     override val buttonPanelAnswers = listOf(
         AnswerItem(R.string.quest_generic_hasFeature_no) { deletePoiNode() },
         AnswerItem(R.string.quest_generic_hasFeature_yes) { applyAnswer(Unit) }
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/opening_hours/AddOpeningHoursForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/opening_hours/AddOpeningHoursForm.kt
index 658196cde2..60e3d9930a 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/quests/opening_hours/AddOpeningHoursForm.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/opening_hours/AddOpeningHoursForm.kt
@@ -114,6 +114,10 @@ class AddOpeningHoursForm : AbstractOsmQuestForm<OpeningHoursAnswer>() {
 
     private fun initStateFromTags() {
         val oh = element.tags["opening_hours"]
+        val objectNote = element.tags["note"]
+        if (objectNote != null) {
+            this.setHint(getString(R.string.note_for_object) + " " + objectNote)
+        }
         val rows = oh?.toOpeningHoursOrNull(lenient = true)?.toOpeningHoursRows()
         if (rows != null) {
             openingHoursAdapter.rows = rows.toMutableList()
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/place_name/AddPlaceNameForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/place_name/AddPlaceNameForm.kt
index c787e38a7a..0533a6f1cd 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/quests/place_name/AddPlaceNameForm.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/place_name/AddPlaceNameForm.kt
@@ -1,5 +1,7 @@
 package de.westnordost.streetcomplete.quests.place_name
 
+import android.os.Bundle
+import android.view.View
 import androidx.appcompat.app.AlertDialog
 import de.westnordost.streetcomplete.R
 import de.westnordost.streetcomplete.databinding.QuestLocalizednameBinding
@@ -18,7 +20,17 @@ class AddPlaceNameForm : AAddLocalizedNameForm<PlaceNameAnswer>() {
     override val otherAnswers = listOf(
         AnswerItem(R.string.quest_placeName_no_name_answer) { confirmNoName() }
     )
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        initStateFromTags()
+    }
 
+    private fun initStateFromTags() {
+        val objectNote = element.tags["note"]
+        if (objectNote != null) {
+            this.setHint(getString(R.string.note_for_object) + " " + objectNote)
+        }
+    }
     override fun onClickOk(names: List<LocalizedName>) {
         applyAnswer(PlaceName(names))
     }
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/postbox_collection_times/AddPostboxCollectionTimesForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/postbox_collection_times/AddPostboxCollectionTimesForm.kt
index d4d97b656a..17e56813ac 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/quests/postbox_collection_times/AddPostboxCollectionTimesForm.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/postbox_collection_times/AddPostboxCollectionTimesForm.kt
@@ -95,6 +95,10 @@ class AddPostboxCollectionTimesForm : AbstractOsmQuestForm<CollectionTimesAnswer
 
     private fun initStateFromTags() {
         val ct = element.tags["collection_times"]
+        val objectNote = element.tags["note"]
+        if (objectNote != null) {
+            this.setHint(getString(R.string.note_for_object) + " " + objectNote)
+        }
         val rows = ct?.toOpeningHoursOrNull(lenient = true)?.toCollectionTimesRows()
         if (rows != null) {
             collectionTimesAdapter.collectionTimesRows = rows.toMutableList()
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/postbox_ref/AddPostboxRefForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/postbox_ref/AddPostboxRefForm.kt
index f81e0b3956..a2727ad194 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/quests/postbox_ref/AddPostboxRefForm.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/postbox_ref/AddPostboxRefForm.kt
@@ -23,6 +23,7 @@ class AddPostboxRefForm : AbstractOsmQuestForm<PostboxRefAnswer>() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        initStateFromTags()
         binding.refInput.doAfterTextChanged { checkIsFormComplete() }
     }
 
@@ -30,6 +31,13 @@ class AddPostboxRefForm : AbstractOsmQuestForm<PostboxRefAnswer>() {
         applyAnswer(PostboxRef(ref!!))
     }
 
+    private fun initStateFromTags() {
+        val objectNote = element.tags["note"]
+        if (objectNote != null) {
+            this.setHint(getString(R.string.note_for_object) + " " + objectNote)
+        }
+    }
+
     private fun confirmNoRef() {
         val ctx = context ?: return
         AlertDialog.Builder(ctx)
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/shop_type/ShopTypeForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/shop_type/ShopTypeForm.kt
index 34de4351e5..84afcc7794 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/quests/shop_type/ShopTypeForm.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/shop_type/ShopTypeForm.kt
@@ -50,6 +50,14 @@ class ShopTypeForm : AbstractOsmQuestForm<ShopTypeAnswer>() {
                 POPULAR_PLACE_FEATURE_IDS,
             ).show()
         }
+        initStateFromTags()
+    }
+
+    private fun initStateFromTags() {
+        val objectNote = element.tags["note"]
+        if (objectNote != null) {
+            this.setHint(getString(R.string.note_for_object) + " " + objectNote)
+        }
     }
 
     private fun filterOnlyShops(feature: Feature): Boolean {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8e056c9f99..cd37644857 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -153,6 +153,7 @@ The info you enter is directly added to OpenStreetMap in your name, without the
     <string name="osm_element_gone_description">"Are you sure that it does not exist, not even at a slightly different location? If you’re not sure, leave a note instead.</string>
     <string name="osm_element_gone_confirmation">It does not exist</string>
     <string name="leave_note">Leave note</string>
+    <string name="note_for_object">Note for this object:</string>
 
     <string name="quest_generic_answer_differs_along_the_way">"Differs along the way…"</string>
     <string name="quest_split_way_description">If it differs along the way, the first step is to split up the way. After that, the quest can be answered for each part separately.\nSplit it now?</string>

From c6ee10d1aa84b6e22d04a2e1e9230f6426516d72 Mon Sep 17 00:00:00 2001
From: Kai Michael Poppe <kai.michael.poppe@gmail.com>
Date: Tue, 10 Sep 2024 13:20:29 +0200
Subject: [PATCH 02/11] Display object note for BusStopName

Adding Bus Stop Name in the mix also.
---
 .../quests/bus_stop_name/AddBusStopNameForm.kt     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_name/AddBusStopNameForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_name/AddBusStopNameForm.kt
index a871c96315..9bf48dd853 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_name/AddBusStopNameForm.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_name/AddBusStopNameForm.kt
@@ -1,6 +1,9 @@
 package de.westnordost.streetcomplete.quests.bus_stop_name
 
+import android.os.Bundle
+import android.view.View
 import androidx.appcompat.app.AlertDialog
+import androidx.core.widget.doAfterTextChanged
 import de.westnordost.streetcomplete.R
 import de.westnordost.streetcomplete.databinding.QuestLocalizednameBinding
 import de.westnordost.streetcomplete.osm.LocalizedName
@@ -15,6 +18,17 @@ class AddBusStopNameForm : AAddLocalizedNameForm<BusStopNameAnswer>() {
     override val addLanguageButton get() = binding.addLanguageButton
     override val namesList get() = binding.namesList
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        initStateFromTags()
+    }
+
+    private fun initStateFromTags() {
+        val objectNote = element.tags["note"]
+        if (objectNote != null) {
+            this.setHint(getString(R.string.note_for_object) + " " + objectNote)
+        }
+    }
     override val otherAnswers = listOf(
         AnswerItem(R.string.quest_placeName_no_name_answer) { confirmNoName() },
         AnswerItem(R.string.quest_streetName_answer_cantType) { showKeyboardInfo() }

From 99a7fe503f2772224da3342388c772f774d91d7f Mon Sep 17 00:00:00 2001
From: Kai Michael Poppe <kai.michael.poppe@gmail.com>
Date: Tue, 10 Sep 2024 20:06:22 +0200
Subject: [PATCH 03/11] Revert "Display object note for BusStopName"

This reverts commit c6ee10d1aa84b6e22d04a2e1e9230f6426516d72.
---
 .../quests/bus_stop_name/AddBusStopNameForm.kt     | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_name/AddBusStopNameForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_name/AddBusStopNameForm.kt
index 9bf48dd853..a871c96315 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_name/AddBusStopNameForm.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_name/AddBusStopNameForm.kt
@@ -1,9 +1,6 @@
 package de.westnordost.streetcomplete.quests.bus_stop_name
 
-import android.os.Bundle
-import android.view.View
 import androidx.appcompat.app.AlertDialog
-import androidx.core.widget.doAfterTextChanged
 import de.westnordost.streetcomplete.R
 import de.westnordost.streetcomplete.databinding.QuestLocalizednameBinding
 import de.westnordost.streetcomplete.osm.LocalizedName
@@ -18,17 +15,6 @@ class AddBusStopNameForm : AAddLocalizedNameForm<BusStopNameAnswer>() {
     override val addLanguageButton get() = binding.addLanguageButton
     override val namesList get() = binding.namesList
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        initStateFromTags()
-    }
-
-    private fun initStateFromTags() {
-        val objectNote = element.tags["note"]
-        if (objectNote != null) {
-            this.setHint(getString(R.string.note_for_object) + " " + objectNote)
-        }
-    }
     override val otherAnswers = listOf(
         AnswerItem(R.string.quest_placeName_no_name_answer) { confirmNoName() },
         AnswerItem(R.string.quest_streetName_answer_cantType) { showKeyboardInfo() }

From d6e48e93376c79eab7dc3e2ac255159369b3e17d Mon Sep 17 00:00:00 2001
From: Kai Michael Poppe <kai.michael.poppe@gmail.com>
Date: Tue, 10 Sep 2024 20:06:27 +0200
Subject: [PATCH 04/11] Revert "Display object note in hint - v1"

This reverts commit bacbfdbec8e62e2a3696ba9650234f5d3425dc58.
---
 .../quests/existence/CheckExistenceForm.kt          | 13 -------------
 .../quests/opening_hours/AddOpeningHoursForm.kt     |  4 ----
 .../quests/place_name/AddPlaceNameForm.kt           | 12 ------------
 .../AddPostboxCollectionTimesForm.kt                |  4 ----
 .../quests/postbox_ref/AddPostboxRefForm.kt         |  8 --------
 .../streetcomplete/quests/shop_type/ShopTypeForm.kt |  8 --------
 app/src/main/res/values/strings.xml                 |  1 -
 7 files changed, 50 deletions(-)

diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/existence/CheckExistenceForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/existence/CheckExistenceForm.kt
index aaacbaaf81..a7340bea64 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/quests/existence/CheckExistenceForm.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/existence/CheckExistenceForm.kt
@@ -1,24 +1,11 @@
 package de.westnordost.streetcomplete.quests.existence
 
-import android.os.Bundle
-import android.view.View
 import de.westnordost.streetcomplete.R
 import de.westnordost.streetcomplete.quests.AbstractOsmQuestForm
 import de.westnordost.streetcomplete.quests.AnswerItem
 
 class CheckExistenceForm : AbstractOsmQuestForm<Unit>() {
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        initStateFromTags()
-    }
-
-    private fun initStateFromTags() {
-        val objectNote = element.tags["note"]
-        if (objectNote != null) {
-            this.setHint(getString(R.string.note_for_object) + " " + objectNote)
-        }
-    }
     override val buttonPanelAnswers = listOf(
         AnswerItem(R.string.quest_generic_hasFeature_no) { deletePoiNode() },
         AnswerItem(R.string.quest_generic_hasFeature_yes) { applyAnswer(Unit) }
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/opening_hours/AddOpeningHoursForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/opening_hours/AddOpeningHoursForm.kt
index 60e3d9930a..658196cde2 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/quests/opening_hours/AddOpeningHoursForm.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/opening_hours/AddOpeningHoursForm.kt
@@ -114,10 +114,6 @@ class AddOpeningHoursForm : AbstractOsmQuestForm<OpeningHoursAnswer>() {
 
     private fun initStateFromTags() {
         val oh = element.tags["opening_hours"]
-        val objectNote = element.tags["note"]
-        if (objectNote != null) {
-            this.setHint(getString(R.string.note_for_object) + " " + objectNote)
-        }
         val rows = oh?.toOpeningHoursOrNull(lenient = true)?.toOpeningHoursRows()
         if (rows != null) {
             openingHoursAdapter.rows = rows.toMutableList()
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/place_name/AddPlaceNameForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/place_name/AddPlaceNameForm.kt
index 0533a6f1cd..c787e38a7a 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/quests/place_name/AddPlaceNameForm.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/place_name/AddPlaceNameForm.kt
@@ -1,7 +1,5 @@
 package de.westnordost.streetcomplete.quests.place_name
 
-import android.os.Bundle
-import android.view.View
 import androidx.appcompat.app.AlertDialog
 import de.westnordost.streetcomplete.R
 import de.westnordost.streetcomplete.databinding.QuestLocalizednameBinding
@@ -20,17 +18,7 @@ class AddPlaceNameForm : AAddLocalizedNameForm<PlaceNameAnswer>() {
     override val otherAnswers = listOf(
         AnswerItem(R.string.quest_placeName_no_name_answer) { confirmNoName() }
     )
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        initStateFromTags()
-    }
 
-    private fun initStateFromTags() {
-        val objectNote = element.tags["note"]
-        if (objectNote != null) {
-            this.setHint(getString(R.string.note_for_object) + " " + objectNote)
-        }
-    }
     override fun onClickOk(names: List<LocalizedName>) {
         applyAnswer(PlaceName(names))
     }
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/postbox_collection_times/AddPostboxCollectionTimesForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/postbox_collection_times/AddPostboxCollectionTimesForm.kt
index 17e56813ac..d4d97b656a 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/quests/postbox_collection_times/AddPostboxCollectionTimesForm.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/postbox_collection_times/AddPostboxCollectionTimesForm.kt
@@ -95,10 +95,6 @@ class AddPostboxCollectionTimesForm : AbstractOsmQuestForm<CollectionTimesAnswer
 
     private fun initStateFromTags() {
         val ct = element.tags["collection_times"]
-        val objectNote = element.tags["note"]
-        if (objectNote != null) {
-            this.setHint(getString(R.string.note_for_object) + " " + objectNote)
-        }
         val rows = ct?.toOpeningHoursOrNull(lenient = true)?.toCollectionTimesRows()
         if (rows != null) {
             collectionTimesAdapter.collectionTimesRows = rows.toMutableList()
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/postbox_ref/AddPostboxRefForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/postbox_ref/AddPostboxRefForm.kt
index a2727ad194..f81e0b3956 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/quests/postbox_ref/AddPostboxRefForm.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/postbox_ref/AddPostboxRefForm.kt
@@ -23,7 +23,6 @@ class AddPostboxRefForm : AbstractOsmQuestForm<PostboxRefAnswer>() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        initStateFromTags()
         binding.refInput.doAfterTextChanged { checkIsFormComplete() }
     }
 
@@ -31,13 +30,6 @@ class AddPostboxRefForm : AbstractOsmQuestForm<PostboxRefAnswer>() {
         applyAnswer(PostboxRef(ref!!))
     }
 
-    private fun initStateFromTags() {
-        val objectNote = element.tags["note"]
-        if (objectNote != null) {
-            this.setHint(getString(R.string.note_for_object) + " " + objectNote)
-        }
-    }
-
     private fun confirmNoRef() {
         val ctx = context ?: return
         AlertDialog.Builder(ctx)
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/shop_type/ShopTypeForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/shop_type/ShopTypeForm.kt
index 84afcc7794..34de4351e5 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/quests/shop_type/ShopTypeForm.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/shop_type/ShopTypeForm.kt
@@ -50,14 +50,6 @@ class ShopTypeForm : AbstractOsmQuestForm<ShopTypeAnswer>() {
                 POPULAR_PLACE_FEATURE_IDS,
             ).show()
         }
-        initStateFromTags()
-    }
-
-    private fun initStateFromTags() {
-        val objectNote = element.tags["note"]
-        if (objectNote != null) {
-            this.setHint(getString(R.string.note_for_object) + " " + objectNote)
-        }
     }
 
     private fun filterOnlyShops(feature: Feature): Boolean {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cd37644857..8e056c9f99 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -153,7 +153,6 @@ The info you enter is directly added to OpenStreetMap in your name, without the
     <string name="osm_element_gone_description">"Are you sure that it does not exist, not even at a slightly different location? If you’re not sure, leave a note instead.</string>
     <string name="osm_element_gone_confirmation">It does not exist</string>
     <string name="leave_note">Leave note</string>
-    <string name="note_for_object">Note for this object:</string>
 
     <string name="quest_generic_answer_differs_along_the_way">"Differs along the way…"</string>
     <string name="quest_split_way_description">If it differs along the way, the first step is to split up the way. After that, the quest can be answered for each part separately.\nSplit it now?</string>

From 0ad6953561a5665cbcb51ba2e7afb04d77f7f172 Mon Sep 17 00:00:00 2001
From: Kai Michael Poppe <kai.michael.poppe@gmail.com>
Date: Tue, 10 Sep 2024 21:15:47 +0200
Subject: [PATCH 05/11] Refactor - v2

Added labels to fragment_quest_answer and made it display a note whenever a quest will be answered.
---
 .../streetcomplete/quests/AbstractOsmQuestForm.kt   |  4 ++++
 .../streetcomplete/quests/AbstractQuestForm.kt      | 12 ++++++++++++
 app/src/main/res/layout/fragment_quest_answer.xml   | 13 +++++++++++++
 app/src/main/res/values/strings.xml                 |  1 +
 app/src/main/res/values/textStyles.xml              | 12 ++++++++++++
 5 files changed, 42 insertions(+)

diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractOsmQuestForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractOsmQuestForm.kt
index 5138f0592b..da62d3266e 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractOsmQuestForm.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractOsmQuestForm.kt
@@ -119,6 +119,10 @@ abstract class AbstractOsmQuestForm<T> : AbstractQuestForm(), IsShowingQuestDeta
 
         setTitle(getString(osmElementQuestType.getTitle(element.tags)))
         setTitleHintLabel(getNameAndLocationSpanned(element, resources, featureDictionary))
+        val objNote = element.tags["note"]
+        if (objNote != null) {
+            setObjNote(objNote)
+        }
     }
 
     override fun onStart() {
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractQuestForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractQuestForm.kt
index ff6e95b808..0b6efdc0b3 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractQuestForm.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractQuestForm.kt
@@ -169,6 +169,13 @@ abstract class AbstractQuestForm :
         updateInfoButtonVisibility()
     }
 
+    protected fun setObjNote(text: CharSequence?) {
+        binding.titleNoteLabel.isGone = text == null
+        binding.titleNoteLabel.text = getString(R.string.note_for_object)
+        binding.noteLabel.isGone = text == null
+        binding.noteLabel.text = text
+        decideObjNoteVisible()
+    }
     protected fun setHintImages(images: List<Drawable>) {
         binding.infoPictures.isGone = images.isEmpty()
         binding.infoPictures.removeAllViews()
@@ -181,6 +188,11 @@ abstract class AbstractQuestForm :
         updateInfoButtonVisibility()
     }
 
+    private fun decideObjNoteVisible() {
+        binding.titleNoteLabel.isGone = binding.titleNoteLabel.text == null
+        binding.noteLabel.isGone = binding.noteLabel.text == null
+    }
+
     private fun toggleInfoArea() {
         infoIsExpanded = !infoIsExpanded
         binding.infoButton.setImageResource(
diff --git a/app/src/main/res/layout/fragment_quest_answer.xml b/app/src/main/res/layout/fragment_quest_answer.xml
index 48ad6b9855..caa8710747 100644
--- a/app/src/main/res/layout/fragment_quest_answer.xml
+++ b/app/src/main/res/layout/fragment_quest_answer.xml
@@ -72,6 +72,19 @@
                             android:textAppearance="@style/TextAppearance.TitleLarge.Hint"
                             android:visibility="gone"/>
 
+                        <TextView
+                            android:id="@+id/titleNoteLabel"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:textAppearance="@style/TextAppearance.TitleLarge.Bold"
+                            android:visibility="gone"/>
+							
+                        <TextView
+                            android:id="@+id/noteLabel"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:textAppearance="@style/TextAppearance.TitleLarge.Italic"
+                            android:visibility="gone"/>							
                     </LinearLayout>
 
                     <ImageView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8e056c9f99..ad897fc66e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -153,6 +153,7 @@ The info you enter is directly added to OpenStreetMap in your name, without the
     <string name="osm_element_gone_description">"Are you sure that it does not exist, not even at a slightly different location? If you’re not sure, leave a note instead.</string>
     <string name="osm_element_gone_confirmation">It does not exist</string>
     <string name="leave_note">Leave note</string>
+    <string name="note_for_object">\nAnother mapper wrote:</string>
 
     <string name="quest_generic_answer_differs_along_the_way">"Differs along the way…"</string>
     <string name="quest_split_way_description">If it differs along the way, the first step is to split up the way. After that, the quest can be answered for each part separately.\nSplit it now?</string>
diff --git a/app/src/main/res/values/textStyles.xml b/app/src/main/res/values/textStyles.xml
index 814873ba96..c74bd21d39 100644
--- a/app/src/main/res/values/textStyles.xml
+++ b/app/src/main/res/values/textStyles.xml
@@ -19,6 +19,18 @@
         <item name="android:textStyle">normal</item>
     </style>
 
+    <style name="TextAppearance.TitleLarge.Bold">
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">@color/hint_text</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="TextAppearance.TitleLarge.Italic">
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">@color/hint_text</item>
+        <item name="android:textStyle">italic</item>
+    </style>
+
     <style name="TextAppearance.Body" parent="TextAppearance.AppCompat.Body1">
         <item name="android:textSize">14sp</item>
         <item name="android:fontFamily">sans-serif</item>

From 138afad509bbeb1055d6bdc5f35b8df7d30d8232 Mon Sep 17 00:00:00 2001
From: Kai Michael Poppe <kai.michael.poppe@gmail.com>
Date: Wed, 11 Sep 2024 08:12:37 +0200
Subject: [PATCH 06/11] Display note as a separate bubble

---
 .../quests/AbstractQuestForm.kt               |  3 +-
 .../main/res/layout/fragment_quest_answer.xml | 65 +++++++++++++++----
 app/src/main/res/values/strings.xml           |  2 +-
 3 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractQuestForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractQuestForm.kt
index 0b6efdc0b3..e4e894756a 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractQuestForm.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractQuestForm.kt
@@ -189,8 +189,7 @@ abstract class AbstractQuestForm :
     }
 
     private fun decideObjNoteVisible() {
-        binding.titleNoteLabel.isGone = binding.titleNoteLabel.text == null
-        binding.noteLabel.isGone = binding.noteLabel.text == null
+        binding.scrollViewNote.isGone = binding.titleNoteLabel.text == null
     }
 
     private fun toggleInfoArea() {
diff --git a/app/src/main/res/layout/fragment_quest_answer.xml b/app/src/main/res/layout/fragment_quest_answer.xml
index caa8710747..517fdbe5ae 100644
--- a/app/src/main/res/layout/fragment_quest_answer.xml
+++ b/app/src/main/res/layout/fragment_quest_answer.xml
@@ -72,19 +72,6 @@
                             android:textAppearance="@style/TextAppearance.TitleLarge.Hint"
                             android:visibility="gone"/>
 
-                        <TextView
-                            android:id="@+id/titleNoteLabel"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:textAppearance="@style/TextAppearance.TitleLarge.Bold"
-                            android:visibility="gone"/>
-							
-                        <TextView
-                            android:id="@+id/noteLabel"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:textAppearance="@style/TextAppearance.TitleLarge.Italic"
-                            android:visibility="gone"/>							
                     </LinearLayout>
 
                     <ImageView
@@ -133,6 +120,58 @@
 
             </LinearLayout>
 
+            <androidx.core.widget.NestedScrollView
+                android:id="@+id/scrollViewNote"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:clipChildren="false"
+                android:clipToPadding="false"
+				android:visibility="gone"
+                android:elevation="@dimen/speech_bubble_elevation">
+
+				<LinearLayout
+					android:id="@+id/speechbubbleNoteContainer"
+					android:background="@drawable/speech_bubble_none"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:orientation="vertical"
+					android:layout_marginStart="@dimen/horizontal_speech_bubble_margin"
+					android:layout_marginEnd="@dimen/horizontal_speech_bubble_margin"
+					android:layout_marginBottom="4dp"
+					android:showDividers="middle"
+					android:paddingStart="22dp"
+					android:paddingEnd="22dp"
+					android:paddingTop="16dp"
+					android:paddingBottom="16dp"
+					android:divider="@drawable/space_16dp"
+					android:elevation="@dimen/speech_bubble_elevation">
+
+						<LinearLayout
+							android:id="@+id/noteArea"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:orientation="vertical"
+							android:showDividers="middle">
+
+								<TextView
+									android:id="@+id/titleNoteLabel"
+									android:layout_width="match_parent"
+									android:layout_height="wrap_content"
+									android:textAppearance="@style/TextAppearance.TitleLarge.Bold" />
+
+								<TextView
+									android:id="@+id/noteLabel"
+									android:layout_width="match_parent"
+									android:layout_height="wrap_content"
+									android:textAppearance="@style/TextAppearance.TitleLarge.Italic" />
+
+						</LinearLayout>
+
+
+                </LinearLayout>
+
+            </androidx.core.widget.NestedScrollView>
+
             <!-- Necessary because even if the bottom sheet is already expanded, the content might
                  be still too large to fit onto the screen without scrolling (it often is) -->
             <androidx.core.widget.NestedScrollView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ad897fc66e..25d043bd6e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -153,7 +153,7 @@ The info you enter is directly added to OpenStreetMap in your name, without the
     <string name="osm_element_gone_description">"Are you sure that it does not exist, not even at a slightly different location? If you’re not sure, leave a note instead.</string>
     <string name="osm_element_gone_confirmation">It does not exist</string>
     <string name="leave_note">Leave note</string>
-    <string name="note_for_object">\nAnother mapper wrote:</string>
+    <string name="note_for_object">Another person noted:</string>
 
     <string name="quest_generic_answer_differs_along_the_way">"Differs along the way…"</string>
     <string name="quest_split_way_description">If it differs along the way, the first step is to split up the way. After that, the quest can be answered for each part separately.\nSplit it now?</string>

From fa183c21d2f39543e8e7ac4a7bff8d95ce35e66b Mon Sep 17 00:00:00 2001
From: Kai Michael Poppe <kai.michael.poppe@gmail.com>
Date: Thu, 12 Sep 2024 08:14:42 +0200
Subject: [PATCH 07/11] Quest Fragement Layout

Removed Nested Scroll View (https://github.com/streetcomplete/StreetComplete/pull/5889#discussion_r1753909412) and TextStyles (https://github.com/streetcomplete/StreetComplete/pull/5889#discussion_r1753926539), made `note` text selectabled (copyable) as web links clickable (as per https://github.com/streetcomplete/StreetComplete/pull/5889#issuecomment-2343589663) and
---
 .../quests/AbstractQuestForm.kt               |  3 +-
 .../main/res/layout/fragment_quest_answer.xml | 84 +++++++++----------
 app/src/main/res/values/textStyles.xml        | 12 ---
 3 files changed, 42 insertions(+), 57 deletions(-)

diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractQuestForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractQuestForm.kt
index e4e894756a..0611fcceae 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractQuestForm.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractQuestForm.kt
@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests
 
 import android.graphics.drawable.Drawable
 import android.os.Bundle
+import android.text.Editable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -189,7 +190,7 @@ abstract class AbstractQuestForm :
     }
 
     private fun decideObjNoteVisible() {
-        binding.scrollViewNote.isGone = binding.titleNoteLabel.text == null
+        binding.speechbubbleNoteContainer.isGone = binding.titleNoteLabel.text == null
     }
 
     private fun toggleInfoArea() {
diff --git a/app/src/main/res/layout/fragment_quest_answer.xml b/app/src/main/res/layout/fragment_quest_answer.xml
index 517fdbe5ae..365e8a8a2d 100644
--- a/app/src/main/res/layout/fragment_quest_answer.xml
+++ b/app/src/main/res/layout/fragment_quest_answer.xml
@@ -120,57 +120,53 @@
 
             </LinearLayout>
 
-            <androidx.core.widget.NestedScrollView
-                android:id="@+id/scrollViewNote"
+
+            <LinearLayout
+                android:id="@+id/speechbubbleNoteContainer"
+                android:background="@drawable/speech_bubble_none"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:clipChildren="false"
-                android:clipToPadding="false"
-				android:visibility="gone"
-                android:elevation="@dimen/speech_bubble_elevation">
+                android:orientation="vertical"
+                android:layout_marginStart="@dimen/horizontal_speech_bubble_margin"
+                android:layout_marginEnd="@dimen/horizontal_speech_bubble_margin"
+                android:layout_marginBottom="4dp"
+                android:showDividers="middle"
+                android:paddingStart="22dp"
+                android:paddingEnd="22dp"
+                android:paddingTop="16dp"
+                android:paddingBottom="16dp"
+                android:divider="@drawable/space_16dp"
+                android:elevation="@dimen/speech_bubble_elevation"
+                android:visibility="gone">
 
-				<LinearLayout
-					android:id="@+id/speechbubbleNoteContainer"
-					android:background="@drawable/speech_bubble_none"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:orientation="vertical"
-					android:layout_marginStart="@dimen/horizontal_speech_bubble_margin"
-					android:layout_marginEnd="@dimen/horizontal_speech_bubble_margin"
-					android:layout_marginBottom="4dp"
-					android:showDividers="middle"
-					android:paddingStart="22dp"
-					android:paddingEnd="22dp"
-					android:paddingTop="16dp"
-					android:paddingBottom="16dp"
-					android:divider="@drawable/space_16dp"
-					android:elevation="@dimen/speech_bubble_elevation">
-
-						<LinearLayout
-							android:id="@+id/noteArea"
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							android:orientation="vertical"
-							android:showDividers="middle">
-
-								<TextView
-									android:id="@+id/titleNoteLabel"
-									android:layout_width="match_parent"
-									android:layout_height="wrap_content"
-									android:textAppearance="@style/TextAppearance.TitleLarge.Bold" />
-
-								<TextView
-									android:id="@+id/noteLabel"
-									android:layout_width="match_parent"
-									android:layout_height="wrap_content"
-									android:textAppearance="@style/TextAppearance.TitleLarge.Italic" />
-
-						</LinearLayout>
+                <LinearLayout
+                    android:id="@+id/noteArea"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:showDividers="middle">
 
+                    <TextView
+                        android:id="@+id/titleNoteLabel"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/TextAppearance.TitleMedium" />
+
+                    <TextView
+                        android:id="@+id/noteLabel"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/TextAppearance.Body"
+                        android:textStyle="italic"
+                        android:textColor="@color/hint_text"
+                        android:autoLink="web"
+                        android:textIsSelectable="true" />
 
                 </LinearLayout>
 
-            </androidx.core.widget.NestedScrollView>
+
+            </LinearLayout>
+
 
             <!-- Necessary because even if the bottom sheet is already expanded, the content might
                  be still too large to fit onto the screen without scrolling (it often is) -->
diff --git a/app/src/main/res/values/textStyles.xml b/app/src/main/res/values/textStyles.xml
index c74bd21d39..814873ba96 100644
--- a/app/src/main/res/values/textStyles.xml
+++ b/app/src/main/res/values/textStyles.xml
@@ -19,18 +19,6 @@
         <item name="android:textStyle">normal</item>
     </style>
 
-    <style name="TextAppearance.TitleLarge.Bold">
-        <item name="android:textSize">16sp</item>
-        <item name="android:textColor">@color/hint_text</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
-    <style name="TextAppearance.TitleLarge.Italic">
-        <item name="android:textSize">16sp</item>
-        <item name="android:textColor">@color/hint_text</item>
-        <item name="android:textStyle">italic</item>
-    </style>
-
     <style name="TextAppearance.Body" parent="TextAppearance.AppCompat.Body1">
         <item name="android:textSize">14sp</item>
         <item name="android:fontFamily">sans-serif</item>

From afcb13882a318a873e0caeea2394dd3606fc0c87 Mon Sep 17 00:00:00 2001
From: Kai Michael Poppe <kai.michael.poppe@gmail.com>
Date: Thu, 12 Sep 2024 13:54:44 +0200
Subject: [PATCH 08/11] Quest Fragment update

Simplifications
---
 .../streetcomplete/quests/AbstractOsmQuestForm.kt        | 5 +----
 .../streetcomplete/quests/AbstractQuestForm.kt           | 9 +--------
 app/src/main/res/layout/fragment_quest_answer.xml        | 3 ++-
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractOsmQuestForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractOsmQuestForm.kt
index da62d3266e..d252b3a2ae 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractOsmQuestForm.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractOsmQuestForm.kt
@@ -119,10 +119,7 @@ abstract class AbstractOsmQuestForm<T> : AbstractQuestForm(), IsShowingQuestDeta
 
         setTitle(getString(osmElementQuestType.getTitle(element.tags)))
         setTitleHintLabel(getNameAndLocationSpanned(element, resources, featureDictionary))
-        val objNote = element.tags["note"]
-        if (objNote != null) {
-            setObjNote(objNote)
-        }
+        setObjNote(element.tags["note"])
     }
 
     override fun onStart() {
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractQuestForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractQuestForm.kt
index 0611fcceae..55a35b1bd4 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractQuestForm.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractQuestForm.kt
@@ -171,11 +171,8 @@ abstract class AbstractQuestForm :
     }
 
     protected fun setObjNote(text: CharSequence?) {
-        binding.titleNoteLabel.isGone = text == null
-        binding.titleNoteLabel.text = getString(R.string.note_for_object)
-        binding.noteLabel.isGone = text == null
         binding.noteLabel.text = text
-        decideObjNoteVisible()
+        binding.speechbubbleNoteContainer.isGone = binding.noteLabel.text.isEmpty()
     }
     protected fun setHintImages(images: List<Drawable>) {
         binding.infoPictures.isGone = images.isEmpty()
@@ -189,10 +186,6 @@ abstract class AbstractQuestForm :
         updateInfoButtonVisibility()
     }
 
-    private fun decideObjNoteVisible() {
-        binding.speechbubbleNoteContainer.isGone = binding.titleNoteLabel.text == null
-    }
-
     private fun toggleInfoArea() {
         infoIsExpanded = !infoIsExpanded
         binding.infoButton.setImageResource(
diff --git a/app/src/main/res/layout/fragment_quest_answer.xml b/app/src/main/res/layout/fragment_quest_answer.xml
index 365e8a8a2d..4944401d6b 100644
--- a/app/src/main/res/layout/fragment_quest_answer.xml
+++ b/app/src/main/res/layout/fragment_quest_answer.xml
@@ -150,7 +150,8 @@
                         android:id="@+id/titleNoteLabel"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:textAppearance="@style/TextAppearance.TitleMedium" />
+                        android:textAppearance="@style/TextAppearance.TitleMedium"
+                        android:text="@string/note_for_object" />
 
                     <TextView
                         android:id="@+id/noteLabel"

From cff1a4c2176d44366fafe99ee46c20dadc6fd8b9 Mon Sep 17 00:00:00 2001
From: Kai Michael Poppe <kai.michael.poppe@gmail.com>
Date: Thu, 12 Sep 2024 13:55:01 +0200
Subject: [PATCH 09/11] Overlays now also display notes

---
 .../overlays/AbstractOverlayForm.kt           | 16 ++++++-
 app/src/main/res/layout/fragment_overlay.xml  | 45 +++++++++++++++++++
 2 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/de/westnordost/streetcomplete/overlays/AbstractOverlayForm.kt b/app/src/main/java/de/westnordost/streetcomplete/overlays/AbstractOverlayForm.kt
index ac90ebcff9..3c6c967d00 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/overlays/AbstractOverlayForm.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/overlays/AbstractOverlayForm.kt
@@ -10,6 +10,7 @@ import android.view.Menu
 import android.view.View
 import android.view.ViewGroup
 import android.widget.PopupMenu
+import android.widget.RelativeLayout
 import androidx.annotation.UiThread
 import androidx.appcompat.app.AlertDialog
 import androidx.core.os.bundleOf
@@ -202,6 +203,7 @@ abstract class AbstractOverlayForm :
         setTitleHintLabel(
             element?.let { getNameAndLocationSpanned(it, resources, featureDictionary) }
         )
+        setObjNote(element?.tags?.get("note"))
 
         binding.moreButton.setOnClickListener {
             showOtherAnswers()
@@ -250,6 +252,18 @@ abstract class AbstractOverlayForm :
         _binding = null
     }
 
+    protected fun setObjNote(text: CharSequence?) {
+        binding.noteLabel.text = text
+        val noteBubbleLayout = (binding.speechbubbleNoteContainer.layoutParams as? RelativeLayout.LayoutParams)
+        noteBubbleLayout?.removeRule(RelativeLayout.ABOVE)
+        if (binding.titleHintLabel.text == null) {
+            noteBubbleLayout?.addRule(RelativeLayout.ABOVE, binding.speechbubbleContentContainer.id)
+        } else {
+            noteBubbleLayout?.addRule(RelativeLayout.ABOVE, binding.titleHintLabelContainer.id)
+        }
+        binding.speechbubbleNoteContainer.isGone = binding.noteLabel.text.isEmpty()
+    }
+
     /* --------------------------------- IsCloseableBottomSheet  ------------------------------- */
 
     @UiThread override fun onClickMapAt(position: LatLon, clickAreaSizeInMeters: Double): Boolean = false
@@ -347,7 +361,7 @@ abstract class AbstractOverlayForm :
     protected abstract fun onClickOk()
 
     protected inline fun <reified T : ViewBinding> contentViewBinding(
-        noinline viewBinder: (View) -> T
+        noinline viewBinder: (View) -> T,
     ) = FragmentViewBindingPropertyDelegate(this, viewBinder, R.id.content)
 
     /* -------------------------------------- ...-Button -----------------------------------------*/
diff --git a/app/src/main/res/layout/fragment_overlay.xml b/app/src/main/res/layout/fragment_overlay.xml
index cf37f269a5..70388e7c91 100644
--- a/app/src/main/res/layout/fragment_overlay.xml
+++ b/app/src/main/res/layout/fragment_overlay.xml
@@ -20,6 +20,51 @@
         android:id="@+id/bottomSheetContainer"
         tools:ignore="RtlHardcoded">
 
+        <de.westnordost.streetcomplete.view.MaskSpeechbubbleCornersFrameLayout
+            android:id="@+id/speechbubbleNoteContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/speech_bubble_none"
+            android:layout_above="@id/speechbubbleContentContainer"
+            android:layout_marginStart="@dimen/horizontal_speech_bubble_margin"
+            android:layout_marginEnd="@dimen/horizontal_speech_bubble_margin"
+            android:layout_marginBottom="4dp"
+            android:showDividers="middle"
+            android:paddingStart="22dp"
+            android:paddingEnd="22dp"
+            android:paddingTop="16dp"
+            android:paddingBottom="16dp"
+            android:divider="@drawable/space_16dp"
+            android:elevation="@dimen/speech_bubble_elevation"
+            android:visibility="gone">
+
+            <LinearLayout
+                android:id="@+id/noteArea"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:showDividers="middle">
+
+                <TextView
+                    android:id="@+id/titleNoteLabel"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="@style/TextAppearance.TitleMedium"
+                    android:text="@string/note_for_object" />
+
+                <TextView
+                    android:id="@+id/noteLabel"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="@style/TextAppearance.Body"
+                    android:textStyle="italic"
+                    android:textColor="@color/hint_text"
+                    android:autoLink="web"
+                    android:textIsSelectable="true" />
+
+            </LinearLayout>
+
+        </de.westnordost.streetcomplete.view.MaskSpeechbubbleCornersFrameLayout>
 
         <de.westnordost.streetcomplete.view.MaskSpeechbubbleCornersFrameLayout
             android:id="@+id/titleHintLabelContainer"

From b32740fb5f77346f31f76c22e816ea4bc19dca4a Mon Sep 17 00:00:00 2001
From: Kai Michael Poppe <kai.michael.poppe@gmail.com>
Date: Thu, 12 Sep 2024 18:39:39 +0200
Subject: [PATCH 10/11] Swap postion of TitleHint and SpeechBubbleNote

as per https://github.com/streetcomplete/StreetComplete/pull/5889#issuecomment-2346519764
---
 .../streetcomplete/overlays/AbstractOverlayForm.kt          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/de/westnordost/streetcomplete/overlays/AbstractOverlayForm.kt b/app/src/main/java/de/westnordost/streetcomplete/overlays/AbstractOverlayForm.kt
index 3c6c967d00..ced26c90a2 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/overlays/AbstractOverlayForm.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/overlays/AbstractOverlayForm.kt
@@ -254,12 +254,12 @@ abstract class AbstractOverlayForm :
 
     protected fun setObjNote(text: CharSequence?) {
         binding.noteLabel.text = text
-        val noteBubbleLayout = (binding.speechbubbleNoteContainer.layoutParams as? RelativeLayout.LayoutParams)
+        val noteBubbleLayout = (binding.titleHintLabelContainer.layoutParams as? RelativeLayout.LayoutParams)
         noteBubbleLayout?.removeRule(RelativeLayout.ABOVE)
-        if (binding.titleHintLabel.text == null) {
+        if (binding.noteLabel.text == null) {
             noteBubbleLayout?.addRule(RelativeLayout.ABOVE, binding.speechbubbleContentContainer.id)
         } else {
-            noteBubbleLayout?.addRule(RelativeLayout.ABOVE, binding.titleHintLabelContainer.id)
+            noteBubbleLayout?.addRule(RelativeLayout.ABOVE, binding.speechbubbleNoteContainer.id)
         }
         binding.speechbubbleNoteContainer.isGone = binding.noteLabel.text.isEmpty()
     }

From 97a65bacb4cff070f1c5f2d1668443ebf2dd26bd Mon Sep 17 00:00:00 2001
From: Kai Michael Poppe <kai.michael.poppe@gmail.com>
Date: Thu, 12 Sep 2024 18:59:51 +0200
Subject: [PATCH 11/11] Simplyfy addRule and rename variable to what it
 actually does

---
 .../overlays/AbstractOverlayForm.kt               | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/de/westnordost/streetcomplete/overlays/AbstractOverlayForm.kt b/app/src/main/java/de/westnordost/streetcomplete/overlays/AbstractOverlayForm.kt
index ced26c90a2..4f8ab0b53e 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/overlays/AbstractOverlayForm.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/overlays/AbstractOverlayForm.kt
@@ -254,13 +254,14 @@ abstract class AbstractOverlayForm :
 
     protected fun setObjNote(text: CharSequence?) {
         binding.noteLabel.text = text
-        val noteBubbleLayout = (binding.titleHintLabelContainer.layoutParams as? RelativeLayout.LayoutParams)
-        noteBubbleLayout?.removeRule(RelativeLayout.ABOVE)
-        if (binding.noteLabel.text == null) {
-            noteBubbleLayout?.addRule(RelativeLayout.ABOVE, binding.speechbubbleContentContainer.id)
-        } else {
-            noteBubbleLayout?.addRule(RelativeLayout.ABOVE, binding.speechbubbleNoteContainer.id)
-        }
+        val titleHintLayout = (binding.titleHintLabelContainer.layoutParams as? RelativeLayout.LayoutParams)
+        titleHintLayout?.removeRule(RelativeLayout.ABOVE)
+        titleHintLayout?.addRule(RelativeLayout.ABOVE,
+            if (binding.noteLabel.text.isEmpty())
+                binding.speechbubbleContentContainer.id
+            else
+                binding.speechbubbleNoteContainer.id
+        )
         binding.speechbubbleNoteContainer.isGone = binding.noteLabel.text.isEmpty()
     }