Implement sharing geometry with QR code

app/build.gradle

@@ -56,7 +56,7 @@ static def getGitHash() {
 }
 
 android {
-    compileSdk rootProject.androidCompileSdk
+    compileSdk = libs.versions.androidCompileSdk.get().toInteger()
     sourceSets {
         main {
             proto {
@@ -75,8 +75,8 @@ android {
     }
     defaultConfig {
         applicationId "org.groundplatform.android"
-        minSdkVersion rootProject.androidMinSdk
-        targetSdkVersion rootProject.androidTargetSdk
+        minSdkVersion libs.versions.androidMinSdk.get().toInteger()
+        targetSdkVersion libs.versions.androidTargetSdk.get().toInteger()
 
         versionCode getGitCommitCount()
         versionName "${getGitBranchName()}-${getGitHash()}-debug"
@@ -177,6 +177,8 @@ configurations {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation project(':core:ui')
+    implementation project(':core:domain')
     implementation libs.androidx.multidex
     implementation libs.androidx.preference.ktx
 
@@ -261,10 +263,6 @@ dependencies {
     implementation libs.androidx.navigation.fragment.ktx
     implementation libs.androidx.navigation.ui.ktx
 
-    // Auto-value
-    compileOnly libs.auto.value.annotations
-    ksp libs.auto.value
-
     // Logging
     implementation libs.timber
 
@@ -371,7 +369,7 @@ apply plugin: 'androidx.navigation.safeargs'
 apply plugin: 'com.google.gms.google-services'
 
 kotlin {
-    jvmToolchain rootProject.jvmToolchainVersion
+    jvmToolchain libs.versions.jvmToolchainVersion.get().toInteger()
 }
 
 secrets {

app/src/main/AndroidManifest.xml

@@ -17,7 +17,8 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools">
+  xmlns:tools="http://schemas.android.com/tools"
+  package="org.groundplatform.android">
 
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -74,13 +75,15 @@
       </intent-filter>
 
       <intent-filter android:autoVerify="true">
-        <action android:name="android.intent.action.VIEW"/>
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.BROWSABLE"/>
+        <action android:name="android.intent.action.VIEW" />
+
+        <category android:name="android.intent.category.DEFAULT" />
+        <category android:name="android.intent.category.BROWSABLE" />
+
         <data
-          android:scheme="https"
           android:host="groundplatform.org"
-          android:pathPrefix="/android/survey/" />
+          android:pathPrefix="/android/survey/"
+          android:scheme="https" />
       </intent-filter>
     </activity>
     <activity

app/src/main/java/org/groundplatform/android/data/local/room/converter/ConverterExt.kt

@@ -54,7 +54,6 @@ import org.groundplatform.android.data.local.room.relations.TaskEntityAndRelatio
 import org.groundplatform.android.model.AuditInfo
 import org.groundplatform.android.model.Survey
 import org.groundplatform.android.model.User
-import org.groundplatform.android.model.geometry.Coordinates
 import org.groundplatform.android.model.geometry.Geometry
 import org.groundplatform.android.model.geometry.Point
 import org.groundplatform.android.model.imagery.OfflineArea
@@ -75,6 +74,7 @@ import org.groundplatform.android.model.task.Option
 import org.groundplatform.android.model.task.Task
 import org.groundplatform.android.model.task.TaskId
 import org.groundplatform.android.proto.Survey.DataSharingTerms
+import org.groundplatform.domain.model.geometry.Coordinates
 import org.json.JSONObject
 import timber.log.Timber
 

app/src/main/java/org/groundplatform/android/data/remote/firebase/protobuf/ModelToProtoExt.kt

@@ -19,7 +19,6 @@ import com.google.protobuf.timestamp
 import java.util.Date
 import kotlinx.collections.immutable.toImmutableMap
 import org.groundplatform.android.model.User
-import org.groundplatform.android.model.geometry.Coordinates
 import org.groundplatform.android.model.geometry.Geometry
 import org.groundplatform.android.model.geometry.LineString
 import org.groundplatform.android.model.geometry.LinearRing
@@ -59,6 +58,7 @@ import org.groundplatform.android.proto.locationOfInterest
 import org.groundplatform.android.proto.point
 import org.groundplatform.android.proto.submission
 import org.groundplatform.android.proto.taskData
+import org.groundplatform.domain.model.geometry.Coordinates
 
 fun SubmissionMutation.createSubmissionMessage(user: User) = submission {
   assert(userId == user.id) { "UserId doesn't match: expected $userId, found ${user.id}" }

app/src/main/java/org/groundplatform/android/data/remote/firebase/schema/GeometryConverter.kt

@@ -16,7 +16,6 @@
 
 package org.groundplatform.android.data.remote.firebase.schema
 
-import org.groundplatform.android.model.geometry.Coordinates
 import org.groundplatform.android.model.geometry.Geometry
 import org.groundplatform.android.model.geometry.LinearRing
 import org.groundplatform.android.model.geometry.MultiPolygon
@@ -27,6 +26,7 @@ import org.groundplatform.android.proto.LinearRing as LinearRingProto
 import org.groundplatform.android.proto.MultiPolygon as MultiPolygonProto
 import org.groundplatform.android.proto.Point as PointProto
 import org.groundplatform.android.proto.Polygon as PolygonProto
+import org.groundplatform.domain.model.geometry.Coordinates
 
 /**
  * Converts between Geometry model objects and their equivalent remote representation using protos.

app/src/main/java/org/groundplatform/android/model/geometry/Geometry.kt

@@ -22,6 +22,7 @@ import org.groundplatform.android.ui.map.gms.GmsExt.center
 import org.groundplatform.android.ui.map.gms.GmsExt.toBounds
 import org.groundplatform.android.ui.map.gms.toLatLngList
 import org.groundplatform.android.ui.util.isClosed
+import org.groundplatform.domain.model.geometry.Coordinates
 
 /** A common ancestor for all geometry types. */
 @Serializable

app/src/main/java/org/groundplatform/android/model/map/Bounds.kt

@@ -15,7 +15,7 @@
  */
 package org.groundplatform.android.model.map
 
-import org.groundplatform.android.model.geometry.Coordinates
+import org.groundplatform.domain.model.geometry.Coordinates
 
 /**
  * Represents a rectangular bound on a map. A bounds may be constructed using only southwest and

app/src/main/java/org/groundplatform/android/model/map/CameraPosition.kt

@@ -15,7 +15,7 @@
  */
 package org.groundplatform.android.model.map
 
-import org.groundplatform.android.model.geometry.Coordinates
+import org.groundplatform.domain.model.geometry.Coordinates
 import timber.log.Timber
 
 /** Represents current camera position of the map. */

app/src/main/java/org/groundplatform/android/system/GeocodingManager.kt

@@ -25,9 +25,9 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import org.groundplatform.android.R
 import org.groundplatform.android.di.coroutines.IoDispatcher
-import org.groundplatform.android.model.geometry.Coordinates
 import org.groundplatform.android.model.map.Bounds
 import org.groundplatform.android.ui.map.gms.GmsExt.center
+import org.groundplatform.domain.model.geometry.Coordinates
 import timber.log.Timber
 
 /** Abstracts native geocoding facilities. */

app/src/main/java/org/groundplatform/android/ui/basemapselector/BasemapSelectorScreen.kt

@@ -55,7 +55,7 @@ import kotlinx.coroutines.launch
 import org.groundplatform.android.R
 import org.groundplatform.android.model.map.MapType
 import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
-import org.groundplatform.android.ui.theme.AppTheme
+import org.groundplatform.theme.AppTheme
 
 /**
  * Screen containing a list of [MapType] for updating basemap layer.

app/src/main/java/org/groundplatform/android/ui/common/AbstractMapContainerFragment.kt

@@ -23,7 +23,6 @@ import androidx.compose.runtime.getValue
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import javax.inject.Inject
 import org.groundplatform.android.R
-import org.groundplatform.android.model.geometry.Coordinates
 import org.groundplatform.android.model.map.Bounds
 import org.groundplatform.android.system.GeocodingManager
 import org.groundplatform.android.system.PermissionDeniedException
@@ -35,6 +34,7 @@ import org.groundplatform.android.ui.map.NewCameraPositionViaBounds
 import org.groundplatform.android.ui.map.NewCameraPositionViaCoordinates
 import org.groundplatform.android.ui.map.NewCameraPositionViaCoordinatesAndZoomLevel
 import org.groundplatform.android.util.createComposeView
+import org.groundplatform.domain.model.geometry.Coordinates
 import timber.log.Timber
 
 /** Injects a [MapFragment] in the container with id "map" and provides shared map functionality. */

app/src/main/java/org/groundplatform/android/ui/common/BaseMapViewModel.kt

@@ -46,7 +46,6 @@ import kotlinx.coroutines.flow.withIndex
 import kotlinx.coroutines.launch
 import org.groundplatform.android.common.Constants.DEFAULT_LOI_ZOOM_LEVEL
 import org.groundplatform.android.model.Survey
-import org.groundplatform.android.model.geometry.Coordinates
 import org.groundplatform.android.model.imagery.TileSource
 import org.groundplatform.android.model.map.CameraPosition
 import org.groundplatform.android.model.map.MapType
@@ -65,6 +64,7 @@ import org.groundplatform.android.ui.map.NewCameraPositionViaCoordinates
 import org.groundplatform.android.ui.map.NewCameraPositionViaCoordinatesAndZoomLevel
 import org.groundplatform.android.ui.map.gms.GmsExt.toBounds
 import org.groundplatform.android.ui.map.gms.toCoordinates
+import org.groundplatform.domain.model.geometry.Coordinates
 import timber.log.Timber
 
 open class BaseMapViewModel

app/src/main/java/org/groundplatform/android/ui/components/ConfirmationDialog.kt

@@ -26,7 +26,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import org.groundplatform.android.R
 import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
-import org.groundplatform.android.ui.theme.AppTheme
+import org.groundplatform.theme.AppTheme
 
 @Composable
 fun ConfirmationDialog(

app/src/main/java/org/groundplatform/android/ui/components/HtmlText.kt

@@ -25,7 +25,7 @@ import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.text.HtmlCompat
 import org.groundplatform.android.R
 import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
-import org.groundplatform.android.ui.theme.AppTheme
+import org.groundplatform.theme.AppTheme
 
 @Composable
 fun HtmlText(html: String, modifier: Modifier = Modifier) {

app/src/main/java/org/groundplatform/android/ui/components/LoadingDialog.kt

@@ -33,8 +33,8 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import org.groundplatform.android.R
 import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
-import org.groundplatform.android.ui.theme.AppTheme
-import org.groundplatform.android.ui.theme.sizes
+import org.groundplatform.theme.AppTheme
+import org.groundplatform.theme.sizes
 
 @Composable
 fun LoadingDialog(messageId: Int) {

app/src/main/java/org/groundplatform/android/ui/components/MapFloatingActionButton.kt

@@ -29,7 +29,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.groundplatform.android.R
 import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
-import org.groundplatform.android.ui.theme.AppTheme
+import org.groundplatform.theme.AppTheme
 
 const val OPEN_NAV_DRAWER_TEST_TAG = "open_nav_drawer"
 const val CHOOSE_MAP_TYPE_TEST_TAG = "choose_map_type"

app/src/main/java/org/groundplatform/android/ui/components/PermissionDeniedDialog.kt

@@ -35,7 +35,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.groundplatform.android.R
 import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
-import org.groundplatform.android.ui.theme.AppTheme
+import org.groundplatform.theme.AppTheme
 import timber.log.Timber
 
 @Composable

app/src/main/java/org/groundplatform/android/ui/components/RecenterButton.kt

@@ -30,7 +30,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.groundplatform.android.R
 import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
-import org.groundplatform.android.ui.theme.AppTheme
+import org.groundplatform.theme.AppTheme
 
 @Composable
 fun RecenterButton(modifier: Modifier = Modifier, onClick: () -> Unit) {

app/src/main/java/org/groundplatform/android/ui/datacollection/DataSubmissionConfirmationScreen.kt

@@ -40,7 +40,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.groundplatform.android.R
 import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
-import org.groundplatform.android.ui.theme.AppTheme
+import org.groundplatform.theme.AppTheme
 
 @Composable
 fun DataSubmissionConfirmationScreen(onDismissed: () -> Unit) {

app/src/main/java/org/groundplatform/android/ui/datacollection/components/InstructionsDialog.kt

@@ -33,7 +33,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import org.groundplatform.android.R
 import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
-import org.groundplatform.android.ui.theme.AppTheme
+import org.groundplatform.theme.AppTheme
 
 @Composable
 fun InstructionsDialog(iconId: Int, stringId: Int) {

app/src/main/java/org/groundplatform/android/ui/datacollection/components/TaskButton.kt

@@ -33,7 +33,7 @@ import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
-import org.groundplatform.android.ui.theme.AppTheme
+import org.groundplatform.theme.AppTheme
 
 @Composable
 fun TaskButton(

app/src/main/java/org/groundplatform/android/ui/datacollection/components/TaskFooter.kt

@@ -28,7 +28,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
 import org.groundplatform.android.ui.datacollection.tasks.location.LocationAccuracyCard
-import org.groundplatform.android.ui.theme.AppTheme
+import org.groundplatform.theme.AppTheme
 
 @Composable
 fun TaskFooter(

app/src/main/java/org/groundplatform/android/ui/datacollection/components/TextTaskInput.kt

@@ -33,7 +33,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.groundplatform.android.common.Constants
 import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
-import org.groundplatform.android.ui.theme.AppTheme
+import org.groundplatform.theme.AppTheme
 
 @Composable
 fun TextTaskInput(

app/src/main/java/org/groundplatform/android/ui/datacollection/components/UriImage.kt

@@ -31,7 +31,7 @@ import coil.request.ImageRequest
 import coil.size.Scale
 import org.groundplatform.android.R
 import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
-import org.groundplatform.android.ui.theme.AppTheme
+import org.groundplatform.theme.AppTheme
 
 @VisibleForTesting const val MAX_IMAGE_SIZE = 2048
 

app/src/main/java/org/groundplatform/android/ui/datacollection/tasks/date/DateTaskScreen.kt

@@ -34,7 +34,7 @@ import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
-import org.groundplatform.android.ui.theme.AppTheme
+import org.groundplatform.theme.AppTheme
 
 const val DATE_TEXT_TEST_TAG: String = "date task input test tag"
 

app/src/main/java/org/groundplatform/android/ui/datacollection/tasks/multiplechoice/MultipleChoiceItemView.kt

@@ -47,7 +47,7 @@ import org.groundplatform.android.common.Constants
 import org.groundplatform.android.model.task.MultipleChoice
 import org.groundplatform.android.model.task.Option
 import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
-import org.groundplatform.android.ui.theme.AppTheme
+import org.groundplatform.theme.AppTheme
 
 const val MULTIPLE_CHOICE_ITEM_TEST_TAG = "multiple choice item test tag"
 const val OTHER_INPUT_TEXT_TEST_TAG = "other input test tag"

app/src/main/java/org/groundplatform/android/ui/datacollection/tasks/photo/PhotoTaskScreen.kt

@@ -36,7 +36,7 @@ import androidx.core.net.toUri
 import org.groundplatform.android.R
 import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
 import org.groundplatform.android.ui.datacollection.components.UriImage
-import org.groundplatform.android.ui.theme.AppTheme
+import org.groundplatform.theme.AppTheme
 
 @Composable
 fun PhotoTaskScreen(uri: Uri, onTakePhoto: () -> Unit, modifier: Modifier = Modifier) {

app/src/main/java/org/groundplatform/android/ui/datacollection/tasks/polygon/DrawAreaTaskViewModel.kt

@@ -36,7 +36,6 @@ import kotlinx.coroutines.launch
 import org.groundplatform.android.R
 import org.groundplatform.android.data.local.LocalValueStore
 import org.groundplatform.android.data.uuid.OfflineUuidGenerator
-import org.groundplatform.android.model.geometry.Coordinates
 import org.groundplatform.android.model.geometry.LineString
 import org.groundplatform.android.model.geometry.LinearRing
 import org.groundplatform.android.model.geometry.Polygon
@@ -62,6 +61,7 @@ import org.groundplatform.android.ui.util.isSelfIntersecting
 import org.groundplatform.android.usecases.user.GetUserSettingsUseCase
 import org.groundplatform.android.util.distanceTo
 import org.groundplatform.android.util.penult
+import org.groundplatform.domain.model.geometry.Coordinates
 import org.jetbrains.annotations.VisibleForTesting
 import timber.log.Timber
 

app/src/main/java/org/groundplatform/android/ui/datacollection/tasks/time/TimeTaskScreen.kt

@@ -34,7 +34,7 @@ import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
-import org.groundplatform.android.ui.theme.AppTheme
+import org.groundplatform.theme.AppTheme
 
 const val TIME_TEXT_TEST_TAG: String = "time task input test tag"
 

app/src/main/java/org/groundplatform/android/ui/home/DataSharingTermsDialog.kt

@@ -32,7 +32,7 @@ import org.groundplatform.android.R
 import org.groundplatform.android.proto.Survey
 import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
 import org.groundplatform.android.ui.components.HtmlText
-import org.groundplatform.android.ui.theme.AppTheme
+import org.groundplatform.theme.AppTheme
 import org.intellij.markdown.flavours.commonmark.CommonMarkFlavourDescriptor
 import org.intellij.markdown.html.HtmlGenerator
 import org.intellij.markdown.parser.MarkdownParser

app/src/main/java/org/groundplatform/android/ui/home/UserDetailsDialog.kt

@@ -25,7 +25,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import org.groundplatform.android.R
 import org.groundplatform.android.model.User
 import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
-import org.groundplatform.android.ui.theme.AppTheme
+import org.groundplatform.theme.AppTheme
 
 @Composable
 fun UserDetailsDialog(user: User, signOutCallback: () -> Unit, dismissCallback: () -> Unit) {

app/src/main/java/org/groundplatform/android/ui/home/mapcontainer/HomeScreenMapContainerScreen.kt

@@ -42,7 +42,7 @@ import org.groundplatform.android.ui.home.mapcontainer.jobs.AdHocDataCollectionB
 import org.groundplatform.android.ui.home.mapcontainer.jobs.JobMapComponent
 import org.groundplatform.android.ui.home.mapcontainer.jobs.JobMapComponentAction
 import org.groundplatform.android.ui.home.mapcontainer.jobs.JobMapComponentState
-import org.groundplatform.android.ui.theme.AppTheme
+import org.groundplatform.theme.AppTheme
 
 @Composable
 fun HomeScreenMapContainerScreen(