Merge ce8abd7 into cdc6847

ground/src/main/java/com/google/android/ground/model/mutation/SubmissionMutation.kt

@@ -38,8 +38,6 @@ data class SubmissionMutation(
 
   override fun toString(): String = super.toString() + "deltas= $deltas"
 
-  fun updateSyncStatus(status: SyncStatus) = this.copy(syncStatus = status)
-
   fun getPhotoData(): List<PhotoTaskData> =
     deltas.map { it.newTaskData }.filterIsInstance<PhotoTaskData>().filter { !it.isEmpty() }
 }

ground/src/main/java/com/google/android/ground/model/submission/CaptureLocationTaskData.kt

@@ -15,41 +15,15 @@
  */
 package com.google.android.ground.model.submission
 
-import android.location.Location
-import com.google.android.ground.model.geometry.Coordinates
 import com.google.android.ground.model.geometry.Point
-import com.google.android.ground.util.toDmsFormat
-import java.math.RoundingMode
-import java.text.DecimalFormat
+import com.google.android.ground.proto.Task
 
 /** User-provided response to a "capture location" data collection [Task]. */
 data class CaptureLocationTaskData(
   val location: Point,
   val altitude: Double?, // in metres
   val accuracy: Double?, // in metres
-) : GeometryTaskData(location) {
-  override fun getDetailsText(): String {
-    // TODO: Move to strings.xml for i18n
-    // Issue URL: https://github.com/google/ground-android/issues/1733
-    val df = DecimalFormat("#.##")
-    df.roundingMode = RoundingMode.DOWN
-    val coordinatesString = location.coordinates.toDmsFormat()
-    val altitudeString = altitude?.let { df.format(it) } ?: "?"
-    val accuracyString = accuracy?.let { df.format(it) } ?: "?"
-    return "$coordinatesString\nAltitude: $altitudeString m\nAccuracy: $accuracyString m"
-  }
+) : TaskData {
 
   override fun isEmpty(): Boolean = false
-
-  companion object {
-    fun Location.toCaptureLocationResult(): CaptureLocationTaskData {
-      val altitude = if (hasAltitude()) altitude else null
-      val accuracy = if (hasAccuracy()) accuracy else null
-      return CaptureLocationTaskData(
-        Point(Coordinates(latitude, longitude)),
-        altitude,
-        accuracy?.toDouble(),
-      )
-    }
-  }
 }

ground/src/main/java/com/google/android/ground/model/submission/DateTimeTaskData.kt

@@ -21,8 +21,6 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class DateTimeTaskData(val timeInMillis: Long) : TaskData {
 
-  override fun getDetailsText(): String = ""
-
   override fun isEmpty(): Boolean = timeInMillis == 0L
 
   companion object {

ground/src/main/java/com/google/android/ground/model/submission/GeometryTaskData.kt

@@ -17,24 +17,24 @@ package com.google.android.ground.model.submission
 
 import com.google.android.ground.model.geometry.Geometry
 import com.google.android.ground.model.geometry.LineString
-import com.google.android.ground.model.geometry.LinearRing
-import com.google.android.ground.model.geometry.MultiPolygon
 import com.google.android.ground.model.geometry.Point
 import com.google.android.ground.model.geometry.Polygon
+import com.google.android.ground.model.task.Task
 
 /** A user-provided response to a geometry-based task ("drop a pin" or "draw an area"). */
-abstract class GeometryTaskData(val geometry: Geometry) : TaskData {
-
-  // TODO: Move strings to view layer.
-  // Issue URL: https://github.com/google/ground-android/issues/1733
-  override fun getDetailsText(): String =
-    when (geometry) {
-      is Point -> "Point data"
-      is Polygon -> "Polygon data"
-      is LinearRing -> "LinearRing data"
-      is LineString -> "LineString data"
-      is MultiPolygon -> "MultiPolygon data"
-    }
+sealed class GeometryTaskData(val geometry: Geometry) : TaskData
 
+/** User-provided response to a "drop a pin" data collection [Task]. */
+data class DropPinTaskData(val location: Point) : GeometryTaskData(location) {
   override fun isEmpty(): Boolean = false
 }
+
+/** User-provided response to a "draw an area" data collection [Task]. */
+data class DrawAreaTaskData(val area: Polygon) : GeometryTaskData(area) {
+  override fun isEmpty(): Boolean = area.isEmpty()
+}
+
+/** User-provided "ongoing" response to a "draw an area" data collection [Task]. */
+data class DrawAreaTaskIncompleteData(val lineString: LineString) : GeometryTaskData(lineString) {
+  override fun isEmpty(): Boolean = lineString.isEmpty()
+}

ground/src/main/java/com/google/android/ground/model/submission/MultipleChoiceTaskData.kt

@@ -22,7 +22,7 @@ import kotlinx.serialization.Serializable
 
 /** User responses to a select-one (radio) or select-multiple (checkbox) field. */
 @Serializable
-class MultipleChoiceTaskData(
+data class MultipleChoiceTaskData(
   private val multipleChoice: MultipleChoice?,
   val selectedOptionIds: List<String>,
 ) : TaskData {
@@ -40,13 +40,6 @@ class MultipleChoiceTaskData(
         suffix = MultipleChoiceTaskViewModel.OTHER_SUFFIX,
       ) ?: ""
 
-  override fun getDetailsText(): String =
-    selectedOptionIds
-      .mapNotNull { multipleChoice?.getOptionById(it) }
-      .map { it.label }
-      .sorted()
-      .joinToString()
-
   override fun isEmpty(): Boolean = selectedOptionIds.isEmpty()
 
   override fun equals(other: Any?): Boolean {

ground/src/main/java/com/google/android/ground/model/submission/NumberTaskData.kt

@@ -19,12 +19,10 @@ import kotlinx.serialization.Serializable
 
 /** A user provided response to a number question task. */
 @Serializable
-data class NumberTaskData(private val number: String) : TaskData {
+data class NumberTaskData(val number: String) : TaskData {
   val value: Double
     get() = number.toDouble()
 
-  override fun getDetailsText(): String = number
-
   override fun isEmpty(): Boolean = number.isEmpty()
 
   companion object {

ground/src/main/java/com/google/android/ground/model/submission/PhotoTaskData.kt

@@ -22,7 +22,6 @@ import kotlinx.serialization.Serializable
 /** Represents a single photo associated with a given [LocationOfInterest] and [Job]. */
 @Serializable
 class PhotoTaskData(val remoteFilename: String) : TaskData {
-  override fun getDetailsText(): String = remoteFilename
 
   override fun isEmpty(): Boolean = remoteFilename.isEmpty()
 

ground/src/main/java/com/google/android/ground/model/submission/SkippedTaskData.kt

@@ -21,7 +21,5 @@ import kotlinx.serialization.Serializable
 @Serializable
 class SkippedTaskData : TaskData {
 
-  override fun getDetailsText(): String = ""
-
   override fun isEmpty(): Boolean = true
 }

ground/src/main/java/com/google/android/ground/model/submission/TaskData.kt

@@ -17,8 +17,6 @@ package com.google.android.ground.model.submission
 
 /** User-provided value for a single data collection [Task]. */
 interface TaskData {
-  fun getDetailsText(): String
-
   fun isEmpty(): Boolean
 }
 

ground/src/main/java/com/google/android/ground/model/submission/TextTaskData.kt

@@ -20,12 +20,8 @@ import kotlinx.serialization.Serializable
 /** A user-provided value to a text question task. */
 @Serializable
 data class TextTaskData(val text: String) : TaskData {
-  override fun getDetailsText(): String = text
-
   override fun isEmpty(): Boolean = text.trim { it <= ' ' }.isEmpty()
 
-  override fun toString(): String = text
-
   companion object {
     fun fromString(text: String): TaskData? = if (text.isEmpty()) null else TextTaskData(text)
   }

ground/src/main/java/com/google/android/ground/model/task/MultipleChoice.kt

@@ -32,6 +32,4 @@ constructor(
     SELECT_ONE,
     SELECT_MULTIPLE,
   }
-
-  fun getOptionById(id: String): Option? = options.firstOrNull { it.id == id }
 }

ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/CaptureLocationResultConverter.kt

@@ -30,7 +30,7 @@ object CaptureLocationResultConverter {
     JSONObject().apply {
       put(ACCURACY_KEY, accuracy)
       put(ALTITUDE_KEY, altitude)
-      put(GEOMETRY_KEY, GeometryWrapperTypeConverter.toString(geometry))
+      put(GEOMETRY_KEY, GeometryWrapperTypeConverter.toString(location))
     }
 
   fun JSONObject.toCaptureLocationTaskData(): CaptureLocationTaskData {

ground/src/main/java/com/google/android/ground/ui/common/AbstractMapFragmentWithControls.kt

@@ -26,10 +26,11 @@ import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import com.google.android.ground.R
 import com.google.android.ground.databinding.MapTaskFragBinding
-import com.google.android.ground.model.submission.CaptureLocationTaskData.Companion.toCaptureLocationResult
 import com.google.android.ground.ui.datacollection.DataCollectionViewModel
 import com.google.android.ground.ui.map.CameraPosition
 import com.google.android.ground.ui.map.MapFragment
+import com.google.android.ground.ui.map.gms.getAccuracyOrNull
+import com.google.android.ground.ui.map.gms.toCoordinates
 import com.google.android.ground.util.toDmsFormat
 import java.math.RoundingMode
 import java.text.DecimalFormat
@@ -66,12 +67,11 @@ abstract class AbstractMapFragmentWithControls : AbstractMapContainerFragment()
     viewLifecycleOwner.lifecycleScope.launch {
       repeatOnLifecycle(Lifecycle.State.STARTED) {
         getMapViewModel().location.collect {
-          val taskData = it?.toCaptureLocationResult()
-          val locationText = taskData?.location?.coordinates?.toDmsFormat()
+          val locationText = it?.toCoordinates()?.toDmsFormat()
 
           val df = DecimalFormat("#.##")
           df.roundingMode = RoundingMode.DOWN
-          val accuracyText = taskData?.accuracy?.let { value -> df.format(value) + "m" } ?: "?"
+          val accuracyText = it?.getAccuracyOrNull()?.let { value -> df.format(value) + "m" } ?: "?"
 
           updateLocationInfoCard(R.string.current_location, locationText, accuracyText)
         }

ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/AbstractTaskViewModel.kt

@@ -15,20 +15,16 @@
  */
 package com.google.android.ground.ui.datacollection.tasks
 
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.asLiveData
 import com.google.android.ground.R
 import com.google.android.ground.model.job.Job
 import com.google.android.ground.model.submission.SkippedTaskData
 import com.google.android.ground.model.submission.TaskData
 import com.google.android.ground.model.submission.isNullOrEmpty
 import com.google.android.ground.model.task.Task
 import com.google.android.ground.ui.common.AbstractViewModel
-import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.map
 
 /** Defines the state of an inflated [Task] and controls its UI. */
 open class AbstractTaskViewModel internal constructor() : AbstractViewModel() {
@@ -37,22 +33,13 @@ open class AbstractTaskViewModel internal constructor() : AbstractViewModel() {
   private val _taskDataFlow: MutableStateFlow<TaskData?> = MutableStateFlow(null)
   val taskTaskData: StateFlow<TaskData?> = _taskDataFlow.asStateFlow()
 
-  /** Transcoded text to be displayed for the current [TaskData]. */
-  val responseText: LiveData<String>
-
   lateinit var task: Task
 
-  init {
-    responseText = detailsTextFlow().asLiveData()
-  }
-
   open fun initialize(job: Job, task: Task, taskData: TaskData?) {
     this.task = task
     setValue(taskData)
   }
 
-  private fun detailsTextFlow(): Flow<String> = taskTaskData.map { it?.getDetailsText() ?: "" }
-
   /** Checks if the current value is valid and updates error value. */
   fun validate(): Int? = validate(task, taskTaskData.value)
 

ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/location/CaptureLocationTaskFragment.kt

@@ -56,7 +56,7 @@ class CaptureLocationTaskFragment @Inject constructor() :
     val args = Bundle()
     args.putString(TASK_ID_FRAGMENT_ARG_KEY, taskId)
     fragment.arguments = args
-    parentFragmentManager
+    childFragmentManager
       .beginTransaction()
       .add(rowLayout.id, fragment, CaptureLocationTaskMapFragment::class.java.simpleName)
       .commit()