Use libgeomag-jni

.github/workflows/android.yml

@@ -43,27 +43,6 @@ jobs:
           java-version: '17'
           architecture: x64
 
-      - name: Set up Golang
-        uses: actions/setup-go@v4
-        with:
-          go-version-file: ${{ github.workspace }}/app/src/main/golang/go.mod
-          cache-dependency-path: ${{ github.workspace }}/app/src/main/golang/go.sum
-
-      - name: Set up NDK
-        uses: nttld/setup-ndk@v1
-        with:
-          ndk-version: r26
-          add-to-path: false
-          local-cache: true
-
-      - name: Build Golang library
-        run: |
-          go install golang.org/x/mobile/cmd/gomobile@latest
-          gomobile init
-          go generate app/src/main/golang/Geomag.go
-        env:
-          ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
-
       - name: Set up Gradle
         uses: gradle/gradle-build-action@v2
         with:

app/build.gradle.kts

@@ -81,6 +81,12 @@ android {
         }
     }
 
+    sourceSets {
+        getByName("main") {
+            jniLibs.srcDir("src/main/libs")
+        }
+    }
+
     splits {
         abi {
             reset()

app/proguard-rules.pro

@@ -11,4 +11,10 @@
    <fields>;
 }
 
+# Keep Native library
+-keep class dev.sanmer.geomag.MagneticField { *; }
+-keepclassmembers class dev.sanmer.geomag.Geomag {
+    native <methods>;
+}
+
 -repackageclasses com.sanmer.geomag

app/src/main/kotlin/com/sanmer/geomag/GeomagExt.kt

@@ -2,98 +2,29 @@ package com.sanmer.geomag
 
 import com.sanmer.geomag.model.MagneticFieldExt
 import com.sanmer.geomag.model.Position
-import com.sanmer.geomag.model.Record
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import kotlinx.datetime.LocalDateTime
+import dev.sanmer.geomag.Geomag
 
-@Suppress(
-    "MemberVisibilityCanBePrivate",
-    "SpellCheckingInspection"
-)
 object GeomagExt {
-    private fun toDecimalYears(
-        year: Int, month: Int, day: Int,
-        hour: Int, min: Int,
-        sec: Int, nsec: Int,
-    )  = Geomag.toDecimalYears(
-        year.toLong(),
-        month.toLong(),
-        day.toLong(),
-        hour.toLong(),
-        min.toLong(),
-        sec.toLong(),
-        nsec.toLong()
-    )
-
-    private fun igrf(
-        latitude: Double,
-        longitude: Double,
-        altKm: Double,
+    fun igrf(
+        position: Position,
         decimalYears: Double
     ) = Geomag.igrf(
-        latitude,
-        longitude,
-        altKm,
-        decimalYears
-    )
-
-    private fun wmm(
-        latitude: Double,
-        longitude: Double,
-        altKm: Double,
-        decimalYears: Double
-    ) = Geomag.wmm(
-        latitude,
-        longitude,
-        altKm,
-        decimalYears
-    )
-
-    fun toDecimalYears(dateTime: LocalDateTime) = toDecimalYears(
-        dateTime.year, dateTime.monthNumber, dateTime.dayOfMonth,
-        dateTime.hour, dateTime.minute,
-        dateTime.second, dateTime.nanosecond
-    )
-
-    fun igrf(
-        dataTime: LocalDateTime,
-        position: Position
-    ) = igrf(
         latitude = position.latitude,
         longitude = position.longitude,
-        altKm = position.altitude,
-        decimalYears = toDecimalYears(dataTime)
+        altitude = position.altitude,
+        decimalYears = decimalYears
     ).let { MagneticFieldExt(it) }
 
     fun wmm(
-        dataTime: LocalDateTime,
-        position: Position
-    ) = wmm(
+        position: Position,
+        decimalYears: Double
+    ) = Geomag.wmm(
         latitude = position.latitude,
         longitude = position.longitude,
-        altKm = position.altitude,
-        decimalYears = toDecimalYears(dataTime)
+        altitude = position.altitude,
+        decimalYears = decimalYears
     ).let { MagneticFieldExt(it) }
 
-    suspend fun run(
-        model: Models,
-        dataTime: LocalDateTime,
-        position: Position
-    ): Record = withContext(Dispatchers.Default) {
-        val cal: (LocalDateTime, Position) -> MagneticFieldExt = when (model) {
-            Models.IGRF -> ::igrf
-            Models.WMM -> ::wmm
-        }
-
-        return@withContext Record(
-            model = model,
-            time = dataTime,
-            position = position,
-            values = cal(dataTime, position)
-        )
-    }
-
     enum class Models {
         IGRF,
         WMM

app/src/main/kotlin/com/sanmer/geomag/model/MagneticFieldExt.kt

@@ -1,6 +1,6 @@
 package com.sanmer.geomag.model
 
-import com.sanmer.geomag.MagneticField
+import dev.sanmer.geomag.MagneticField
 
 data class MagneticFieldExt(
     val declination: Double,
@@ -19,20 +19,20 @@ data class MagneticFieldExt(
     val totalSV: Double
 ) {
     constructor(field: MagneticField) : this(
-        declination = field.declination,
-        declinationSV = field.declinationSV.orZero(),
-        inclination = field.inclination,
-        inclinationSV = field.inclinationSV.orZero(),
-        horizontalIntensity = field.horizontalIntensity,
-        horizontalSV = field.horizontalSV.orZero(),
-        northComponent = field.northComponent,
-        northSV = field.northSV.orZero(),
-        eastComponent = field.eastComponent,
-        eastSV = field.eastSV.orZero(),
-        verticalComponent = field.verticalComponent,
-        verticalSV = field.verticalSV.orZero(),
-        totalIntensity = field.totalIntensity,
-        totalSV = field.totalSV.orZero()
+        declination = field.d,
+        declinationSV = field.dDot,
+        inclination = field.i,
+        inclinationSV = field.iDot,
+        horizontalIntensity = field.h,
+        horizontalSV = field.hDot,
+        northComponent = field.x,
+        northSV = field.xDot,
+        eastComponent = field.y,
+        eastSV = field.yDot,
+        verticalComponent = field.z,
+        verticalSV = field.zDot,
+        totalIntensity = field.f,
+        totalSV = field.fDot
     )
 
     companion object {
@@ -46,6 +46,4 @@ data class MagneticFieldExt(
             0.0, 0.0
         )
     }
-}
-
-private fun Double.orZero() = if (isNaN()) 0.0 else this
+}

app/src/main/kotlin/com/sanmer/geomag/ui/screens/records/view/items/RecordInfoItem.kt

@@ -12,9 +12,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.sanmer.geomag.GeomagExt
 import com.sanmer.geomag.R
 import com.sanmer.geomag.model.Record
+import dev.sanmer.geomag.Geomag
 
 @Composable
 fun RecordInfoItem(
@@ -57,7 +57,7 @@ fun RecordInfoItem(
 
         ValueItem(
             key = stringResource(id = R.string.overview_decimal),
-            value = GeomagExt.toDecimalYears(record.time).toString()
+            value = Geomag.toDecimalYears(record.time).toString()
         )
     }
 }