Skip to content

Fix crash on draw area task #3646

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shobhitagarwal1612 merged 2 commits into from
Mar 31, 2026
Merged

Fix crash on draw area task #3646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4d0b5d
move collection of camera movements to DrawAreaTaskMapFragment
andreia-ferreira Mar 31, 2026
f9f4a9b
Merge branch 'master' into andreia/fix-crash-draw-area
andreia-ferreira Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions ...n/java/org/groundplatform/android/ui/datacollection/tasks/polygon/DrawAreaTaskFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,9 @@ import android.widget.Toast
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.setValue
import androidx.lifecycle.lifecycleScope
import dagger.hilt.android.AndroidEntryPoint
import javax.inject.Inject
import javax.inject.Provider
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import org.groundplatform.android.R
import org.groundplatform.android.ui.components.ConfirmationDialog
import org.groundplatform.android.ui.datacollection.components.InstructionData
Expand All @@ -35,7 +32,6 @@ import org.groundplatform.android.ui.datacollection.tasks.AbstractTaskFragment
@AndroidEntryPoint
class DrawAreaTaskFragment @Inject constructor() : AbstractTaskFragment<DrawAreaTaskViewModel>() {
@Inject lateinit var drawAreaTaskMapFragmentProvider: Provider<DrawAreaTaskMapFragment>
private lateinit var drawAreaTaskMapFragment: DrawAreaTaskMapFragment

override val taskHeader: TaskHeader by lazy {
TaskHeader(viewModel.task.label, R.drawable.outline_draw)
Expand Down Expand Up @@ -68,13 +64,6 @@ class DrawAreaTaskFragment @Inject constructor() : AbstractTaskFragment<DrawArea
}
}

override fun onTaskViewAttached() {
// Collect camera movement events from ViewModel (e.g., after undo/redo)
viewModel.cameraMoveEvents
.onEach { coordinates -> drawAreaTaskMapFragment.moveToPosition(coordinates) }
.launchIn(viewLifecycleOwner.lifecycleScope)
}

override fun onTaskResume() {
if (isVisible && !viewModel.instructionsDialogShown) {
viewModel.showInstructionsDialog.value = true
Expand Down
4 changes: 4 additions & 0 deletions ...ava/org/groundplatform/android/ui/datacollection/tasks/polygon/DrawAreaTaskMapFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ class DrawAreaTaskMapFragment @Inject constructor() :
}

launch { taskViewModel.draftUpdates.collect { map.updateFeature(it) } }

launch {
taskViewModel.cameraMoveEvents.collect { coordinates -> moveToPosition(coordinates) }
}
}
}

Expand Down
Loading