Added DrawGeometryTask #3421
Open
Added DrawGeometryTask #3421
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…sk' into anandwana001/3148/drawgeometrytask
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## master #3421 +/- ##
============================================
- Coverage 69.92% 69.16% -0.77%
- Complexity 1599 1615 +16
============================================
Files 319 323 +4
Lines 8598 8768 +170
Branches 949 967 +18
============================================
+ Hits 6012 6064 +52
- Misses 2010 2122 +112
- Partials 576 582 +6
🚀 New features to boost your workflow:
|
shobhitagarwal1612
requested changes
Dec 26, 2025
Member
shobhitagarwal1612
left a comment
shobhitagarwal1612
left a comment
There was a problem hiding this comment.
Please attach a screen recording as well to the description.
Comment on lines
+119
to
+127
| if (obj is JSONObject) { | ||
| (obj as JSONObject).toCaptureLocationTaskData() | ||
| } else { | ||
| DataStoreException.checkType(String::class.java, obj) | ||
| val geometry = GeometryWrapperTypeConverter.fromString(obj as String)?.getGeometry() | ||
| DataStoreException.checkNotNull(geometry, "Missing geometry in draw geometry task result") | ||
| DataStoreException.checkType(Point::class.java, geometry!!) | ||
| DropPinTaskData(geometry as Point) | ||
| } |
Member
There was a problem hiding this comment.
Can we define a new *taskData for DRAW_GEOMETRY data type?
Let's not reuse existing *taskData classes to prevent any confusions with legacy code.
Comment on lines
+89
to
+92
| DrawGeometry( | ||
| task.drawGeometry.requireDeviceLocation, | ||
| task.drawGeometry.minAccuracyMeters, | ||
| ) |
Member
There was a problem hiding this comment.
Looking at the proto, it also contains a allowed method field whose value can be one of "DROP_PIN" and "DRAW_AREA". Please add that field as well.
| */ | ||
| package org.groundplatform.android.model.task | ||
|
|
||
| data class DrawGeometry(val isLocationLockRequired: Boolean, val minAccuracyMeters: Float) |
| import org.groundplatform.android.util.renderComposableDialog | ||
|
|
||
| @AndroidEntryPoint | ||
| class DrawGeometryTaskFragment @Inject constructor() : |
Member
There was a problem hiding this comment.
Please add some ktdoc
| @Inject lateinit var drawGeometryTaskMapFragmentProvider: Provider<DrawGeometryTaskMapFragment> | ||
|
|
||
| override fun onCreateTaskView(inflater: LayoutInflater): TaskView = | ||
| TaskViewFactory.createWithCombinedHeader(inflater, R.drawable.outline_pin_drop) |
Member
There was a problem hiding this comment.
IIUC, this task should be able to choose between DROP_PIN and DRAW_AREA depending upon the proto field and should not always default to DROP_PIN.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #3148
This PR implements the new DrawGeometry task UI for Android, unifying the "Drop Pin" and "Capture Location" functionalities into a single, configurable task type. This change aligns the Android client with the updated DrawGeometry task model, allowing survey administrators to configure location lock requirements and accuracy thresholds.
Key Changes
Model & Schema:
UI Implementation:
Persistence:
Tests:
- Location lock enforcement logic.
- Correct generation of CaptureLocationTaskData vs. DropPinTaskData.
- Location lock flow initialization.
Verification
Automated Tests:
Manual Verification:
@shobhitagarwal1612 PTAL?