Consistent naming of task classes (#2140)

* s/PolygonDrawing/DrawArea/

* s/DropAPin/DropPinTask/

* s/CaptureLocationMap/CaptureLocationTaskMap/

* Fix nav id

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

@@ -90,7 +90,7 @@ internal object SubmissionConverter {
       Task.Type.NUMBER -> putNumberResponse(taskId, obj, data)
       Task.Type.DATE -> putDateResponse(taskId, obj, data)
       Task.Type.TIME -> putTimeResponse(taskId, obj, data)
-      Task.Type.DROP_PIN -> putDropAPinResponse(taskId, obj, data)
+      Task.Type.DROP_PIN -> putDropPinResponse(taskId, obj, data)
       Task.Type.DRAW_AREA -> putGeometryTaskResponse(taskId, obj, data)
       Task.Type.CAPTURE_LOCATION -> putCaptureLocationResult(taskId, obj, data)
       else -> throw DataStoreException("Unknown type " + task.type)
@@ -117,7 +117,7 @@ internal object SubmissionConverter {
     TimeResponse.fromDate(value.toDate())?.let { r: Value -> data[taskId] = r }
   }
 
-  private fun putDropAPinResponse(taskId: String, obj: Any, data: MutableMap<String, Value>) {
+  private fun putDropPinResponse(taskId: String, obj: Any, data: MutableMap<String, Value>) {
     val map = obj as HashMap<String, *>
     check(map["type"] == "Point")
     val result = GeometryConverter.fromFirestoreMap(map).getOrNull()

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

@@ -19,13 +19,13 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import com.google.android.ground.MainViewModel
 import com.google.android.ground.ui.datacollection.tasks.date.DateTaskViewModel
-import com.google.android.ground.ui.datacollection.tasks.location.CaptureLocationMapViewModel
+import com.google.android.ground.ui.datacollection.tasks.location.CaptureLocationTaskMapViewModel
 import com.google.android.ground.ui.datacollection.tasks.location.CaptureLocationTaskViewModel
 import com.google.android.ground.ui.datacollection.tasks.multiplechoice.MultipleChoiceTaskViewModel
 import com.google.android.ground.ui.datacollection.tasks.number.NumberTaskViewModel
 import com.google.android.ground.ui.datacollection.tasks.photo.PhotoTaskViewModel
-import com.google.android.ground.ui.datacollection.tasks.point.DropAPinTaskViewModel
-import com.google.android.ground.ui.datacollection.tasks.polygon.PolygonDrawingViewModel
+import com.google.android.ground.ui.datacollection.tasks.point.DropPinTaskViewModel
+import com.google.android.ground.ui.datacollection.tasks.polygon.DrawAreaTaskViewModel
 import com.google.android.ground.ui.datacollection.tasks.text.TextTaskViewModel
 import com.google.android.ground.ui.datacollection.tasks.time.TimeTaskViewModel
 import com.google.android.ground.ui.home.HomeScreenViewModel
@@ -50,8 +50,8 @@ import dagger.multibindings.IntoMap
 abstract class ViewModelModule {
   @Binds
   @IntoMap
-  @ViewModelKey(PolygonDrawingViewModel::class)
-  abstract fun bindPolygonDrawingViewModel(viewModel: PolygonDrawingViewModel): ViewModel
+  @ViewModelKey(DrawAreaTaskViewModel::class)
+  abstract fun bindDrawAreaTaskViewModel(viewModel: DrawAreaTaskViewModel): ViewModel
 
   @Binds
   @IntoMap
@@ -135,8 +135,8 @@ abstract class ViewModelModule {
 
   @Binds
   @IntoMap
-  @ViewModelKey(DropAPinTaskViewModel::class)
-  abstract fun bindDropAPinTaskViewModel(viewModel: DropAPinTaskViewModel): ViewModel
+  @ViewModelKey(DropPinTaskViewModel::class)
+  abstract fun bindDropPinTaskViewModel(viewModel: DropPinTaskViewModel): ViewModel
 
   @Binds
   @IntoMap
@@ -155,8 +155,10 @@ abstract class ViewModelModule {
 
   @Binds
   @IntoMap
-  @ViewModelKey(CaptureLocationMapViewModel::class)
-  abstract fun bindCaptureLocationMapViewModel(viewModel: CaptureLocationMapViewModel): ViewModel
+  @ViewModelKey(CaptureLocationTaskMapViewModel::class)
+  abstract fun bindCaptureLocationTaskMapViewModel(
+    viewModel: CaptureLocationTaskMapViewModel
+  ): ViewModel
 
   @Binds
   @IntoMap

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

@@ -38,8 +38,8 @@ import com.google.android.ground.ui.datacollection.tasks.location.CaptureLocatio
 import com.google.android.ground.ui.datacollection.tasks.multiplechoice.MultipleChoiceTaskViewModel
 import com.google.android.ground.ui.datacollection.tasks.number.NumberTaskViewModel
 import com.google.android.ground.ui.datacollection.tasks.photo.PhotoTaskViewModel
-import com.google.android.ground.ui.datacollection.tasks.point.DropAPinTaskViewModel
-import com.google.android.ground.ui.datacollection.tasks.polygon.PolygonDrawingViewModel
+import com.google.android.ground.ui.datacollection.tasks.point.DropPinTaskViewModel
+import com.google.android.ground.ui.datacollection.tasks.polygon.DrawAreaTaskViewModel
 import com.google.android.ground.ui.datacollection.tasks.text.TextTaskViewModel
 import com.google.android.ground.ui.datacollection.tasks.time.TimeTaskViewModel
 import com.google.android.ground.ui.home.HomeScreenFragmentDirections
@@ -218,8 +218,8 @@ internal constructor(
         Task.Type.NUMBER -> NumberTaskViewModel::class.java
         Task.Type.DATE -> DateTaskViewModel::class.java
         Task.Type.TIME -> TimeTaskViewModel::class.java
-        Task.Type.DROP_PIN -> DropAPinTaskViewModel::class.java
-        Task.Type.DRAW_AREA -> PolygonDrawingViewModel::class.java
+        Task.Type.DROP_PIN -> DropPinTaskViewModel::class.java
+        Task.Type.DRAW_AREA -> DrawAreaTaskViewModel::class.java
         Task.Type.CAPTURE_LOCATION -> CaptureLocationTaskViewModel::class.java
         Task.Type.UNKNOWN -> throw IllegalArgumentException("Unsupported task type: $taskType")
       }

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

@@ -23,8 +23,8 @@ import com.google.android.ground.ui.datacollection.tasks.location.CaptureLocatio
 import com.google.android.ground.ui.datacollection.tasks.multiplechoice.MultipleChoiceTaskFragment
 import com.google.android.ground.ui.datacollection.tasks.number.NumberTaskFragment
 import com.google.android.ground.ui.datacollection.tasks.photo.PhotoTaskFragment
-import com.google.android.ground.ui.datacollection.tasks.point.DropAPinTaskFragment
-import com.google.android.ground.ui.datacollection.tasks.polygon.PolygonDrawingTaskFragment
+import com.google.android.ground.ui.datacollection.tasks.point.DropPinTaskFragment
+import com.google.android.ground.ui.datacollection.tasks.polygon.DrawAreaTaskFragment
 import com.google.android.ground.ui.datacollection.tasks.text.TextTaskFragment
 import com.google.android.ground.ui.datacollection.tasks.time.TimeTaskFragment
 import dagger.assisted.Assisted
@@ -49,8 +49,8 @@ constructor(
         Task.Type.TEXT -> TextTaskFragment()
         Task.Type.MULTIPLE_CHOICE -> MultipleChoiceTaskFragment()
         Task.Type.PHOTO -> PhotoTaskFragment()
-        Task.Type.DROP_PIN -> DropAPinTaskFragment()
-        Task.Type.DRAW_AREA -> PolygonDrawingTaskFragment()
+        Task.Type.DROP_PIN -> DropPinTaskFragment()
+        Task.Type.DRAW_AREA -> DrawAreaTaskFragment()
         Task.Type.NUMBER -> NumberTaskFragment()
         Task.Type.DATE -> DateTaskFragment()
         Task.Type.TIME -> TimeTaskFragment()

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

@@ -44,8 +44,8 @@ class CaptureLocationTaskFragment :
       .beginTransaction()
       .add(
         rowLayout.id,
-        CaptureLocationMapFragment.newInstance(viewModel, map),
-        CaptureLocationMapFragment::class.java.simpleName
+        CaptureLocationTaskMapFragment.newInstance(viewModel, map),
+        CaptureLocationTaskMapFragment::class.java.simpleName
       )
       .commit()
     return rowLayout

ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/location/CaptureLocationMapFragment.kt → ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/location/CaptureLocationTaskMapFragment.kt

@@ -27,14 +27,14 @@ import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
 
 @AndroidEntryPoint(AbstractMapFragmentWithControls::class)
-class CaptureLocationMapFragment(private val viewModel: CaptureLocationTaskViewModel) :
-  Hilt_CaptureLocationMapFragment() {
+class CaptureLocationTaskMapFragment(private val viewModel: CaptureLocationTaskViewModel) :
+  Hilt_CaptureLocationTaskMapFragment() {
 
-  private lateinit var mapViewModel: CaptureLocationMapViewModel
+  private lateinit var mapViewModel: CaptureLocationTaskMapViewModel
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
-    mapViewModel = getViewModel(CaptureLocationMapViewModel::class.java)
+    mapViewModel = getViewModel(CaptureLocationTaskMapViewModel::class.java)
   }
 
   override fun getMapViewModel(): BaseMapViewModel = mapViewModel
@@ -58,6 +58,6 @@ class CaptureLocationMapFragment(private val viewModel: CaptureLocationTaskViewM
 
   companion object {
     fun newInstance(viewModel: CaptureLocationTaskViewModel, map: MapFragment) =
-      CaptureLocationMapFragment(viewModel).apply { this.map = map }
+      CaptureLocationTaskMapFragment(viewModel).apply { this.map = map }
   }
 }

ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/location/CaptureLocationMapViewModel.kt → ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/location/CaptureLocationTaskMapViewModel.kt

@@ -26,7 +26,7 @@ import com.google.android.ground.ui.common.BaseMapViewModel
 import com.google.android.ground.ui.common.MapConfig
 import javax.inject.Inject
 
-class CaptureLocationMapViewModel
+class CaptureLocationTaskMapViewModel
 @Inject
 internal constructor(
   offlineAreaRepository: OfflineAreaRepository,

ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/point/DropAPinTaskFragment.kt → ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/point/DropPinTaskFragment.kt

@@ -31,7 +31,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
 @AndroidEntryPoint(AbstractTaskFragment::class)
-class DropAPinTaskFragment : Hilt_DropAPinTaskFragment<DropAPinTaskViewModel>() {
+class DropPinTaskFragment : Hilt_DropPinTaskFragment<DropPinTaskViewModel>() {
 
   @Inject lateinit var markerIconFactory: IconFactory
   @Inject lateinit var map: MapFragment
@@ -43,7 +43,7 @@ class DropAPinTaskFragment : Hilt_DropAPinTaskFragment<DropAPinTaskViewModel>()
     val rowLayout = LinearLayout(requireContext()).apply { id = View.generateViewId() }
     parentFragmentManager
       .beginTransaction()
-      .add(rowLayout.id, DropAPinMapFragment.newInstance(viewModel, map), "Drop a pin fragment")
+      .add(rowLayout.id, DropPinTaskMapFragment.newInstance(viewModel, map), "Drop a pin fragment")
       .commit()
     return rowLayout
   }

ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/point/DropAPinMapFragment.kt → ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/point/DropPinTaskMapFragment.kt

@@ -31,8 +31,8 @@ import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
 
 @AndroidEntryPoint(AbstractMapFragmentWithControls::class)
-class DropAPinMapFragment(private val viewModel: DropAPinTaskViewModel) :
-  Hilt_DropAPinMapFragment() {
+class DropPinTaskMapFragment(private val viewModel: DropPinTaskViewModel) :
+  Hilt_DropPinTaskMapFragment() {
 
   private lateinit var mapViewModel: BaseMapViewModel
   private lateinit var mapContainerViewModel: HomeScreenMapContainerViewModel
@@ -74,7 +74,7 @@ class DropAPinMapFragment(private val viewModel: DropAPinTaskViewModel) :
   }
 
   companion object {
-    fun newInstance(viewModel: DropAPinTaskViewModel, map: MapFragment) =
-      DropAPinMapFragment(viewModel).apply { this.map = map }
+    fun newInstance(viewModel: DropPinTaskViewModel, map: MapFragment) =
+      DropPinTaskMapFragment(viewModel).apply { this.map = map }
   }
 }

ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/point/DropAPinTaskViewModel.kt → ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/point/DropPinTaskViewModel.kt

@@ -30,7 +30,7 @@ import com.google.android.ground.ui.map.Feature
 import com.google.android.ground.ui.map.FeatureType
 import javax.inject.Inject
 
-class DropAPinTaskViewModel
+class DropPinTaskViewModel
 @Inject
 constructor(resources: Resources, private val uuidGenerator: OfflineUuidGenerator) :
   AbstractTaskViewModel(resources) {

ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/polygon/PolygonDrawingTaskFragment.kt → ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/polygon/DrawAreaTaskFragment.kt

@@ -34,7 +34,7 @@ import javax.inject.Inject
 import kotlinx.coroutines.launch
 
 @AndroidEntryPoint(AbstractTaskFragment::class)
-class PolygonDrawingTaskFragment : Hilt_PolygonDrawingTaskFragment<PolygonDrawingViewModel>() {
+class DrawAreaTaskFragment : Hilt_DrawAreaTaskFragment<DrawAreaTaskViewModel>() {
 
   @Inject lateinit var markerIconFactory: IconFactory
   @Inject lateinit var map: MapFragment
@@ -45,21 +45,17 @@ class PolygonDrawingTaskFragment : Hilt_PolygonDrawingTaskFragment<PolygonDrawin
   private lateinit var nextButton: TaskButton
   private lateinit var undoButton: TaskButton
 
-  private lateinit var polygonDrawingMapFragment: PolygonDrawingMapFragment
+  private lateinit var drawAreaTaskMapFragment: DrawAreaTaskMapFragment
 
   override fun onCreateTaskView(inflater: LayoutInflater): TaskView =
     TaskViewFactory.createWithCombinedHeader(inflater, R.drawable.outline_draw)
 
   override fun onCreateTaskBody(inflater: LayoutInflater): View {
     val rowLayout = LinearLayout(requireContext()).apply { id = View.generateViewId() }
-    polygonDrawingMapFragment = PolygonDrawingMapFragment.newInstance(viewModel, map)
+    drawAreaTaskMapFragment = DrawAreaTaskMapFragment.newInstance(viewModel, map)
     parentFragmentManager
       .beginTransaction()
-      .add(
-        rowLayout.id,
-        polygonDrawingMapFragment,
-        PolygonDrawingMapFragment::class.java.simpleName
-      )
+      .add(rowLayout.id, drawAreaTaskMapFragment, DrawAreaTaskMapFragment::class.java.simpleName)
       .commit()
     return rowLayout
   }

ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/polygon/PolygonDrawingMapFragment.kt → ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/polygon/DrawAreaTaskMapFragment.kt

@@ -27,8 +27,8 @@ import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
 
 @AndroidEntryPoint(AbstractMapFragmentWithControls::class)
-class PolygonDrawingMapFragment(private val viewModel: PolygonDrawingViewModel) :
-  Hilt_PolygonDrawingMapFragment() {
+class DrawAreaTaskMapFragment(private val viewModel: DrawAreaTaskViewModel) :
+  Hilt_DrawAreaTaskMapFragment() {
 
   private lateinit var mapViewModel: BaseMapViewModel
   private lateinit var mapContainerViewModel: HomeScreenMapContainerViewModel
@@ -65,7 +65,7 @@ class PolygonDrawingMapFragment(private val viewModel: PolygonDrawingViewModel)
   }
 
   companion object {
-    fun newInstance(viewModel: PolygonDrawingViewModel, map: MapFragment) =
-      PolygonDrawingMapFragment(viewModel).apply { this.map = map }
+    fun newInstance(viewModel: DrawAreaTaskViewModel, map: MapFragment) =
+      DrawAreaTaskMapFragment(viewModel).apply { this.map = map }
   }
 }

ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/polygon/PolygonDrawingViewModel.kt → ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/polygon/DrawAreaTaskViewModel.kt

@@ -42,7 +42,7 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.stateIn
 
 @SharedViewModel
-class PolygonDrawingViewModel
+class DrawAreaTaskViewModel
 @Inject
 internal constructor(private val uuidGenerator: OfflineUuidGenerator, resources: Resources) :
   AbstractTaskViewModel(resources) {

ground/src/main/res/navigation/nav_graph.xml

@@ -105,8 +105,8 @@
     </fragment>
 
     <fragment
-      android:id="@+id/drop_a_pin_task_fragment"
-      android:name="com.google.android.ground.ui.datacollection.tasks.point.DropAPinTaskFragment"
+      android:id="@+id/drop_pin_task_fragment"
+      android:name="com.google.android.ground.ui.datacollection.tasks.point.DropPinTaskFragment"
       android:label="@string/collect_data"
       tools:layout="@layout/text_task_frag" />
 
@@ -134,7 +134,7 @@
 
     <fragment
       android:id="@+id/polygon_task_fragment"
-      android:name="com.google.android.ground.ui.datacollection.tasks.polygon.PolygonDrawingTaskFragment"
+      android:name="com.google.android.ground.ui.datacollection.tasks.polygon.DrawAreaTaskFragment"
       android:label="@string/collect_data"
       tools:layout="@layout/text_task_frag" />
 

ground/src/test/java/com/google/android/ground/ui/datacollection/tasks/point/DropAPinTaskFragmentTest.kt → ground/src/test/java/com/google/android/ground/ui/datacollection/tasks/point/DropPinTaskFragmentTest.kt

@@ -34,18 +34,15 @@ import com.google.android.ground.ui.map.CameraPosition
 import dagger.hilt.android.testing.BindValue
 import dagger.hilt.android.testing.HiltAndroidTest
 import javax.inject.Inject
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import org.hamcrest.core.IsNot.*
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.robolectric.RobolectricTestRunner
 
-@OptIn(ExperimentalCoroutinesApi::class)
 @HiltAndroidTest
 @RunWith(RobolectricTestRunner::class)
-class DropAPinTaskFragmentTest :
-  BaseTaskFragmentTest<DropAPinTaskFragment, DropAPinTaskViewModel>() {
+class DropPinTaskFragmentTest : BaseTaskFragmentTest<DropPinTaskFragment, DropPinTaskViewModel>() {
 
   @BindValue @Mock override lateinit var dataCollectionViewModel: DataCollectionViewModel
   @Inject override lateinit var viewModelFactory: ViewModelFactory
@@ -62,15 +59,15 @@ class DropAPinTaskFragmentTest :
 
   @Test
   fun testHeader() {
-    setupTaskFragment<DropAPinTaskFragment>(job, task)
+    setupTaskFragment<DropPinTaskFragment>(job, task)
 
     hasTaskViewWithoutHeader(task.label)
   }
 
   @Test
   fun testDropPin() = runWithTestDispatcher {
     val testPosition = CameraPosition(Coordinates(10.0, 20.0))
-    setupTaskFragment<DropAPinTaskFragment>(job, task)
+    setupTaskFragment<DropPinTaskFragment>(job, task)
 
     viewModel.updateCameraPosition(testPosition)
     onView(withText("Drop pin")).perform(click())
@@ -83,15 +80,15 @@ class DropAPinTaskFragmentTest :
 
   @Test
   fun testInfoCard_noValue() {
-    setupTaskFragment<DropAPinTaskFragment>(job, task)
+    setupTaskFragment<DropPinTaskFragment>(job, task)
 
     infoCardHidden()
   }
 
   @Test
   fun testUndo() = runWithTestDispatcher {
     val testPosition = CameraPosition(Coordinates(10.0, 20.0))
-    setupTaskFragment<DropAPinTaskFragment>(job, task)
+    setupTaskFragment<DropPinTaskFragment>(job, task)
 
     viewModel.updateCameraPosition(testPosition)
     onView(withText("Drop pin")).perform(click())
@@ -104,7 +101,7 @@ class DropAPinTaskFragmentTest :
 
   @Test
   fun testActionButtons() {
-    setupTaskFragment<DropAPinTaskFragment>(job, task)
+    setupTaskFragment<DropPinTaskFragment>(job, task)
 
     assertFragmentHasButtons(
       ButtonAction.PREVIOUS,
@@ -117,7 +114,7 @@ class DropAPinTaskFragmentTest :
 
   @Test
   fun testActionButtons_whenTaskIsOptional() {
-    setupTaskFragment<DropAPinTaskFragment>(job, task.copy(isRequired = false))
+    setupTaskFragment<DropPinTaskFragment>(job, task.copy(isRequired = false))
 
     buttonIsHidden("Next")
     buttonIsEnabled("Skip")
@@ -127,7 +124,7 @@ class DropAPinTaskFragmentTest :
 
   @Test
   fun testActionButtons_whenTaskIsRequired() {
-    setupTaskFragment<DropAPinTaskFragment>(job, task.copy(isRequired = true))
+    setupTaskFragment<DropPinTaskFragment>(job, task.copy(isRequired = true))
 
     buttonIsHidden("Next")
     buttonIsHidden("Skip")
@@ -137,7 +134,7 @@ class DropAPinTaskFragmentTest :
 
   @Test
   fun `Hint icon is shown`() {
-    setupTaskFragment<DropAPinTaskFragment>(job, task)
+    setupTaskFragment<DropPinTaskFragment>(job, task)
 
     onView(withId(R.id.hintIcon)).check(matches(isDisplayed()))
   }