Merge branch 'master' into anandwana001/2699/undo-redo-feature-draw

Author: anandwana001

app/src/main/AndroidManifest.xml

@@ -72,6 +72,16 @@
 
         <category android:name="android.intent.category.LAUNCHER" />
       </intent-filter>
+
+      <intent-filter android:autoVerify="true">
+        <action android:name="android.intent.action.VIEW"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+        <data
+          android:scheme="https"
+          android:host="groundplatform.org"
+          android:pathPrefix="/survey/" />
+      </intent-filter>
     </activity>
     <activity
       android:name="org.groundplatform.android.SettingsActivity"

app/src/main/java/org/groundplatform/android/Config.kt

@@ -44,6 +44,17 @@ object Config {
    */
   const val CLUSTERING_ZOOM_THRESHOLD = 14f
 
+  /**
+   * The path segment used in deep‑link URIs to identify the survey screen.
+   *
+   * When handling incoming deep links, compare the first segment of the URI’s path to this constant
+   * to determine whether to navigate to the survey flow.
+   */
+  const val SURVEY_PATH_SEGMENT = "survey"
+
+  /** Limit on the permitted character length for free text question responses. */
+  const val TEXT_DATA_CHAR_LIMIT = 255
+
   // TODO: Make sub-paths configurable and
   //  stop hardcoding here.
   // Issue URL: https://github.com/google/ground-android/issues/1730

app/src/main/java/org/groundplatform/android/MainActivity.kt

@@ -17,6 +17,7 @@ package org.groundplatform.android
 
 import android.app.AlertDialog
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.enableEdgeToEdge
@@ -27,12 +28,15 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.core.view.WindowInsetsCompat
 import androidx.lifecycle.lifecycleScope
+import androidx.navigation.NavController
 import androidx.navigation.NavDirections
 import androidx.navigation.fragment.NavHostFragment
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
+import org.groundplatform.android.Config.SURVEY_PATH_SEGMENT
 import org.groundplatform.android.databinding.MainActBinding
 import org.groundplatform.android.repository.UserRepository
 import org.groundplatform.android.system.ActivityCallback
@@ -60,6 +64,8 @@ class MainActivity : AbstractActivity() {
 
   private var signInProgressDialog: AlertDialog? = null
 
+  private var pendingDeepLink: Uri? = null
+
   override fun onCreate(savedInstanceState: Bundle?) {
     // Make sure this is before calling super.onCreate()
     setTheme(R.style.AppTheme)
@@ -83,7 +89,19 @@ class MainActivity : AbstractActivity() {
 
     viewModel = viewModelFactory[this, MainViewModel::class.java]
 
-    lifecycleScope.launch { viewModel.navigationRequests.filterNotNull().collect { updateUi(it) } }
+    lifecycleScope.launch {
+      viewModel.navigationRequests.filterNotNull().first()
+
+      intent.data?.let {
+        if (navHostFragment.navController.currentDestination?.id != R.id.sign_in_fragment) {
+          navHostFragment.navController.handleDeepLinkIfNeeded(it)
+        } else {
+          pendingDeepLink = it
+        }
+      }
+
+      viewModel.navigationRequests.filterNotNull().collect { updateUi(it) }
+    }
 
     onBackPressedDispatcher.addCallback(
       this,
@@ -234,4 +252,13 @@ class MainActivity : AbstractActivity() {
       navHostFragment.navController.navigate(directions)
     }
   }
+
+  private fun NavController.handleDeepLinkIfNeeded(uri: Uri) {
+    if (uri.pathSegments.firstOrNull() == SURVEY_PATH_SEGMENT) {
+      val surveyId = uri.lastPathSegment
+      val action = SurveySelectorFragmentDirections.showSurveySelectorScreen(false)
+      action.surveyId = surveyId
+      navigate(action)
+    }
+  }
 }

app/src/main/java/org/groundplatform/android/ui/datacollection/components/TextTaskInput.kt

@@ -15,18 +15,23 @@
  */
 package org.groundplatform.android.ui.datacollection.components
 
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.TextField
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import org.groundplatform.android.Config
 import org.groundplatform.android.ExcludeFromJacocoGeneratedReport
 import org.groundplatform.android.ui.theme.AppTheme
 
@@ -37,7 +42,14 @@ fun TextTaskInput(
   keyboardType: KeyboardType = KeyboardType.Text,
   valueChanged: (text: String) -> Unit = {},
 ) {
-  TextField(
+  OutlinedTextField(
+    supportingText = {
+      Row(modifier = modifier.fillMaxWidth()) {
+        Spacer(modifier = modifier.weight(1f))
+        Text("${value.length} / ${Config.TEXT_DATA_CHAR_LIMIT}", textAlign = TextAlign.End)
+      }
+    },
+    isError = value.length > Config.TEXT_DATA_CHAR_LIMIT,
     value = value,
     onValueChange = { valueChanged(it) },
     modifier =

app/src/main/java/org/groundplatform/android/ui/datacollection/tasks/AbstractTaskViewModel.kt

@@ -44,6 +44,13 @@ open class AbstractTaskViewModel internal constructor() : AbstractViewModel() {
   /** Checks if the current value is valid and updates error value. */
   fun validate(): Int? = validate(task, taskTaskData.value)
 
+  /**
+   * Performs input validation on the given [Task] and associated [TaskData].
+   *
+   * Returns an [Int] identifier for an error string if validation fails, returns null otherwise.
+   * Subclasses may override this method to validate input data and display an error message to the
+   * user.
+   */
   open fun validate(task: Task, taskData: TaskData?): Int? {
     // Empty response for a required task.
     if (task.isRequired && (taskData == null || taskData.isEmpty())) {

app/src/main/java/org/groundplatform/android/ui/datacollection/tasks/multiplechoice/MultipleChoiceItemView.kt

@@ -17,14 +17,16 @@ package org.groundplatform.android.ui.datacollection.tasks.multiplechoice
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.RadioButton
-import androidx.compose.material3.TextField
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
@@ -34,8 +36,10 @@ import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import org.groundplatform.android.Config
 import org.groundplatform.android.ExcludeFromJacocoGeneratedReport
 import org.groundplatform.android.R
 import org.groundplatform.android.model.task.MultipleChoice
@@ -97,7 +101,17 @@ fun MultipleChoiceItemView(
 
     if (item.isOtherOption) {
       Row(modifier = modifier.padding(horizontal = 48.dp)) {
-        TextField(
+        OutlinedTextField(
+          supportingText = {
+            Row(modifier = modifier.fillMaxWidth()) {
+              Spacer(modifier = modifier.weight(1f))
+              Text(
+                "${item.otherText.length} / ${Config.TEXT_DATA_CHAR_LIMIT}",
+                textAlign = TextAlign.End,
+              )
+            }
+          },
+          isError = item.otherText.length > Config.TEXT_DATA_CHAR_LIMIT,
           value = item.otherText,
           textStyle = MaterialTheme.typography.bodyLarge,
           onValueChange = { otherValueChanged(it) },

app/src/main/java/org/groundplatform/android/ui/datacollection/tasks/multiplechoice/MultipleChoiceTaskViewModel.kt

@@ -21,6 +21,8 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.update
+import org.groundplatform.android.Config
+import org.groundplatform.android.R
 import org.groundplatform.android.model.job.Job
 import org.groundplatform.android.model.submission.MultipleChoiceTaskData
 import org.groundplatform.android.model.submission.MultipleChoiceTaskData.Companion.fromList
@@ -57,6 +59,16 @@ class MultipleChoiceTaskViewModel @Inject constructor() : AbstractTaskViewModel(
     updateMultipleChoiceItems()
   }
 
+  override fun validate(task: Task, taskData: TaskData?): Int? {
+    if (task.type != Task.Type.MULTIPLE_CHOICE || !selectedIds.contains(OTHER_ID))
+      return super.validate(task, taskData)
+
+    if (otherText.length > Config.TEXT_DATA_CHAR_LIMIT)
+      return R.string.text_task_data_character_limit
+
+    return super.validate(task, taskData)
+  }
+
   /**
    * Invoked when "other" text input field is modified. It updates the internal state with the new
    * text, if valid.

app/src/main/java/org/groundplatform/android/ui/datacollection/tasks/text/TextTaskViewModel.kt

@@ -20,13 +20,25 @@ import androidx.lifecycle.asLiveData
 import javax.inject.Inject
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.map
+import org.groundplatform.android.Config
+import org.groundplatform.android.R
 import org.groundplatform.android.model.submission.TaskData
 import org.groundplatform.android.model.submission.TextTaskData
+import org.groundplatform.android.model.task.Task
 import org.groundplatform.android.ui.datacollection.tasks.AbstractTaskViewModel
 
 class TextTaskViewModel @Inject constructor() : AbstractTaskViewModel() {
 
   /** Transcoded text to be displayed for the current [TaskData]. */
   val responseText: LiveData<String> =
     taskTaskData.filterIsInstance<TextTaskData?>().map { it?.text ?: "" }.asLiveData()
+
+  override fun validate(task: Task, taskData: TaskData?): Int? {
+    if (task.type != Task.Type.TEXT) return super.validate(task, taskData)
+
+    if ((taskData as TextTaskData).text.length > Config.TEXT_DATA_CHAR_LIMIT)
+      return R.string.text_task_data_character_limit
+
+    return super.validate(task, taskData)
+  }
 }

app/src/main/java/org/groundplatform/android/ui/surveyselector/SurveySelectorFragment.kt

@@ -23,6 +23,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.PopupMenu
 import androidx.navigation.fragment.findNavController
+import androidx.navigation.fragment.navArgs
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import org.groundplatform.android.R
@@ -45,11 +46,16 @@ class SurveySelectorFragment : AbstractFragment(), BackPressListener {
   private lateinit var binding: SurveySelectorFragBinding
   private lateinit var adapter: SurveyListAdapter
 
+  private val args: SurveySelectorFragmentArgs by navArgs()
+
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     viewModel = getViewModel(SurveySelectorViewModel::class.java)
     adapter = SurveyListAdapter(viewModel, this)
     viewModel.uiState.launchWhenStartedAndCollect { updateUi(it) }
+    if (!args.surveyId.isNullOrBlank()) {
+      viewModel.activateSurvey(args.surveyId!!)
+    }
   }
 
   private fun updateUi(uiState: UiState) {

app/src/main/java/org/groundplatform/android/ui/tos/TermsOfServiceFragment.kt

@@ -49,6 +49,7 @@ import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
+import org.groundplatform.android.Config.SURVEY_PATH_SEGMENT
 import org.groundplatform.android.R
 import org.groundplatform.android.ui.common.AbstractFragment
 import org.groundplatform.android.ui.compose.Toolbar
@@ -139,9 +140,19 @@ class TermsOfServiceFragment : AbstractFragment() {
     super.onViewCreated(view, savedInstanceState)
     lifecycleScope.launch {
       viewModel.navigateToSurveySelector.collect {
-        findNavController()
-          .navigate(SurveySelectorFragmentDirections.showSurveySelectorScreen(true))
+        activity?.intent?.data?.let { uri ->
+          if (uri.pathSegments.firstOrNull() == SURVEY_PATH_SEGMENT) {
+            val surveyId = uri.lastPathSegment
+            openSurveySelector(surveyId)
+          }
+        } ?: run { openSurveySelector() }
       }
     }
   }
+
+  private fun openSurveySelector(surveyId: String? = null) {
+    val action = SurveySelectorFragmentDirections.showSurveySelectorScreen(true)
+    action.surveyId = surveyId
+    findNavController().navigate(action)
+  }
 }