reimplement feature-selection in compose (#6773)

Author: westnordost

app/build.gradle.kts

@@ -404,13 +404,13 @@ tasks.register<UpdatePresetsTask>("updatePresets") {
     group = "streetcomplete"
     version = presetsVersion
     languageCodes = bcp47ExportLanguages
-    targetDir = "$projectDir/src/androidMain/assets/osmfeatures/default"
+    targetDir = "$projectDir/src/commonMain/composeResources/files/osmfeatures/default"
 }
 
 tasks.register<UpdateNsiPresetsTask>("updateNsiPresets") {
     group = "streetcomplete"
     version = nsiVersion
-    targetDir = "$projectDir/src/androidMain/assets/osmfeatures/brands"
+    targetDir = "$projectDir/src/commonMain/composeResources/files/osmfeatures/brands"
 }
 
 // tasks.register<DownloadBrandLogosTask>("downloadBrandLogos") {
@@ -422,10 +422,10 @@ tasks.register<UpdateNsiPresetsTask>("updateNsiPresets") {
 tasks.register<DownloadAndConvertPresetIconsTask>("downloadAndConvertPresetIcons") {
     group = "streetcomplete"
     version = presetsVersion
-    targetDir = "$projectDir/src/androidMain/res/drawable/"
+    targetDir = "$projectDir/src/commonMain/composeResources/drawable/"
     iconSize = 34
     transformName = { "preset_" + it.replace('-', '_') }
-    indexFile = "$projectDir/src/androidMain/kotlin/de/westnordost/streetcomplete/view/PresetIconIndex.kt"
+    indexFile = "$projectDir/src/androidMain/kotlin/de/westnordost/streetcomplete/view/PresetIconIndex.kt" // necessary as long as map is not compose based yet
 }
 
 tasks.register<UpdateAppTranslationsTask>("updateTranslations") {
@@ -476,12 +476,14 @@ tasks.register("copyDefaultStringsToEnStrings") {
     }
 }
 
+// necessary as long as map hasn't been converted to compose yet
 val copySharedResToAndroid by tasks.registering(Copy::class) {
     val target = "build/generated/androidMain/res/drawable"
     from("src/commonMain/composeResources/drawable")
     into(target)
     include {
         it.name.startsWith("building_") ||
+        it.name.startsWith("preset_") ||
         it.name == "sport_volleyball.xml" ||
         it.name == "religion_christian.xml" ||
         it.name == "religion_jewish.xml" ||

app/src/androidMain/kotlin/de/westnordost/streetcomplete/data/meta/MetadataModule.kt

@@ -20,7 +20,8 @@ val metadataModule = module {
     }
     single<Lazy<FeatureDictionary>>(named("FeatureDictionaryLazy")) {
         lazy {
-            FeatureDictionary.create(get<AssetManager>(), "osmfeatures/default", "osmfeatures/brands")
+            val p = "composeResources/de.westnordost.streetcomplete.resources/files/"
+            FeatureDictionary.create(get<AssetManager>(), p+"osmfeatures/default", p+"osmfeatures/brands")
         }
     }
 }

app/src/androidMain/kotlin/de/westnordost/streetcomplete/overlays/places/PlacesOverlayForm.kt

@@ -3,8 +3,14 @@ package de.westnordost.streetcomplete.overlays.places
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AlertDialog
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.material.ContentAlpha
 import androidx.compose.material.LocalContentColor
 import androidx.compose.material.LocalTextStyle
@@ -31,7 +37,7 @@ import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry
 import de.westnordost.streetcomplete.data.osm.mapdata.Element
 import de.westnordost.streetcomplete.data.osm.mapdata.ElementType
 import de.westnordost.streetcomplete.data.preferences.Preferences
-import de.westnordost.streetcomplete.databinding.FragmentOverlayPlacesBinding
+import de.westnordost.streetcomplete.databinding.ComposeViewBinding
 import de.westnordost.streetcomplete.osm.POPULAR_PLACE_FEATURE_IDS
 import de.westnordost.streetcomplete.osm.applyReplacePlaceTo
 import de.westnordost.streetcomplete.osm.applyTo
@@ -47,15 +53,17 @@ import de.westnordost.streetcomplete.overlays.AnswerItem
 import de.westnordost.streetcomplete.resources.Res
 import de.westnordost.streetcomplete.resources.name_label
 import de.westnordost.streetcomplete.resources.quest_placeName_no_name_answer
+import de.westnordost.streetcomplete.ui.common.feature.FeatureIcon
+import de.westnordost.streetcomplete.ui.common.feature.FeatureSelect
+import de.westnordost.streetcomplete.ui.common.last_picked.LastPickedChipsRow
 import de.westnordost.streetcomplete.ui.common.localized_name.LocalizedNamesForm
 import de.westnordost.streetcomplete.ui.util.content
 import de.westnordost.streetcomplete.ui.util.rememberSerializable
-import de.westnordost.streetcomplete.util.getLanguagesForFeatureDictionary
 import de.westnordost.streetcomplete.util.getLocationSpanned
 import de.westnordost.streetcomplete.util.ktx.geometryType
 import de.westnordost.streetcomplete.util.ktx.viewLifecycleScope
-import de.westnordost.streetcomplete.view.controller.FeatureViewController
-import de.westnordost.streetcomplete.view.dialogs.SearchFeaturesDialog
+import de.westnordost.streetcomplete.util.locale.getLanguagesForFeatureDictionary
+import de.westnordost.streetcomplete.util.takeFavorites
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
 import org.jetbrains.compose.resources.stringResource
@@ -64,19 +72,31 @@ import kotlin.coroutines.resume
 
 class PlacesOverlayForm : AbstractOverlayForm() {
 
-    override val contentLayoutResId = R.layout.fragment_overlay_places
-    private val binding by contentViewBinding(FragmentOverlayPlacesBinding::bind)
+    override val contentLayoutResId = R.layout.compose_view
+    private val binding by contentViewBinding(ComposeViewBinding::bind)
 
     private val prefs: Preferences by inject()
 
     private var originalFeature: Feature? = null
     private var originalNoName: Boolean = false
     private var originalNames: List<LocalizedName> = emptyList()
-
+    private var selectedFeature: MutableState<Feature?> = mutableStateOf(null)
     private var localizedNames: MutableState<List<LocalizedName>> = mutableStateOf(emptyList())
     private var isNoName: MutableState<Boolean> = mutableStateOf(false)
 
-    private lateinit var featureCtrl: FeatureViewController
+    private val lastPickedFeatures: List<Feature> by lazy {
+        val languages = getLanguagesForFeatureDictionary()
+        prefs.getLastPicked<String>(this::class.simpleName!!)
+            .takeFavorites(n = 5, first = 1)
+            .mapNotNull { featureId ->
+                featureDictionary.getById(
+                    id = featureId,
+                    languages = languages,
+                    country = countryOrSubdivisionCode,
+                )
+            }
+    }
+
 
     private lateinit var vacantShopFeature: Feature
 
@@ -88,10 +108,11 @@ class PlacesOverlayForm : AbstractOverlayForm() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        val languages = getLanguagesForFeatureDictionary(resources.configuration)
+        val languages = getLanguagesForFeatureDictionary()
         vacantShopFeature = featureDictionary.getById("shop/vacant", languages)!!
         originalNames = parseLocalizedNames(element?.tags.orEmpty()).orEmpty()
         originalFeature = getOriginalFeature()
+        selectedFeature.value = originalFeature
         originalNoName = element?.tags?.get("name:signed") == "no" || element?.tags?.get("noname") == "yes"
     }
 
@@ -110,7 +131,7 @@ class PlacesOverlayForm : AbstractOverlayForm() {
     }
 
     private fun getFeatureDictionaryFeature(element: Element): Feature? {
-        val languages = getLanguagesForFeatureDictionary(resources.configuration)
+        val languages = getLanguagesForFeatureDictionary()
         val geometryType = if (element.type == ElementType.NODE) null else element.geometryType
 
         return featureDictionary.getByTags(
@@ -128,24 +149,6 @@ class PlacesOverlayForm : AbstractOverlayForm() {
         setTitleHintLabel(element?.tags?.let { getLocationSpanned(it, resources) })
         setMarkerIcon(R.drawable.quest_shop)
 
-        featureCtrl = FeatureViewController(featureDictionary, binding.featureTextView, binding.featureIconView)
-        featureCtrl.countryOrSubdivisionCode = countryOrSubdivisionCode
-        featureCtrl.feature = originalFeature
-
-        binding.featureView.setOnClickListener {
-            SearchFeaturesDialog(
-                requireContext(),
-                featureDictionary,
-                element?.geometryType ?: GeometryType.POINT,
-                countryOrSubdivisionCode,
-                featureCtrl.feature?.name,
-                { it.toElement().isPlace() || it.id == "shop/vacant" },
-                ::onSelectedFeature,
-                POPULAR_PLACE_FEATURE_IDS,
-            ).show()
-        }
-
-
         val selectableLanguages = (
             countryInfo.officialLanguages + countryInfo.additionalStreetsignLanguages
         ).distinct().toMutableList()
@@ -156,66 +159,105 @@ class PlacesOverlayForm : AbstractOverlayForm() {
             }
         }
 
-        binding.names.composeViewBase.content { Surface {
+        binding.composeViewBase.content { Surface {
             localizedNames = rememberSerializable {
                 mutableStateOf(originalNames.takeIf { it.isNotEmpty() } ?: defaultNames())
             }
             isNoName = rememberSaveable { mutableStateOf(originalNoName) }
 
-            Column {
-                Text(
-                    text = stringResource(Res.string.name_label),
-                    style = MaterialTheme.typography.caption.copy(
-                        color = LocalContentColor.current.copy(alpha = ContentAlpha.medium)
-                    )
+            Column(
+                modifier = Modifier
+                    .defaultMinSize(minHeight = 96.dp)
+                    .fillMaxWidth(),
+                horizontalAlignment = Alignment.CenterHorizontally,
+                verticalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterVertically),
+            ) {
+                val feature = selectedFeature.value
+
+                FeatureSelect(
+                    feature = feature,
+                    onSelectedFeature = ::onSelectedFeature,
+                    featureDictionary = featureDictionary,
+                    geometryType = element?.geometryType ?: GeometryType.POINT,
+                    countryCode = countryOrSubdivisionCode,
+                    filterFn = { it.toElement().isPlace() || it.id == "shop/vacant" },
+                    codesOfDefaultFeatures = POPULAR_PLACE_FEATURE_IDS,
                 )
-                if (isNoName.value && localizedNames.value.isEmpty()) {
-                    Text(
-                        text = stringResource(Res.string.quest_placeName_no_name_answer),
-                        style = LocalTextStyle.current.copy(
-                            fontWeight = FontWeight.Bold,
-                            color = LocalContentColor.current.copy(alpha = ContentAlpha.medium)
-                        ),
-                        modifier = Modifier
-                            .padding(20.dp)
-                            .align(Alignment.CenterHorizontally)
+                if (feature != null && !feature.hasFixedName) {
+                    Column {
+                        Text(
+                            text = stringResource(Res.string.name_label),
+                            style = MaterialTheme.typography.caption.copy(
+                                color = LocalContentColor.current.copy(alpha = ContentAlpha.medium)
+                            )
+                        )
+                        if (isNoName.value && localizedNames.value.isEmpty()) {
+                            Text(
+                                text = stringResource(Res.string.quest_placeName_no_name_answer),
+                                style = LocalTextStyle.current.copy(
+                                    fontWeight = FontWeight.Bold,
+                                    color = LocalContentColor.current.copy(alpha = ContentAlpha.medium)
+                                ),
+                                modifier = Modifier
+                                    .padding(20.dp)
+                                    .align(Alignment.CenterHorizontally)
+                            )
+                        }
+                        LocalizedNamesForm(
+                            localizedNames = localizedNames.value,
+                            onChanged = {
+                                localizedNames.value = it
+                                if (it.isNotEmpty()) isNoName.value = false
+                                checkIsFormComplete()
+                            },
+                            languageTags = selectableLanguages,
+                        )
+                    }
+                }
+                // show only for adding new POIs becaues it gets too busy with also the name form
+                // being displayed
+                if (lastPickedFeatures.isNotEmpty() && element == null && selectedFeature.value == null) {
+                    LastPickedChipsRow(
+                        items = lastPickedFeatures,
+                        onClick = {
+                            selectedFeature.value = it
+                            checkIsFormComplete()
+                        },
+                        modifier = Modifier.padding(start = 48.dp, end = 56.dp),
+                        itemContent = {
+                            FeatureIcon(
+                                feature = it,
+                                modifier = Modifier.size(22.5.dp)
+                            )
+                        }
                     )
+                } else {
+                    Spacer(Modifier.size(48.dp))
                 }
-                LocalizedNamesForm(
-                    localizedNames = localizedNames.value,
-                    onChanged = {
-                        localizedNames.value = it
-                        if (it.isNotEmpty()) isNoName.value = false
-                        checkIsFormComplete()
-                    },
-                    languageTags = selectableLanguages,
-                )
             }
         } }
-
-        updateNameContainerVisibility()
+        checkIsFormComplete()
     }
 
     private fun onSelectedFeature(feature: Feature) {
-        featureCtrl.feature = feature
+        selectedFeature.value = feature
         isNoName.value = false
         // clear previous names (if necessary, and if any)
-        if (feature.hasFixedName) {
+        if (feature.hasFixedName == true) {
             localizedNames.value = listOf()
         } else {
             localizedNames.value = defaultNames()
         }
-        updateNameContainerVisibility()
         checkIsFormComplete()
     }
 
     private fun setVacant() {
-        val languages = getLanguagesForFeatureDictionary(resources.configuration)
+        val languages = getLanguagesForFeatureDictionary()
         onSelectedFeature(featureDictionary.getById("shop/vacant", languages)!!)
     }
 
     private fun createNoNameAnswer(): AnswerItem? {
-        val feature = featureCtrl.feature
+        val feature = selectedFeature.value
         return if (feature == null || isNoName.value || feature.hasFixedName) {
             null
         } else {
@@ -235,34 +277,33 @@ class PlacesOverlayForm : AbstractOverlayForm() {
         checkIsFormComplete()
     }
 
-    private fun updateNameContainerVisibility() {
-        val feature = featureCtrl.feature
-        val isNameInputInvisible = feature == null || feature.hasFixedName
-        binding.names.root.isGone = isNameInputInvisible
-    }
-
     private fun defaultNames(): List<LocalizedName> =
         listOf(LocalizedName(countryInfo.language.orEmpty(), ""))
 
     override fun hasChanges(): Boolean =
-        originalFeature != featureCtrl.feature
+        originalFeature != selectedFeature.value
         || originalNames != localizedNames.value.filter { it.name.isNotEmpty() }
         || originalNoName != isNoName.value
 
     override fun isFormComplete(): Boolean =
-        featureCtrl.feature != null
+        selectedFeature.value != null
         // name is not necessary
 
     override fun onClickOk() {
         val inputNames = localizedNames.value.filter { it.name.isNotEmpty() }
         val firstLanguage = inputNames.firstOrNull()?.languageTag
         if (!firstLanguage.isNullOrEmpty()) prefs.preferredLanguageForNames = firstLanguage
 
+        val feature = selectedFeature.value!!
+        if (!feature.isSuggestion) {
+            prefs.addLastPicked(this::class.simpleName!!, feature.id)
+        }
+
         viewLifecycleScope.launch {
             applyEdit(createEditAction(
                 element, geometry,
                 inputNames, originalNames,
-                featureCtrl.feature!!, originalFeature,
+                selectedFeature.value!!, originalFeature,
                 isNoName.value,
                 ::confirmReplaceShop
             ))

app/src/androidMain/kotlin/de/westnordost/streetcomplete/overlays/surface/SurfaceOverlayForm.kt

@@ -34,8 +34,8 @@ import de.westnordost.streetcomplete.overlays.ItemPairSelectOverlayForm
 import de.westnordost.streetcomplete.overlays.ItemSelectOverlayForm
 import de.westnordost.streetcomplete.ui.common.item_select.ImageWithLabel
 import de.westnordost.streetcomplete.ui.util.content
-import de.westnordost.streetcomplete.util.getLanguagesForFeatureDictionary
 import de.westnordost.streetcomplete.util.ktx.couldBeSteps
+import de.westnordost.streetcomplete.util.locale.getLanguagesForFeatureDictionary
 import de.westnordost.streetcomplete.util.takeFavorites
 import org.jetbrains.compose.resources.painterResource
 import org.jetbrains.compose.resources.stringResource
@@ -114,14 +114,12 @@ class SurfaceOverlayForm : AbstractOverlayForm() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        val languages = getLanguagesForFeatureDictionary(resources.configuration)
+        val languages = getLanguagesForFeatureDictionary()
         val footwayLabel = featureDictionary.getById("highway/footway", languages)?.name.orEmpty()
         val cyclewayLabel = featureDictionary.getById("highway/cycleway", languages)?.name.orEmpty()
 
         binding.composeViewBase.content { Surface {
-            val item = selectedItem.value
-
-            when (item) {
+            when (val item = selectedItem.value) {
                 is SingleSurface -> {
                     val lastPickedSingleSurfaces = remember { lastPickedSingleSurfaces }
                     ItemSelectOverlayForm(