Convert GeoPointMapActivity to Fragment
#7253
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| package org.odk.collect.androidshared.system | ||
|
|
||
| import android.os.Bundle | ||
| import android.os.Parcelable | ||
| import androidx.core.os.BundleCompat | ||
|
|
||
| object BundleExt { | ||
|
|
||
| inline fun <reified T : Parcelable> Bundle.getParcelableExtraCompat(name: String): T? { | ||
|
Member
There was a problem hiding this comment. The name |
||
| return BundleCompat.getParcelable(this, name, T::class.java) | ||
| } | ||
| } | ||
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| package org.odk.collect.android.widgets.geo | ||
|
|
||
| import androidx.lifecycle.ViewModelProvider | ||
| import org.javarosa.core.model.data.GeoPointData | ||
| import org.javarosa.form.api.FormEntryPrompt | ||
| import org.odk.collect.android.utilities.Appearances | ||
| import org.odk.collect.android.utilities.FormEntryPromptUtils | ||
| import org.odk.collect.android.widgets.interfaces.SelectChoiceLoader | ||
| import org.odk.collect.android.widgets.utilities.BindAttributes | ||
| import org.odk.collect.android.widgets.utilities.WidgetAnswerDialogFragment | ||
| import org.odk.collect.geo.GeoUtils.parseGeometryPoint | ||
| import org.odk.collect.geo.GeoUtils.toMapPoint | ||
| import org.odk.collect.geo.geopoint.GeoPointMapFragment | ||
|
|
||
| class GeoPointMapDialogFragment( | ||
| viewModelFactory: ViewModelProvider.Factory | ||
| ) : | ||
| WidgetAnswerDialogFragment<GeoPointMapFragment>( | ||
| GeoPointMapFragment::class, | ||
| viewModelFactory | ||
| ) { | ||
|
|
||
| override fun onCreateFragment( | ||
| prompt: FormEntryPrompt, | ||
| selectChoiceLoader: SelectChoiceLoader | ||
| ): GeoPointMapFragment { | ||
| childFragmentManager.setFragmentResultListener( | ||
| GeoPointMapFragment.REQUEST_GEOPOINT, | ||
| this | ||
| ) { _, result -> | ||
| val geoPoint = result.getString(GeoPointMapFragment.RESULT_GEOPOINT) | ||
|
|
||
| if (geoPoint != null) { | ||
| onAnswer(geoPoint) | ||
| } else { | ||
| dismiss() | ||
| } | ||
| } | ||
|
|
||
| val retainMockAccuracy = | ||
| FormEntryPromptUtils.getBindAttribute(prompt, BindAttributes.ALLOW_MOCK_ACCURACY) | ||
| .toBoolean() | ||
|
|
||
| val inputPoint = when (val answer = prompt.answerValue) { | ||
| is GeoPointData -> answer.toMapPoint() | ||
| null -> null | ||
| else -> throw IllegalArgumentException() | ||
| } | ||
|
|
||
| val draggable = Appearances.hasAppearance(prompt, Appearances.PLACEMENT_MAP) | ||
| return GeoPointMapFragment( | ||
| inputPoint, | ||
| draggable, | ||
| prompt.isReadOnly, | ||
| retainMockAccuracy | ||
| ) | ||
| } | ||
|
|
||
| private fun onAnswer(geoString: String) { | ||
| val answer = if (geoString.isBlank()) { | ||
| null | ||
| } else { | ||
| GeoPointData(parseGeometryPoint(geoString)) | ||
| } | ||
|
|
||
| onAnswer(answer) | ||
| } | ||
| } |
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wrapping a single extension function in an object adds an extra layer without much benefit. A top-level extension function would be more idiomatic and just as easy to import.