Spike out using Fragment instead of Activity for geotrace

collect_app/src/main/java/org/odk/collect/android/activities/FormFillingActivity.java

@@ -168,6 +168,7 @@
 import org.odk.collect.android.widgets.range.RangePickerIntegerWidget;
 import org.odk.collect.android.widgets.utilities.ExternalAppRecordingRequester;
 import org.odk.collect.android.widgets.utilities.FormControllerWaitingForDataRegistry;
+import org.odk.collect.android.widgets.utilities.GeoPolyDialogFragment;
 import org.odk.collect.android.widgets.utilities.InternalRecordingRequester;
 import org.odk.collect.android.widgets.utilities.WaitingForDataRegistry;
 import org.odk.collect.androidshared.system.IntentLauncher;
@@ -438,6 +439,7 @@ public void onCreate(Bundle savedInstanceState) {
                 .forClass(DeleteRepeatDialogFragment.class, () -> new DeleteRepeatDialogFragment(viewModelFactory))
                 .forClass(BackgroundAudioPermissionDialogFragment.class, () -> new BackgroundAudioPermissionDialogFragment(viewModelFactory))
                 .forClass(SelectOneFromMapDialogFragment.class, () -> new SelectOneFromMapDialogFragment(viewModelFactory))
+                .forClass(GeoPolyDialogFragment.class, () -> new GeoPolyDialogFragment(viewModelFactory))
                 .build());
 
         getSupportFragmentManager().setFragmentResultListener(REQUEST_DELETE_REPEAT, this, (requestKey, result) -> deleteGroup());

collect_app/src/main/java/org/odk/collect/android/formentry/ODKView.java

@@ -41,6 +41,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.widget.NestedScrollView;
+import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.LifecycleOwner;
 
 import org.javarosa.core.model.Constants;
@@ -145,7 +146,7 @@ public class ODKView extends SwipeHandler.View implements OnLongClickListener, W
      * @param advancingPage   whether this view is being created after a forward swipe through the
      */
     public ODKView(
-            ComponentActivity context,
+            FragmentActivity context,
             final FormEntryPrompt[] questionPrompts,
             FormEntryCaption[] groups,
             boolean advancingPage,

collect_app/src/main/java/org/odk/collect/android/widgets/WidgetFactory.java

@@ -18,10 +18,10 @@
 import static org.odk.collect.android.utilities.Appearances.PLACEMENT_MAP;
 import static org.odk.collect.android.utilities.Appearances.hasAppearance;
 
-import android.app.Activity;
 import android.content.Context;
 import android.hardware.SensorManager;
 
+import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.LifecycleOwner;
 
 import org.javarosa.core.model.Constants;
@@ -54,9 +54,6 @@
 import org.odk.collect.android.widgets.range.RangePickerDecimalWidget;
 import org.odk.collect.android.widgets.range.RangePickerIntegerWidget;
 import org.odk.collect.android.widgets.utilities.ActivityGeoDataRequester;
-import org.odk.collect.android.widgets.video.ExVideoWidget;
-import org.odk.collect.android.widgets.video.VideoWidget;
-import org.odk.collect.audioclips.AudioPlayer;
 import org.odk.collect.android.widgets.utilities.AudioRecorderRecordingStatusHandler;
 import org.odk.collect.android.widgets.utilities.DateTimeWidgetUtils;
 import org.odk.collect.android.widgets.utilities.FileRequester;
@@ -66,8 +63,11 @@
 import org.odk.collect.android.widgets.utilities.RecordingRequesterProvider;
 import org.odk.collect.android.widgets.utilities.StringRequester;
 import org.odk.collect.android.widgets.utilities.WaitingForDataRegistry;
+import org.odk.collect.android.widgets.video.ExVideoWidget;
+import org.odk.collect.android.widgets.video.VideoWidget;
 import org.odk.collect.androidshared.system.CameraUtils;
 import org.odk.collect.androidshared.system.IntentLauncherImpl;
+import org.odk.collect.audioclips.AudioPlayer;
 import org.odk.collect.audiorecorder.recording.AudioRecorder;
 import org.odk.collect.permissions.PermissionsProvider;
 import org.odk.collect.settings.SettingsProvider;
@@ -82,7 +82,7 @@ public class WidgetFactory {
 
     private static final String PICKER_APPEARANCE = "picker";
 
-    private final Activity activity;
+    private final FragmentActivity activity;
     private final boolean useExternalRecorder;
     private final WaitingForDataRegistry waitingForDataRegistry;
     private final QuestionMediaManager questionMediaManager;
@@ -97,7 +97,7 @@ public class WidgetFactory {
     private final FormController formController;
     private final SettingsProvider settingsProvider;
 
-    public WidgetFactory(Activity activity,
+    public WidgetFactory(FragmentActivity activity,
                          boolean useExternalRecorder,
                          WaitingForDataRegistry waitingForDataRegistry,
                          QuestionMediaManager questionMediaManager,

collect_app/src/main/java/org/odk/collect/android/widgets/utilities/ActivityGeoDataRequester.kt

@@ -1,13 +1,15 @@
 package org.odk.collect.android.widgets.utilities
 
-import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
+import androidx.core.os.bundleOf
+import androidx.fragment.app.FragmentActivity
 import org.javarosa.form.api.FormEntryPrompt
 import org.odk.collect.android.utilities.Appearances
 import org.odk.collect.android.utilities.ApplicationConstants
 import org.odk.collect.android.utilities.FormEntryPromptUtils
 import org.odk.collect.android.widgets.interfaces.GeoDataRequester
+import org.odk.collect.androidshared.ui.DialogFragmentUtils
 import org.odk.collect.geo.Constants.EXTRA_DRAGGABLE_ONLY
 import org.odk.collect.geo.Constants.EXTRA_READ_ONLY
 import org.odk.collect.geo.Constants.EXTRA_RETAIN_MOCK_ACCURACY
@@ -22,7 +24,7 @@ import java.lang.Boolean.parseBoolean
 
 class ActivityGeoDataRequester(
     private val permissionsProvider: PermissionsProvider,
-    private val activity: Activity
+    private val activity: FragmentActivity
 ) : GeoDataRequester {
 
     override fun requestGeoPoint(
@@ -127,24 +129,10 @@ class ActivityGeoDataRequester(
             activity,
             object : PermissionListener {
                 override fun granted() {
-                    waitingForDataRegistry.waitForData(prompt.index)
-
-                    val intent = Intent(activity, GeoPolyActivity::class.java).also {
-                        it.putExtra(
-                            GeoPolyActivity.EXTRA_POLYGON,
-                            ArrayList(parseGeometry(answerText))
-                        )
-                        it.putExtra(
-                            GeoPolyActivity.OUTPUT_MODE_KEY,
-                            GeoPolyFragment.OutputMode.GEOTRACE
-                        )
-                        it.putExtra(EXTRA_READ_ONLY, prompt.isReadOnly)
-                        it.putExtra(EXTRA_RETAIN_MOCK_ACCURACY, getAllowMockAccuracy(prompt))
-                    }
-
-                    activity.startActivityForResult(
-                        intent,
-                        ApplicationConstants.RequestCodes.GEOTRACE_CAPTURE
+                    DialogFragmentUtils.showIfNotShowing(
+                        GeoPolyDialogFragment::class.java,
+                        bundleOf(WidgetAnswerDialogFragment.ARG_FORM_INDEX to prompt.index),
+                        activity.supportFragmentManager
                     )
                 }
             }