Recycling quest UI change (fixes #6613, fixes #6608)

* add class for tree structure

* recycling materials in that tree structure + PET -> pet bottles

* implement stuff

* and solve todo...

* actually, let's remove the special case for Czechia - just show "any glass" always. It's just one more item in the list (as opposed to opening of a dialog in the old UI)

* no need to convert to list

* typo + fix test

* remove now unused graphic

* order items by common-ness, add last-picked-ordering

Author: westnordost

app/src/androidMain/kotlin/de/westnordost/streetcomplete/quests/recycling_material/AddRecyclingContainerMaterials.kt

@@ -58,29 +58,19 @@ class AddRecyclingContainerMaterials : OsmElementQuestType<RecyclingContainerMat
         }
     }
 
-    private fun applyRecyclingMaterialsAnswer(materials: List<RecyclingMaterial>, tags: Tags) {
+    private fun applyRecyclingMaterialsAnswer(materials: Iterable<RecyclingMaterial>, tags: Tags) {
         // first clear recycling:* taggings previously "yes"
         for ((key, value) in tags.entries) {
             if (key.startsWith("recycling:") && value == "yes") {
                 tags.remove(key)
             }
         }
-
-        // if the user chose deliberately not "all plastic", also tag it explicitly
-        val selectedPlastics = materials.filter { it in RecyclingMaterial.allPlastics }
-        if (selectedPlastics.isNotEmpty()) {
-            for (plastic in RecyclingMaterial.allPlastics) {
-                tags.remove("recycling:${plastic.value}")
-            }
-
-            val selectedAndIndirectlySelectedPlastics =
-                selectedPlastics + selectedPlastics.flatMapTo(HashSet()) { it.subValues }
-
-            val notSelectedPlastics =
-                RecyclingMaterial.allPlastics - selectedAndIndirectlySelectedPlastics.toSet()
-
-            for (notSelectedPlastic in notSelectedPlastics) {
-                tags["recycling:${notSelectedPlastic.value}"] = "no"
+        // if any parent value is now "yes" all child values may not be "no". E.g. if "Any plastic"
+        // was selected, "plastic bottles" may not be "no".
+        for (material in materials) {
+            for (childMaterial in RecyclingMaterial.tree.yieldChildValues(material).orEmpty()) {
+                val key = "recycling:${childMaterial.value}"
+                if (tags[key] == "no") tags.remove(key)
             }
         }
 
@@ -89,6 +79,7 @@ class AddRecyclingContainerMaterials : OsmElementQuestType<RecyclingContainerMat
             tags["recycling:${material.value}"] = "yes"
         }
 
+
         // only set the check date if nothing was changed
         if (!tags.hasChanges || tags.hasCheckDateForKey("recycling")) {
             tags.updateCheckDateForKey("recycling")

app/src/androidMain/kotlin/de/westnordost/streetcomplete/quests/recycling_material/AddRecyclingContainerMaterialsForm.kt

@@ -6,43 +6,54 @@ import androidx.appcompat.app.AlertDialog
 import androidx.compose.material.Surface
 import androidx.compose.runtime.mutableStateOf
 import de.westnordost.streetcomplete.R
+import de.westnordost.streetcomplete.data.preferences.Preferences
 import de.westnordost.streetcomplete.databinding.ComposeViewBinding
 import de.westnordost.streetcomplete.quests.AbstractOsmQuestForm
 import de.westnordost.streetcomplete.quests.AnswerItem
 import de.westnordost.streetcomplete.ui.util.content
-
+import de.westnordost.streetcomplete.util.takeFavorites
+import org.koin.android.ext.android.inject
+import kotlin.getValue
 
 class AddRecyclingContainerMaterialsForm : AbstractOsmQuestForm<RecyclingContainerMaterialsAnswer>() {
 
     override val contentLayoutResId = R.layout.compose_view
     private val binding by contentViewBinding(ComposeViewBinding::bind)
     override val defaultExpanded = false
 
+    private val prefs: Preferences by inject()
+
     override val otherAnswers = listOf(
         AnswerItem(R.string.quest_recycling_materials_answer_waste) { confirmJustTrash() }
     )
 
-    private val items = RecyclingMaterial.selectableValues.map { listOf(it) }
-    private val selectedItems = mutableStateOf(emptySet<RecyclingMaterialsItem>())
+    private lateinit var reorderedItems: List<RecyclingMaterial>
+    private val selectedItems = mutableStateOf(emptySet<RecyclingMaterial>())
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        reorderedItems = moveFavouritesToFront(RecyclingMaterial.entries)
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
         binding.composeViewBase.content { Surface {
             RecyclingContainerMaterialsForm(
-                items = items,
+                items = reorderedItems,
+                tree = RecyclingMaterial.tree,
                 selectedItems = selectedItems.value,
                 onSelectedItems = {
                     selectedItems.value = it
                     checkIsFormComplete()
                 },
-                isAnyGlassRecyclable = countryInfo.isUsuallyAnyGlassRecyclableInContainers,
             )
         } }
     }
 
     override fun onClickOk() {
-        applyAnswer(RecyclingMaterials(selectedItems.value.flatten()))
+        prefs.addLastPicked(this::class.simpleName!!, selectedItems.value.toList())
+        applyAnswer(RecyclingMaterials(selectedItems.value))
     }
 
     override fun isFormComplete() = selectedItems.value.isNotEmpty()
@@ -55,4 +66,11 @@ class AddRecyclingContainerMaterialsForm : AbstractOsmQuestForm<RecyclingContain
             .show()
         }
     }
+
+    private fun moveFavouritesToFront(originalList: List<RecyclingMaterial>): List<RecyclingMaterial> {
+        val favourites = prefs
+            .getLastPicked<RecyclingMaterial>(this::class.simpleName!!)
+            .takeFavorites(4)
+        return (favourites + originalList).distinct()
+    }
 }

app/src/androidMain/res/values-en/strings.xml

@@ -1036,6 +1036,7 @@ A level counts as a roof level when its windows are in the roof. Subsequently, r
     <string name="quest_carWashType_service">Staff cleans car</string>
 
     <string name="quest_charging_station_bicycles_title">Can bicycles be charged here, too?</string>
+    <string name="quest_charging_station_bicycles_answer_only">It’s only for bicycles</string>
     <string name="quest_charging_station_bicycles_hint">Bicycle charger power adapters plug into normal household sockets.</string>
 
     <string name="quest_charging_station_capacity_title">How many cars can be charged here at the same time?</string>
@@ -1455,15 +1456,13 @@ If there are no signs along the whole street which apply for the highlighted sec
     <string name="quest_recycling_type_glass_bottles">Glass bottles and jars</string>
     <string name="quest_recycling_type_glass_bottles_short">Bottles and jars</string>
     <string name="quest_recycling_type_paper">Paper</string>
-    <string name="quest_recycling_type_plastic_generic">Plastic</string>
     <string name="quest_recycling_type_plastic">Any plastic</string>
     <string name="quest_recycling_type_shoes">Shoes</string>
     <string name="quest_recycling_type_electric_appliances">Electric appliances</string>
-    <string name="quest_recycling_type_plastic_bottles">Plastic bottles only</string>
-    <string name="quest_recycling_type_beverage_cartons">Beverage cartons only</string>
-    <string name="quest_recycling_type_pet">PET only</string>
-    <string name="quest_recycling_type_plastic_packaging">Plastic packaging only</string>
-    <string name="quest_recycling_type_plastic_bottles_and_cartons">Plastic bottles and cartons only</string>
+    <string name="quest_recycling_type_plastic_bottles">Plastic bottles</string>
+    <string name="quest_recycling_type_beverage_cartons">Beverage cartons</string>
+    <string name="quest_recycling_type_pet_bottles">PET bottles</string>
+    <string name="quest_recycling_type_plastic_packaging">Any plastic packaging</string>
     <string name="quest_recycling_type_scrap_metal">Scrap metal</string>
     <string name="quest_recycling_type_any_glass">Any glass</string>
     <string name="quest_recycling_type_cooking_oil">Cooking Oil</string>

app/src/androidMain/res/values/strings.xml

@@ -1456,15 +1456,13 @@ If there are no signs along the whole street which apply for the highlighted sec
     <string name="quest_recycling_type_glass_bottles">Glass bottles and jars</string>
     <string name="quest_recycling_type_glass_bottles_short">Bottles and jars</string>
     <string name="quest_recycling_type_paper">Paper</string>
-    <string name="quest_recycling_type_plastic_generic">Plastic</string>
     <string name="quest_recycling_type_plastic">Any plastic</string>
     <string name="quest_recycling_type_shoes">Shoes</string>
     <string name="quest_recycling_type_electric_appliances">Electric appliances</string>
-    <string name="quest_recycling_type_plastic_bottles">Plastic bottles only</string>
-    <string name="quest_recycling_type_beverage_cartons">Beverage cartons only</string>
-    <string name="quest_recycling_type_pet">PET only</string>
-    <string name="quest_recycling_type_plastic_packaging">Plastic packaging only</string>
-    <string name="quest_recycling_type_plastic_bottles_and_cartons">Plastic bottles and cartons only</string>
+    <string name="quest_recycling_type_plastic_bottles">Plastic bottles</string>
+    <string name="quest_recycling_type_beverage_cartons">Beverage cartons</string>
+    <string name="quest_recycling_type_pet_bottles">PET bottles</string>
+    <string name="quest_recycling_type_plastic_packaging">Any plastic packaging</string>
     <string name="quest_recycling_type_scrap_metal">Scrap metal</string>
     <string name="quest_recycling_type_any_glass">Any glass</string>
     <string name="quest_recycling_type_cooking_oil">Cooking Oil</string>