Note forms in compose (#6804)

Author: westnordost

app/build.gradle.kts

@@ -46,8 +46,6 @@ plugins {
 repositories {
     google()
     mavenCentral()
-    // for com.github.chrisbaines:PhotoView
-    maven { url = uri("https://www.jitpack.io") }
 }
 
 buildkonfig {
@@ -209,7 +207,6 @@ kotlin {
 
                 // widgets
                 implementation("com.google.android.flexbox:flexbox:3.0.0")
-                implementation("com.github.chrisbanes:PhotoView:2.3.0")
 
                 // map and location
                 implementation("org.maplibre.gl:android-sdk:12.3.1")

app/src/androidInstrumentedTest/kotlin/de/westnordost/streetcomplete/util/NameAndLocationLabelTest.kt

@@ -32,7 +32,7 @@ class NameAndLocationLabelTest {
         brandPresetsBasePath = "osmfeatures/brands"
     )
     /*
-    TODO KMP upstream
+    TODO Compose Multiplatform upstream
     Unfortunately, ResourceEnvironment's constructor is internal, so we cannot use this
     see https://youtrack.jetbrains.com/issue/CMP-9959/Access-resources-in-specific-language-outside-of-composition
     Without using specifically English resources, most tests will fail

app/src/androidMain/kotlin/de/westnordost/streetcomplete/quests/AbstractQuestForm.kt

@@ -136,6 +136,9 @@ abstract class AbstractQuestForm :
 
     protected open fun getHintImages(): List<DrawableResource> = questType.hintImages
 
+    @Composable
+    protected open fun ContentBeforeSpeechbubbleContent() {}
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -148,6 +151,10 @@ abstract class AbstractQuestForm :
             )
         } }
 
+        binding.contentBeforeSpeechbubbleContent.content {
+            ContentBeforeSpeechbubbleContent()
+        }
+
         binding.okButton.setOnClickListener {
             if (!isFormComplete()) {
                 activity?.toast(R.string.no_changes)

app/src/androidMain/kotlin/de/westnordost/streetcomplete/quests/LeaveNoteInsteadFragment.kt

@@ -1,13 +1,19 @@
 package de.westnordost.streetcomplete.quests
 
+import android.content.pm.PackageManager.FEATURE_CAMERA_ANY
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.compose.foundation.layout.Column
+import androidx.compose.material.ContentAlpha
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.ProvideTextStyle
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.platform.ComposeView
 import androidx.core.os.bundleOf
 import androidx.core.view.isGone
 import de.westnordost.streetcomplete.ApplicationConstants
@@ -16,8 +22,8 @@ import de.westnordost.streetcomplete.data.osm.mapdata.ElementType
 import de.westnordost.streetcomplete.data.osm.mapdata.LatLon
 import de.westnordost.streetcomplete.data.osmnotes.edits.NoteEditAction
 import de.westnordost.streetcomplete.data.osmnotes.edits.NoteEditsController
-import de.westnordost.streetcomplete.databinding.FormLeaveNoteBinding
 import de.westnordost.streetcomplete.databinding.FragmentQuestAnswerBinding
+import de.westnordost.streetcomplete.quests.note_comments.NoteForm
 import de.westnordost.streetcomplete.resources.*
 import de.westnordost.streetcomplete.screens.main.bottom_sheet.AbstractCreateNoteFragment
 import de.westnordost.streetcomplete.ui.theme.titleLarge
@@ -27,6 +33,7 @@ import de.westnordost.streetcomplete.util.viewBinding
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import kotlinx.io.files.FileSystem
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
@@ -37,6 +44,7 @@ import org.koin.android.ext.android.inject
 class LeaveNoteInsteadFragment : AbstractCreateNoteFragment() {
 
     private val noteEditsController: NoteEditsController by inject()
+    private val fileSystem: FileSystem by inject()
 
     private var _binding: FragmentQuestAnswerBinding? = null
     private val binding: FragmentQuestAnswerBinding get() = _binding!!
@@ -49,10 +57,7 @@ class LeaveNoteInsteadFragment : AbstractCreateNoteFragment() {
     override val floatingBottomView get() = binding.okButtonContainer
     override val okButton get() = binding.okButton
     override val okButtonContainer get() = binding.okButtonContainer
-
-    private val contentBinding by viewBinding(FormLeaveNoteBinding::bind, R.id.content)
-
-    override val noteInput get() = contentBinding.noteInput
+    private lateinit var content: ComposeView
 
     interface Listener {
         fun onCreatedNote(position: LatLon)
@@ -75,18 +80,38 @@ class LeaveNoteInsteadFragment : AbstractCreateNoteFragment() {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         _binding = FragmentQuestAnswerBinding.inflate(inflater, container, false)
-        inflater.inflate(R.layout.form_leave_note, binding.content)
+        content = ComposeView(inflater.context)
+        binding.content.addView(content)
         return binding.root
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+
+        val addImagesEnabled = requireContext().packageManager.hasSystemFeature(FEATURE_CAMERA_ANY)
+
         binding.buttonPanel.isGone = true
-        contentBinding.descriptionLabel.isGone = true
         binding.questHeader.content { Surface {
-            ProvideTextStyle(MaterialTheme.typography.titleLarge) {
-                Text(stringResource(Res.string.map_btn_create_note))
-            }
+            QuestHeader(
+                title = stringResource(Res.string.map_btn_create_note),
+                subtitle = null,
+                hintText = stringResource(Res.string.create_new_note_hint),
+                hintImages = emptyList()
+            )
+        } }
+        content.content { Surface {
+            NoteForm(
+                text = noteText.value,
+                onTextChange = {
+                    noteText.value = it
+                    updateOkButtonEnablement()
+                },
+                addImagesEnabled = addImagesEnabled,
+                onDeleteImage = ::deleteImage,
+                onTakePhoto = { takePhoto() },
+                fileSystem = fileSystem,
+                imagePaths = noteImagePaths.value,
+            )
         } }
     }