ohs-foundation · MeshackKangi · Jul 2, 2026 · Jul 2, 2026 · Jul 6, 2026 · Jul 6, 2026
diff --git a/catalog/src/commonMain/kotlin/dev/ohs/fhir/catalog/ui/questionnaire/QuestionnaireScreen.kt b/catalog/src/commonMain/kotlin/dev/ohs/fhir/catalog/ui/questionnaire/QuestionnaireScreen.kt
@@ -48,13 +48,13 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import dev.ohs.fhir.catalog.ui.questionnaire.components.ErrorStateToggleAction
-import dev.ohs.fhir.catalog.views.barcode.BarcodeItemViewFactoryMatcher
-import dev.ohs.fhir.catalog.views.locationwidget.LocationCaptureItemViewFactoryMatcher
-import dev.ohs.fhir.catalog.views.locationwidget.LocationCoordinateItemViewFactoryMatcher
 import dev.ohs.fhir.datacapture.Questionnaire
 import dev.ohs.fhir.datacapture.QuestionnaireConfig
 import dev.ohs.fhir.datacapture.QuestionnaireItemViewFactoryMatcher
 import dev.ohs.fhir.datacapture.QuestionnaireItemViewFactoryMatchersProvider
+import dev.ohs.fhir.datacapture.views.barcode.BarcodeItemViewFactoryMatcher
+import dev.ohs.fhir.datacapture.views.locationwidget.LocationCaptureItemViewFactoryMatcher
+import dev.ohs.fhir.datacapture.views.locationwidget.LocationCoordinateItemViewFactoryMatcher
 import kotlin_fhir_data_capture.catalog.generated.resources.Res
 import kotlin_fhir_data_capture.catalog.generated.resources.arrow_back_filled_24dp
 import kotlin_fhir_data_capture.catalog.generated.resources.behavior_name_calculated_expression

diff --git a/datacapture/build.gradle.kts b/datacapture/build.gradle.kts
@@ -89,6 +89,7 @@ kotlin {
         implementation(libs.navigation.compose)
         implementation(libs.ohs.fhir.model)
         implementation(libs.ohs.fhir.path)
+        implementation(libs.compass.geolocation)
       }
     }
 
@@ -137,6 +138,26 @@ kotlin {
         implementation(libs.kotlinx.coroutines.swing)
       }
     }
+    androidMain {
+      dependencies {
+        implementation(libs.compass.geolocation.mobile)
+        implementation(libs.compass.permissions.mobile)
+        implementation(libs.moko.permissions.camera)
+        implementation(libs.moko.permissions.compose)
+        implementation(libs.kscan)
+      }
+    }
+
+    iosMain {
+      dependencies {
+        implementation(libs.compass.geolocation.mobile)
+        implementation(libs.compass.permissions.mobile)
+        implementation(libs.moko.permissions.camera)
+        implementation(libs.moko.permissions.compose)
+      }
+    }
+
+    wasmJsMain { dependencies { implementation(libs.compass.geolocation.browser) } }
   }
 }
 

diff --git a/...iews/locationwidget/Geolocator.android.kt → ...iews/locationwidget/Geolocator.android.kt b/...iews/locationwidget/Geolocator.android.kt → ...iews/locationwidget/Geolocator.android.kt
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dev.ohs.fhir.catalog.views.locationwidget
+package dev.ohs.fhir.datacapture.views.locationwidget
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import dev.jordond.compass.geolocation.Geolocator
 import dev.jordond.compass.geolocation.mobile
 
-@Composable internal actual fun rememberGeolocator(): Geolocator = remember { Geolocator.mobile() }
+@Composable actual fun rememberGeolocator(): Geolocator = remember { Geolocator.mobile() }
diff --git a/datacapture/src/commonMain/composeResources/drawable/gm_location_on_24.xml b/datacapture/src/commonMain/composeResources/drawable/gm_location_on_24.xml
@@ -0,0 +1,13 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal"
+>
+  <path
+        android:fillColor="#FFFF"
+        android:pathData="M480,480q33,0 56.5,-23.5T560,400q0,-33 -23.5,-56.5T480,320q-33,0 -56.5,23.5T400,400q0,33 23.5,56.5T480,480ZM480,774q122,-112 181,-203.5T720,408q0,-109 -69.5,-178.5T480,160q-101,0 -170.5,69.5T240,408q0,71 59,162.5T480,774ZM480,880Q319,743 239.5,625.5T160,408q0,-150 96.5,-239T480,80q127,0 223.5,89T800,408q0,100 -79.5,217.5T480,880ZM480,400Z"
+    />
+</vector>
diff --git a/datacapture/src/commonMain/composeResources/drawable/ic_location_on.xml b/datacapture/src/commonMain/composeResources/drawable/ic_location_on.xml
@@ -0,0 +1,12 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+>
+    <path
+        android:fillColor="#1A73E8"
+        android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"
+    />
+</vector>
diff --git a/datacapture/src/commonMain/composeResources/values/strings.xml b/datacapture/src/commonMain/composeResources/values/strings.xml
@@ -157,4 +157,5 @@
     <string name="space_asterisk">\u0020\u002a</string>
     <string name="repeated_group_title">%1$s. %2$s</string>
     <string name="add_repeated_group_item">Add %1$s</string>
+    <string name="record_gps_location">Record GPS Location</string>
 </resources>
diff --git a/...atalog/views/locationwidget/Geolocator.kt → ...apture/views/locationwidget/Geolocator.kt b/...atalog/views/locationwidget/Geolocator.kt → ...apture/views/locationwidget/Geolocator.kt
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dev.ohs.fhir.catalog.views.locationwidget
+package dev.ohs.fhir.datacapture.views.locationwidget
 
 import androidx.compose.runtime.Composable
 import dev.jordond.compass.geolocation.Geolocator
 
-@Composable internal expect fun rememberGeolocator(): Geolocator
+@Composable expect fun rememberGeolocator(): Geolocator
diff --git a/...nwidget/LocationCaptureItemViewFactory.kt → ...nwidget/LocationCaptureItemViewFactory.kt b/...nwidget/LocationCaptureItemViewFactory.kt → ...nwidget/LocationCaptureItemViewFactory.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dev.ohs.fhir.catalog.views.locationwidget
+package dev.ohs.fhir.datacapture.views.locationwidget
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -45,9 +45,9 @@ import dev.ohs.fhir.datacapture.views.QuestionnaireViewItem
 import dev.ohs.fhir.datacapture.views.components.Header
 import dev.ohs.fhir.datacapture.views.components.MediaItem
 import dev.ohs.fhir.datacapture.views.factories.QuestionnaireItemViewFactory
-import kotlin_fhir_data_capture.catalog.generated.resources.Res
-import kotlin_fhir_data_capture.catalog.generated.resources.gm_location_on_24
-import kotlin_fhir_data_capture.catalog.generated.resources.record_gps_location
+import kotlin_fhir_data_capture.datacapture.generated.resources.Res
+import kotlin_fhir_data_capture.datacapture.generated.resources.gm_location_on_24
+import kotlin_fhir_data_capture.datacapture.generated.resources.record_gps_location
 import kotlinx.coroutines.launch
 import org.jetbrains.compose.resources.painterResource
 import org.jetbrains.compose.resources.stringResource

diff --git a/...dget/LocationCoordinateItemViewFactory.kt → ...dget/LocationCoordinateItemViewFactory.kt b/...dget/LocationCoordinateItemViewFactory.kt → ...dget/LocationCoordinateItemViewFactory.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dev.ohs.fhir.catalog.views.locationwidget
+package dev.ohs.fhir.datacapture.views.locationwidget
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -38,8 +38,8 @@ import dev.ohs.fhir.datacapture.views.factories.QuestionnaireItemViewFactory
 import dev.ohs.fhir.model.r4.Decimal
 import dev.ohs.fhir.model.r4.Questionnaire
 import dev.ohs.fhir.model.r4.QuestionnaireResponse
-import kotlin_fhir_data_capture.catalog.generated.resources.Res
-import kotlin_fhir_data_capture.catalog.generated.resources.required_text_and_new_line
+import kotlin_fhir_data_capture.datacapture.generated.resources.Res
+import kotlin_fhir_data_capture.datacapture.generated.resources.required_text_and_new_line
 import org.jetbrains.compose.resources.stringResource
 
 internal const val PRIMARY_GPS_COORDINATE_EXTENSION_URL =

diff --git a/.../views/locationwidget/LocationEventBus.kt → .../views/locationwidget/LocationEventBus.kt b/.../views/locationwidget/LocationEventBus.kt → .../views/locationwidget/LocationEventBus.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dev.ohs.fhir.catalog.views.locationwidget
+package dev.ohs.fhir.datacapture.views.locationwidget
 
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow

diff --git a/...og/views/locationwidget/Geolocator.ios.kt → ...re/views/locationwidget/Geolocator.ios.kt b/...og/views/locationwidget/Geolocator.ios.kt → ...re/views/locationwidget/Geolocator.ios.kt
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dev.ohs.fhir.catalog.views.locationwidget
+package dev.ohs.fhir.datacapture.views.locationwidget
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import dev.jordond.compass.geolocation.Geolocator
 import dev.jordond.compass.geolocation.mobile
 
-@Composable internal actual fun rememberGeolocator(): Geolocator = remember { Geolocator.mobile() }
+@Composable actual fun rememberGeolocator(): Geolocator = remember { Geolocator.mobile() }
diff --git a/...iews/locationwidget/Geolocator.desktop.kt → ...iews/locationwidget/Geolocator.desktop.kt b/...iews/locationwidget/Geolocator.desktop.kt → ...iews/locationwidget/Geolocator.desktop.kt
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dev.ohs.fhir.catalog.views.locationwidget
+package dev.ohs.fhir.datacapture.views.locationwidget
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import dev.jordond.compass.geolocation.Geolocator
 import dev.jordond.compass.geolocation.NotSupportedLocator
 
 @Composable
-internal actual fun rememberGeolocator(): Geolocator = remember { Geolocator(NotSupportedLocator) }
+actual fun rememberGeolocator(): Geolocator = remember { Geolocator(NotSupportedLocator) }
diff --git a/...views/locationwidget/Geolocator.wasmJs.kt → ...views/locationwidget/Geolocator.wasmJs.kt b/...views/locationwidget/Geolocator.wasmJs.kt → ...views/locationwidget/Geolocator.wasmJs.kt
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dev.ohs.fhir.catalog.views.locationwidget
+package dev.ohs.fhir.datacapture.views.locationwidget
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import dev.jordond.compass.geolocation.Geolocator
 import dev.jordond.compass.geolocation.browser
 
-@Composable internal actual fun rememberGeolocator(): Geolocator = remember { Geolocator.browser() }
+@Composable actual fun rememberGeolocator(): Geolocator = remember { Geolocator.browser() }
diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
-#Gradle
-org.gradle.jvmargs=-Xmx16g -XX:MaxMetaspaceSize=8g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx6g -XX:MaxMetaspaceSize=512m
+org.gradle.workers.max=2
+org.gradle.parallel=true
 org.gradle.caching=true
-org.gradle.configuration-cache=true
 
 #Kotlin
 kotlin.code.style=official
@@ -23,3 +23,5 @@ androidNamespace=dev.ohs.fhir.datacapture
 #Kotest
 io.kotest.multiplatform.compiler.plugin.enabled=false
 kotest.compiler.plugin.enabled=false
+org.gradle.jvmargs=-Xmx4g
+org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1024m