Develop (#99)

[mage-1564]
Update to populate "contact us" email based on server config

[mage-1534]
Add user filter feature

[mage-1516] (#97)
Fix duplicate feeds issue on map settings page

[mage-1603]
Update geopackage-android-map dependency to version 6.7.5

Author: nruss11-om

mage/build.gradle

@@ -45,11 +45,6 @@ android {
         enabled = true
     }
 
-    sourceSets {
-        androidTest.setRoot('tests')
-        androidTest.java.srcDirs = ['tests/src']
-    }
-
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
@@ -89,8 +84,8 @@ android {
 
     defaultConfig {
         applicationId "mil.nga.giat.mage"
-        versionCode 1955
-        versionName '7.2.7'
+        versionCode 1956
+        versionName '7.3.0'
         minSdkVersion 27
         targetSdkVersion 36
         multiDexEnabled true
@@ -226,7 +221,7 @@ dependencies {
     implementation 'com.google.maps.android:maps-compose-widgets:2.11.4'
 
     implementation 'com.google.maps.android:android-maps-utils:3.5.3'
-    implementation 'mil.nga.geopackage.map:geopackage-android-map:6.7.4'
+    implementation 'mil.nga.geopackage.map:geopackage-android-map:6.7.5'
     implementation 'mil.nga.mgrs:mgrs-android:2.2.3'
     implementation 'mil.nga.gars:gars-android:1.2.3'
     implementation 'org.ocpsoft.prettytime:prettytime:3.2.5.Final'
@@ -235,6 +230,7 @@ dependencies {
     implementation 'com.github.bumptech.glide:glide:4.13.2'
     implementation 'com.github.bumptech.glide:okhttp3-integration:4.13.2'
     implementation "com.google.accompanist:accompanist-glide:0.15.0"
+    implementation "com.github.bumptech.glide:compose:1.0.0-beta01"
     kapt 'com.github.bumptech.glide:compiler:4.13.2'
 
     implementation 'com.nulab-inc:zxcvbn:1.2.3'
@@ -249,7 +245,7 @@ dependencies {
 
     implementation files ('libs/sanselanandroid.jar')
 
-    // Testing-only dependencies
+    //instrumentation test dependencies
     androidTestImplementation "androidx.test:core:$coreVersion"
     androidTestImplementation "androidx.test:core-ktx:$coreVersion"
     androidTestImplementation "androidx.test.ext:junit:$extJUnitVersion"
@@ -259,6 +255,15 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
     androidTestImplementation "androidx.test.espresso:espresso-contrib:$espressoVersion"
     androidTestImplementation "io.mockk:mockk-android:1.13.8"
+
+    //unit tests
+    testImplementation "androidx.test:core:$coreVersion"
+    testImplementation "androidx.test:core-ktx:$coreVersion"
+    testImplementation "androidx.test.ext:junit:$extJUnitVersion"
+    testImplementation "androidx.test.ext:junit-ktx:$extJUnitVersion"
+    testImplementation "io.mockk:mockk-android:1.13.8"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0"
+
 }
 
 tasks.register('androidArtifactVersion') {

mage/tests/AndroidManifest.xml renamed to mage/src/androidTest/AndroidManifest.xml

@@ -2,20 +2,11 @@
 
 import android.test.suitebuilder.annotation.SmallTest;
 import android.util.Log;
-
 import junit.framework.TestCase;
-
 import java.text.ParseException;
 import java.util.Date;
-
 import mil.nga.giat.mage.sdk.utils.ISO8601DateFormatFactory;
 
-/**
- *
- * Unit test that tests the {@link mil.nga.giat.mage.sdk.utils.ISO8601DateFormatFactory}
- *
- * @author wiedemanns
- */
 public class DateFormatFactoryTest extends TestCase {
 
 	private static final String LOG_NAME = DateFormatFactoryTest.class.getName();

mage/tests/src/mil/nga/giat/mage/map/WMSTileProviderTest.java renamed to mage/src/androidTest/java/mil/nga/giat/mage/map/WMSTileProviderTest.java

@@ -163,7 +163,12 @@
         <activity
             android:name=".filter.ObservationFilterActivity"
             android:theme="@style/AppTheme.NoActionBar"
+            android:windowSoftInputMode="adjustPan"
             android:label="@string/observation_filter" />
+        <activity
+            android:name=".filter.ObservationUserFilterActivity"
+            android:theme="@style/AppTheme.NoActionBar"
+            android:label="@string/observation_users_filter" />
         <activity
             android:name=".filter.LocationFilterActivity"
             android:theme="@style/AppTheme.NoActionBar"