Add allow-mock-accuracy for non-default geopoint and geoshape/geotrace

androidshared/build.gradle

@@ -54,6 +54,7 @@ dependencies {
     implementation Dependencies.androidx_lifecycle_livedata_ktx
     implementation Dependencies.android_material
     implementation Dependencies.androidx_fragment_ktx
+    implementation Dependencies.timber
 
     testImplementation project(':testshared')
     testImplementation Dependencies.junit

androidshared/src/main/java/org/odk/collect/androidshared/system/ContextUtils.kt

@@ -0,0 +1,15 @@
+package org.odk.collect.androidshared.system
+
+import android.content.Context
+import android.util.TypedValue
+import androidx.annotation.AttrRes
+
+object ContextUtils {
+
+    @JvmStatic
+    fun getThemeAttributeValue(context: Context, @AttrRes resId: Int): Int {
+        val outValue = TypedValue()
+        context.theme.resolveAttribute(resId, outValue, true)
+        return outValue.data
+    }
+}

androidshared/src/main/java/org/odk/collect/androidshared/utils/ExternalFilesUtils.kt → androidshared/src/main/java/org/odk/collect/androidshared/system/ExternalFilesUtils.kt

@@ -1,4 +1,4 @@
-package org.odk.collect.androidshared.utils
+package org.odk.collect.androidshared.system
 
 import android.content.Context
 import java.io.File

collect_app/src/main/java/org/odk/collect/android/permissions/PermissionsChecker.java → androidshared/src/main/java/org/odk/collect/androidshared/system/PermissionsChecker.java

@@ -1,4 +1,4 @@
-package org.odk.collect.android.permissions;
+package org.odk.collect.androidshared.system;
 
 import android.content.Context;
 import android.content.pm.PackageManager;

androidshared/src/main/java/org/odk/collect/androidshared/ui/DialogFragmentUtils.kt

@@ -0,0 +1,82 @@
+package org.odk.collect.androidshared.ui
+
+import android.os.Bundle
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.FragmentManager
+import timber.log.Timber
+
+object DialogFragmentUtils {
+
+    @JvmStatic
+    fun <T : DialogFragment> showIfNotShowing(
+        dialogClass: Class<T>,
+        fragmentManager: FragmentManager
+    ) {
+        showIfNotShowing(dialogClass, null, fragmentManager)
+    }
+
+    @JvmStatic
+    fun <T : DialogFragment> showIfNotShowing(
+        dialogClass: Class<T>,
+        args: Bundle?,
+        fragmentManager: FragmentManager
+    ) {
+        showIfNotShowing(createNewInstance(dialogClass, args), dialogClass, fragmentManager)
+    }
+
+    @JvmStatic
+    fun <T : DialogFragment> showIfNotShowing(
+        newDialog: T,
+        dialogClass: Class<T>,
+        fragmentManager: FragmentManager
+    ) {
+        if (fragmentManager.isStateSaved) {
+            return
+        }
+        val tag = dialogClass.name
+        val existingDialog = fragmentManager.findFragmentByTag(tag) as T?
+        if (existingDialog == null) {
+            newDialog.show(fragmentManager.beginTransaction(), tag)
+
+            // We need to execute this transaction. Otherwise a follow up call to this method
+            // could happen before the Fragment exists in the Fragment Manager and so the
+            // call to findFragmentByTag would return null and result in second dialog being show.
+            try {
+                fragmentManager.executePendingTransactions()
+            } catch (e: IllegalStateException) {
+                Timber.w(e)
+            }
+        }
+    }
+
+    @JvmStatic
+    fun dismissDialog(dialogClazz: Class<*>, fragmentManager: FragmentManager) {
+        val existingDialog = fragmentManager.findFragmentByTag(dialogClazz.name) as DialogFragment?
+        if (existingDialog != null) {
+            existingDialog.dismissAllowingStateLoss()
+
+            // We need to execute this transaction. Otherwise a next attempt to display a dialog
+            // could happen before the Fragment is dismissed in Fragment Manager and so the
+            // call to findFragmentByTag would return something (not null) and as a result the
+            // next dialog won't be displayed.
+            try {
+                fragmentManager.executePendingTransactions()
+            } catch (e: IllegalStateException) {
+                Timber.w(e)
+            }
+        }
+    }
+
+    private fun <T : DialogFragment> createNewInstance(dialogClass: Class<T>, args: Bundle?): T {
+        return try {
+            val instance = dialogClass.newInstance()
+            instance.arguments = args
+            instance
+        } catch (e: IllegalAccessException) {
+            // These would mean we have a non zero arg constructor for a Fragment
+            throw RuntimeException(e)
+        } catch (e: InstantiationException) {
+            throw RuntimeException(e)
+        }
+    }
+}

androidshared/src/main/java/org/odk/collect/androidshared/utils/ToastUtils.kt → androidshared/src/main/java/org/odk/collect/androidshared/ui/ToastUtils.kt

@@ -1,4 +1,4 @@
-package org.odk.collect.androidshared.utils
+package org.odk.collect.androidshared.ui
 
 import android.app.Activity
 import android.app.Application

collect_app/src/test/java/org/odk/collect/android/utilities/DialogUtilsTest.java → androidshared/src/test/java/org/odk/collect/androidshared/utils/DialogFragmentUtilsTest.java

@@ -1,4 +1,7 @@
-package org.odk.collect.android.utilities;
+package org.odk.collect.androidshared.utils;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
 
 import android.os.Bundle;
 
@@ -10,47 +13,44 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.odk.collect.androidshared.ui.DialogFragmentUtils;
+import org.robolectric.Robolectric;
 import org.robolectric.android.controller.ActivityController;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.odk.collect.android.support.CollectHelpers.buildThemedActivity;
-import static org.odk.collect.android.support.CollectHelpers.createThemedActivity;
-
 @RunWith(AndroidJUnit4.class)
-public class DialogUtilsTest {
+public class DialogFragmentUtilsTest {
 
     @Test
     public void showIfNotShowing_onlyEverOpensOneDialog() {
-        FragmentActivity activity = createThemedActivity(FragmentActivity.class);
+        FragmentActivity activity = Robolectric.setupActivity(FragmentActivity.class);
         FragmentManager fragmentManager = activity.getSupportFragmentManager();
 
-        DialogUtils.showIfNotShowing(DialogFragment.class, fragmentManager);
+        DialogFragmentUtils.showIfNotShowing(DialogFragment.class, fragmentManager);
         assertThat(fragmentManager.getFragments().size(), equalTo(1));
         Fragment dialog1 = fragmentManager.getFragments().get(0);
 
-        DialogUtils.showIfNotShowing(DialogFragment.class, fragmentManager);
+        DialogFragmentUtils.showIfNotShowing(DialogFragment.class, fragmentManager);
         assertThat(fragmentManager.getFragments().size(), equalTo(1));
         assertThat(fragmentManager.getFragments().get(0), equalTo(dialog1));
     }
 
     @Test
     public void showIfNotShowing_whenActivitySavedState_doesNotShowDialog() {
-        ActivityController<FragmentActivity> activityController = buildThemedActivity(FragmentActivity.class).setup();
+        ActivityController<FragmentActivity> activityController = Robolectric.buildActivity(FragmentActivity.class).setup();
         activityController.pause().stop().saveInstanceState(new Bundle());
 
         FragmentManager fragmentManager = activityController.get().getSupportFragmentManager();
-        DialogUtils.showIfNotShowing(DialogFragment.class, fragmentManager);
+        DialogFragmentUtils.showIfNotShowing(DialogFragment.class, fragmentManager);
         assertThat(fragmentManager.getFragments().size(), equalTo(0));
     }
 
     @Test
     public void showIfNotShowing_whenActivityDestroyed_doesNotShowDialog() {
-        ActivityController<FragmentActivity> activityController = buildThemedActivity(FragmentActivity.class).setup();
+        ActivityController<FragmentActivity> activityController = Robolectric.buildActivity(FragmentActivity.class).setup();
         activityController.pause().stop().destroy();
 
         FragmentManager fragmentManager = activityController.get().getSupportFragmentManager();
-        DialogUtils.showIfNotShowing(DialogFragment.class, fragmentManager);
+        DialogFragmentUtils.showIfNotShowing(DialogFragment.class, fragmentManager);
         assertThat(fragmentManager.getFragments().size(), equalTo(0));
     }
 }

build.gradle

@@ -18,7 +18,7 @@ buildscript {
         classpath 'com.google.gms:google-services:4.3.5'
         classpath 'org.jacoco:org.jacoco.core:0.8.7'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21"
         classpath "org.jlleitschuh.gradle:ktlint-gradle:10.1.0"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.39.0"
     }

collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/BackgroundAudioRecordingTest.java

@@ -16,7 +16,7 @@
 import org.junit.runner.RunWith;
 import org.odk.collect.android.R;
 import org.odk.collect.android.listeners.PermissionListener;
-import org.odk.collect.android.permissions.PermissionsChecker;
+import org.odk.collect.androidshared.system.PermissionsChecker;
 import org.odk.collect.android.permissions.PermissionsProvider;
 import org.odk.collect.android.storage.StorageSubdirectory;
 import org.odk.collect.android.support.CollectTestRule;

collect_app/src/main/AndroidManifest.xml

@@ -137,9 +137,15 @@ the specific language governing permissions and limitations under the License.
         <activity
             android:name="org.odk.collect.geo.GeoPointActivity"
             android:theme="@style/Theme.Collect"
-            tools:replace="android:theme"/>
-        <activity android:name=".activities.GeoPointMapActivity" />
-        <activity android:name=".activities.GeoPolyActivity" />
+            tools:replace="android:theme" />
+        <activity
+            android:name="org.odk.collect.geo.GeoPointMapActivity"
+            android:theme="@style/Theme.Collect"
+            tools:replace="android:theme" />
+        <activity
+            android:name="org.odk.collect.geo.GeoPolyActivity"
+            android:theme="@style/Theme.Collect"
+            tools:replace="android:theme" />
         <activity android:name=".activities.FormMapActivity" />
         <activity android:name=".activities.BearingActivity" />
         <activity

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

@@ -22,7 +22,7 @@
 
 import org.odk.collect.android.R;
 import org.odk.collect.android.fragments.Camera2Fragment;
-import org.odk.collect.androidshared.utils.ToastUtils;
+import org.odk.collect.androidshared.ui.ToastUtils;
 
 public class CaptureSelfieActivity extends CollectAbstractActivity {
 

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

@@ -21,7 +21,7 @@
 
 import org.odk.collect.android.R;
 import org.odk.collect.android.fragments.Camera2VideoFragment;
-import org.odk.collect.androidshared.utils.ToastUtils;
+import org.odk.collect.androidshared.ui.ToastUtils;
 
 public class CaptureSelfieVideoActivity extends CollectAbstractActivity {
 

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

@@ -45,9 +45,9 @@
 import org.odk.collect.android.projects.CurrentProjectProvider;
 import org.odk.collect.android.tasks.FormSyncTask;
 import org.odk.collect.android.utilities.ApplicationConstants;
-import org.odk.collect.android.utilities.DialogUtils;
 import org.odk.collect.android.utilities.MultiClickGuard;
 import org.odk.collect.android.views.ObviousProgressBar;
+import org.odk.collect.androidshared.ui.DialogFragmentUtils;
 
 import javax.inject.Inject;
 
@@ -99,9 +99,9 @@ public void onCreate(Bundle savedInstanceState) {
 
         blankFormsListViewModel.isAuthenticationRequired().observe(this, authenticationRequired -> {
             if (authenticationRequired) {
-                DialogUtils.showIfNotShowing(ServerAuthDialogFragment.class, getSupportFragmentManager());
+                DialogFragmentUtils.showIfNotShowing(ServerAuthDialogFragment.class, getSupportFragmentManager());
             } else {
-                DialogUtils.dismissDialog(ServerAuthDialogFragment.class, getSupportFragmentManager());
+                DialogFragmentUtils.dismissDialog(ServerAuthDialogFragment.class, getSupportFragmentManager());
             }
         });
 

collect_app/src/main/java/org/odk/collect/android/activities/FirstLaunchActivity.kt

@@ -10,9 +10,9 @@ import org.odk.collect.android.projects.CurrentProjectProvider
 import org.odk.collect.android.projects.ManualProjectCreatorDialog
 import org.odk.collect.android.projects.ProjectImporter
 import org.odk.collect.android.projects.QrCodeProjectCreatorDialog
-import org.odk.collect.android.utilities.DialogUtils
 import org.odk.collect.android.utilities.ThemeUtils
 import org.odk.collect.android.version.VersionInformation
+import org.odk.collect.androidshared.ui.DialogFragmentUtils
 import org.odk.collect.projects.Project
 import javax.inject.Inject
 
@@ -38,11 +38,17 @@ class FirstLaunchActivity : CollectAbstractActivity() {
         DaggerUtils.getComponent(this).inject(this)
 
         binding.configureViaQrButton.setOnClickListener {
-            DialogUtils.showIfNotShowing(QrCodeProjectCreatorDialog::class.java, supportFragmentManager)
+            DialogFragmentUtils.showIfNotShowing(
+                QrCodeProjectCreatorDialog::class.java,
+                supportFragmentManager
+            )
         }
 
         binding.configureManuallyButton.setOnClickListener {
-            DialogUtils.showIfNotShowing(ManualProjectCreatorDialog::class.java, supportFragmentManager)
+            DialogFragmentUtils.showIfNotShowing(
+                ManualProjectCreatorDialog::class.java,
+                supportFragmentManager
+            )
         }
 
         binding.appName.text = String.format(