Quest form & overlay form in compose

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

@@ -27,6 +27,7 @@ import de.westnordost.streetcomplete.databinding.ButtonPanelButtonBinding
 import de.westnordost.streetcomplete.databinding.FragmentQuestAnswerBinding
 import de.westnordost.streetcomplete.screens.main.bottom_sheet.AbstractBottomSheetFragment
 import de.westnordost.streetcomplete.screens.main.bottom_sheet.IsMapOrientationAware
+import de.westnordost.streetcomplete.ui.common.quest.QuestHeader
 import de.westnordost.streetcomplete.ui.util.content
 import de.westnordost.streetcomplete.util.FragmentViewBindingPropertyDelegate
 import de.westnordost.streetcomplete.util.ktx.popIn
@@ -137,7 +138,7 @@ abstract class AbstractQuestForm :
     protected open fun getHintImages(): List<DrawableResource> = questType.hintImages
 
     @Composable
-    protected open fun ContentBeforeSpeechbubbleContent() {}
+    protected open fun ContentBeforeSpeechBubbleContent() {}
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -152,7 +153,7 @@ abstract class AbstractQuestForm :
         } }
 
         binding.contentBeforeSpeechbubbleContent.content {
-            ContentBeforeSpeechbubbleContent()
+            ContentBeforeSpeechBubbleContent()
         }
 
         binding.okButton.setOnClickListener {

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

@@ -26,6 +26,7 @@ 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.common.quest.QuestHeader
 import de.westnordost.streetcomplete.ui.theme.titleLarge
 import de.westnordost.streetcomplete.ui.util.content
 import de.westnordost.streetcomplete.util.ktx.viewLifecycleScope

app/src/androidMain/kotlin/de/westnordost/streetcomplete/quests/note_discussion/NoteDiscussionForm.kt

@@ -37,6 +37,7 @@ import de.westnordost.streetcomplete.quests.AnswerItem
 import de.westnordost.streetcomplete.quests.note_comments.NoteCommentItem
 import de.westnordost.streetcomplete.quests.note_comments.NoteForm
 import de.westnordost.streetcomplete.screens.main.bottom_sheet.AbstractCreateNoteFragment
+import de.westnordost.streetcomplete.ui.theme.defaultTextLinkStyles
 import de.westnordost.streetcomplete.ui.util.content
 import de.westnordost.streetcomplete.ui.util.rememberSerializable
 import de.westnordost.streetcomplete.util.image.loadImageBitmap
@@ -126,16 +127,8 @@ class NoteDiscussionForm : AbstractQuestForm(), TakePhotoFragment.Listener {
     }
 
     @Composable
-    override fun ContentBeforeSpeechbubbleContent() {
-        val textLinkStyles = TextLinkStyles(
-            style = SpanStyle(
-                color = MaterialTheme.colors.primary,
-                textDecoration = TextDecoration.Underline
-            ),
-            focusedStyle = SpanStyle(
-                color = MaterialTheme.colors.secondary,
-            )
-        )
+    override fun ContentBeforeSpeechBubbleContent() {
+        val textLinkStyles = MaterialTheme.typography.defaultTextLinkStyles()
         ProvideTextStyle(MaterialTheme.typography.body2) {
             Column(
                 verticalArrangement = Arrangement.spacedBy(8.dp),

app/src/androidMain/kotlin/de/westnordost/streetcomplete/screens/main/bottom_sheet/CreateNoteFragment.kt

@@ -26,9 +26,9 @@ import de.westnordost.streetcomplete.data.osmnotes.edits.NoteEditAction
 import de.westnordost.streetcomplete.data.osmnotes.edits.NoteEditsController
 import de.westnordost.streetcomplete.data.osmtracks.Trackpoint
 import de.westnordost.streetcomplete.databinding.FragmentCreateNoteBinding
-import de.westnordost.streetcomplete.quests.QuestHeader
 import de.westnordost.streetcomplete.quests.note_comments.NoteForm
 import de.westnordost.streetcomplete.resources.*
+import de.westnordost.streetcomplete.ui.common.quest.QuestHeader
 import de.westnordost.streetcomplete.ui.util.content
 import de.westnordost.streetcomplete.util.ktx.getLocationInWindow
 import de.westnordost.streetcomplete.util.ktx.viewLifecycleScope

app/src/androidMain/kotlin/de/westnordost/streetcomplete/screens/main/edithistory/EditDetails.kt

@@ -7,10 +7,12 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.material.ContentAlpha
 import androidx.compose.material.Divider
+import androidx.compose.material.LocalContentAlpha
 import androidx.compose.material.LocalContentColor
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -45,11 +47,12 @@ fun EditDetails(
         modifier = modifier,
         verticalArrangement = Arrangement.spacedBy(8.dp)
     ) {
-        Text(
-            text = dateTimeFormatter.format(createdTime),
-            style = MaterialTheme.typography.body2,
-            color = LocalContentColor.current.copy(alpha = ContentAlpha.medium),
-        )
+        CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) {
+            Text(
+                text = dateTimeFormatter.format(createdTime),
+                style = MaterialTheme.typography.body2,
+            )
+        }
         Row(
             horizontalArrangement = Arrangement.spacedBy(16.dp),
             verticalAlignment = Alignment.CenterVertically

app/src/androidMain/kotlin/de/westnordost/streetcomplete/screens/main/teammode/TeamModeWizard.kt

@@ -52,6 +52,7 @@ import kotlinx.coroutines.delay
 import org.jetbrains.compose.resources.painterResource
 import org.jetbrains.compose.resources.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import de.westnordost.streetcomplete.ui.theme.divider
 
 /** Wizard which enables team mode */
 @Composable
@@ -200,7 +201,7 @@ private fun SplitQuestsIllustration(
     }
 
     val arrangement = Arrangement.spacedBy((-48 + 64 * padding.value).dp)
-    val dividerColor = MaterialTheme.colors.onSurface.copy(alpha = 0.12f)
+    val dividerColor = MaterialTheme.colors.divider
     val dividerWidth = 4.dp.toPx()
     Column(
         modifier = Modifier

app/src/androidMain/kotlin/de/westnordost/streetcomplete/screens/settings/overlay_selection/OverlaySelectionRow.kt

@@ -13,10 +13,12 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.material.Checkbox
 import androidx.compose.material.ContentAlpha
+import androidx.compose.material.LocalContentAlpha
 import androidx.compose.material.LocalContentColor
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
@@ -73,10 +75,11 @@ fun OverlaySelectionRow(
 
 @Composable
 private fun DisabledHint(text: String) {
-    Text(
-        text = text,
-        style = MaterialTheme.typography.body2,
-        fontStyle = FontStyle.Italic,
-        color = LocalContentColor.current.copy(alpha = ContentAlpha.medium),
-    )
+    CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) {
+        Text(
+            text = text,
+            style = MaterialTheme.typography.body2,
+            fontStyle = FontStyle.Italic,
+        )
+    }
 }

app/src/androidMain/kotlin/de/westnordost/streetcomplete/screens/settings/presets/EditTypePresetsScreen.kt

@@ -100,7 +100,7 @@ import org.jetbrains.compose.resources.stringResource
 private fun EditTypePresetsList(
     viewModel: EditTypePresetsViewModel,
     modifier: Modifier = Modifier,
-    contentPadding: PaddingValues = PaddingValues(0.dp)
+    contentPadding: PaddingValues = PaddingValues.Zero
 ) {
     val presets by viewModel.presets.collectAsState()
 

app/src/androidMain/kotlin/de/westnordost/streetcomplete/screens/settings/quest_selection/QuestSelectionList.kt

@@ -45,7 +45,7 @@ fun QuestSelectionList(
     onSelect: (questType: QuestType, selected: Boolean) -> Unit,
     onReorder: (questType: QuestType, toAfter: QuestType) -> Unit,
     modifier: Modifier = Modifier,
-    contentPadding: PaddingValues = PaddingValues(0.dp),
+    contentPadding: PaddingValues = PaddingValues.Zero,
 ) {
     var showEnableQuestDialog by remember { mutableStateOf<QuestType?>(null) }
 

app/src/androidMain/kotlin/de/westnordost/streetcomplete/screens/settings/quest_selection/QuestSelectionRow.kt

@@ -15,10 +15,12 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.material.Checkbox
 import androidx.compose.material.ContentAlpha
 import androidx.compose.material.Icon
+import androidx.compose.material.LocalContentAlpha
 import androidx.compose.material.LocalContentColor
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -92,12 +94,13 @@ fun QuestSelectionRow(
 
 @Composable
 private fun DisabledHint(text: String) {
-    Text(
-        text = text,
-        style = MaterialTheme.typography.body2,
-        fontStyle = FontStyle.Italic,
-        color = LocalContentColor.current.copy(alpha = ContentAlpha.medium),
-    )
+    CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) {
+        Text(
+            text = text,
+            style = MaterialTheme.typography.body2,
+            fontStyle = FontStyle.Italic,
+        )
+    }
 }
 
 @Preview

app/src/androidMain/kotlin/de/westnordost/streetcomplete/screens/user/edits/EditTypeStatisticsColumn.kt

@@ -26,7 +26,7 @@ import de.westnordost.streetcomplete.ui.theme.GrassGreen
 fun EditTypeStatisticsColumn(
     statistics: List<EditTypeStatistics>,
     modifier: Modifier = Modifier,
-    contentPadding: PaddingValues = PaddingValues(0.dp),
+    contentPadding: PaddingValues = PaddingValues.Zero,
 ) {
     var showInfo by remember { mutableStateOf<EditTypeStatistics?>(null) }
 

app/src/commonMain/composeResources/drawable/ic_check_48.xml → app/src/commonMain/composeResources/drawable/ic_check_32.xml

@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
+    android:width="32dp"
+    android:height="32dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path

app/src/commonMain/kotlin/de/westnordost/streetcomplete/quests/lanes/LanesForm.kt

@@ -23,6 +23,7 @@ import de.westnordost.streetcomplete.resources.*
 import de.westnordost.streetcomplete.ui.common.dialogs.WheelPickerDialog
 import de.westnordost.streetcomplete.ui.common.last_picked.LastPickedChipsRow
 import de.westnordost.streetcomplete.ui.common.street_side_select.MiniCompass
+import de.westnordost.streetcomplete.ui.theme.divider
 import org.jetbrains.compose.resources.stringResource
 
 /** Form to input how many lanes a road has */
@@ -80,7 +81,7 @@ fun LanesForm(
                 modifier = Modifier
                     .padding(horizontal = 8.dp)
                     .align(Alignment.BottomStart),
-                chipBorder = BorderStroke(1.dp, MaterialTheme.colors.onSurface.copy(alpha = 0.12f)),
+                chipBorder = BorderStroke(1.dp, MaterialTheme.colors.divider),
             ) { laneCount ->
                 LanesButtonContent(
                     laneCount = laneCount,

app/src/commonMain/kotlin/de/westnordost/streetcomplete/quests/max_speed/MaxSpeedForm.kt

@@ -6,10 +6,12 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material.ContentAlpha
+import androidx.compose.material.LocalContentAlpha
 import androidx.compose.material.LocalContentColor
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -66,11 +68,12 @@ fun MaxSpeedForm(
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.spacedBy(4.dp)
     ) {
-        Text(
-            text = stringResource(Res.string.quest_maxspeed_type_description),
-            color = LocalContentColor.current.copy(alpha = ContentAlpha.medium),
-            style = MaterialTheme.typography.body2,
-        )
+        CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) {
+            Text(
+                text = stringResource(Res.string.quest_maxspeed_type_description),
+                style = MaterialTheme.typography.body2,
+            )
+        }
         DropdownButton(
             items = selectableMaxSpeedTypes,
             onSelectedItem = { onAnswer(it) },

app/src/commonMain/kotlin/de/westnordost/streetcomplete/quests/max_speed/RoadTypeSelect.kt

@@ -2,10 +2,12 @@ package de.westnordost.streetcomplete.quests.max_speed
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.material.ContentAlpha
+import androidx.compose.material.LocalContentAlpha
 import androidx.compose.material.LocalContentColor
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -33,11 +35,12 @@ fun RoadTypeSelect(
         horizontalAlignment = Alignment.CenterHorizontally,
         modifier = modifier,
     ) {
-        Text(
-            text = stringResource(Res.string.quest_maxspeed_answer_roadtype_description),
-            color = LocalContentColor.current.copy(alpha = ContentAlpha.medium),
-            style = MaterialTheme.typography.body2,
-        )
+        CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) {
+            Text(
+                text = stringResource(Res.string.quest_maxspeed_answer_roadtype_description),
+                style = MaterialTheme.typography.body2,
+            )
+        }
         ItemSelectGrid(
             columns = SimpleGridCells.Fixed(cells),
             items = selectable,

app/src/commonMain/kotlin/de/westnordost/streetcomplete/quests/note_comments/NoteCommentItem.kt

@@ -1,18 +1,15 @@
 package de.westnordost.streetcomplete.quests.note_comments
 
-import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.material.ContentAlpha
 import androidx.compose.material.Divider
-import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
@@ -24,11 +21,13 @@ import androidx.compose.ui.text.TextLinkStyles
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.withLink
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import de.westnordost.streetcomplete.data.osmnotes.NoteComment
 import de.westnordost.streetcomplete.resources.*
-import de.westnordost.streetcomplete.ui.common.SpeechBubbleArrowDirection
-import de.westnordost.streetcomplete.ui.common.SpeechBubbleShape
+import de.westnordost.streetcomplete.ui.common.speech_bubble.SpeechBubble
+import de.westnordost.streetcomplete.ui.common.speech_bubble.SpeechBubbleArrowDirection
+import de.westnordost.streetcomplete.ui.common.speech_bubble.SpeechBubbleNoArrow
 import de.westnordost.streetcomplete.ui.util.annotateLinks
 import de.westnordost.streetcomplete.ui.util.formatAnnotated
 import de.westnordost.streetcomplete.util.ktx.toLocalDateTime
@@ -47,6 +46,7 @@ fun NoteCommentItem(
     noteComment: NoteComment,
     avatarPainter: Painter?,
     modifier: Modifier = Modifier,
+    elevation: Dp = 16.dp,
     textLinkStyles: TextLinkStyles? = null
 ) {
     val annotatedUserName = buildAnnotatedString {
@@ -83,33 +83,21 @@ fun NoteCommentItem(
             Row(horizontalArrangement = Arrangement.spacedBy(4.dp)) {
                 Surface(
                     modifier = Modifier.size(50.dp),
-                    elevation = 16.dp,
+                    elevation = elevation,
                     shape = CircleShape,
-                    border = BorderStroke(1.dp, MaterialTheme.colors.onSurface.copy(alpha = 0.12f))
                 ) {
                     Image(
                         painter = avatarPainter ?: painterResource(Res.drawable.avatar_osm_anonymous),
                         contentDescription = annotatedUserName.text
                     )
                 }
 
-                val speechBubbleShape = SpeechBubbleShape(
+                SpeechBubble(
                     arrowDirection = SpeechBubbleArrowDirection.Start,
-                    cornerRadius = 16.dp,
-                    arrowSize = 10.dp,
-                )
-                Surface(
-                    elevation = 16.dp,
-                    shape = speechBubbleShape,
-                    border = BorderStroke(1.dp, MaterialTheme.colors.onSurface.copy(alpha = 0.12f))
+                    elevation = elevation,
                 ) {
                     SelectionContainer {
-                        Column(
-                            modifier = Modifier
-                                .padding(speechBubbleShape.contentPadding)
-                                .padding(horizontal = 16.dp, vertical = 12.dp),
-                            verticalArrangement = Arrangement.spacedBy(4.dp)
-                        ) {
+                        Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
                             Text(annotatedCommentText)
                             Divider()
                             Text(
@@ -125,11 +113,7 @@ fun NoteCommentItem(
         // the action (if anything else than a normal comment) is shown in a separate bubble, just
         // like for example in github ("comment and close")
         if (actionTextResource != null) {
-            Surface(
-                elevation = 16.dp,
-                shape = RoundedCornerShape(16.dp),
-                border = BorderStroke(1.dp, MaterialTheme.colors.onSurface.copy(alpha = 0.12f))
-            ) {
+            SpeechBubbleNoArrow(elevation = elevation) {
                 Text(
                     text = stringResource(actionTextResource)
                         .formatAnnotated(annotatedUserName, dateText),