Add support for styling lines and shapes in Select One from Map questions

androidshared/src/main/java/org/odk/collect/androidshared/utils/ColorUtils.kt

@@ -0,0 +1,27 @@
+package org.odk.collect.androidshared.utils
+
+import android.graphics.Color
+import androidx.annotation.ColorInt
+
+@ColorInt
+fun String.toColorInt() = try {
+    var sanitizedColor = if (this.startsWith("#")) {
+        this
+    } else {
+        "#$this"
+    }
+
+    if (sanitizedColor.length == 4) {
+        sanitizedColor = shorthandToLonghandHexColor(sanitizedColor)
+    }
+
+    Color.parseColor(sanitizedColor)
+} catch (e: IllegalArgumentException) {
+    null
+}
+
+private fun shorthandToLonghandHexColor(shorthandColor: String): String {
+    return shorthandColor.substring(1).fold("#") { accum, char ->
+        "$accum$char$char"
+    }
+}

androidshared/src/test/java/org/odk/collect/androidshared/utils/ColorUtilsTest.kt

@@ -0,0 +1,45 @@
+package org.odk.collect.androidshared.utils
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers.equalTo
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class ColorUtilsTest {
+    @Test
+    fun `return null when color is empty`() {
+        assertThat("".toColorInt(), equalTo(null))
+    }
+
+    @Test
+    fun `return null when color is blank`() {
+        assertThat(" ".toColorInt(), equalTo(null))
+    }
+
+    @Test
+    fun `return null when color is invalid`() {
+        assertThat("qwerty".toColorInt(), equalTo(null))
+    }
+
+    @Test
+    fun `return color int for valid hex color with # prefix`() {
+        assertThat("#aaccee".toColorInt(), equalTo(-5583634))
+    }
+
+    @Test
+    fun `return color int for valid hex color without # prefix`() {
+        assertThat("aaccee".toColorInt(), equalTo(-5583634))
+    }
+
+    @Test
+    fun `return color int for valid shorthand hex color with # prefix`() {
+        assertThat("#ace".toColorInt(), equalTo(-5583634))
+    }
+
+    @Test
+    fun `return color int for valid shorthand hex color without # prefix`() {
+        assertThat("ace".toColorInt(), equalTo(-5583634))
+    }
+}

collect_app/src/androidTest/java/org/odk/collect/android/support/FakeClickableMapFragment.kt

@@ -3,8 +3,10 @@ package org.odk.collect.android.support
 import android.os.Handler
 import android.os.Looper
 import androidx.fragment.app.Fragment
+import org.odk.collect.maps.LineDescription
 import org.odk.collect.maps.MapFragment
 import org.odk.collect.maps.MapPoint
+import org.odk.collect.maps.PolygonDescription
 import org.odk.collect.maps.markers.MarkerDescription
 import org.odk.collect.maps.markers.MarkerIconDescription
 
@@ -57,16 +59,12 @@ class FakeClickableMapFragment : Fragment(), MapFragment {
         return MapPoint(0.0, 0.0)
     }
 
-    override fun addPolyLine(
-        points: MutableIterable<MapPoint>,
-        closed: Boolean,
-        draggable: Boolean
-    ): Int {
+    override fun addPolyLine(lineDescription: LineDescription): Int {
         return -1
     }
 
-    override fun addPolygon(points: MutableIterable<MapPoint>): Int {
-        return addPolyLine(points, closed = true, draggable = false)
+    override fun addPolygon(polygonDescription: PolygonDescription): Int {
+        return -1
     }
 
     override fun appendPointToPolyLine(featureId: Int, point: MapPoint) {}

collect_app/src/main/java/org/odk/collect/android/formmanagement/formmap/FormMapViewModel.kt

@@ -115,12 +115,12 @@ class FormMapViewModel(
             )
 
             val info = "$instanceLastStatusChangeDate\n${dateFormat.format(instance.deletedDate)}"
-            MappableSelectItem(
+            MappableSelectItem.MappableSelectPoint(
                 instance.dbId,
-                listOf(MapPoint(latitude, longitude)),
-                getDrawableIdForStatus(instance.status, false),
-                getDrawableIdForStatus(instance.status, true),
                 instance.displayName,
+                point = MapPoint(latitude, longitude),
+                smallIcon = getDrawableIdForStatus(instance.status, false),
+                largeIcon = getDrawableIdForStatus(instance.status, true),
                 info = info
             )
         } else if (!instance.canEditWhenComplete() && listOf(
@@ -130,12 +130,12 @@ class FormMapViewModel(
             ).contains(instance.status)
         ) {
             val info = "$instanceLastStatusChangeDate\n${resources.getString(org.odk.collect.strings.R.string.cannot_edit_completed_form)}"
-            MappableSelectItem(
+            MappableSelectItem.MappableSelectPoint(
                 instance.dbId,
-                listOf(MapPoint(latitude, longitude)),
-                getDrawableIdForStatus(instance.status, false),
-                getDrawableIdForStatus(instance.status, true),
                 instance.displayName,
+                point = MapPoint(latitude, longitude),
+                smallIcon = getDrawableIdForStatus(instance.status, false),
+                largeIcon = getDrawableIdForStatus(instance.status, true),
                 info = info
             )
         } else {
@@ -146,12 +146,12 @@ class FormMapViewModel(
                     createViewAction()
                 }
 
-            MappableSelectItem(
+            MappableSelectItem.MappableSelectPoint(
                 instance.dbId,
-                listOf(MapPoint(latitude, longitude)),
-                getDrawableIdForStatus(instance.status, false),
-                getDrawableIdForStatus(instance.status, true),
                 instance.displayName,
+                point = MapPoint(latitude, longitude),
+                smallIcon = getDrawableIdForStatus(instance.status, false),
+                largeIcon = getDrawableIdForStatus(instance.status, true),
                 info = instanceLastStatusChangeDate,
                 action = action,
                 status = instanceStatusToMappableSelectionItemStatus(instance)

collect_app/src/main/java/org/odk/collect/android/widgets/items/SelectOneFromMapDialogFragment.kt

@@ -136,7 +136,7 @@ internal class SelectChoicesMapData(
         prompt: FormEntryPrompt
     ): List<MappableSelectItem> {
         return selectChoices.foldIndexed(emptyList()) { index, list, selectChoice ->
-            val geometry = selectChoice.getChild("geometry")
+            val geometry = selectChoice.getChild(GEOMETRY)
 
             if (geometry != null) {
                 try {
@@ -153,26 +153,57 @@ internal class SelectChoicesMapData(
                                 IconifiedText(null, "${it.first}: ${it.second}")
                             }
 
-                            val markerColor =
-                                selectChoice.additionalChildren.firstOrNull { it.first == "marker-color" }?.second
-                            val markerSymbol =
-                                selectChoice.additionalChildren.firstOrNull { it.first == "marker-symbol" }?.second
-
-                            list + MappableSelectItem(
-                                index.toLong(),
-                                points,
-                                if (markerSymbol == null) org.odk.collect.icons.R.drawable.ic_map_marker_with_hole_small else org.odk.collect.icons.R.drawable.ic_map_marker_small,
-                                if (markerSymbol == null) org.odk.collect.icons.R.drawable.ic_map_marker_with_hole_big else org.odk.collect.icons.R.drawable.ic_map_marker_big,
-                                prompt.getSelectChoiceText(selectChoice),
-                                properties,
-                                selectChoice.index == selectedIndex,
-                                markerColor,
-                                markerSymbol,
-                                action = IconifiedText(
-                                    org.odk.collect.icons.R.drawable.ic_save,
-                                    resources.getString(org.odk.collect.strings.R.string.select_item)
+                            if (points.size == 1) {
+                                val markerColor =
+                                    getPropertyValue(selectChoice, MARKER_COLOR)
+                                val markerSymbol =
+                                    getPropertyValue(selectChoice, MARKER_SYMBOL)
+
+                                list + MappableSelectItem.MappableSelectPoint(
+                                    index.toLong(),
+                                    prompt.getSelectChoiceText(selectChoice),
+                                    properties,
+                                    selectChoice.index == selectedIndex,
+                                    point = points[0],
+                                    smallIcon = if (markerSymbol == null) org.odk.collect.icons.R.drawable.ic_map_marker_with_hole_small else org.odk.collect.icons.R.drawable.ic_map_marker_small,
+                                    largeIcon = if (markerSymbol == null) org.odk.collect.icons.R.drawable.ic_map_marker_with_hole_big else org.odk.collect.icons.R.drawable.ic_map_marker_big,
+                                    color = markerColor,
+                                    symbol = markerSymbol,
+                                    action = IconifiedText(
+                                        org.odk.collect.icons.R.drawable.ic_save,
+                                        resources.getString(org.odk.collect.strings.R.string.select_item)
+                                    )
                                 )
-                            )
+                            } else if (points.first() != points.last()) {
+                                list + MappableSelectItem.MappableSelectLine(
+                                    index.toLong(),
+                                    prompt.getSelectChoiceText(selectChoice),
+                                    properties,
+                                    selectChoice.index == selectedIndex,
+                                    points = points,
+                                    action = IconifiedText(
+                                        org.odk.collect.icons.R.drawable.ic_save,
+                                        resources.getString(org.odk.collect.strings.R.string.select_item)
+                                    ),
+                                    strokeWidth = getPropertyValue(selectChoice, STROKE_WIDTH),
+                                    strokeColor = getPropertyValue(selectChoice, STROKE)
+                                )
+                            } else {
+                                list + MappableSelectItem.MappableSelectPolygon(
+                                    index.toLong(),
+                                    prompt.getSelectChoiceText(selectChoice),
+                                    properties,
+                                    selectChoice.index == selectedIndex,
+                                    points = points,
+                                    action = IconifiedText(
+                                        org.odk.collect.icons.R.drawable.ic_save,
+                                        resources.getString(org.odk.collect.strings.R.string.select_item)
+                                    ),
+                                    strokeWidth = getPropertyValue(selectChoice, STROKE_WIDTH),
+                                    strokeColor = getPropertyValue(selectChoice, STROKE),
+                                    fillColor = getPropertyValue(selectChoice, FILL)
+                                )
+                            }
                         } else {
                             list
                         }
@@ -188,6 +219,10 @@ internal class SelectChoicesMapData(
         }
     }
 
+    private fun getPropertyValue(selectChoice: SelectChoice, propertyName: String): String? {
+        return selectChoice.additionalChildren.firstOrNull { it.first == propertyName }?.second
+    }
+
     override fun isLoading(): NonNullLiveData<Boolean> {
         return isLoading
     }
@@ -207,4 +242,13 @@ internal class SelectChoicesMapData(
     override fun getMappableItems(): LiveData<List<MappableSelectItem>?> {
         return items
     }
+
+    companion object PropertyNames {
+        const val GEOMETRY = "geometry"
+        const val MARKER_COLOR = "marker-color"
+        const val MARKER_SYMBOL = "marker-symbol"
+        const val STROKE = "stroke"
+        const val STROKE_WIDTH = "stroke-width"
+        const val FILL = "fill"
+    }
 }