From 1663746b138dcf9450bc1e032015e9b78704e438 Mon Sep 17 00:00:00 2001
From: Sufyan Abbasi <sufy@google.com>
Date: Thu, 14 Nov 2024 16:10:13 -0800
Subject: [PATCH 01/17] Add new LOI flow (unstyled)

---
 .../HomeScreenMapContainerFragment.kt         |  34 +----
 .../HomeScreenMapContainerViewModel.kt        |  31 ++---
 .../mapcontainer/cards/JobSelectionDialog.kt  |  85 +++++++++++++
 .../home/mapcontainer/cards/MapCardAdapter.kt | 119 ++++++++++--------
 .../ground/ui/map/gms/GoogleMapsFragment.kt   |   2 +
 .../google/android/ground/ui/theme/Color.kt   |   2 +-
 .../src/main/res/layout/add_loi_card_item.xml |  71 +++++------
 ground/src/main/res/values/dimens.xml         |   2 +-
 ground/src/main/res/values/strings.xml        |   7 +-
 9 files changed, 204 insertions(+), 149 deletions(-)
 create mode 100644 ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/JobSelectionDialog.kt

diff --git a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt
index 44880ed491..c60ec5f074 100644
--- a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt
+++ b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt
@@ -24,9 +24,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.ComposeView
 import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.PagerSnapHelper
-import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.SnapHelper
 import com.google.android.ground.R
 import com.google.android.ground.coroutines.ApplicationScope
@@ -105,8 +103,8 @@ class HomeScreenMapContainerFragment : AbstractMapContainerFragment() {
       }
 
       // Bind data for cards
-      mapContainerViewModel.getMapCardUiData().launchWhenStartedAndCollect { (mapCards, loiCount) ->
-        adapter.updateData(canUserSubmitData, mapCards, loiCount - 1)
+      mapContainerViewModel.getMapCardUiData().launchWhenStartedAndCollect { (loiCard, jobCards) ->
+        adapter.updateData(canUserSubmitData, loiCard, jobCards)
       }
     }
 
@@ -259,37 +257,9 @@ class HomeScreenMapContainerFragment : AbstractMapContainerFragment() {
     val recyclerViewBinding = LoiCardsRecyclerViewBinding.inflate(layoutInflater, container, true)
     val recyclerView = recyclerViewBinding.recyclerView
     recyclerView.adapter = adapter
-    recyclerView.addOnScrollListener(
-      object : RecyclerView.OnScrollListener() {
-        override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
-          super.onScrollStateChanged(recyclerView, newState)
-          val layoutManager = recyclerView.layoutManager as LinearLayoutManager
-          val firstVisiblePosition = layoutManager.findFirstVisibleItemPosition()
-          val lastVisiblePosition = layoutManager.findLastVisibleItemPosition()
-          val firstCompletelyVisiblePosition =
-            layoutManager.findFirstCompletelyVisibleItemPosition()
-          var midPosition = (firstVisiblePosition + lastVisiblePosition) / 2
-
-          // Focus the last card
-          if (firstCompletelyVisiblePosition > midPosition) {
-            midPosition = firstCompletelyVisiblePosition
-          }
-
-          adapter.focusItemAtIndex(midPosition)
-        }
-      }
-    )
 
     val helper: SnapHelper = PagerSnapHelper()
     helper.attachToRecyclerView(recyclerView)
-
-    mapContainerViewModel.loiClicks.launchWhenStartedAndCollect {
-      val index = it?.let { adapter.getIndex(it) } ?: -1
-      if (index != -1) {
-        recyclerView.scrollToPosition(index)
-        adapter.focusItemAtIndex(index)
-      }
-    }
   }
 
   private fun navigateToDataCollectionFragment(cardUiData: MapCardUiData) {
diff --git a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModel.kt b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModel.kt
index b514e046ca..072370c43f 100644
--- a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModel.kt
+++ b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModel.kt
@@ -106,8 +106,8 @@ internal constructor(
    */
   private val loisInViewport: StateFlow<List<LocationOfInterest>>
 
-  /** [LocationOfInterest] clicked by the user. */
-  val loiClicks: MutableStateFlow<LocationOfInterest?> = MutableStateFlow(null)
+  /** [Feature] clicked by the user. */
+  val featureClicked: MutableStateFlow<Feature?> = MutableStateFlow(null)
 
   /**
    * List of [Job]s which allow LOIs to be added during field collection, populated only when zoomed
@@ -175,12 +175,20 @@ internal constructor(
    * Returns a flow of [MapCardUiData] associated with the active survey's LOIs and adhoc jobs for
    * displaying the cards.
    */
-  fun getMapCardUiData(): Flow<Pair<List<MapCardUiData>, Int>> =
-    loisInViewport.combine(adHocLoiJobs) { lois, jobs ->
-      val loiCards = lois.map { MapCardUiData.LoiCardUiData(it) }
-      val jobCards = jobs.map { MapCardUiData.AddLoiCardUiData(it) }
-
-      Pair(loiCards + jobCards, lois.size)
+  fun getMapCardUiData():
+    Flow<Pair<MapCardUiData.LoiCardUiData?, List<MapCardUiData.AddLoiCardUiData>>> =
+    combine(loisInViewport, featureClicked, adHocLoiJobs) { loisInView, feature, jobs ->
+      val loiCard =
+        loisInView
+          .filter { it.geometry == feature?.geometry }
+          .firstOrNull()
+          ?.let { MapCardUiData.LoiCardUiData(it) }
+      if (loiCard == null && feature != null) {
+        // The feature is not in view anymore.
+        featureClicked.value = null
+      }
+      val jobCard = jobs.map { MapCardUiData.AddLoiCardUiData(it) }
+      Pair(loiCard, jobCard)
     }
 
   private fun updatedLoiSelectedStates(
@@ -198,12 +206,7 @@ internal constructor(
    * list of provided features is empty.
    */
   fun onFeatureClicked(features: Set<Feature>) {
-    val geometry = features.map { it.geometry }.minByOrNull { it.area } ?: return
-    for (loi in loisInViewport.value) {
-      if (loi.geometry == geometry) {
-        loiClicks.value = loi
-      }
-    }
+    featureClicked.value = features.minByOrNull { it.geometry.area }
   }
 
   suspend fun updateDataSharingConsent(dataSharingTerms: Boolean) {
diff --git a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/JobSelectionDialog.kt b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/JobSelectionDialog.kt
new file mode 100644
index 0000000000..feb61b1fd6
--- /dev/null
+++ b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/JobSelectionDialog.kt
@@ -0,0 +1,85 @@
+package com.google.android.ground.ui.home.mapcontainer.cards
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Button
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.em
+import androidx.compose.ui.unit.sp
+import com.google.android.ground.R
+
+@Composable
+fun JobSelectionDialog(
+  selectedJobId: String,
+  jobs: List<MapCardUiData.AddLoiCardUiData>,
+  onJobSelection: (MapCardUiData.AddLoiCardUiData) -> Unit,
+  onConfirmRequest: (MapCardUiData.AddLoiCardUiData) -> Unit,
+  onDismissRequest: () -> Unit,
+) {
+  AlertDialog(
+    containerColor = MaterialTheme.colorScheme.surface,
+    onDismissRequest = onDismissRequest,
+    title = {
+      Column(
+        modifier = Modifier.fillMaxWidth()
+      ) {
+        Text(text = stringResource(R.string.add_site), fontSize = 5.em)
+      }
+    },
+    text = {
+      Column {
+        Spacer(Modifier.height(16.dp))
+        jobs.forEach { JobSelectionRow(it, onJobSelection, it.job.id === selectedJobId) }
+      }
+    },
+    confirmButton = {
+      Button(
+        onClick = { jobs.find { it.job.id == selectedJobId }?.let { onConfirmRequest(it) } },
+        contentPadding = PaddingValues(25.dp, 0.dp),
+        enabled = selectedJobId != "",
+      ) {
+        Text(stringResource(R.string.begin))
+      }
+    },
+    dismissButton = {
+      OutlinedButton(onClick = { onDismissRequest() }) {
+        Text(text = stringResource(R.string.cancel))
+      }
+    },
+  )
+}
+
+@Composable
+fun JobSelectionRow(
+  job: MapCardUiData.AddLoiCardUiData,
+  onJobSelection: (MapCardUiData.AddLoiCardUiData) -> Unit,
+  selected: Boolean,
+) {
+  Row(modifier = Modifier.fillMaxWidth().padding(8.dp).clickable { onJobSelection(job) }) {
+    Text(job.job.name ?: stringResource(R.string.unnamed_job), fontSize = 18.sp)
+    if (selected) {
+      Icon(
+        modifier = Modifier.size(25.dp),
+        painter = painterResource(id = R.drawable.baseline_check_24),
+        contentDescription = "selected",
+        tint = MaterialTheme.colorScheme.onSurface,
+      )
+    }
+  }
+}
diff --git a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/MapCardAdapter.kt b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/MapCardAdapter.kt
index f7a8479270..867f4cf819 100644
--- a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/MapCardAdapter.kt
+++ b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/MapCardAdapter.kt
@@ -20,13 +20,20 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.platform.ComposeView
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.ground.R
 import com.google.android.ground.databinding.AddLoiCardItemBinding
 import com.google.android.ground.databinding.LoiCardItemBinding
-import com.google.android.ground.model.job.Job
 import com.google.android.ground.model.locationofinterest.LocationOfInterest
 import com.google.android.ground.ui.common.LocationOfInterestHelper
+import com.google.android.ground.ui.theme.AppTheme
 
 /**
  * An implementation of [RecyclerView.Adapter] that associates [LocationOfInterest] data with the
@@ -37,9 +44,8 @@ class MapCardAdapter(
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
   private var canUserSubmitData: Boolean = false
-  private var focusedIndex: Int = 0
-  private var indexOfLastLoi: Int = -1
-  private val itemsList: MutableList<MapCardUiData> = mutableListOf()
+  private var activeLoi: MapCardUiData.LoiCardUiData? = null
+  private val newLoiJobs: MutableList<MapCardUiData.AddLoiCardUiData> = mutableListOf()
   private var cardFocusedListener: ((MapCardUiData?) -> Unit)? = null
   private lateinit var collectDataListener: (MapCardUiData) -> Unit
 
@@ -58,44 +64,37 @@ class MapCardAdapter(
   }
 
   override fun getItemViewType(position: Int): Int =
-    if (position <= indexOfLastLoi) {
+    if (activeLoi != null) {
       R.layout.loi_card_item
     } else {
+      // Assume we don't render add LOI option unless we know the job allows it.
       R.layout.add_loi_card_item
     }
 
   /** Binds [LocationOfInterest] data to [LoiViewHolder] or [AddLoiCardViewHolder]. */
   override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-    val uiData = itemsList[position]
-    val cardHolder = bindViewHolder(uiData, holder)
-    if (focusedIndex == position) {
-      cardFocusedListener?.invoke(uiData)
+    val loi = activeLoi
+    if (loi != null) {
+      val cardHolder = bindLoiCardViewHolder(loi, holder)
+      cardHolder.setOnClickListener { collectDataListener(loi) }
+    } else {
+      bindAddLoiCardViewHolder(newLoiJobs, holder) { job -> collectDataListener(job) }
     }
-    cardHolder.setOnClickListener { collectDataListener(uiData) }
   }
 
   /** Returns the size of the list. */
-  override fun getItemCount() = itemsList.size
-
-  /** Updates the currently focused item. */
-  fun focusItemAtIndex(newIndex: Int) {
-    if (newIndex < 0 || newIndex >= itemCount || focusedIndex == newIndex) return
-
-    focusedIndex = newIndex
-    notifyDataSetChanged()
-  }
+  override fun getItemCount() = if (activeLoi != null || newLoiJobs.isNotEmpty()) 1 else 0
 
   /** Overwrites existing cards. */
   fun updateData(
     canUserSubmitData: Boolean,
-    newItemsList: List<MapCardUiData>,
-    indexOfLastLoi: Int,
+    loiCard: MapCardUiData.LoiCardUiData?,
+    jobCards: List<MapCardUiData.AddLoiCardUiData>,
   ) {
     this.canUserSubmitData = canUserSubmitData
-    this.indexOfLastLoi = indexOfLastLoi
-    itemsList.clear()
-    itemsList.addAll(newItemsList)
-    focusedIndex = 0
+    activeLoi = loiCard
+    newLoiJobs.clear()
+    newLoiJobs.addAll(jobCards)
     notifyDataSetChanged()
   }
 
@@ -107,32 +106,18 @@ class MapCardAdapter(
     this.collectDataListener = listener
   }
 
-  private fun bindViewHolder(
-    uiData: MapCardUiData,
+  private fun bindLoiCardViewHolder(
+    loiData: MapCardUiData.LoiCardUiData,
     holder: RecyclerView.ViewHolder,
-  ): CardViewHolder =
-    when (uiData) {
-      is MapCardUiData.LoiCardUiData -> {
-        (holder as LoiViewHolder).apply { bind(canUserSubmitData, uiData.loi) }
-      }
-      is MapCardUiData.AddLoiCardUiData -> {
-        (holder as AddLoiCardViewHolder).apply { bind(canUserSubmitData, uiData.job) }
-      }
-    }
+  ): LoiViewHolder = (holder as LoiViewHolder).apply { bind(canUserSubmitData, loiData.loi) }
 
-  /** Returns index of job card with the given [LocationOfInterest]. */
-  fun getIndex(loi: LocationOfInterest): Int {
-    for ((index, item) in itemsList.withIndex()) {
-      if (item is MapCardUiData.LoiCardUiData && item.loi == loi) {
-        return index
-      }
-    }
-    return -1
-  }
+  private fun bindAddLoiCardViewHolder(
+    addLoiJobData: List<MapCardUiData.AddLoiCardUiData>,
+    holder: RecyclerView.ViewHolder,
+    callback: (MapCardUiData.AddLoiCardUiData) -> Unit,
+  ): AddLoiCardViewHolder = (holder as AddLoiCardViewHolder).apply { bind(addLoiJobData, callback) }
 
-  abstract class CardViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-    abstract fun setOnClickListener(callback: () -> Unit)
-  }
+  abstract class CardViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {}
 
   /** View item representing the [LocationOfInterest] data in the list. */
   class LoiViewHolder(
@@ -152,7 +137,7 @@ class MapCardAdapter(
       }
     }
 
-    override fun setOnClickListener(callback: () -> Unit) {
+    fun setOnClickListener(callback: () -> Unit) {
       binding.collectData.setOnClickListener { callback() }
     }
   }
@@ -160,17 +145,41 @@ class MapCardAdapter(
   /** View item representing the Add Loi Job data in the list. */
   class AddLoiCardViewHolder(internal val binding: AddLoiCardItemBinding) :
     CardViewHolder(binding.root) {
+    private val jobDialogOpened = mutableStateOf(false)
 
-    fun bind(canUserSubmitData: Boolean, job: Job) {
+    fun bind(
+      jobs: List<MapCardUiData.AddLoiCardUiData>,
+      callback: (MapCardUiData.AddLoiCardUiData) -> Unit,
+    ) {
       with(binding) {
-        jobName.text = job.name
-        collectData.visibility =
-          if (canUserSubmitData && job.hasTasks()) View.VISIBLE else View.GONE
+        loiCard.setOnClickListener {
+          jobDialogOpened.value = true
+          (root as ViewGroup).addView(
+            ComposeView(root.context).apply {
+              setContent { AppTheme { ShowJobSelectionDialog(jobs, callback, jobDialogOpened) } }
+            }
+          )
+        }
       }
     }
 
-    override fun setOnClickListener(callback: () -> Unit) {
-      binding.collectData.setOnClickListener { callback() }
+    @Composable
+    fun ShowJobSelectionDialog(
+      jobs: List<MapCardUiData.AddLoiCardUiData>,
+      callback: (MapCardUiData.AddLoiCardUiData) -> Unit,
+      jobDialogOpened: MutableState<Boolean>,
+    ) {
+      var selectedJobId by rememberSaveable { mutableStateOf(jobs[0].job.id) }
+      var openJobsDialog by rememberSaveable { jobDialogOpened }
+      if (openJobsDialog) {
+        JobSelectionDialog(
+          selectedJobId = selectedJobId,
+          jobs = jobs,
+          onJobSelection = { selectedJobId = it.job.id },
+          onConfirmRequest = { callback(it) },
+          onDismissRequest = { openJobsDialog = false },
+        )
+      }
     }
   }
 }
diff --git a/ground/src/main/java/com/google/android/ground/ui/map/gms/GoogleMapsFragment.kt b/ground/src/main/java/com/google/android/ground/ui/map/gms/GoogleMapsFragment.kt
index 73e027db41..3b21e09f03 100644
--- a/ground/src/main/java/com/google/android/ground/ui/map/gms/GoogleMapsFragment.kt
+++ b/ground/src/main/java/com/google/android/ground/ui/map/gms/GoogleMapsFragment.kt
@@ -225,6 +225,8 @@ class GoogleMapsFragment : SupportMapFragment(), MapFragment {
     val clickedPolygons = featureManager.getIntersectingPolygons(latLng)
     if (clickedPolygons.isNotEmpty()) {
       viewLifecycleOwner.lifecycleScope.launch { featureClicks.emit(clickedPolygons) }
+    } else {
+      viewLifecycleOwner.lifecycleScope.launch { featureClicks.emit(emptySet()) }
     }
   }
 
diff --git a/ground/src/main/java/com/google/android/ground/ui/theme/Color.kt b/ground/src/main/java/com/google/android/ground/ui/theme/Color.kt
index 3c20235c4d..e44ca53739 100644
--- a/ground/src/main/java/com/google/android/ground/ui/theme/Color.kt
+++ b/ground/src/main/java/com/google/android/ground/ui/theme/Color.kt
@@ -35,7 +35,7 @@ val md_theme_light_onError = Color(0xFFFFFFFF)
 val md_theme_light_onErrorContainer = Color(0xFF410002)
 val md_theme_light_background = Color(0xFFFCFDF7)
 val md_theme_light_onBackground = Color(0xFF1A1C19)
-val md_theme_light_surface = Color(0xFFFCFDF7)
+val md_theme_light_surface = Color(0xFFEDEEE9)
 val md_theme_light_onSurface = Color(0xFF1A1C19)
 val md_theme_light_surfaceVariant = Color(0xFFDDE5D9)
 val md_theme_light_onSurfaceVariant = Color(0xFF424940)
diff --git a/ground/src/main/res/layout/add_loi_card_item.xml b/ground/src/main/res/layout/add_loi_card_item.xml
index 7d810defae..e26f037652 100644
--- a/ground/src/main/res/layout/add_loi_card_item.xml
+++ b/ground/src/main/res/layout/add_loi_card_item.xml
@@ -22,64 +22,49 @@
 
   <com.google.android.material.card.MaterialCardView
     android:id="@+id/loi_card"
-    android:layout_width="match_parent"
+    android:clickable="true"
+    android:focusable="true"
+    android:layout_gravity="center_horizontal"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="@dimen/job_card_start_end_margin"
     android:layout_marginEnd="@dimen/job_card_start_end_margin"
-    android:backgroundTint="?attr/colorSecondaryContainer"
+    android:backgroundTint="?attr/colorPrimaryContainer"
     android:orientation="vertical"
     app:cardCornerRadius="@dimen/job_card_corner_radius"
     app:cardElevation="2dp"
     app:strokeWidth="0dp">
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <LinearLayout
       android:id="@+id/wrapper_view"
       android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:orientation="vertical"
-      android:padding="16dp">
+      android:layout_height="match_parent"
+      android:layout_gravity="fill"
+      android:gravity="fill"
+      android:orientation="horizontal"
+      android:paddingStart="16dp"
+      android:paddingTop="12dp"
+      android:paddingEnd="18dp"
+      android:paddingBottom="4dp">
       <TextView
-        android:id="@+id/jobName"
-        style="@style/JobCardTitle"
+        android:id="@+id/newSitePlus"
+        style="@style/JobCardDescription"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@+id/newSite"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="Map the terrain" />
+        android:layout_height="match_parent"
+        android:layout_marginEnd="8dp"
+        android:gravity="center"
+        android:text="@string/plus_sign"
+        android:textColor="?attr/colorOnSurface"
+        android:textSize="30sp"
+        tools:text="+" />
       <TextView
         android:id="@+id/newSite"
         style="@style/JobCardDescription"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        android:text="@string/new_site"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:text="@string/add_site"
         android:textColor="?attr/colorOnSurface"
-        app:layout_constraintBottom_toTopOf="@+id/newSiteHintText"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/jobName"
-        tools:text="Suggest area of interest" />
-      <TextView
-        android:id="@+id/newSiteHintText"
-        style="@style/JobCardAdditionalText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        android:text="@string/new_site_hint_text"
-        app:layout_constraintBottom_toTopOf="@+id/collectData"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/newSite"
-        tools:text="Add new site and submit related data" />
-      <Button
-        android:id="@+id/collectData"
-        style="@style/Widget.App.Button.Inverse"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        android:clickable="false"
-        android:text="@string/collect_data"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/newSiteHintText" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+        tools:text="Add a site" />
+    </LinearLayout>
   </com.google.android.material.card.MaterialCardView>
 </layout>
diff --git a/ground/src/main/res/values/dimens.xml b/ground/src/main/res/values/dimens.xml
index 882defb9ab..446644b70d 100644
--- a/ground/src/main/res/values/dimens.xml
+++ b/ground/src/main/res/values/dimens.xml
@@ -37,6 +37,6 @@
   <dimen name="loi_card_item_margin">10dp</dimen>
 
   <dimen name="job_card_corner_radius">16dp</dimen>
-  <dimen name="job_card_start_end_margin">8dp</dimen>
+  <dimen name="job_card_start_end_margin">4dp</dimen>
   <dimen name="zoom_on_cluster_click_padding">50dp</dimen>
 </resources>
diff --git a/ground/src/main/res/values/strings.xml b/ground/src/main/res/values/strings.xml
index 3fed5678f0..68051b69d5 100644
--- a/ground/src/main/res/values/strings.xml
+++ b/ground/src/main/res/values/strings.xml
@@ -81,9 +81,8 @@
   <string name="skip">Skip</string>
 
   <string name="drop_pin">Drop pin</string>
-
-  <string name="new_site">New data collection site</string>
-  <string name="new_site_hint_text">Add new site and submit related data</string>
+  <string name="add_site">Add a site</string>
+  <string name="plus_sign">+</string>
   <string name="drop_a_pin_tooltip_text">Drag your map until the center pin is on the desired location</string>
   <string name="current_location">Current location:</string>
   <string name="loading">Loading…</string>
@@ -102,6 +101,7 @@
   <string name="close_app">Close app</string>
   <string name="cancel">Cancel</string>
   <string name="save">Save</string>
+  <string name="begin">Begin</string>
   <string name="no_imagery_available_for_area">No imagery for this area. Select an area with imagery to download to your device.</string>
   <string name="selected_offline_area_size">The selected area may take up to %s\u00A0MB of space on your device</string>
   <string name="selected_offline_area_too_large">Zoom in and select a smaller area to download to your device</string>
@@ -114,6 +114,7 @@
   <string name="remove_offline_access">Remove offline access</string>
   <string name="unnamed_point">Unnamed point</string>
   <string name="unnamed_area">Unnamed area</string>
+  <string name="unnamed_job">Unnamed Job</string>
   <string name="offline_area_size_on_disk_mb">%s\u00A0MB on disk</string>
   <string name="offline_area_list_item_size_on_disk_mb">%s\u00A0MB</string>
   <string name="offline_downloaded_areas">Downloaded areas</string>

From f5fec714b887783547b594a9e71b6801d4026669 Mon Sep 17 00:00:00 2001
From: Sufyan Abbasi <sufy@google.com>
Date: Fri, 6 Dec 2024 16:23:27 -0800
Subject: [PATCH 02/17] Refactor out cards

---
 .../ground/e2etest/SurveyRunnerTest.kt        |  2 +-
 .../HomeScreenMapContainerFragment.kt         | 28 ++++++------
 .../HomeScreenMapContainerViewModel.kt        | 10 ++---
 .../mapcontainer/cards/JobSelectionDialog.kt  | 10 ++---
 .../home/mapcontainer/cards/MapCardAdapter.kt | 44 +++++++++----------
 .../cards/{MapCardUiData.kt => MapUiData.kt}  |  6 +--
 ...add_loi_card_item.xml => add_loi_item.xml} |  6 +--
 7 files changed, 53 insertions(+), 53 deletions(-)
 rename ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/{MapCardUiData.kt => MapUiData.kt} (84%)
 rename ground/src/main/res/layout/{add_loi_card_item.xml => add_loi_item.xml} (94%)

diff --git a/e2eTest/src/main/java/com/google/android/ground/e2etest/SurveyRunnerTest.kt b/e2eTest/src/main/java/com/google/android/ground/e2etest/SurveyRunnerTest.kt
index b384801dbf..2b095422cd 100644
--- a/e2eTest/src/main/java/com/google/android/ground/e2etest/SurveyRunnerTest.kt
+++ b/e2eTest/src/main/java/com/google/android/ground/e2etest/SurveyRunnerTest.kt
@@ -131,7 +131,7 @@ class SurveyRunnerTest : AutomatorRunner {
     cards.forEach { it.swipe(Direction.LEFT, 1F) }
     val loiCollectDataButtonSelector =
       byText(R.string.collect_data)
-        .hasAncestor(loiCardSelector.hasDescendant(byText(R.string.new_site)))
+        .hasAncestor(loiCardSelector.hasDescendant(byText(R.string.add_site)))
     if (!waitClickGone(loiCollectDataButtonSelector)) {
       captureScreenshot()
       fail("Failed to start ad-hoc loi data collection.")
diff --git a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt
index c60ec5f074..a6e14959dc 100644
--- a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt
+++ b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt
@@ -45,7 +45,7 @@ import com.google.android.ground.ui.home.DataSharingTermsDialog
 import com.google.android.ground.ui.home.HomeScreenFragmentDirections
 import com.google.android.ground.ui.home.HomeScreenViewModel
 import com.google.android.ground.ui.home.mapcontainer.cards.MapCardAdapter
-import com.google.android.ground.ui.home.mapcontainer.cards.MapCardUiData
+import com.google.android.ground.ui.home.mapcontainer.cards.MapUiData
 import com.google.android.ground.ui.map.MapFragment
 import com.google.android.ground.ui.theme.AppTheme
 import dagger.hilt.android.AndroidEntryPoint
@@ -86,16 +86,16 @@ class HomeScreenMapContainerFragment : AbstractMapContainerFragment() {
       val canUserSubmitData = userRepository.canUserSubmitData()
 
       // Handle collect button clicks
-      adapter.setCollectDataListener { mapCardUiData ->
+      adapter.setCollectDataListener { mapUiData ->
         val job =
           lifecycleScope.launch {
             mapContainerViewModel.activeSurveyDataSharingTermsFlow.cancellable().collectLatest {
               hasDataSharingTerms ->
               onCollectData(
                 canUserSubmitData,
-                hasValidTasks(mapCardUiData),
+                hasValidTasks(mapUiData),
                 hasDataSharingTerms,
-                mapCardUiData,
+                mapUiData,
               )
             }
           }
@@ -111,16 +111,16 @@ class HomeScreenMapContainerFragment : AbstractMapContainerFragment() {
     map.featureClicks.launchWhenStartedAndCollect { mapContainerViewModel.onFeatureClicked(it) }
   }
 
-  private fun hasValidTasks(cardUiData: MapCardUiData) =
+  private fun hasValidTasks(cardUiData: MapUiData) =
     when (cardUiData) {
       // LOI tasks are filtered out of the tasks list for pre-defined tasks.
-      is MapCardUiData.LoiCardUiData ->
+      is MapUiData.LoiUiData ->
         cardUiData.loi.job.tasks.values.count { !it.isAddLoiTask } > 0
-      is MapCardUiData.AddLoiCardUiData -> cardUiData.job.tasks.values.isNotEmpty()
+      is MapUiData.AddLoiUiData -> cardUiData.job.tasks.values.isNotEmpty()
     }
 
   private fun renderDataSharingTermsDialog(
-    cardUiData: MapCardUiData,
+    cardUiData: MapUiData,
     dataSharingTerms: DataSharingTerms,
   ) =
     ComposeView(requireContext()).apply {
@@ -146,7 +146,7 @@ class HomeScreenMapContainerFragment : AbstractMapContainerFragment() {
     canUserSubmitData: Boolean,
     hasTasks: Boolean,
     hasDataSharingTerms: DataSharingTerms?,
-    cardUiData: MapCardUiData,
+    cardUiData: MapUiData,
   ) {
     if (!canUserSubmitData) {
       // Skip data collection screen if the user can't submit any data
@@ -262,9 +262,9 @@ class HomeScreenMapContainerFragment : AbstractMapContainerFragment() {
     helper.attachToRecyclerView(recyclerView)
   }
 
-  private fun navigateToDataCollectionFragment(cardUiData: MapCardUiData) {
+  private fun navigateToDataCollectionFragment(cardUiData: MapUiData) {
     when (cardUiData) {
-      is MapCardUiData.LoiCardUiData ->
+      is MapUiData.LoiUiData ->
         navigator.navigate(
           HomeScreenFragmentDirections.actionHomeScreenFragmentToDataCollectionFragment(
             cardUiData.loi.id,
@@ -274,7 +274,7 @@ class HomeScreenMapContainerFragment : AbstractMapContainerFragment() {
             null,
           )
         )
-      is MapCardUiData.AddLoiCardUiData ->
+      is MapUiData.AddLoiUiData ->
         navigator.navigate(
           HomeScreenFragmentDirections.actionHomeScreenFragmentToDataCollectionFragment(
             null,
@@ -292,8 +292,8 @@ class HomeScreenMapContainerFragment : AbstractMapContainerFragment() {
 
     adapter.setLoiCardFocusedListener {
       when (it) {
-        is MapCardUiData.LoiCardUiData -> mapContainerViewModel.selectLocationOfInterest(it.loi.id)
-        is MapCardUiData.AddLoiCardUiData,
+        is MapUiData.LoiUiData -> mapContainerViewModel.selectLocationOfInterest(it.loi.id)
+        is MapUiData.AddLoiUiData,
         null -> mapContainerViewModel.selectLocationOfInterest(null)
       }
     }
diff --git a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModel.kt b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModel.kt
index 5a6ffe52e4..fd4e23944d 100644
--- a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModel.kt
+++ b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModel.kt
@@ -33,7 +33,7 @@ import com.google.android.ground.system.PermissionsManager
 import com.google.android.ground.system.SettingsManager
 import com.google.android.ground.ui.common.BaseMapViewModel
 import com.google.android.ground.ui.common.SharedViewModel
-import com.google.android.ground.ui.home.mapcontainer.cards.MapCardUiData
+import com.google.android.ground.ui.home.mapcontainer.cards.MapUiData
 import com.google.android.ground.ui.map.Feature
 import com.google.android.ground.ui.map.FeatureType
 import com.google.android.ground.ui.map.isLocationOfInterest
@@ -181,22 +181,22 @@ internal constructor(
   }
 
   /**
-   * Returns a flow of [MapCardUiData] associated with the active survey's LOIs and adhoc jobs for
+   * Returns a flow of [MapUiData] associated with the active survey's LOIs and adhoc jobs for
    * displaying the cards.
    */
   fun getMapCardUiData():
-    Flow<Pair<MapCardUiData.LoiCardUiData?, List<MapCardUiData.AddLoiCardUiData>>> =
+    Flow<Pair<MapUiData.LoiUiData?, List<MapUiData.AddLoiUiData>>> =
     combine(loisInViewport, featureClicked, adHocLoiJobs) { loisInView, feature, jobs ->
       val loiCard =
         loisInView
           .filter { it.geometry == feature?.geometry }
           .firstOrNull()
-          ?.let { MapCardUiData.LoiCardUiData(it) }
+          ?.let { MapUiData.LoiUiData(it) }
       if (loiCard == null && feature != null) {
         // The feature is not in view anymore.
         featureClicked.value = null
       }
-      val jobCard = jobs.map { MapCardUiData.AddLoiCardUiData(it) }
+      val jobCard = jobs.map { MapUiData.AddLoiUiData(it) }
       Pair(loiCard, jobCard)
     }
 
diff --git a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/JobSelectionDialog.kt b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/JobSelectionDialog.kt
index feb61b1fd6..9f9cb196cd 100644
--- a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/JobSelectionDialog.kt
+++ b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/JobSelectionDialog.kt
@@ -27,9 +27,9 @@ import com.google.android.ground.R
 @Composable
 fun JobSelectionDialog(
   selectedJobId: String,
-  jobs: List<MapCardUiData.AddLoiCardUiData>,
-  onJobSelection: (MapCardUiData.AddLoiCardUiData) -> Unit,
-  onConfirmRequest: (MapCardUiData.AddLoiCardUiData) -> Unit,
+  jobs: List<MapUiData.AddLoiUiData>,
+  onJobSelection: (MapUiData.AddLoiUiData) -> Unit,
+  onConfirmRequest: (MapUiData.AddLoiUiData) -> Unit,
   onDismissRequest: () -> Unit,
 ) {
   AlertDialog(
@@ -67,8 +67,8 @@ fun JobSelectionDialog(
 
 @Composable
 fun JobSelectionRow(
-  job: MapCardUiData.AddLoiCardUiData,
-  onJobSelection: (MapCardUiData.AddLoiCardUiData) -> Unit,
+  job: MapUiData.AddLoiUiData,
+  onJobSelection: (MapUiData.AddLoiUiData) -> Unit,
   selected: Boolean,
 ) {
   Row(modifier = Modifier.fillMaxWidth().padding(8.dp).clickable { onJobSelection(job) }) {
diff --git a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/MapCardAdapter.kt b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/MapCardAdapter.kt
index 867f4cf819..482450e96f 100644
--- a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/MapCardAdapter.kt
+++ b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/MapCardAdapter.kt
@@ -29,7 +29,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.ComposeView
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.ground.R
-import com.google.android.ground.databinding.AddLoiCardItemBinding
+import com.google.android.ground.databinding.AddLoiItemBinding
 import com.google.android.ground.databinding.LoiCardItemBinding
 import com.google.android.ground.model.locationofinterest.LocationOfInterest
 import com.google.android.ground.ui.common.LocationOfInterestHelper
@@ -44,10 +44,10 @@ class MapCardAdapter(
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
   private var canUserSubmitData: Boolean = false
-  private var activeLoi: MapCardUiData.LoiCardUiData? = null
-  private val newLoiJobs: MutableList<MapCardUiData.AddLoiCardUiData> = mutableListOf()
-  private var cardFocusedListener: ((MapCardUiData?) -> Unit)? = null
-  private lateinit var collectDataListener: (MapCardUiData) -> Unit
+  private var activeLoi: MapUiData.LoiUiData? = null
+  private val newLoiJobs: MutableList<MapUiData.AddLoiUiData> = mutableListOf()
+  private var cardFocusedListener: ((MapUiData?) -> Unit)? = null
+  private lateinit var collectDataListener: (MapUiData) -> Unit
 
   /** Creates a new [RecyclerView.ViewHolder] item without any data. */
   override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
@@ -59,7 +59,7 @@ class MapCardAdapter(
         updateSubmissionCount,
       )
     } else {
-      AddLoiCardViewHolder(AddLoiCardItemBinding.inflate(layoutInflater, parent, false))
+      AddLoiCardViewHolder(AddLoiItemBinding.inflate(layoutInflater, parent, false))
     }
   }
 
@@ -68,7 +68,7 @@ class MapCardAdapter(
       R.layout.loi_card_item
     } else {
       // Assume we don't render add LOI option unless we know the job allows it.
-      R.layout.add_loi_card_item
+      R.layout.add_loi_item
     }
 
   /** Binds [LocationOfInterest] data to [LoiViewHolder] or [AddLoiCardViewHolder]. */
@@ -88,33 +88,33 @@ class MapCardAdapter(
   /** Overwrites existing cards. */
   fun updateData(
     canUserSubmitData: Boolean,
-    loiCard: MapCardUiData.LoiCardUiData?,
-    jobCards: List<MapCardUiData.AddLoiCardUiData>,
+    loiUi: MapUiData.LoiUiData?,
+    jobUi: List<MapUiData.AddLoiUiData>,
   ) {
     this.canUserSubmitData = canUserSubmitData
-    activeLoi = loiCard
+    activeLoi = loiUi
     newLoiJobs.clear()
-    newLoiJobs.addAll(jobCards)
+    newLoiJobs.addAll(jobUi)
     notifyDataSetChanged()
   }
 
-  fun setLoiCardFocusedListener(listener: (MapCardUiData?) -> Unit) {
+  fun setLoiCardFocusedListener(listener: (MapUiData?) -> Unit) {
     this.cardFocusedListener = listener
   }
 
-  fun setCollectDataListener(listener: (MapCardUiData) -> Unit) {
+  fun setCollectDataListener(listener: (MapUiData) -> Unit) {
     this.collectDataListener = listener
   }
 
   private fun bindLoiCardViewHolder(
-    loiData: MapCardUiData.LoiCardUiData,
+    loiData: MapUiData.LoiUiData,
     holder: RecyclerView.ViewHolder,
   ): LoiViewHolder = (holder as LoiViewHolder).apply { bind(canUserSubmitData, loiData.loi) }
 
   private fun bindAddLoiCardViewHolder(
-    addLoiJobData: List<MapCardUiData.AddLoiCardUiData>,
+    addLoiJobData: List<MapUiData.AddLoiUiData>,
     holder: RecyclerView.ViewHolder,
-    callback: (MapCardUiData.AddLoiCardUiData) -> Unit,
+    callback: (MapUiData.AddLoiUiData) -> Unit,
   ): AddLoiCardViewHolder = (holder as AddLoiCardViewHolder).apply { bind(addLoiJobData, callback) }
 
   abstract class CardViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {}
@@ -143,16 +143,16 @@ class MapCardAdapter(
   }
 
   /** View item representing the Add Loi Job data in the list. */
-  class AddLoiCardViewHolder(internal val binding: AddLoiCardItemBinding) :
+  class AddLoiCardViewHolder(internal val binding: AddLoiItemBinding) :
     CardViewHolder(binding.root) {
     private val jobDialogOpened = mutableStateOf(false)
 
     fun bind(
-      jobs: List<MapCardUiData.AddLoiCardUiData>,
-      callback: (MapCardUiData.AddLoiCardUiData) -> Unit,
+      jobs: List<MapUiData.AddLoiUiData>,
+      callback: (MapUiData.AddLoiUiData) -> Unit,
     ) {
       with(binding) {
-        loiCard.setOnClickListener {
+        loiUi.setOnClickListener {
           jobDialogOpened.value = true
           (root as ViewGroup).addView(
             ComposeView(root.context).apply {
@@ -165,8 +165,8 @@ class MapCardAdapter(
 
     @Composable
     fun ShowJobSelectionDialog(
-      jobs: List<MapCardUiData.AddLoiCardUiData>,
-      callback: (MapCardUiData.AddLoiCardUiData) -> Unit,
+      jobs: List<MapUiData.AddLoiUiData>,
+      callback: (MapUiData.AddLoiUiData) -> Unit,
       jobDialogOpened: MutableState<Boolean>,
     ) {
       var selectedJobId by rememberSaveable { mutableStateOf(jobs[0].job.id) }
diff --git a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/MapCardUiData.kt b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/MapUiData.kt
similarity index 84%
rename from ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/MapCardUiData.kt
rename to ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/MapUiData.kt
index 6cb93bceb0..aae197b2f8 100644
--- a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/MapCardUiData.kt
+++ b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/MapUiData.kt
@@ -19,9 +19,9 @@ import com.google.android.ground.model.job.Job
 import com.google.android.ground.model.locationofinterest.LocationOfInterest
 
 /** Data classes used to populate the Map cards (either an Loi card, or a Suggest Loi card). */
-sealed interface MapCardUiData {
+sealed interface MapUiData {
 
-  data class LoiCardUiData(val loi: LocationOfInterest) : MapCardUiData
+  data class LoiUiData(val loi: LocationOfInterest) : MapUiData
 
-  data class AddLoiCardUiData(val job: Job) : MapCardUiData
+  data class AddLoiUiData(val job: Job) : MapUiData
 }
diff --git a/ground/src/main/res/layout/add_loi_card_item.xml b/ground/src/main/res/layout/add_loi_item.xml
similarity index 94%
rename from ground/src/main/res/layout/add_loi_card_item.xml
rename to ground/src/main/res/layout/add_loi_item.xml
index e26f037652..dcd603c3dc 100644
--- a/ground/src/main/res/layout/add_loi_card_item.xml
+++ b/ground/src/main/res/layout/add_loi_item.xml
@@ -20,8 +20,8 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools">
 
-  <com.google.android.material.card.MaterialCardView
-    android:id="@+id/loi_card"
+  <com.google.android.material.button.MaterialButton
+    android:id="@+id/loi_ui"
     android:clickable="true"
     android:focusable="true"
     android:layout_gravity="center_horizontal"
@@ -66,5 +66,5 @@
         android:textColor="?attr/colorOnSurface"
         tools:text="Add a site" />
     </LinearLayout>
-  </com.google.android.material.card.MaterialCardView>
+  </com.google.android.material.button.MaterialButton>
 </layout>

From 5aa9496ba30bdd156850a30b899d11d10db175dd Mon Sep 17 00:00:00 2001
From: Sufyan Abbasi <sufy@google.com>
Date: Thu, 19 Dec 2024 01:37:29 -0800
Subject: [PATCH 03/17] Refactor cards into Composables.

---
 .../ground/e2etest/SurveyRunnerTest.kt        |   6 +-
 .../HomeScreenMapContainerFragment.kt         |  63 +--
 .../HomeScreenMapContainerViewModel.kt        |   8 +-
 .../mapcontainer/cards/JobSelectionDialog.kt  |  85 ----
 .../home/mapcontainer/cards/MapCardAdapter.kt | 185 ---------
 .../home/mapcontainer/jobs/JobMapAdapter.kt   | 391 ++++++++++++++++++
 .../mapcontainer/{cards => jobs}/MapUiData.kt |   2 +-
 .../src/main/res/drawable/ic_ring_marker.xml  |  29 ++
 ground/src/main/res/layout/add_loi_item.xml   |  70 ----
 ground/src/main/res/layout/loi_card_item.xml  |  78 ----
 .../res/layout/loi_cards_recycler_view.xml    |  37 --
 ground/src/main/res/navigation/nav_graph.xml  |  14 +-
 ground/src/main/res/values-es/strings.xml     |   2 +-
 ground/src/main/res/values-fr/strings.xml     |   2 +-
 ground/src/main/res/values/strings.xml        |   4 +-
 15 files changed, 460 insertions(+), 516 deletions(-)
 delete mode 100644 ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/JobSelectionDialog.kt
 delete mode 100644 ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/MapCardAdapter.kt
 create mode 100644 ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapAdapter.kt
 rename ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/{cards => jobs}/MapUiData.kt (94%)
 create mode 100644 ground/src/main/res/drawable/ic_ring_marker.xml
 delete mode 100644 ground/src/main/res/layout/add_loi_item.xml
 delete mode 100644 ground/src/main/res/layout/loi_card_item.xml
 delete mode 100644 ground/src/main/res/layout/loi_cards_recycler_view.xml

diff --git a/e2eTest/src/main/java/com/google/android/ground/e2etest/SurveyRunnerTest.kt b/e2eTest/src/main/java/com/google/android/ground/e2etest/SurveyRunnerTest.kt
index 2b095422cd..cbfd82b4e5 100644
--- a/e2eTest/src/main/java/com/google/android/ground/e2etest/SurveyRunnerTest.kt
+++ b/e2eTest/src/main/java/com/google/android/ground/e2etest/SurveyRunnerTest.kt
@@ -114,7 +114,7 @@ class SurveyRunnerTest : AutomatorRunner {
   private fun zoomIntoLocation() {
     clickLocationLock()
     allowPermissions()
-    val loiCardSelector = byClass(CardView::class).hasDescendant(byText(R.string.collect_data))
+    val loiCardSelector = byClass(CardView::class).hasDescendant(byText(R.string.add_data))
     if (device.wait(Until.hasObject(loiCardSelector), LONG_TIMEOUT) == null) {
       captureScreenshot()
       fail("Failed to zoom in to location.")
@@ -130,7 +130,7 @@ class SurveyRunnerTest : AutomatorRunner {
     val cards = device.findObjects(loiCardSelector)
     cards.forEach { it.swipe(Direction.LEFT, 1F) }
     val loiCollectDataButtonSelector =
-      byText(R.string.collect_data)
+      byText(R.string.add_data)
         .hasAncestor(loiCardSelector.hasDescendant(byText(R.string.add_site)))
     if (!waitClickGone(loiCollectDataButtonSelector)) {
       captureScreenshot()
@@ -145,7 +145,7 @@ class SurveyRunnerTest : AutomatorRunner {
       fail("Failed to find predefined loi card")
     }
     // Assume that the first card is the predefined LOI.
-    val loiCollectDataButtonSelector = byText(R.string.collect_data)
+    val loiCollectDataButtonSelector = byText(R.string.add_data)
     if (!waitClickGone(loiCollectDataButtonSelector)) {
       captureScreenshot()
       fail("Failed to start predefined loi data collection.")
diff --git a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt
index 90cc73e3b5..bb7c7ac703 100644
--- a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt
+++ b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt
@@ -19,24 +19,18 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.TextView
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.ComposeView
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.PagerSnapHelper
-import androidx.recyclerview.widget.SnapHelper
 import com.google.android.ground.R
 import com.google.android.ground.coroutines.ApplicationScope
 import com.google.android.ground.coroutines.IoDispatcher
 import com.google.android.ground.coroutines.MainDispatcher
 import com.google.android.ground.databinding.BasemapLayoutBinding
-import com.google.android.ground.databinding.LoiCardsRecyclerViewBinding
 import com.google.android.ground.databinding.MenuButtonBinding
 import com.google.android.ground.model.locationofinterest.LOI_NAME_PROPERTY
-import com.google.android.ground.model.locationofinterest.LocationOfInterest
 import com.google.android.ground.proto.Survey.DataSharingTerms
 import com.google.android.ground.repository.SubmissionRepository
 import com.google.android.ground.repository.UserRepository
@@ -46,8 +40,8 @@ import com.google.android.ground.ui.common.EphemeralPopups
 import com.google.android.ground.ui.home.DataSharingTermsDialog
 import com.google.android.ground.ui.home.HomeScreenFragmentDirections
 import com.google.android.ground.ui.home.HomeScreenViewModel
-import com.google.android.ground.ui.home.mapcontainer.cards.MapCardAdapter
-import com.google.android.ground.ui.home.mapcontainer.cards.MapUiData
+import com.google.android.ground.ui.home.mapcontainer.jobs.JobMapAdapter
+import com.google.android.ground.ui.home.mapcontainer.jobs.MapUiData
 import com.google.android.ground.ui.map.MapFragment
 import com.google.android.ground.ui.theme.AppTheme
 import dagger.hilt.android.AndroidEntryPoint
@@ -58,7 +52,7 @@ import kotlinx.coroutines.flow.cancellable
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.runBlocking
 import timber.log.Timber
 
 /** Main app view, displaying the map and related controls (center cross-hairs, add button, etc). */
@@ -75,20 +69,22 @@ class HomeScreenMapContainerFragment : AbstractMapContainerFragment() {
   private lateinit var mapContainerViewModel: HomeScreenMapContainerViewModel
   private lateinit var homeScreenViewModel: HomeScreenViewModel
   private lateinit var binding: BasemapLayoutBinding
-  private lateinit var adapter: MapCardAdapter
+  private lateinit var adapter: JobMapAdapter
   private lateinit var infoPopup: EphemeralPopups.InfoPopup
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     mapContainerViewModel = getViewModel(HomeScreenMapContainerViewModel::class.java)
     homeScreenViewModel = getViewModel(HomeScreenViewModel::class.java)
-    adapter = MapCardAdapter { loi, view -> updateSubmissionCount(loi, view) }
+    adapter = JobMapAdapter { loi -> submissionRepository.getTotalSubmissionCount(loi) }
 
     launchWhenStarted {
+      Timber.v("GOT HERE: launchWhenStarted")
       val canUserSubmitData = userRepository.canUserSubmitData()
 
       // Handle collect button clicks
       adapter.setCollectDataListener { mapUiData ->
+        Timber.v("GOT HERE: setCollectDataListener")
         val job =
           lifecycleScope.launch {
             mapContainerViewModel.activeSurveyDataSharingTermsFlow.cancellable().collectLatest {
@@ -106,7 +102,9 @@ class HomeScreenMapContainerFragment : AbstractMapContainerFragment() {
 
       // Bind data for cards
       mapContainerViewModel.getMapCardUiData().launchWhenStartedAndCollect { (loiCard, jobCards) ->
-        adapter.updateData(canUserSubmitData, loiCard, jobCards)
+          runBlocking {
+            adapter.updateData(canUserSubmitData, loiCard, jobCards)
+          }
       }
     }
 
@@ -116,8 +114,7 @@ class HomeScreenMapContainerFragment : AbstractMapContainerFragment() {
   private fun hasValidTasks(cardUiData: MapUiData) =
     when (cardUiData) {
       // LOI tasks are filtered out of the tasks list for pre-defined tasks.
-      is MapUiData.LoiUiData ->
-        cardUiData.loi.job.tasks.values.count { !it.isAddLoiTask } > 0
+      is MapUiData.LoiUiData -> cardUiData.loi.job.tasks.values.count { !it.isAddLoiTask } > 0
       is MapUiData.AddLoiUiData -> cardUiData.job.tasks.values.isNotEmpty()
     }
 
@@ -175,17 +172,6 @@ class HomeScreenMapContainerFragment : AbstractMapContainerFragment() {
     navigateToDataCollectionFragment(cardUiData)
   }
 
-  /** Updates the given [TextView] with the submission count for the given [LocationOfInterest]. */
-  private fun updateSubmissionCount(loi: LocationOfInterest, view: TextView) {
-    externalScope.launch {
-      val count = submissionRepository.getTotalSubmissionCount(loi)
-      val submissionText =
-        if (count == 0) resources.getString(R.string.no_submissions)
-        else resources.getQuantityString(R.plurals.submission_count, count, count)
-      withContext(mainDispatcher) { view.text = submissionText }
-    }
-  }
-
   override fun onCreateView(
     inflater: LayoutInflater,
     container: ViewGroup?,
@@ -201,8 +187,8 @@ class HomeScreenMapContainerFragment : AbstractMapContainerFragment() {
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
-    setupMenuFab()
-    setupBottomLoiCards()
+    val menuBinding = setupMenuFab()
+    setupBottomLoiCards(menuBinding)
     showDataCollectionHint()
   }
 
@@ -247,21 +233,18 @@ class HomeScreenMapContainerFragment : AbstractMapContainerFragment() {
       }
   }
 
-  private fun setupMenuFab() {
+  private fun setupMenuFab(): MenuButtonBinding {
     val mapOverlay = binding.overlay
     val menuBinding = MenuButtonBinding.inflate(layoutInflater, mapOverlay, true)
     menuBinding.homeScreenViewModel = homeScreenViewModel
     menuBinding.lifecycleOwner = this
+    return menuBinding
   }
 
-  private fun setupBottomLoiCards() {
-    val container = binding.bottomContainer
-    val recyclerViewBinding = LoiCardsRecyclerViewBinding.inflate(layoutInflater, container, true)
-    val recyclerView = recyclerViewBinding.recyclerView
-    recyclerView.adapter = adapter
-
-    val helper: SnapHelper = PagerSnapHelper()
-    helper.attachToRecyclerView(recyclerView)
+  private fun setupBottomLoiCards(menuBinding: MenuButtonBinding) {
+    adapter.basemapLayoutBinding = binding
+    adapter.menuBinding = menuBinding
+    adapter.render()
   }
 
   private fun navigateToDataCollectionFragment(cardUiData: MapUiData) {
@@ -296,13 +279,7 @@ class HomeScreenMapContainerFragment : AbstractMapContainerFragment() {
   override fun onMapReady(map: MapFragment) {
     mapContainerViewModel.mapLoiFeatures.launchWhenStartedAndCollect { map.setFeatures(it) }
 
-    adapter.setLoiCardFocusedListener {
-      when (it) {
-        is MapUiData.LoiUiData -> mapContainerViewModel.selectLocationOfInterest(it.loi.id)
-        is MapUiData.AddLoiUiData,
-        null -> mapContainerViewModel.selectLocationOfInterest(null)
-      }
-    }
+    adapter.setSelectedFeature { mapContainerViewModel.selectLocationOfInterest(it) }
   }
 
   override fun getMapViewModel(): BaseMapViewModel = mapContainerViewModel
diff --git a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModel.kt b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModel.kt
index fd4e23944d..0ed6f4af51 100644
--- a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModel.kt
+++ b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModel.kt
@@ -33,7 +33,7 @@ import com.google.android.ground.system.PermissionsManager
 import com.google.android.ground.system.SettingsManager
 import com.google.android.ground.ui.common.BaseMapViewModel
 import com.google.android.ground.ui.common.SharedViewModel
-import com.google.android.ground.ui.home.mapcontainer.cards.MapUiData
+import com.google.android.ground.ui.home.mapcontainer.jobs.MapUiData
 import com.google.android.ground.ui.map.Feature
 import com.google.android.ground.ui.map.FeatureType
 import com.google.android.ground.ui.map.isLocationOfInterest
@@ -184,8 +184,7 @@ internal constructor(
    * Returns a flow of [MapUiData] associated with the active survey's LOIs and adhoc jobs for
    * displaying the cards.
    */
-  fun getMapCardUiData():
-    Flow<Pair<MapUiData.LoiUiData?, List<MapUiData.AddLoiUiData>>> =
+  fun getMapCardUiData(): Flow<Pair<MapUiData.LoiUiData?, List<MapUiData.AddLoiUiData>>> =
     combine(loisInViewport, featureClicked, adHocLoiJobs) { loisInView, feature, jobs ->
       val loiCard =
         loisInView
@@ -248,5 +247,8 @@ internal constructor(
 
   fun selectLocationOfInterest(id: String?) {
     selectedLoiIdFlow.value = id
+    if (id == null) {
+      featureClicked.value = null
+    }
   }
 }
diff --git a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/JobSelectionDialog.kt b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/JobSelectionDialog.kt
deleted file mode 100644
index 9f9cb196cd..0000000000
--- a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/JobSelectionDialog.kt
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.google.android.ground.ui.home.mapcontainer.cards
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.Button
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedButton
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.em
-import androidx.compose.ui.unit.sp
-import com.google.android.ground.R
-
-@Composable
-fun JobSelectionDialog(
-  selectedJobId: String,
-  jobs: List<MapUiData.AddLoiUiData>,
-  onJobSelection: (MapUiData.AddLoiUiData) -> Unit,
-  onConfirmRequest: (MapUiData.AddLoiUiData) -> Unit,
-  onDismissRequest: () -> Unit,
-) {
-  AlertDialog(
-    containerColor = MaterialTheme.colorScheme.surface,
-    onDismissRequest = onDismissRequest,
-    title = {
-      Column(
-        modifier = Modifier.fillMaxWidth()
-      ) {
-        Text(text = stringResource(R.string.add_site), fontSize = 5.em)
-      }
-    },
-    text = {
-      Column {
-        Spacer(Modifier.height(16.dp))
-        jobs.forEach { JobSelectionRow(it, onJobSelection, it.job.id === selectedJobId) }
-      }
-    },
-    confirmButton = {
-      Button(
-        onClick = { jobs.find { it.job.id == selectedJobId }?.let { onConfirmRequest(it) } },
-        contentPadding = PaddingValues(25.dp, 0.dp),
-        enabled = selectedJobId != "",
-      ) {
-        Text(stringResource(R.string.begin))
-      }
-    },
-    dismissButton = {
-      OutlinedButton(onClick = { onDismissRequest() }) {
-        Text(text = stringResource(R.string.cancel))
-      }
-    },
-  )
-}
-
-@Composable
-fun JobSelectionRow(
-  job: MapUiData.AddLoiUiData,
-  onJobSelection: (MapUiData.AddLoiUiData) -> Unit,
-  selected: Boolean,
-) {
-  Row(modifier = Modifier.fillMaxWidth().padding(8.dp).clickable { onJobSelection(job) }) {
-    Text(job.job.name ?: stringResource(R.string.unnamed_job), fontSize = 18.sp)
-    if (selected) {
-      Icon(
-        modifier = Modifier.size(25.dp),
-        painter = painterResource(id = R.drawable.baseline_check_24),
-        contentDescription = "selected",
-        tint = MaterialTheme.colorScheme.onSurface,
-      )
-    }
-  }
-}
diff --git a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/MapCardAdapter.kt b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/MapCardAdapter.kt
deleted file mode 100644
index 482450e96f..0000000000
--- a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/MapCardAdapter.kt
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.ground.ui.home.mapcontainer.cards
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.TextView
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.platform.ComposeView
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.ground.R
-import com.google.android.ground.databinding.AddLoiItemBinding
-import com.google.android.ground.databinding.LoiCardItemBinding
-import com.google.android.ground.model.locationofinterest.LocationOfInterest
-import com.google.android.ground.ui.common.LocationOfInterestHelper
-import com.google.android.ground.ui.theme.AppTheme
-
-/**
- * An implementation of [RecyclerView.Adapter] that associates [LocationOfInterest] data with the
- * [ViewHolder] views.
- */
-class MapCardAdapter(
-  private val updateSubmissionCount: (loi: LocationOfInterest, view: TextView) -> Unit
-) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-  private var canUserSubmitData: Boolean = false
-  private var activeLoi: MapUiData.LoiUiData? = null
-  private val newLoiJobs: MutableList<MapUiData.AddLoiUiData> = mutableListOf()
-  private var cardFocusedListener: ((MapUiData?) -> Unit)? = null
-  private lateinit var collectDataListener: (MapUiData) -> Unit
-
-  /** Creates a new [RecyclerView.ViewHolder] item without any data. */
-  override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-    val layoutInflater = LayoutInflater.from(parent.context)
-
-    return if (viewType == R.layout.loi_card_item) {
-      LoiViewHolder(
-        LoiCardItemBinding.inflate(layoutInflater, parent, false),
-        updateSubmissionCount,
-      )
-    } else {
-      AddLoiCardViewHolder(AddLoiItemBinding.inflate(layoutInflater, parent, false))
-    }
-  }
-
-  override fun getItemViewType(position: Int): Int =
-    if (activeLoi != null) {
-      R.layout.loi_card_item
-    } else {
-      // Assume we don't render add LOI option unless we know the job allows it.
-      R.layout.add_loi_item
-    }
-
-  /** Binds [LocationOfInterest] data to [LoiViewHolder] or [AddLoiCardViewHolder]. */
-  override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-    val loi = activeLoi
-    if (loi != null) {
-      val cardHolder = bindLoiCardViewHolder(loi, holder)
-      cardHolder.setOnClickListener { collectDataListener(loi) }
-    } else {
-      bindAddLoiCardViewHolder(newLoiJobs, holder) { job -> collectDataListener(job) }
-    }
-  }
-
-  /** Returns the size of the list. */
-  override fun getItemCount() = if (activeLoi != null || newLoiJobs.isNotEmpty()) 1 else 0
-
-  /** Overwrites existing cards. */
-  fun updateData(
-    canUserSubmitData: Boolean,
-    loiUi: MapUiData.LoiUiData?,
-    jobUi: List<MapUiData.AddLoiUiData>,
-  ) {
-    this.canUserSubmitData = canUserSubmitData
-    activeLoi = loiUi
-    newLoiJobs.clear()
-    newLoiJobs.addAll(jobUi)
-    notifyDataSetChanged()
-  }
-
-  fun setLoiCardFocusedListener(listener: (MapUiData?) -> Unit) {
-    this.cardFocusedListener = listener
-  }
-
-  fun setCollectDataListener(listener: (MapUiData) -> Unit) {
-    this.collectDataListener = listener
-  }
-
-  private fun bindLoiCardViewHolder(
-    loiData: MapUiData.LoiUiData,
-    holder: RecyclerView.ViewHolder,
-  ): LoiViewHolder = (holder as LoiViewHolder).apply { bind(canUserSubmitData, loiData.loi) }
-
-  private fun bindAddLoiCardViewHolder(
-    addLoiJobData: List<MapUiData.AddLoiUiData>,
-    holder: RecyclerView.ViewHolder,
-    callback: (MapUiData.AddLoiUiData) -> Unit,
-  ): AddLoiCardViewHolder = (holder as AddLoiCardViewHolder).apply { bind(addLoiJobData, callback) }
-
-  abstract class CardViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {}
-
-  /** View item representing the [LocationOfInterest] data in the list. */
-  class LoiViewHolder(
-    internal val binding: LoiCardItemBinding,
-    private val updateSubmissionCount: (loi: LocationOfInterest, view: TextView) -> Unit,
-  ) : CardViewHolder(binding.root) {
-    private val loiHelper = LocationOfInterestHelper(itemView.resources)
-
-    fun bind(canUserSubmitData: Boolean, loi: LocationOfInterest) {
-      with(binding) {
-        loiName.text = loiHelper.getDisplayLoiName(loi)
-        jobName.text = loiHelper.getJobName(loi)
-        // NOTE(#2539): The DataCollectionFragment will crash if there are no non-LOI tasks.
-        collectData.visibility =
-          if (canUserSubmitData && loi.job.hasNonLoiTasks()) View.VISIBLE else View.GONE
-        updateSubmissionCount(loi, submissions)
-      }
-    }
-
-    fun setOnClickListener(callback: () -> Unit) {
-      binding.collectData.setOnClickListener { callback() }
-    }
-  }
-
-  /** View item representing the Add Loi Job data in the list. */
-  class AddLoiCardViewHolder(internal val binding: AddLoiItemBinding) :
-    CardViewHolder(binding.root) {
-    private val jobDialogOpened = mutableStateOf(false)
-
-    fun bind(
-      jobs: List<MapUiData.AddLoiUiData>,
-      callback: (MapUiData.AddLoiUiData) -> Unit,
-    ) {
-      with(binding) {
-        loiUi.setOnClickListener {
-          jobDialogOpened.value = true
-          (root as ViewGroup).addView(
-            ComposeView(root.context).apply {
-              setContent { AppTheme { ShowJobSelectionDialog(jobs, callback, jobDialogOpened) } }
-            }
-          )
-        }
-      }
-    }
-
-    @Composable
-    fun ShowJobSelectionDialog(
-      jobs: List<MapUiData.AddLoiUiData>,
-      callback: (MapUiData.AddLoiUiData) -> Unit,
-      jobDialogOpened: MutableState<Boolean>,
-    ) {
-      var selectedJobId by rememberSaveable { mutableStateOf(jobs[0].job.id) }
-      var openJobsDialog by rememberSaveable { jobDialogOpened }
-      if (openJobsDialog) {
-        JobSelectionDialog(
-          selectedJobId = selectedJobId,
-          jobs = jobs,
-          onJobSelection = { selectedJobId = it.job.id },
-          onConfirmRequest = { callback(it) },
-          onDismissRequest = { openJobsDialog = false },
-        )
-      }
-    }
-  }
-}
diff --git a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapAdapter.kt b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapAdapter.kt
new file mode 100644
index 0000000000..56e4463f93
--- /dev/null
+++ b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapAdapter.kt
@@ -0,0 +1,391 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.ground.ui.home.mapcontainer.jobs
+
+import android.view.ViewGroup
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.gestures.detectTapGestures
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.filled.Clear
+import androidx.compose.material3.BottomSheetDefaults
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonColors
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.Text
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.pluralStringResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.google.android.ground.R
+import com.google.android.ground.databinding.BasemapLayoutBinding
+import com.google.android.ground.databinding.MenuButtonBinding
+import com.google.android.ground.model.job.getDefaultColor
+import com.google.android.ground.model.locationofinterest.LocationOfInterest
+import com.google.android.ground.ui.common.LocationOfInterestHelper
+import com.google.android.ground.ui.theme.AppTheme
+import kotlinx.coroutines.launch
+import timber.log.Timber
+
+/** Manages a set of [Composable] components that renders [LocationOfInterest] cards and dialogs. */
+class JobMapAdapter(private val getSubmissionCount: suspend (loi: LocationOfInterest) -> Int) {
+  lateinit var basemapLayoutBinding: BasemapLayoutBinding
+  lateinit var menuBinding: MenuButtonBinding
+  private var collectDataListener: MutableState<(MapUiData) -> Unit> = mutableStateOf({})
+  private var canUserSubmitData = mutableStateOf(false)
+  private var activeLoi: MutableState<MapUiData.LoiUiData?> = mutableStateOf(null)
+  private val newLoiJobs: MutableList<MapUiData.AddLoiUiData> = mutableStateListOf()
+  private var selectedFeatureListener: ((String?) -> Unit) = {}
+  private val jobModalOpened = mutableStateOf(false)
+  private val jobCardOpened = mutableStateOf(false)
+  private val submissionCount = mutableIntStateOf(-1)
+
+  fun render() {
+    initializeJobCard()
+    initializeAddLoiButton()
+    basemapLayoutBinding.bottomContainer.bringToFront()
+  }
+
+  /** Overwrites existing cards. */
+  suspend fun updateData(
+    canUserSubmitData: Boolean,
+    selectedLoi: MapUiData.LoiUiData?,
+    addLoiJobs: List<MapUiData.AddLoiUiData>,
+  ) {
+    this.canUserSubmitData.value = canUserSubmitData
+    activeLoi.value = selectedLoi
+    newLoiJobs.clear()
+    newLoiJobs.addAll(addLoiJobs)
+    if (selectedLoi != null) {
+      submissionCount.intValue = getSubmissionCount(selectedLoi.loi)
+      jobCardOpened.value = true
+      selectedFeatureListener(selectedLoi.loi.id)
+    }
+  }
+
+  fun setSelectedFeature(listener: (String?) -> Unit) {
+    selectedFeatureListener = listener
+  }
+
+  fun setCollectDataListener(listener: (MapUiData) -> Unit) {
+    collectDataListener.value = listener
+  }
+
+  private fun initializeAddLoiButton() {
+    with(basemapLayoutBinding) {
+      (bottomContainer as ViewGroup).addView(
+        ComposeView(bottomContainer.context).apply {
+          setContent {
+            AppTheme {
+              InitializeAddLoiButton {
+                if (newLoiJobs.size == 1) {
+                  // If there's only one job, start data collection on it without showing the
+                  // job modal.
+                  jobModalOpened.value = false
+                  collectDataListener.value(newLoiJobs.first())
+                } else {
+                  jobModalOpened.value = true
+                }
+              }
+              InitializeJobSelectionModal()
+            }
+          }
+        }
+      )
+    }
+  }
+
+  private fun initializeJobCard() {
+    with(basemapLayoutBinding) {
+      (bottomContainer as ViewGroup).addView(
+        ComposeView(bottomContainer.context).apply { setContent { AppTheme { InitializeJobCard() } } }
+      )
+    }
+  }
+
+  private fun closeJobCard() {
+    jobCardOpened.value = false
+    activeLoi.value = null
+    selectedFeatureListener(null)
+  }
+
+  @Composable
+  private fun InitializeAddLoiButton(callback: () -> Unit) {
+    val jobs = remember { newLoiJobs }
+    val jobModalOpened by remember { jobModalOpened }
+    val canUserSubmitData by remember { canUserSubmitData }
+    if (jobs.size == 0 || jobModalOpened || !canUserSubmitData) {
+      return
+    }
+    Row(
+      Modifier.fillMaxWidth(),
+      horizontalArrangement = Arrangement.Center,
+      verticalAlignment = Alignment.CenterVertically,
+    ) {
+      ActionButton(
+        icon = Icons.Filled.Add,
+        contentDescription = stringResource(id = R.string.add_site),
+        callback = callback,
+      )
+    }
+  }
+
+  @Composable
+  private fun InitializeJobSelectionModal() {
+    val jobs = remember { newLoiJobs }
+    var openJobsModal by remember { jobModalOpened }
+    val collectDataCallback by remember { collectDataListener }
+    if (openJobsModal) {
+      basemapLayoutBinding.mapTypeBtn.hide()
+      basemapLayoutBinding.locationLockBtn.hide()
+      menuBinding.hamburgerBtn.hide()
+      Modal(onDismiss = { openJobsModal = false }) {
+        jobs.forEach {job->
+          JobSelectionRow(job) {
+            collectDataCallback(job)
+            openJobsModal = false
+          }
+          Spacer(Modifier.height(16.dp))
+        }
+      }
+    } else {
+      basemapLayoutBinding.mapTypeBtn.show()
+      basemapLayoutBinding.locationLockBtn.show()
+      menuBinding.hamburgerBtn.show()
+    }
+  }
+
+  @OptIn(ExperimentalMaterial3Api::class)
+  @Composable
+  private fun InitializeJobCard() {
+    val sheetState = rememberModalBottomSheetState()
+    val scope = rememberCoroutineScope()
+    val showJobCard by remember { jobCardOpened }
+    val loi by remember { activeLoi }
+    val submissionCount by remember { submissionCount }
+    val canUserSubmitData by remember { canUserSubmitData }
+    val collectDataCallback by remember { collectDataListener }
+    val loiHelper = LocationOfInterestHelper(LocalContext.current.resources)
+
+    if (!showJobCard) {
+      return
+    }
+    loi?.let {loiData ->
+      ModalBottomSheet(
+        onDismissRequest = { closeJobCard() },
+        sheetState = sheetState,
+        containerColor = MaterialTheme.colorScheme.surface,
+        dragHandle = { BottomSheetDefaults.DragHandle(width = 32.dp) },
+      ) {
+        Column(
+          modifier = Modifier.fillMaxWidth().padding(start = 24.dp, end = 24.dp, bottom = 32.dp)
+        ) {
+          Text(
+            loiHelper.getJobName(loiData.loi) ?: "",
+            color = MaterialTheme.colorScheme.onSurface,
+            fontSize = 18.sp,
+          )
+          Row(
+            modifier = Modifier.padding(vertical = 8.dp),
+            verticalAlignment = Alignment.CenterVertically,
+          ) {
+            Icon(
+              painter = painterResource(R.drawable.ic_ring_marker),
+              contentDescription = stringResource(R.string.job_site_icon),
+              modifier = Modifier.size(32.dp),
+              tint = Color(loiData.loi.job.getDefaultColor()),
+            )
+            Spacer(modifier = Modifier.size(18.dp))
+            Text(
+              loiHelper.getDisplayLoiName(loiData.loi),
+              color = MaterialTheme.colorScheme.onSurface,
+              fontSize = 28.sp,
+            )
+          }
+          Row(
+            modifier = Modifier.fillMaxWidth(),
+            verticalAlignment = Alignment.Top,
+            horizontalArrangement = Arrangement.SpaceBetween,
+          ) {
+            Text(
+              if (submissionCount <= 0) stringResource(R.string.no_submissions)
+              else
+                pluralStringResource(R.plurals.submission_count, submissionCount, submissionCount),
+              color = MaterialTheme.colorScheme.onSurface,
+              fontSize = 16.sp,
+            )
+            // NOTE(#2539): The DataCollectionFragment will crash if there are no non-LOI tasks.
+            if (canUserSubmitData && loiData.loi.job.hasNonLoiTasks()) {
+              Button(
+                onClick = {
+                  scope
+                    .launch { sheetState.hide() }
+                    .invokeOnCompletion {
+                      Timber.v("GOT HERE: sheetState HIDE")
+                      if (!sheetState.isVisible) {
+                        closeJobCard()
+                      }
+                      collectDataCallback(loiData)
+                    }
+                }
+              ) {
+                Text(
+                  stringResource(R.string.add_data),
+                  modifier = Modifier.padding(4.dp),
+                  fontSize = 18.sp,
+                )
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+@Composable
+fun ActionButton(icon: ImageVector, contentDescription: String, callback: () -> Unit) {
+  Button(
+    onClick = callback,
+    modifier = Modifier.size(width = 100.dp, height = 100.dp),
+    colors =
+      ButtonColors(
+        containerColor = MaterialTheme.colorScheme.primaryContainer,
+        contentColor = Color.Black,
+        disabledContainerColor = ButtonDefaults.buttonColors().disabledContainerColor,
+        disabledContentColor = ButtonDefaults.buttonColors().disabledContentColor,
+      ),
+    shape =
+      RoundedCornerShape(
+        topStartPercent = 25,
+        topEndPercent = 25,
+        bottomStartPercent = 25,
+        bottomEndPercent = 25,
+      ),
+  ) {
+    Icon(imageVector = icon, contentDescription = contentDescription, Modifier.size(65.dp))
+  }
+}
+
+@Composable
+fun Modal(onDismiss: () -> Unit, content: @Composable () -> Unit) {
+  Column(
+    Modifier.fillMaxSize()
+      .background(
+        Brush.verticalGradient(
+          colorStops =
+            arrayOf(
+              0.0f to Color.Black.copy(alpha = 0.75F),
+              0.9f to Color.DarkGray.copy(alpha = 0.6F),
+              1f to Color.Transparent,
+            )
+        )
+      )
+      .pointerInput(Unit) { detectTapGestures {} }
+      .clickable(onClick = onDismiss),
+    verticalArrangement = Arrangement.SpaceBetween,
+    horizontalAlignment = Alignment.CenterHorizontally,
+  ) {
+    Spacer(Modifier.weight(1F))
+    Column(
+      verticalArrangement = Arrangement.SpaceBetween,
+      horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+      content()
+    }
+    Box(modifier = Modifier.weight(1F).fillMaxWidth(), contentAlignment = Alignment.BottomCenter) {
+      ActionButton(icon = Icons.Filled.Clear, contentDescription = stringResource(R.string.close)) {
+        onDismiss()
+      }
+    }
+  }
+}
+
+@Composable
+fun JobSelectionRow(job: MapUiData.AddLoiUiData, onJobSelected: () -> Unit) {
+  Button(
+    onClick = { onJobSelected() },
+    modifier = Modifier.fillMaxWidth(0.65F).clickable { onJobSelected() },
+    shape =
+      RoundedCornerShape(
+        topStartPercent = 25,
+        topEndPercent = 25,
+        bottomStartPercent = 25,
+        bottomEndPercent = 25,
+      ),
+    colors =
+      ButtonDefaults.buttonColors()
+        .copy(
+          containerColor = MaterialTheme.colorScheme.surface,
+          contentColor = MaterialTheme.colorScheme.onSurface,
+        ),
+  ) {
+    Row(
+      modifier = Modifier.fillMaxWidth(),
+      verticalAlignment = Alignment.CenterVertically,
+      horizontalArrangement = Arrangement.Start,
+    ) {
+      Icon(
+        painter = painterResource(R.drawable.ic_ring_marker),
+        contentDescription = stringResource(R.string.job_site_icon),
+        modifier = Modifier.size(32.dp),
+        tint = Color(job.job.getDefaultColor()),
+      )
+      Spacer(modifier = Modifier.size(8.dp))
+      Text(
+        job.job.name ?: stringResource(R.string.unnamed_job),
+        modifier = Modifier.padding(16.dp),
+        fontSize = 24.sp,
+      )
+    }
+  }
+}
diff --git a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/MapUiData.kt b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/MapUiData.kt
similarity index 94%
rename from ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/MapUiData.kt
rename to ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/MapUiData.kt
index aae197b2f8..cb46c35edb 100644
--- a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/cards/MapUiData.kt
+++ b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/MapUiData.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.ground.ui.home.mapcontainer.cards
+package com.google.android.ground.ui.home.mapcontainer.jobs
 
 import com.google.android.ground.model.job.Job
 import com.google.android.ground.model.locationofinterest.LocationOfInterest
diff --git a/ground/src/main/res/drawable/ic_ring_marker.xml b/ground/src/main/res/drawable/ic_ring_marker.xml
new file mode 100644
index 0000000000..9e91c9d08d
--- /dev/null
+++ b/ground/src/main/res/drawable/ic_ring_marker.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2024 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     https://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:fillColor="#F37C22"
+      android:fillType="evenOdd"
+      android:pathData="M0.4,9.3V10.7C0.4,12.7 0.6,14.8 1.1,15.9C1.6,17 2.6,18.1 3.8,18.7C5.1,19.4 7.3,19.6 9.3,19.6H10.7C12.7,19.6 14.9,19.4 16.2,18.7C17.4,18.1 18.4,17 18.9,15.9C19.4,14.8 19.6,12.7 19.6,10.7V9.3C19.6,7.3 19.4,5.2 18.9,4.1C18.4,3 17.4,1.9 16.2,1.3C14.9,0.6 12.7,0.4 10.7,0.4H9.3C7.3,0.4 5.1,0.6 3.8,1.3C2.6,1.9 1.6,3 1.1,4.1C0.6,5.2 0.4,7.3 0.4,9.3ZM7.6,6.7C7.1,6.7 6.7,7.1 6.7,7.6V12.4C6.7,12.9 7.1,13.3 7.6,13.3H12.4C12.9,13.3 13.3,12.9 13.3,12.4V7.6C13.3,7.1 12.9,6.7 12.4,6.7H7.6Z" />
+</vector>
+
diff --git a/ground/src/main/res/layout/add_loi_item.xml b/ground/src/main/res/layout/add_loi_item.xml
deleted file mode 100644
index dcd603c3dc..0000000000
--- a/ground/src/main/res/layout/add_loi_item.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2023 Google LLC
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     https://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools">
-
-  <com.google.android.material.button.MaterialButton
-    android:id="@+id/loi_ui"
-    android:clickable="true"
-    android:focusable="true"
-    android:layout_gravity="center_horizontal"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="@dimen/job_card_start_end_margin"
-    android:layout_marginEnd="@dimen/job_card_start_end_margin"
-    android:backgroundTint="?attr/colorPrimaryContainer"
-    android:orientation="vertical"
-    app:cardCornerRadius="@dimen/job_card_corner_radius"
-    app:cardElevation="2dp"
-    app:strokeWidth="0dp">
-    <LinearLayout
-      android:id="@+id/wrapper_view"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:layout_gravity="fill"
-      android:gravity="fill"
-      android:orientation="horizontal"
-      android:paddingStart="16dp"
-      android:paddingTop="12dp"
-      android:paddingEnd="18dp"
-      android:paddingBottom="4dp">
-      <TextView
-        android:id="@+id/newSitePlus"
-        style="@style/JobCardDescription"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_marginEnd="8dp"
-        android:gravity="center"
-        android:text="@string/plus_sign"
-        android:textColor="?attr/colorOnSurface"
-        android:textSize="30sp"
-        tools:text="+" />
-      <TextView
-        android:id="@+id/newSite"
-        style="@style/JobCardDescription"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:text="@string/add_site"
-        android:textColor="?attr/colorOnSurface"
-        tools:text="Add a site" />
-    </LinearLayout>
-  </com.google.android.material.button.MaterialButton>
-</layout>
diff --git a/ground/src/main/res/layout/loi_card_item.xml b/ground/src/main/res/layout/loi_card_item.xml
deleted file mode 100644
index d64751a0d7..0000000000
--- a/ground/src/main/res/layout/loi_card_item.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2022 Google LLC
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     https://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools">
-
-  <com.google.android.material.card.MaterialCardView
-    android:id="@+id/loi_card"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="@dimen/job_card_start_end_margin"
-    android:layout_marginEnd="@dimen/job_card_start_end_margin"
-    android:orientation="vertical"
-    android:backgroundTint="?attr/colorBackgroundFloating"
-    app:cardCornerRadius="@dimen/job_card_corner_radius"
-    app:cardElevation="2dp"
-    app:strokeWidth="0dp">
-    <androidx.constraintlayout.widget.ConstraintLayout
-      android:id="@+id/wrapper_view"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:padding="16dp">
-      <TextView
-        android:id="@+id/jobName"
-        style="@style/JobCardTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="Map the terrain" />
-      <TextView
-        android:id="@+id/loiName"
-        style="@style/JobCardDescription"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        app:layout_constraintStart_toStartOf="@id/jobName"
-        app:layout_constraintTop_toBottomOf="@id/jobName"
-        tools:text="Quilombolas" />
-      <TextView
-        android:id="@+id/submissions"
-        style="@style/JobCardAdditionalText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginTop="4dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/loiName"
-        tools:text="No submissions" />
-      <Button
-        android:id="@+id/collectData"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        android:clickable="false"
-        android:text="@string/collect_data"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/submissions" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-  </com.google.android.material.card.MaterialCardView>
-</layout>
diff --git a/ground/src/main/res/layout/loi_cards_recycler_view.xml b/ground/src/main/res/layout/loi_cards_recycler_view.xml
deleted file mode 100644
index 99594cd18b..0000000000
--- a/ground/src/main/res/layout/loi_cards_recycler_view.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2022 Google LLC
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     https://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools">
-
-  <androidx.recyclerview.widget.RecyclerView
-    android:id="@+id/recycler_view"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:clipToPadding="false"
-    android:orientation="horizontal"
-    android:paddingStart="32dp"
-    android:paddingTop="8dp"
-    android:paddingEnd="32dp"
-    android:paddingBottom="8dp"
-    app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-    tools:itemCount="3"
-    tools:listitem="@layout/loi_card_item" />
-
-</layout>
\ No newline at end of file
diff --git a/ground/src/main/res/navigation/nav_graph.xml b/ground/src/main/res/navigation/nav_graph.xml
index 4f6895a9a8..2f6a269358 100644
--- a/ground/src/main/res/navigation/nav_graph.xml
+++ b/ground/src/main/res/navigation/nav_graph.xml
@@ -114,7 +114,7 @@
     <fragment
       android:id="@+id/data_collection_fragment"
       android:name="com.google.android.ground.ui.datacollection.DataCollectionFragment"
-      android:label="@string/collect_data"
+      android:label="@string/add_data"
       tools:layout="@layout/data_collection_frag">
       <argument
         android:name="locationOfInterestId"
@@ -143,37 +143,37 @@
     <fragment
       android:id="@+id/drop_pin_task_fragment"
       android:name="com.google.android.ground.ui.datacollection.tasks.point.DropPinTaskFragment"
-      android:label="@string/collect_data"
+      android:label="@string/add_data"
       tools:layout="@layout/text_task_frag" />
 
     <fragment
       android:id="@+id/multiple_choice_task_fragment"
       android:name="com.google.android.ground.ui.datacollection.tasks.multiplechoice.MultipleChoiceTaskFragment"
-      android:label="@string/collect_data"
+      android:label="@string/add_data"
       tools:layout="@layout/text_task_frag" />
 
     <fragment
       android:id="@+id/number_task_fragment"
       android:name="com.google.android.ground.ui.datacollection.tasks.number.NumberTaskFragment"
-      android:label="@string/collect_data"
+      android:label="@string/add_data"
       tools:layout="@layout/text_task_frag" />
 
     <fragment
       android:id="@+id/photo_task_fragment"
       android:name="com.google.android.ground.ui.datacollection.tasks.photo.PhotoTaskFragment"
-      android:label="@string/collect_data"
+      android:label="@string/add_data"
       tools:layout="@layout/text_task_frag" />
 
     <fragment
       android:id="@+id/polygon_task_fragment"
       android:name="com.google.android.ground.ui.datacollection.tasks.polygon.DrawAreaTaskFragment"
-      android:label="@string/collect_data"
+      android:label="@string/add_data"
       tools:layout="@layout/text_task_frag" />
 
     <fragment
       android:id="@+id/question_task_fragment"
       android:name="com.google.android.ground.ui.datacollection.tasks.text.TextTaskFragment"
-      android:label="@string/collect_data"
+      android:label="@string/add_data"
       tools:layout="@layout/text_task_frag" />
   </navigation>
   <fragment
diff --git a/ground/src/main/res/values-es/strings.xml b/ground/src/main/res/values-es/strings.xml
index f1d455edd3..1f4003224d 100644
--- a/ground/src/main/res/values-es/strings.xml
+++ b/ground/src/main/res/values-es/strings.xml
@@ -41,7 +41,7 @@
   <string name="google_api_install_failed">La instalación de los Servicios de Google Play ha fallado</string>
   <string name="sign_out">Cerrar sesión</string>
   <string name="ok">Aceptar</string>
-  <string name="collect_data">Recopilar datos</string>
+  <string name="add_data">Recopilar datos</string>
 
   <!-- Untranslated strings -->
   <string name="offline_area_selector">Seleccione el área que quiera descargar</string>
diff --git a/ground/src/main/res/values-fr/strings.xml b/ground/src/main/res/values-fr/strings.xml
index 6a20cff412..ac93b22608 100644
--- a/ground/src/main/res/values-fr/strings.xml
+++ b/ground/src/main/res/values-fr/strings.xml
@@ -42,7 +42,7 @@
   <string name="google_api_install_failed">Échec de l&#8217;installation de Google Play Services</string>
   <string name="sign_out">Déconnexion</string>
   <string name="ok">OK</string>
-  <string name="collect_data">Enregistrer</string>
+  <string name="add_data">Enregistrer</string>
 
   <!-- Untranslated strings -->
   <string name="offline_area_selector">Sélectionnez une zone à télécharger</string>
diff --git a/ground/src/main/res/values/strings.xml b/ground/src/main/res/values/strings.xml
index 5e52661317..ccdf2eea70 100644
--- a/ground/src/main/res/values/strings.xml
+++ b/ground/src/main/res/values/strings.xml
@@ -42,7 +42,7 @@
   <string name="google_api_install_failed">Google Play Services installation failed</string>
   <string name="sign_out">Sign out</string>
   <string name="ok">OK</string>
-  <string name="collect_data">Collect data</string>
+  <string name="add_data">Add data</string>
 
   <!-- Untranslated strings -->
   <string name="offline_area_selector">Select area to download</string>
@@ -82,7 +82,7 @@
 
   <string name="drop_pin">Drop pin</string>
   <string name="add_site">Add a site</string>
-  <string name="plus_sign">+</string>
+  <string name="job_site_icon">Job site icon</string>
   <string name="drop_a_pin_tooltip_text">Drag your map until the center pin is on the desired location</string>
   <string name="current_location">Current location:</string>
   <string name="loading">Loading…</string>

From 34dc21ead6c99c68e45e3c0debd88d124fe719e3 Mon Sep 17 00:00:00 2001
From: Sufyan Abbasi <sufy@google.com>
Date: Thu, 19 Dec 2024 01:50:51 -0800
Subject: [PATCH 04/17] Formatting.

---
 .../home/mapcontainer/HomeScreenMapContainerFragment.kt   | 4 +---
 .../ground/ui/home/mapcontainer/jobs/JobMapAdapter.kt     | 8 +++++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt
index bb7c7ac703..ba245ba728 100644
--- a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt
+++ b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt
@@ -102,9 +102,7 @@ class HomeScreenMapContainerFragment : AbstractMapContainerFragment() {
 
       // Bind data for cards
       mapContainerViewModel.getMapCardUiData().launchWhenStartedAndCollect { (loiCard, jobCards) ->
-          runBlocking {
-            adapter.updateData(canUserSubmitData, loiCard, jobCards)
-          }
+        runBlocking { adapter.updateData(canUserSubmitData, loiCard, jobCards) }
       }
     }
 
diff --git a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapAdapter.kt b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapAdapter.kt
index 56e4463f93..eab541cfdf 100644
--- a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapAdapter.kt
+++ b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapAdapter.kt
@@ -147,7 +147,9 @@ class JobMapAdapter(private val getSubmissionCount: suspend (loi: LocationOfInte
   private fun initializeJobCard() {
     with(basemapLayoutBinding) {
       (bottomContainer as ViewGroup).addView(
-        ComposeView(bottomContainer.context).apply { setContent { AppTheme { InitializeJobCard() } } }
+        ComposeView(bottomContainer.context).apply {
+          setContent { AppTheme { InitializeJobCard() } }
+        }
       )
     }
   }
@@ -189,7 +191,7 @@ class JobMapAdapter(private val getSubmissionCount: suspend (loi: LocationOfInte
       basemapLayoutBinding.locationLockBtn.hide()
       menuBinding.hamburgerBtn.hide()
       Modal(onDismiss = { openJobsModal = false }) {
-        jobs.forEach {job->
+        jobs.forEach { job ->
           JobSelectionRow(job) {
             collectDataCallback(job)
             openJobsModal = false
@@ -219,7 +221,7 @@ class JobMapAdapter(private val getSubmissionCount: suspend (loi: LocationOfInte
     if (!showJobCard) {
       return
     }
-    loi?.let {loiData ->
+    loi?.let { loiData ->
       ModalBottomSheet(
         onDismissRequest = { closeJobCard() },
         sheetState = sheetState,

From 5c420e85f35f62dedd8f77594e9c29ba682ab31d Mon Sep 17 00:00:00 2001
From: Sufyan Abbasi <sufy@google.com>
Date: Thu, 19 Dec 2024 02:03:17 -0800
Subject: [PATCH 05/17] Address `checkCode` issues.

---
 .../home/mapcontainer/jobs/JobMapAdapter.kt   |  1 +
 ground/src/main/res/values-es/strings.xml     |  3 ---
 ground/src/main/res/values-fr/strings.xml     |  3 ---
 ground/src/main/res/values-pt/strings.xml     |  5 +----
 ground/src/main/res/values/dimens.xml         |  4 ----
 ground/src/main/res/values/strings.xml        |  1 -
 ground/src/main/res/values/styles.xml         | 22 -------------------
 7 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapAdapter.kt b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapAdapter.kt
index eab541cfdf..f7bb03aa5b 100644
--- a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapAdapter.kt
+++ b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapAdapter.kt
@@ -206,6 +206,7 @@ class JobMapAdapter(private val getSubmissionCount: suspend (loi: LocationOfInte
     }
   }
 
+  @Suppress("CognitiveComplexMethod", "LongMethod")
   @OptIn(ExperimentalMaterial3Api::class)
   @Composable
   private fun InitializeJobCard() {
diff --git a/ground/src/main/res/values-es/strings.xml b/ground/src/main/res/values-es/strings.xml
index 1f4003224d..10a9c28972 100644
--- a/ground/src/main/res/values-es/strings.xml
+++ b/ground/src/main/res/values-es/strings.xml
@@ -80,9 +80,6 @@
   <string name="skip">Omitir</string>
 
   <string name="drop_pin">Colocar marcador</string>
-
-  <string name="new_site">Nuevo sitio de recolección de datos</string>
-  <string name="new_site_hint_text">Añadir nuevo sitio y enviar datos relacionados</string>
   <string name="drop_a_pin_tooltip_text">Arrastre el mapa hasta que el marcador central esté en la ubicación deseada</string>
   <string name="current_location">Ubicación actual:</string>
   <string name="loading">Cargando…</string>
diff --git a/ground/src/main/res/values-fr/strings.xml b/ground/src/main/res/values-fr/strings.xml
index bbf253d145..20b6223a3a 100644
--- a/ground/src/main/res/values-fr/strings.xml
+++ b/ground/src/main/res/values-fr/strings.xml
@@ -81,9 +81,6 @@
   <string name="skip">Ignore</string>
 
   <string name="drop_pin">Placer une épingle</string>
-
-  <string name="new_site">Nouveau site de collecte</string>
-  <string name="new_site_hint_text">Ajouter un nouveau site et soumettre les données correspondantes</string>
   <string name="drop_a_pin_tooltip_text">Faites glisser votre carte jusqu&#8217;à ce que l&#8217;épingle au centre se trouve à l&#8217;endroit souhaité.</string>
   <string name="current_location">Localisation actuelle :</string>
   <string name="loading">Chargement…</string>
diff --git a/ground/src/main/res/values-pt/strings.xml b/ground/src/main/res/values-pt/strings.xml
index 494e3a2993..46d8047050 100644
--- a/ground/src/main/res/values-pt/strings.xml
+++ b/ground/src/main/res/values-pt/strings.xml
@@ -41,7 +41,7 @@
   <string name="google_api_install_failed">A instalação do Google Play Services falhou</string>
   <string name="sign_out">Terminar sessão</string>
   <string name="ok">OK</string>
-  <string name="collect_data">Coletar dados</string>
+  <string name="add_data">Coletar dados</string>
 
   <!-- Untranslated strings -->
   <string name="offline_area_selector">Selecione a área para fazer download</string>
@@ -80,9 +80,6 @@
   <string name="skip">Pular</string>
 
   <string name="drop_pin">Marcar ponto</string>
-
-  <string name="new_site">Novo local de coleta de dados</string>
-  <string name="new_site_hint_text">Adicionar novo local e enviar dados relacionados</string>
   <string name="drop_a_pin_tooltip_text">Arraste o mapa até que o ponto central esteja na localização desejada</string>
   <string name="current_location">Localização atual:</string>
   <string name="loading">Carregando…</string>
diff --git a/ground/src/main/res/values/dimens.xml b/ground/src/main/res/values/dimens.xml
index 446644b70d..c3a372fc5b 100644
--- a/ground/src/main/res/values/dimens.xml
+++ b/ground/src/main/res/values/dimens.xml
@@ -34,9 +34,5 @@
   <dimen name="nav_drawer_profile_image_size">36dp</dimen>
 
   <!-- LOI bottom card -->
-  <dimen name="loi_card_item_margin">10dp</dimen>
-
-  <dimen name="job_card_corner_radius">16dp</dimen>
-  <dimen name="job_card_start_end_margin">4dp</dimen>
   <dimen name="zoom_on_cluster_click_padding">50dp</dimen>
 </resources>
diff --git a/ground/src/main/res/values/strings.xml b/ground/src/main/res/values/strings.xml
index ccdf2eea70..0a9146b75b 100644
--- a/ground/src/main/res/values/strings.xml
+++ b/ground/src/main/res/values/strings.xml
@@ -101,7 +101,6 @@
   <string name="close_app">Close app</string>
   <string name="cancel">Cancel</string>
   <string name="save">Save</string>
-  <string name="begin">Begin</string>
   <string name="no_imagery_available_for_area">No imagery for this area. Select an area with imagery to download to your device.</string>
   <string name="selected_offline_area_size">The selected area may take up to %s\u00A0MB of space on your device</string>
   <string name="selected_offline_area_too_large">Zoom in and select a smaller area to download to your device</string>
diff --git a/ground/src/main/res/values/styles.xml b/ground/src/main/res/values/styles.xml
index 6b94a15bef..e369542380 100644
--- a/ground/src/main/res/values/styles.xml
+++ b/ground/src/main/res/values/styles.xml
@@ -176,28 +176,6 @@
     <item name="cardElevation">0dp</item>
   </style>
 
-  <style name="JobCardTitle" parent="AppTheme.Base">
-    <item name="android:textColor">?attr/colorOnSurfaceVariant</item>
-    <item name="android:textSize">14sp</item>
-  </style>
-
-  <style name="JobCardDescription" parent="AppTheme.Base">
-    <item name="android:textColor">?attr/colorOnSurface</item>
-    <item name="android:textSize">16sp</item>
-    <item name="android:layout_marginTop">@dimen/loi_card_item_margin</item>
-  </style>
-
-  <style name="JobCardAdditionalText" parent="AppTheme.Base">
-    <item name="android:textColor">?attr/colorSecondary</item>
-    <item name="android:textSize">12sp</item>
-    <item name="android:layout_marginTop">@dimen/loi_card_item_margin</item>
-  </style>
-
-  <style name="Widget.App.Button.Inverse" parent="Widget.Material3.Button">
-    <item name="android:backgroundTint">?colorPrimaryInverse</item>
-    <item name="android:textColor">?attr/colorOnSecondaryContainer</item>
-  </style>
-
   <style name="TextAppearance.App.MapClusterLabel" parent="TextAppearance.Material3.LabelMedium">
     <item name="android:textColor">@color/blackOverlay</item>
     <item name="android:fontFamily">@font/text_700</item>

From 7e6657307351c88373eb2c69b14b3a75ab5bbeed Mon Sep 17 00:00:00 2001
From: Sufyan Abbasi <sufy@google.com>
Date: Thu, 19 Dec 2024 12:03:05 -0800
Subject: [PATCH 06/17] Remove debug logs.

---
 .../ui/home/mapcontainer/HomeScreenMapContainerFragment.kt      | 2 --
 .../android/ground/ui/home/mapcontainer/jobs/JobMapAdapter.kt   | 1 -
 2 files changed, 3 deletions(-)

diff --git a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt
index ba245ba728..c14ec4ee9c 100644
--- a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt
+++ b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt
@@ -79,12 +79,10 @@ class HomeScreenMapContainerFragment : AbstractMapContainerFragment() {
     adapter = JobMapAdapter { loi -> submissionRepository.getTotalSubmissionCount(loi) }
 
     launchWhenStarted {
-      Timber.v("GOT HERE: launchWhenStarted")
       val canUserSubmitData = userRepository.canUserSubmitData()
 
       // Handle collect button clicks
       adapter.setCollectDataListener { mapUiData ->
-        Timber.v("GOT HERE: setCollectDataListener")
         val job =
           lifecycleScope.launch {
             mapContainerViewModel.activeSurveyDataSharingTermsFlow.cancellable().collectLatest {
diff --git a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapAdapter.kt b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapAdapter.kt
index f7bb03aa5b..8be96d4071 100644
--- a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapAdapter.kt
+++ b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapAdapter.kt
@@ -273,7 +273,6 @@ class JobMapAdapter(private val getSubmissionCount: suspend (loi: LocationOfInte
                   scope
                     .launch { sheetState.hide() }
                     .invokeOnCompletion {
-                      Timber.v("GOT HERE: sheetState HIDE")
                       if (!sheetState.isVisible) {
                         closeJobCard()
                       }

From 66303202a21d92b36185c347215c8c112d9336f7 Mon Sep 17 00:00:00 2001
From: Sufyan Abbasi <sufy@google.com>
Date: Thu, 19 Dec 2024 12:06:35 -0800
Subject: [PATCH 07/17] Rename MapUIData and fields.

---
 .../HomeScreenMapContainerFragment.kt          | 18 +++++++++---------
 .../HomeScreenMapContainerViewModel.kt         | 10 +++++-----
 ...Data.kt => DataCollectionEntryPointData.kt} |  6 +++---
 .../ui/home/mapcontainer/jobs/JobMapAdapter.kt | 15 +++++++--------
 4 files changed, 24 insertions(+), 25 deletions(-)
 rename ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/{MapUiData.kt => DataCollectionEntryPointData.kt} (79%)

diff --git a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt
index c14ec4ee9c..126e4eace4 100644
--- a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt
+++ b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt
@@ -41,7 +41,7 @@ import com.google.android.ground.ui.home.DataSharingTermsDialog
 import com.google.android.ground.ui.home.HomeScreenFragmentDirections
 import com.google.android.ground.ui.home.HomeScreenViewModel
 import com.google.android.ground.ui.home.mapcontainer.jobs.JobMapAdapter
-import com.google.android.ground.ui.home.mapcontainer.jobs.MapUiData
+import com.google.android.ground.ui.home.mapcontainer.jobs.DataCollectionEntryPointData
 import com.google.android.ground.ui.map.MapFragment
 import com.google.android.ground.ui.theme.AppTheme
 import dagger.hilt.android.AndroidEntryPoint
@@ -107,15 +107,15 @@ class HomeScreenMapContainerFragment : AbstractMapContainerFragment() {
     map.featureClicks.launchWhenStartedAndCollect { mapContainerViewModel.onFeatureClicked(it) }
   }
 
-  private fun hasValidTasks(cardUiData: MapUiData) =
+  private fun hasValidTasks(cardUiData: DataCollectionEntryPointData) =
     when (cardUiData) {
       // LOI tasks are filtered out of the tasks list for pre-defined tasks.
-      is MapUiData.LoiUiData -> cardUiData.loi.job.tasks.values.count { !it.isAddLoiTask } > 0
-      is MapUiData.AddLoiUiData -> cardUiData.job.tasks.values.isNotEmpty()
+      is DataCollectionEntryPointData.SelectedLoiSheetData -> cardUiData.loi.job.tasks.values.count { !it.isAddLoiTask } > 0
+      is DataCollectionEntryPointData.AdHocDataCollectionButtonData -> cardUiData.job.tasks.values.isNotEmpty()
     }
 
   private fun renderDataSharingTermsDialog(
-    cardUiData: MapUiData,
+    cardUiData: DataCollectionEntryPointData,
     dataSharingTerms: DataSharingTerms,
   ) =
     ComposeView(requireContext()).apply {
@@ -141,7 +141,7 @@ class HomeScreenMapContainerFragment : AbstractMapContainerFragment() {
     canUserSubmitData: Boolean,
     hasTasks: Boolean,
     hasDataSharingTerms: DataSharingTerms?,
-    cardUiData: MapUiData,
+    cardUiData: DataCollectionEntryPointData,
   ) {
     if (!canUserSubmitData) {
       // Skip data collection screen if the user can't submit any data
@@ -243,9 +243,9 @@ class HomeScreenMapContainerFragment : AbstractMapContainerFragment() {
     adapter.render()
   }
 
-  private fun navigateToDataCollectionFragment(cardUiData: MapUiData) {
+  private fun navigateToDataCollectionFragment(cardUiData: DataCollectionEntryPointData) {
     when (cardUiData) {
-      is MapUiData.LoiUiData ->
+      is DataCollectionEntryPointData.SelectedLoiSheetData ->
         findNavController()
           .navigate(
             HomeScreenFragmentDirections.actionHomeScreenFragmentToDataCollectionFragment(
@@ -257,7 +257,7 @@ class HomeScreenMapContainerFragment : AbstractMapContainerFragment() {
               "",
             )
           )
-      is MapUiData.AddLoiUiData ->
+      is DataCollectionEntryPointData.AdHocDataCollectionButtonData ->
         findNavController()
           .navigate(
             HomeScreenFragmentDirections.actionHomeScreenFragmentToDataCollectionFragment(
diff --git a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModel.kt b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModel.kt
index 0ed6f4af51..a3725097d5 100644
--- a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModel.kt
+++ b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModel.kt
@@ -33,7 +33,7 @@ import com.google.android.ground.system.PermissionsManager
 import com.google.android.ground.system.SettingsManager
 import com.google.android.ground.ui.common.BaseMapViewModel
 import com.google.android.ground.ui.common.SharedViewModel
-import com.google.android.ground.ui.home.mapcontainer.jobs.MapUiData
+import com.google.android.ground.ui.home.mapcontainer.jobs.DataCollectionEntryPointData
 import com.google.android.ground.ui.map.Feature
 import com.google.android.ground.ui.map.FeatureType
 import com.google.android.ground.ui.map.isLocationOfInterest
@@ -181,21 +181,21 @@ internal constructor(
   }
 
   /**
-   * Returns a flow of [MapUiData] associated with the active survey's LOIs and adhoc jobs for
+   * Returns a flow of [DataCollectionEntryPointData] associated with the active survey's LOIs and adhoc jobs for
    * displaying the cards.
    */
-  fun getMapCardUiData(): Flow<Pair<MapUiData.LoiUiData?, List<MapUiData.AddLoiUiData>>> =
+  fun getMapCardUiData(): Flow<Pair<DataCollectionEntryPointData.SelectedLoiSheetData?, List<DataCollectionEntryPointData.AdHocDataCollectionButtonData>>> =
     combine(loisInViewport, featureClicked, adHocLoiJobs) { loisInView, feature, jobs ->
       val loiCard =
         loisInView
           .filter { it.geometry == feature?.geometry }
           .firstOrNull()
-          ?.let { MapUiData.LoiUiData(it) }
+          ?.let { DataCollectionEntryPointData.SelectedLoiSheetData(it) }
       if (loiCard == null && feature != null) {
         // The feature is not in view anymore.
         featureClicked.value = null
       }
-      val jobCard = jobs.map { MapUiData.AddLoiUiData(it) }
+      val jobCard = jobs.map { DataCollectionEntryPointData.AdHocDataCollectionButtonData(it) }
       Pair(loiCard, jobCard)
     }
 
diff --git a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/MapUiData.kt b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/DataCollectionEntryPointData.kt
similarity index 79%
rename from ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/MapUiData.kt
rename to ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/DataCollectionEntryPointData.kt
index cb46c35edb..873f3b21ce 100644
--- a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/MapUiData.kt
+++ b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/DataCollectionEntryPointData.kt
@@ -19,9 +19,9 @@ import com.google.android.ground.model.job.Job
 import com.google.android.ground.model.locationofinterest.LocationOfInterest
 
 /** Data classes used to populate the Map cards (either an Loi card, or a Suggest Loi card). */
-sealed interface MapUiData {
+sealed interface DataCollectionEntryPointData {
 
-  data class LoiUiData(val loi: LocationOfInterest) : MapUiData
+  data class SelectedLoiSheetData(val loi: LocationOfInterest) : DataCollectionEntryPointData
 
-  data class AddLoiUiData(val job: Job) : MapUiData
+  data class AdHocDataCollectionButtonData(val job: Job) : DataCollectionEntryPointData
 }
diff --git a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapAdapter.kt b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapAdapter.kt
index 8be96d4071..03ad78780d 100644
--- a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapAdapter.kt
+++ b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapAdapter.kt
@@ -74,16 +74,15 @@ import com.google.android.ground.model.locationofinterest.LocationOfInterest
 import com.google.android.ground.ui.common.LocationOfInterestHelper
 import com.google.android.ground.ui.theme.AppTheme
 import kotlinx.coroutines.launch
-import timber.log.Timber
 
 /** Manages a set of [Composable] components that renders [LocationOfInterest] cards and dialogs. */
 class JobMapAdapter(private val getSubmissionCount: suspend (loi: LocationOfInterest) -> Int) {
   lateinit var basemapLayoutBinding: BasemapLayoutBinding
   lateinit var menuBinding: MenuButtonBinding
-  private var collectDataListener: MutableState<(MapUiData) -> Unit> = mutableStateOf({})
+  private var collectDataListener: MutableState<(DataCollectionEntryPointData) -> Unit> = mutableStateOf({})
   private var canUserSubmitData = mutableStateOf(false)
-  private var activeLoi: MutableState<MapUiData.LoiUiData?> = mutableStateOf(null)
-  private val newLoiJobs: MutableList<MapUiData.AddLoiUiData> = mutableStateListOf()
+  private var activeLoi: MutableState<DataCollectionEntryPointData.SelectedLoiSheetData?> = mutableStateOf(null)
+  private val newLoiJobs: MutableList<DataCollectionEntryPointData.AdHocDataCollectionButtonData> = mutableStateListOf()
   private var selectedFeatureListener: ((String?) -> Unit) = {}
   private val jobModalOpened = mutableStateOf(false)
   private val jobCardOpened = mutableStateOf(false)
@@ -98,8 +97,8 @@ class JobMapAdapter(private val getSubmissionCount: suspend (loi: LocationOfInte
   /** Overwrites existing cards. */
   suspend fun updateData(
     canUserSubmitData: Boolean,
-    selectedLoi: MapUiData.LoiUiData?,
-    addLoiJobs: List<MapUiData.AddLoiUiData>,
+    selectedLoi: DataCollectionEntryPointData.SelectedLoiSheetData?,
+    addLoiJobs: List<DataCollectionEntryPointData.AdHocDataCollectionButtonData>,
   ) {
     this.canUserSubmitData.value = canUserSubmitData
     activeLoi.value = selectedLoi
@@ -116,7 +115,7 @@ class JobMapAdapter(private val getSubmissionCount: suspend (loi: LocationOfInte
     selectedFeatureListener = listener
   }
 
-  fun setCollectDataListener(listener: (MapUiData) -> Unit) {
+  fun setCollectDataListener(listener: (DataCollectionEntryPointData) -> Unit) {
     collectDataListener.value = listener
   }
 
@@ -353,7 +352,7 @@ fun Modal(onDismiss: () -> Unit, content: @Composable () -> Unit) {
 }
 
 @Composable
-fun JobSelectionRow(job: MapUiData.AddLoiUiData, onJobSelected: () -> Unit) {
+fun JobSelectionRow(job: DataCollectionEntryPointData.AdHocDataCollectionButtonData, onJobSelected: () -> Unit) {
   Button(
     onClick = { onJobSelected() },
     modifier = Modifier.fillMaxWidth(0.65F).clickable { onJobSelected() },

From ac03e37efaa0c386ea24bf54dcc807c5526aa0cc Mon Sep 17 00:00:00 2001
From: Jonas Spekker <93268515+jo-spek@users.noreply.github.com>
Date: Fri, 20 Dec 2024 14:00:16 +0100
Subject: [PATCH 08/17] Update strings.xml

---
 ground/src/main/res/values/strings.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ground/src/main/res/values/strings.xml b/ground/src/main/res/values/strings.xml
index 0a9146b75b..4236dc0c3c 100644
--- a/ground/src/main/res/values/strings.xml
+++ b/ground/src/main/res/values/strings.xml
@@ -30,8 +30,7 @@
   -->
 
   <!-- Shown when user has refused to grant app fine grained location permission. -->
-  <string name="no_fine_location_permissions">Cannot show current location without
-    permission</string>
+  <string name="no_fine_location_permissions">Cannot show current location without permission</string>
   <!-- Shown when an unknown error occurs obtaining fine grained location permission. -->
   <string name="location_updates_unknown_error">Failed to enable location updates</string>
   <!-- Shown when user has refused to enable location services in settings.-->

From a6a5838f3d06d4befd0532d8d957945c2ce5748a Mon Sep 17 00:00:00 2001
From: Jonas Spekker <93268515+jo-spek@users.noreply.github.com>
Date: Fri, 20 Dec 2024 14:00:24 +0100
Subject: [PATCH 09/17] Update strings.xml

---
 ground/src/main/res/values-pt/strings.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ground/src/main/res/values-pt/strings.xml b/ground/src/main/res/values-pt/strings.xml
index 46d8047050..20e9880d24 100644
--- a/ground/src/main/res/values-pt/strings.xml
+++ b/ground/src/main/res/values-pt/strings.xml
@@ -80,6 +80,8 @@
   <string name="skip">Pular</string>
 
   <string name="drop_pin">Marcar ponto</string>
+  <string name="add_site">Adicionar um site</string>
+  <string name="job_site_icon">Job site icon</string>
   <string name="drop_a_pin_tooltip_text">Arraste o mapa até que o ponto central esteja na localização desejada</string>
   <string name="current_location">Localização atual:</string>
   <string name="loading">Carregando…</string>
@@ -110,6 +112,7 @@
   <string name="remove_offline_access">Remover acesso offline</string>
   <string name="unnamed_point">Ponto sem nome</string>
   <string name="unnamed_area">Área sem nome</string>
+  <string name="unnamed_job">Unnamed Job</string>
   <string name="offline_area_size_on_disk_mb">%s\u00A0MB no disco</string>
   <string name="offline_area_list_item_size_on_disk_mb">%s\u00A0MB</string>
   <string name="offline_downloaded_areas">Áreas descarregadas</string>
@@ -127,7 +130,6 @@
   <string name="map_location">Localização do mapa:</string>
   <string name="sign_out_dialog_title">Aviso de fim de sessão</string>
   <string name="sign_out_dialog_body">Se você terminar sua sessão:\n \u2022 Quaisquer dados não sincronizados serão descartados.\n \u2022 Você não poderá iniciar sessão se estiver offline\n \u2022 Inquéritos offline não estarão disponíveis até você iniciar sessão novamente\n\nTem certeza de que deseja sair?</string>
-   
   <string name="suggest_data_collection_hint">Amplie para começar a coletar dados</string>
   <string name="read_only_data_collection_hint">Inquérito apenas para leitura</string>
   <string name="predefined_data_collection_hint">Amplie até um local de coleta de dados para coletar informações</string>
@@ -148,7 +150,6 @@
   <string name="about">Sobre</string>
   <string name="terms_of_service">Termos de serviço</string>
   <string name="about_ground">Ground é um projeto comunitário de código aberto desenvolvido pelo Google e pela FAO no âmbito da “Forest Data Partnership”, com a ajuda do SIG, Ecam e dos contribuintes da comunidade de código aberto. \n\nEle é licenciado sob a <annotation type="apache_license">Apache License, Version 2.0</annotation>. \n\nVeja outras <annotation type="all_licenses">licenças</annotation></string>
- 
   <string name="failed">Falhou</string>
   <string name="synced">Sincronizado</string>
   <string name="syncing">Sincronizando</string>

From b0eb25325d0eb85780baea4daf73b0586d46d05d Mon Sep 17 00:00:00 2001
From: Jonas Spekker <93268515+jo-spek@users.noreply.github.com>
Date: Fri, 20 Dec 2024 14:00:46 +0100
Subject: [PATCH 10/17] Update strings.xml

Added "add_site" and two more strings (untranslated)
---
 ground/src/main/res/values-fr/strings.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ground/src/main/res/values-fr/strings.xml b/ground/src/main/res/values-fr/strings.xml
index 20b6223a3a..91e6576c41 100644
--- a/ground/src/main/res/values-fr/strings.xml
+++ b/ground/src/main/res/values-fr/strings.xml
@@ -30,8 +30,7 @@
   -->
 
   <!-- Shown when user has refused to grant app fine grained location permission. -->
-  <string name="no_fine_location_permissions">Impossible d&#8217;afficher la position actuelle sans
-  autorisation</string>
+  <string name="no_fine_location_permissions">Impossible d&#8217;afficher la position actuelle sans autorisation</string>
   <!-- Shown when an unknown error occurs obtaining fine grained location permission. -->
   <string name="location_updates_unknown_error">Échec de l&#8217;activation des mises à jour de localisation</string>
   <!-- Shown when user has refused to enable location services in settings.-->
@@ -81,6 +80,8 @@
   <string name="skip">Ignore</string>
 
   <string name="drop_pin">Placer une épingle</string>
+  <string name="add_site">Ajouter un site</string>
+  <string name="job_site_icon">Job site icon</string>
   <string name="drop_a_pin_tooltip_text">Faites glisser votre carte jusqu&#8217;à ce que l&#8217;épingle au centre se trouve à l&#8217;endroit souhaité.</string>
   <string name="current_location">Localisation actuelle :</string>
   <string name="loading">Chargement…</string>
@@ -111,6 +112,7 @@
   <string name="remove_offline_access">Supprimer l&#8217;accès hors ligne</string>
   <string name="unnamed_point">Point non nommé</string>
   <string name="unnamed_area">Zone non nommée</string>
+  <string name="unnamed_job">Unnamed Job</string>
   <string name="offline_area_size_on_disk_mb">%s\u00A0MB sur disque</string>
   <string name="offline_area_list_item_size_on_disk_mb">%s\u00A0MB</string>
   <string name="offline_downloaded_areas">Zones téléchargées</string>

From cce58a59b1c69fac355cae1f733310f6603c9873 Mon Sep 17 00:00:00 2001
From: Jonas Spekker <93268515+jo-spek@users.noreply.github.com>
Date: Fri, 20 Dec 2024 14:00:52 +0100
Subject: [PATCH 11/17] Update strings.xml

Added "add_site" and two more strings (untranslated)
---
 ground/src/main/res/values-es/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ground/src/main/res/values-es/strings.xml b/ground/src/main/res/values-es/strings.xml
index 10a9c28972..af79ac07c6 100644
--- a/ground/src/main/res/values-es/strings.xml
+++ b/ground/src/main/res/values-es/strings.xml
@@ -80,6 +80,8 @@
   <string name="skip">Omitir</string>
 
   <string name="drop_pin">Colocar marcador</string>
+  <string name="add_site">Añadir un sitio</string>
+  <string name="job_site_icon">Job site icon</string>
   <string name="drop_a_pin_tooltip_text">Arrastre el mapa hasta que el marcador central esté en la ubicación deseada</string>
   <string name="current_location">Ubicación actual:</string>
   <string name="loading">Cargando…</string>
@@ -110,6 +112,7 @@
   <string name="remove_offline_access">Eliminar acceso sin conexión</string>
   <string name="unnamed_point">Punto sin nombre</string>
   <string name="unnamed_area">Área sin nombre</string>
+  <string name="unnamed_job">Unnamed Job</string>
   <string name="offline_area_size_on_disk_mb">%s\u00A0MB en el disco</string>
   <string name="offline_area_list_item_size_on_disk_mb">%s\u00A0MB</string>
   <string name="offline_downloaded_areas">Áreas descargadas</string>

From da4a8010d778c83ad9396f7fb0feb707969d88a2 Mon Sep 17 00:00:00 2001
From: Jonas Spekker <93268515+jo-spek@users.noreply.github.com>
Date: Fri, 20 Dec 2024 14:07:23 +0100
Subject: [PATCH 12/17] Update strings.xml

Remaining translations added ("unnamed_job" and "job_site_icon").
---
 ground/src/main/res/values-es/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ground/src/main/res/values-es/strings.xml b/ground/src/main/res/values-es/strings.xml
index af79ac07c6..be9b24be2f 100644
--- a/ground/src/main/res/values-es/strings.xml
+++ b/ground/src/main/res/values-es/strings.xml
@@ -81,7 +81,7 @@
 
   <string name="drop_pin">Colocar marcador</string>
   <string name="add_site">Añadir un sitio</string>
-  <string name="job_site_icon">Job site icon</string>
+  <string name="job_site_icon">Icono del sitio de tareas</string>
   <string name="drop_a_pin_tooltip_text">Arrastre el mapa hasta que el marcador central esté en la ubicación deseada</string>
   <string name="current_location">Ubicación actual:</string>
   <string name="loading">Cargando…</string>
@@ -112,7 +112,7 @@
   <string name="remove_offline_access">Eliminar acceso sin conexión</string>
   <string name="unnamed_point">Punto sin nombre</string>
   <string name="unnamed_area">Área sin nombre</string>
-  <string name="unnamed_job">Unnamed Job</string>
+  <string name="unnamed_job">Tarea sin nombre</string>
   <string name="offline_area_size_on_disk_mb">%s\u00A0MB en el disco</string>
   <string name="offline_area_list_item_size_on_disk_mb">%s\u00A0MB</string>
   <string name="offline_downloaded_areas">Áreas descargadas</string>

From d28e429568cce729c3f26428dc4f67184bad2bda Mon Sep 17 00:00:00 2001
From: Jonas Spekker <93268515+jo-spek@users.noreply.github.com>
Date: Fri, 20 Dec 2024 14:07:29 +0100
Subject: [PATCH 13/17] Update strings.xml

Remaining translations added ("unnamed_job" and "job_site_icon").
---
 ground/src/main/res/values-pt/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ground/src/main/res/values-pt/strings.xml b/ground/src/main/res/values-pt/strings.xml
index 20e9880d24..c47bbf4054 100644
--- a/ground/src/main/res/values-pt/strings.xml
+++ b/ground/src/main/res/values-pt/strings.xml
@@ -81,7 +81,7 @@
 
   <string name="drop_pin">Marcar ponto</string>
   <string name="add_site">Adicionar um site</string>
-  <string name="job_site_icon">Job site icon</string>
+  <string name="job_site_icon">Ícone do site de tarefas</string>
   <string name="drop_a_pin_tooltip_text">Arraste o mapa até que o ponto central esteja na localização desejada</string>
   <string name="current_location">Localização atual:</string>
   <string name="loading">Carregando…</string>
@@ -112,7 +112,7 @@
   <string name="remove_offline_access">Remover acesso offline</string>
   <string name="unnamed_point">Ponto sem nome</string>
   <string name="unnamed_area">Área sem nome</string>
-  <string name="unnamed_job">Unnamed Job</string>
+  <string name="unnamed_job">Tarefa sem nome</string>
   <string name="offline_area_size_on_disk_mb">%s\u00A0MB no disco</string>
   <string name="offline_area_list_item_size_on_disk_mb">%s\u00A0MB</string>
   <string name="offline_downloaded_areas">Áreas descarregadas</string>

From 0e30070788b9db795e2879b86238e5fc8968e8ee Mon Sep 17 00:00:00 2001
From: Jonas Spekker <93268515+jo-spek@users.noreply.github.com>
Date: Fri, 20 Dec 2024 14:07:35 +0100
Subject: [PATCH 14/17] Update strings.xml

Remaining translations added ("unnamed_job" and "job_site_icon").
---
 ground/src/main/res/values-fr/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ground/src/main/res/values-fr/strings.xml b/ground/src/main/res/values-fr/strings.xml
index 91e6576c41..86a0d6eefd 100644
--- a/ground/src/main/res/values-fr/strings.xml
+++ b/ground/src/main/res/values-fr/strings.xml
@@ -81,7 +81,7 @@
 
   <string name="drop_pin">Placer une épingle</string>
   <string name="add_site">Ajouter un site</string>
-  <string name="job_site_icon">Job site icon</string>
+  <string name="job_site_icon">Icône du site de la tâche</string>
   <string name="drop_a_pin_tooltip_text">Faites glisser votre carte jusqu&#8217;à ce que l&#8217;épingle au centre se trouve à l&#8217;endroit souhaité.</string>
   <string name="current_location">Localisation actuelle :</string>
   <string name="loading">Chargement…</string>
@@ -112,7 +112,7 @@
   <string name="remove_offline_access">Supprimer l&#8217;accès hors ligne</string>
   <string name="unnamed_point">Point non nommé</string>
   <string name="unnamed_area">Zone non nommée</string>
-  <string name="unnamed_job">Unnamed Job</string>
+  <string name="unnamed_job">Tâche non nommée</string>
   <string name="offline_area_size_on_disk_mb">%s\u00A0MB sur disque</string>
   <string name="offline_area_list_item_size_on_disk_mb">%s\u00A0MB</string>
   <string name="offline_downloaded_areas">Zones téléchargées</string>

From 6a64f25bf374940398e3ebcd42be7aec904a3cfb Mon Sep 17 00:00:00 2001
From: Sufyan Abbasi <sufy@google.com>
Date: Fri, 24 Jan 2025 15:16:21 -0800
Subject: [PATCH 15/17] Add missing import

---
 .../ui/home/mapcontainer/jobs/DataCollectionEntryPointData.kt    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/DataCollectionEntryPointData.kt b/app/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/DataCollectionEntryPointData.kt
index 8f5d6e3f9a..c340d47978 100644
--- a/app/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/DataCollectionEntryPointData.kt
+++ b/app/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/DataCollectionEntryPointData.kt
@@ -1,5 +1,6 @@
 package com.google.android.ground.ui.home.mapcontainer.jobs
 
+import com.google.android.ground.model.job.Job
 import com.google.android.ground.model.locationofinterest.LocationOfInterest
 
 /** Data classes used to populate the Map cards (either an Loi card, or a Suggest Loi card). */

From 2705df050ca51a490673da2a4918b04af25ecaed Mon Sep 17 00:00:00 2001
From: Sufyan Abbasi <sufy@google.com>
Date: Fri, 24 Jan 2025 15:24:09 -0800
Subject: [PATCH 16/17] Formatting

---
 .../HomeScreenMapContainerFragment.kt          |  8 +++++---
 .../HomeScreenMapContainerViewModel.kt         | 12 +++++++++---
 .../jobs/DataCollectionEntryPointData.kt       | 18 +++++++++++++++++-
 .../ui/home/mapcontainer/jobs/JobMapAdapter.kt | 14 ++++++++++----
 4 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt b/app/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt
index a2dfb32210..15204160df 100644
--- a/app/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt
+++ b/app/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt
@@ -40,8 +40,8 @@ import com.google.android.ground.ui.common.EphemeralPopups
 import com.google.android.ground.ui.home.DataSharingTermsDialog
 import com.google.android.ground.ui.home.HomeScreenFragmentDirections
 import com.google.android.ground.ui.home.HomeScreenViewModel
-import com.google.android.ground.ui.home.mapcontainer.jobs.JobMapAdapter
 import com.google.android.ground.ui.home.mapcontainer.jobs.DataCollectionEntryPointData
+import com.google.android.ground.ui.home.mapcontainer.jobs.JobMapAdapter
 import com.google.android.ground.ui.map.MapFragment
 import com.google.android.ground.ui.theme.AppTheme
 import dagger.hilt.android.AndroidEntryPoint
@@ -110,8 +110,10 @@ class HomeScreenMapContainerFragment : AbstractMapContainerFragment() {
   private fun hasValidTasks(cardUiData: DataCollectionEntryPointData) =
     when (cardUiData) {
       // LOI tasks are filtered out of the tasks list for pre-defined tasks.
-      is DataCollectionEntryPointData.SelectedLoiSheetData -> cardUiData.loi.job.tasks.values.count { !it.isAddLoiTask } > 0
-      is DataCollectionEntryPointData.AdHocDataCollectionButtonData -> cardUiData.job.tasks.values.isNotEmpty()
+      is DataCollectionEntryPointData.SelectedLoiSheetData ->
+        cardUiData.loi.job.tasks.values.count { !it.isAddLoiTask } > 0
+      is DataCollectionEntryPointData.AdHocDataCollectionButtonData ->
+        cardUiData.job.tasks.values.isNotEmpty()
     }
 
   private fun renderDataSharingTermsDialog(
diff --git a/app/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModel.kt b/app/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModel.kt
index 9197ef79d6..42974283a7 100644
--- a/app/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModel.kt
+++ b/app/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModel.kt
@@ -178,10 +178,16 @@ internal constructor(
   }
 
   /**
-   * Returns a flow of [DataCollectionEntryPointData] associated with the active survey's LOIs and adhoc jobs for
-   * displaying the cards.
+   * Returns a flow of [DataCollectionEntryPointData] associated with the active survey's LOIs and
+   * adhoc jobs for displaying the cards.
    */
-  fun getMapCardUiData(): Flow<Pair<DataCollectionEntryPointData.SelectedLoiSheetData?, List<DataCollectionEntryPointData.AdHocDataCollectionButtonData>>> =
+  fun getMapCardUiData():
+    Flow<
+      Pair<
+        DataCollectionEntryPointData.SelectedLoiSheetData?,
+        List<DataCollectionEntryPointData.AdHocDataCollectionButtonData>,
+      >
+    > =
     combine(loisInViewport, featureClicked, adHocLoiJobs) { loisInView, feature, jobs ->
       val loiCard =
         loisInView
diff --git a/app/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/DataCollectionEntryPointData.kt b/app/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/DataCollectionEntryPointData.kt
index c340d47978..285d8ebd78 100644
--- a/app/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/DataCollectionEntryPointData.kt
+++ b/app/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/DataCollectionEntryPointData.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.google.android.ground.ui.home.mapcontainer.jobs
 
 import com.google.android.ground.model.job.Job
@@ -9,4 +25,4 @@ sealed interface DataCollectionEntryPointData {
   data class SelectedLoiSheetData(val loi: LocationOfInterest) : DataCollectionEntryPointData
 
   data class AdHocDataCollectionButtonData(val job: Job) : DataCollectionEntryPointData
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapAdapter.kt b/app/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapAdapter.kt
index 03ad78780d..3efdfc2480 100644
--- a/app/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapAdapter.kt
+++ b/app/src/main/java/com/google/android/ground/ui/home/mapcontainer/jobs/JobMapAdapter.kt
@@ -79,10 +79,13 @@ import kotlinx.coroutines.launch
 class JobMapAdapter(private val getSubmissionCount: suspend (loi: LocationOfInterest) -> Int) {
   lateinit var basemapLayoutBinding: BasemapLayoutBinding
   lateinit var menuBinding: MenuButtonBinding
-  private var collectDataListener: MutableState<(DataCollectionEntryPointData) -> Unit> = mutableStateOf({})
+  private var collectDataListener: MutableState<(DataCollectionEntryPointData) -> Unit> =
+    mutableStateOf({})
   private var canUserSubmitData = mutableStateOf(false)
-  private var activeLoi: MutableState<DataCollectionEntryPointData.SelectedLoiSheetData?> = mutableStateOf(null)
-  private val newLoiJobs: MutableList<DataCollectionEntryPointData.AdHocDataCollectionButtonData> = mutableStateListOf()
+  private var activeLoi: MutableState<DataCollectionEntryPointData.SelectedLoiSheetData?> =
+    mutableStateOf(null)
+  private val newLoiJobs: MutableList<DataCollectionEntryPointData.AdHocDataCollectionButtonData> =
+    mutableStateListOf()
   private var selectedFeatureListener: ((String?) -> Unit) = {}
   private val jobModalOpened = mutableStateOf(false)
   private val jobCardOpened = mutableStateOf(false)
@@ -352,7 +355,10 @@ fun Modal(onDismiss: () -> Unit, content: @Composable () -> Unit) {
 }
 
 @Composable
-fun JobSelectionRow(job: DataCollectionEntryPointData.AdHocDataCollectionButtonData, onJobSelected: () -> Unit) {
+fun JobSelectionRow(
+  job: DataCollectionEntryPointData.AdHocDataCollectionButtonData,
+  onJobSelected: () -> Unit,
+) {
   Button(
     onClick = { onJobSelected() },
     modifier = Modifier.fillMaxWidth(0.65F).clickable { onJobSelected() },

From c4be97e607cb45cf1ccdcd14a69db2b36e390666 Mon Sep 17 00:00:00 2001
From: Sufyan Abbasi <sufy@google.com>
Date: Sun, 26 Jan 2025 22:42:57 -0800
Subject: [PATCH 17/17] Add tests for new job logic.

---
 .../HomeScreenMapContainerFragment.kt         |   3 +-
 .../HomeScreenMapContainerViewModel.kt        |   2 +-
 .../firebase/schema/SurveyConverterTest.kt    |   2 +-
 .../HomeScreenMapContainerViewModelTest.kt    | 101 ++++++++++++++++++
 .../main/kotlin/com/sharedtest/FakeData.kt    |  14 ++-
 5 files changed, 118 insertions(+), 4 deletions(-)
 create mode 100644 app/src/test/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModelTest.kt

diff --git a/app/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt b/app/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt
index 15204160df..91859891e9 100644
--- a/app/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt
+++ b/app/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragment.kt
@@ -99,7 +99,8 @@ class HomeScreenMapContainerFragment : AbstractMapContainerFragment() {
       }
 
       // Bind data for cards
-      mapContainerViewModel.getMapCardUiData().launchWhenStartedAndCollect { (loiCard, jobCards) ->
+      mapContainerViewModel.getDataCollectionEntryPoints().launchWhenStartedAndCollect {
+        (loiCard, jobCards) ->
         runBlocking { adapter.updateData(canUserSubmitData, loiCard, jobCards) }
       }
     }
diff --git a/app/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModel.kt b/app/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModel.kt
index 42974283a7..43973c582a 100644
--- a/app/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModel.kt
+++ b/app/src/main/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModel.kt
@@ -181,7 +181,7 @@ internal constructor(
    * Returns a flow of [DataCollectionEntryPointData] associated with the active survey's LOIs and
    * adhoc jobs for displaying the cards.
    */
-  fun getMapCardUiData():
+  fun getDataCollectionEntryPoints():
     Flow<
       Pair<
         DataCollectionEntryPointData.SelectedLoiSheetData?,
diff --git a/app/src/test/java/com/google/android/ground/persistence/remote/firebase/schema/SurveyConverterTest.kt b/app/src/test/java/com/google/android/ground/persistence/remote/firebase/schema/SurveyConverterTest.kt
index 8b9705339f..1f062b2f79 100644
--- a/app/src/test/java/com/google/android/ground/persistence/remote/firebase/schema/SurveyConverterTest.kt
+++ b/app/src/test/java/com/google/android/ground/persistence/remote/firebase/schema/SurveyConverterTest.kt
@@ -41,7 +41,7 @@ class SurveyConverterTest {
         dataSharingTerms = DATA_SHARING_TERMS.copy {}
       }
       val snapshot = createSurveyProtoDocumentSnapshot(surveyProto)
-      assertThat(SurveyConverter.toSurvey(snapshot, listOf(JOB))).isEqualTo(SURVEY)
+      assertThat(SurveyConverter.toSurvey(snapshot, listOf(JOB, ADHOC_JOB))).isEqualTo(SURVEY)
     }
   }
 
diff --git a/app/src/test/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModelTest.kt b/app/src/test/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModelTest.kt
new file mode 100644
index 0000000000..fd2de546cd
--- /dev/null
+++ b/app/src/test/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerViewModelTest.kt
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.ground.ui.home.mapcontainer
+
+import com.google.android.ground.BaseHiltTest
+import com.google.android.ground.domain.usecases.survey.ActivateSurveyUseCase
+import com.google.android.ground.model.geometry.Coordinates
+import com.google.android.ground.repository.LocationOfInterestRepository
+import com.google.android.ground.repository.SurveyRepository
+import com.google.android.ground.repository.UserRepository
+import com.google.android.ground.ui.home.mapcontainer.jobs.DataCollectionEntryPointData
+import com.google.android.ground.ui.map.Bounds
+import com.google.android.ground.ui.map.CameraPosition
+import com.google.common.truth.Truth.assertThat
+import com.sharedtest.FakeData.ADHOC_JOB
+import com.sharedtest.FakeData.LOCATION_OF_INTEREST
+import com.sharedtest.FakeData.LOCATION_OF_INTEREST_FEATURE
+import com.sharedtest.FakeData.SURVEY
+import com.sharedtest.FakeData.USER
+import com.sharedtest.persistence.remote.FakeRemoteDataStore
+import com.sharedtest.system.auth.FakeAuthenticationManager
+import dagger.hilt.android.testing.BindValue
+import dagger.hilt.android.testing.HiltAndroidTest
+import javax.inject.Inject
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.test.advanceUntilIdle
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.robolectric.RobolectricTestRunner
+
+@HiltAndroidTest
+@RunWith(RobolectricTestRunner::class)
+class HomeScreenMapContainerViewModelTest : BaseHiltTest() {
+  @Inject lateinit var viewModel: HomeScreenMapContainerViewModel
+  @Inject lateinit var surveyRepository: SurveyRepository
+  @Inject lateinit var authenticationManager: FakeAuthenticationManager
+  @Inject lateinit var remoteDataStore: FakeRemoteDataStore
+  @Inject lateinit var userRepository: UserRepository
+  @Inject lateinit var activateSurvey: ActivateSurveyUseCase
+  @BindValue @Mock lateinit var loiRepository: LocationOfInterestRepository
+
+  @OptIn(ExperimentalCoroutinesApi::class)
+  @Before
+  override fun setUp() {
+    super.setUp()
+    runWithTestDispatcher {
+      surveyRepository.activateSurvey(SURVEY.id)
+      // Setup user
+      authenticationManager.setUser(USER)
+      userRepository.saveUserDetails(USER)
+
+      // Setup survey and LOIs
+      remoteDataStore.surveys = listOf(SURVEY)
+      remoteDataStore.predefinedLois = listOf(LOCATION_OF_INTEREST)
+      activateSurvey(SURVEY.id)
+      `when`(loiRepository.getWithinBounds(SURVEY, BOUNDS))
+        .thenReturn(flowOf(listOf(LOCATION_OF_INTEREST)))
+      viewModel.onMapCameraMoved(CAMERA_POSITION)
+      advanceUntilIdle()
+    }
+  }
+
+  @Test
+  fun `renders the job card when zoomed into LOI and clicked on`() = runWithTestDispatcher {
+    viewModel.onFeatureClicked(features = setOf(LOCATION_OF_INTEREST_FEATURE))
+    val pair = viewModel.getDataCollectionEntryPoints().first()
+    assertThat(pair.first)
+      .isEqualTo(DataCollectionEntryPointData.SelectedLoiSheetData(LOCATION_OF_INTEREST))
+    assertThat(pair.second)
+      .isEqualTo(listOf(DataCollectionEntryPointData.AdHocDataCollectionButtonData(ADHOC_JOB)))
+  }
+
+  companion object {
+    private val BOUNDS = Bounds(Coordinates(-20.0, -20.0), Coordinates(-10.0, -10.0))
+    val CAMERA_POSITION =
+      CameraPosition(
+        coordinates = LOCATION_OF_INTEREST.geometry.center(),
+        zoomLevel = 16f,
+        bounds = BOUNDS,
+      )
+  }
+}
diff --git a/sharedTest/src/main/kotlin/com/sharedtest/FakeData.kt b/sharedTest/src/main/kotlin/com/sharedtest/FakeData.kt
index aa20cbca97..41ccc6f802 100644
--- a/sharedTest/src/main/kotlin/com/sharedtest/FakeData.kt
+++ b/sharedTest/src/main/kotlin/com/sharedtest/FakeData.kt
@@ -64,6 +64,18 @@ object FakeData {
       strategy = Job.DataCollectionStrategy.PREDEFINED,
     )
 
+  private val ADHOC_TASK =
+    newTask("adhoc_task", Task.Type.CAPTURE_LOCATION).copy(isAddLoiTask = true)
+
+  val ADHOC_JOB =
+    Job(
+      name = "Adhoc Job",
+      id = "ADHOC_JOB",
+      style = Style("#000"),
+      strategy = Job.DataCollectionStrategy.AD_HOC,
+      tasks = mapOf(ADHOC_TASK.id to ADHOC_TASK),
+    )
+
   val USER = User("user_id", "", "User")
 
   val DATA_SHARING_TERMS = dataSharingTerms {
@@ -76,7 +88,7 @@ object FakeData {
       "SURVEY",
       "Survey title",
       "Test survey description",
-      mapOf(JOB.id to JOB),
+      mapOf(JOB.id to JOB, ADHOC_JOB.id to ADHOC_JOB),
       mapOf(USER.email to "DATA_COLLECTOR"),
       DATA_SHARING_TERMS.copy {},
     )