Grill fuel quest -- add OtherAnswer that this is just a firering, not…

… a Grill (#5371) * add a "not a BBQ" other answer * try to fix compile issues * cleanups * try to fix compile error * try NOT_BBQ as an enum * enum kludge * include * try to get it to compile * try to import variables * try to get rid of "sealed interface class" in order to get it to compile * add confirmNotBbq() * add missing import * indicate magic value * try to get "sealed interface BbqFuelAnswer" to work * try buttonPanelAnswers from dier_type * try building_entrance items override * whitespace cleanups * Update app/src/main/java/de/westnordost/streetcomplete/quests/bbq_fuel/AddBbqFuelForm.kt * rename NOT_BBQ => IsFirePitAnswer * indicate what it is instead of what it is not, try different words for clarification and shortening * rephrase other answer, use different message format * try to fix compilation error Failed to flatten XML for resource 'quest_bbq_fuel_not_a_bbq' with error: Invalid unicode escape sequence in string * cleanup texts * Update app/src/main/res/values/strings.xml Co-authored-by: Flo Edelmann <[email protected]> --------- Co-authored-by: Tobias Zwick <[email protected]> Co-authored-by: Flo Edelmann <[email protected]>
streetcomplete · Nov 26, 2023 · 723078c · 723078c
1 parent 9de3369
commit 723078c
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 15 deletions.
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/bbq_fuel/AddBbqFuel.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/bbq_fuel/AddBbqFuel.kt
@@ -9,7 +9,7 @@ import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType
 import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.OUTDOORS
 import de.westnordost.streetcomplete.osm.Tags
 
-class AddBbqFuel : OsmFilterQuestType<BbqFuel>() {
+class AddBbqFuel : OsmFilterQuestType<BbqFuelAnswer>() {
 
     override val elementFilter = """
         nodes, ways with
@@ -30,7 +30,13 @@ class AddBbqFuel : OsmFilterQuestType<BbqFuel>() {
 
     override fun createForm() = AddBbqFuelForm()
 
-    override fun applyAnswerTo(answer: BbqFuel, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {
-        tags["fuel"] = answer.osmValue
+    override fun applyAnswerTo(answer: BbqFuelAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {
+        when (answer) {
+            is BbqFuel -> tags["fuel"] = answer.osmValue
+            IsFirePitAnswer -> {
+                tags.remove("amenity")
+                tags["leisure"] = "firepit"
+            }
+        }
     }
 }
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/bbq_fuel/AddBbqFuelForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/bbq_fuel/AddBbqFuelForm.kt
@@ -1,14 +1,32 @@
 package de.westnordost.streetcomplete.quests.bbq_fuel
 
+import androidx.appcompat.app.AlertDialog
 import de.westnordost.streetcomplete.R
 import de.westnordost.streetcomplete.quests.AListQuestForm
+import de.westnordost.streetcomplete.quests.AnswerItem
 import de.westnordost.streetcomplete.quests.TextItem
+import de.westnordost.streetcomplete.quests.bbq_fuel.BbqFuel.WOOD
+import de.westnordost.streetcomplete.quests.bbq_fuel.BbqFuel.ELECTRIC
+import de.westnordost.streetcomplete.quests.bbq_fuel.BbqFuel.CHARCOAL
 
-class AddBbqFuelForm : AListQuestForm<BbqFuel>() {
+class AddBbqFuelForm : AListQuestForm<BbqFuelAnswer>() {
+    override val items: List<TextItem<BbqFuelAnswer>> = listOf(
+        TextItem(WOOD, R.string.quest_bbq_fuel_wood),
+        TextItem(ELECTRIC, R.string.quest_bbq_fuel_electric),
+        TextItem(CHARCOAL, R.string.quest_bbq_fuel_charcoal),
+    )
 
-    override val items = listOf(
-        TextItem(BbqFuel.WOOD, R.string.quest_bbq_fuel_wood),
-        TextItem(BbqFuel.ELECTRIC, R.string.quest_bbq_fuel_electric),
-        TextItem(BbqFuel.CHARCOAL, R.string.quest_bbq_fuel_charcoal),
+    override val otherAnswers = listOf(
+        AnswerItem(R.string.quest_bbq_fuel_not_a_bbq) { confirmNotBbq() },
     )
+
+    private fun confirmNotBbq() {
+        val ctx = context ?: return
+        AlertDialog.Builder(ctx)
+            .setTitle(R.string.quest_generic_confirmation_title)
+            .setMessage(R.string.quest_bbq_fuel_not_a_bbq_confirmation)
+            .setPositiveButton(R.string.quest_generic_confirmation_yes) { _, _ -> applyAnswer(IsFirePitAnswer) }
+            .setNegativeButton(R.string.quest_generic_confirmation_no, null)
+            .show()
+    }
 }
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/bbq_fuel/BbqFuel.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/bbq_fuel/BbqFuel.kt
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/bbq_fuel/BbqFuelAnswer.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/bbq_fuel/BbqFuelAnswer.kt
@@ -0,0 +1,11 @@
+package de.westnordost.streetcomplete.quests.bbq_fuel
+
+sealed interface BbqFuelAnswer
+
+enum class BbqFuel(val osmValue: String) : BbqFuelAnswer {
+    WOOD("wood"),
+    ELECTRIC("electric"),
+    CHARCOAL("charcoal")
+}
+
+object IsFirePitAnswer : BbqFuelAnswer
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1301,6 +1301,8 @@ If there are no signs along the whole street which apply for the highlighted sec
     <string name="quest_bbq_fuel_wood">Wood</string>
     <string name="quest_bbq_fuel_electric">Electric</string>
     <string name="quest_bbq_fuel_charcoal">Charcoal</string>
+    <string name="quest_bbq_fuel_not_a_bbq">It’s a fire enclosure</string>
+    <string name="quest_bbq_fuel_not_a_bbq_confirmation">Fire enclosures don’t have a cooking surface (e.g. grate/plate), as opposed to grills.</string>
 
     <string name="quest_railway_crossing_barrier_title2">What barriers are used at this railway crossing?</string>
     <string name="quest_railway_crossing_barrier_none2">No barriers</string>