Removed Default region retention

Author: Vishwajith-Shettigar

app/src/main/java/org/oppia/android/app/player/state/ImageRegionSelectionInteractionView.kt

@@ -132,7 +132,6 @@ class ImageRegionSelectionInteractionView @JvmOverloads constructor(
         userAnswerState
       )
       areasImage.addRegionViews()
-      areasImage.maybeSelectDefaultRegion()
       performAttachment(areasImage)
     }
   }

app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ImageRegionSelectionInteractionViewModel.kt

@@ -6,11 +6,9 @@ import androidx.databinding.ObservableField
 import org.oppia.android.R
 import org.oppia.android.app.model.AnswerErrorCategory
 import org.oppia.android.app.model.ClickOnImage
-import org.oppia.android.app.model.ImageInteractionState
 import org.oppia.android.app.model.ImageWithRegions
 import org.oppia.android.app.model.Interaction
 import org.oppia.android.app.model.InteractionObject
-import org.oppia.android.app.model.Point2d
 import org.oppia.android.app.model.UserAnswer
 import org.oppia.android.app.model.UserAnswerState
 import org.oppia.android.app.model.WrittenTranslationContext
@@ -41,7 +39,6 @@ class ImageRegionSelectionInteractionViewModel private constructor(
   var errorMessage = ObservableField<String>("")
   private var isDefaultRegionClicked = false
   var answerText: CharSequence = ""
-  private var dafaultRegionCoordinates: Point2d? = null
   val selectableRegions: List<ImageWithRegions.LabeledRegion> by lazy {
     val schemaObject = interaction.customizationArgsMap["imageAndRegions"]
     schemaObject?.customSchemaValue?.imageWithRegions?.labelRegionsList ?: listOf()
@@ -84,16 +81,11 @@ class ImageRegionSelectionInteractionViewModel private constructor(
   override fun onClickableAreaTouched(region: RegionClickedEvent) {
     when (region) {
       is DefaultRegionClickedEvent -> {
-        dafaultRegionCoordinates = Point2d.newBuilder().apply {
-          x = region.x
-          y = region.y
-        }.build()
         answerText = ""
         isAnswerAvailable.set(false)
         isDefaultRegionClicked = true
       }
       is NamedRegionClickedEvent -> {
-        dafaultRegionCoordinates = null
         answerText = region.regionLabel
         isAnswerAvailable.set(true)
       }
@@ -128,14 +120,8 @@ class ImageRegionSelectionInteractionViewModel private constructor(
 
   override fun getUserAnswerState(): UserAnswerState {
     return UserAnswerState.newBuilder().apply {
-      if (answerText.isNotEmpty() || dafaultRegionCoordinates != null) {
-        this.imageInteractionState = ImageInteractionState.newBuilder().apply {
-          if (answerText.isNotEmpty()) {
-            this.imageLabel = answerText.toString()
-          } else {
-            this.defaultRegionCoordinates = dafaultRegionCoordinates
-          }
-        }.build()
+      if (answerText.isNotEmpty()) {
+        this.imageLabel = answerText.toString()
       }
       this.answerErrorCategory = answerErrorCetegory
     }.build()

app/src/main/java/org/oppia/android/app/utility/ClickableAreasImage.kt

@@ -10,7 +10,6 @@ import androidx.core.view.forEachIndexed
 import androidx.core.view.isVisible
 import org.oppia.android.R
 import org.oppia.android.app.model.ImageWithRegions.LabeledRegion
-import org.oppia.android.app.model.Point2d
 import org.oppia.android.app.model.UserAnswerState
 import org.oppia.android.app.player.state.ImageRegionSelectionInteractionView
 import org.oppia.android.app.shim.ViewBindingShim
@@ -27,20 +26,13 @@ class ClickableAreasImage(
   userAnswerState: UserAnswerState
 ) {
   private var imageLabel: String? = null
-  private var defaultRegionCoordinates: Point2d? = null
-
   private val defaultRegionView by lazy { bindingInterface.getDefaultRegion(parentView) }
 
   init {
     imageView.initializeShowRegionTouchListener()
 
-    if (userAnswerState.hasImageInteractionState()) {
-      if (userAnswerState.imageInteractionState.imageLabel.isNotBlank()) {
-        imageLabel = userAnswerState.imageInteractionState.imageLabel
-      } else {
-        defaultRegionCoordinates =
-          userAnswerState.imageInteractionState.defaultRegionCoordinates
-      }
+    if (userAnswerState.imageLabel.isNotBlank()) {
+      imageLabel = userAnswerState.imageLabel
     }
   }
 
@@ -90,13 +82,6 @@ class ClickableAreasImage(
     return imageView.height - imageView.paddingTop - imageView.paddingBottom
   }
 
-  /** Selects default region. */
-  fun maybeSelectDefaultRegion() {
-    defaultRegionCoordinates?.let {
-      onPhotoTap(it.x, it.y)
-    }
-  }
-
   /** Add selectable regions to [FrameLayout]. */
   fun addRegionViews() {
     // Remove all views other than the default region & selectable image.

model/src/main/proto/exploration.proto

@@ -441,18 +441,10 @@ message UserAnswerState {
     // A user's selected list of set of html content ids in drag and drop interaction.
     ListOfSetsOfTranslatableHtmlContentIds list_of_sets_of_translatable_html_content_ids = 4;
     // Image region selected by user.
-    ImageInteractionState image_interaction_state=5;
+    string image_label=5;
   }
 }
 
-// Represents the state of image selection that the user has selected.
-message ImageInteractionState{
-    // Selected image label.
-    string image_label=1;
-    // Selected default region coordinates.
-    Point2d default_region_coordinates=2;
-}
-
 // Represents categories of errors that can be inferred from a pending answer.
 enum AnswerErrorCategory {
   // The error is unknown or not specified.