feat: Add Dashboard screen

GPSTest/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'dagger.hilt.android.plugin'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     defaultConfig {
         minSdkVersion 24
@@ -134,8 +134,7 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
@@ -195,19 +194,24 @@ dependencies {
 
     // Integration with activities
     implementation 'androidx.activity:activity-compose:1.4.0'
-    implementation "androidx.compose.compiler:compiler:1.1.0-beta02"
+    implementation "androidx.compose.compiler:compiler:1.2.0-alpha06"
     // Compose Material Design
-    implementation 'androidx.compose.material:material:1.0.5'
+    implementation 'androidx.compose.material3:material3:1.0.0-alpha08'
+    implementation 'com.google.android.material:material:1.5.0'
     // Bridging XML themes to Compose
-    implementation "com.google.android.material:compose-theme-adapter:1.1.0"
+    implementation "com.google.android.material:compose-theme-adapter:1.1.6"
     // Animations
-    implementation 'androidx.compose.animation:animation:1.1.0-beta02'
+    implementation 'androidx.compose.animation:animation:1.1.0-beta03'
+    // For FlowRow
+    implementation 'com.google.accompanist:accompanist-flowlayout:0.23.1'
     // Tooling support (Previews, etc.)
     implementation 'androidx.compose.ui:ui-tooling:1.0.5'
     // Integration with ViewModels
     implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.4.0'
     //Integration with LiveData
-    implementation 'androidx.compose.runtime:runtime-livedata:1.1.0-beta02'
+    implementation 'androidx.compose.runtime:runtime-livedata:1.1.0-beta03'
+    // Preference datastore
+    implementation "androidx.datastore:datastore-preferences:1.0.0"
     // UI Tests
     androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.0.5'
 

GPSTest/src/androidTest/java/com/android/gpstest/SatelliteUtilsTest.kt

@@ -16,11 +16,17 @@
 package com.android.gpstest
 
 import android.location.GnssMeasurement.*
+import android.location.Location
 import android.os.Build
 import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import com.android.gpstest.model.GeoidAltitude
 import com.android.gpstest.model.GnssType
 import com.android.gpstest.model.SatelliteStatus
+import com.android.gpstest.model.SatelliteStatus.Companion.NO_DATA
 import com.android.gpstest.model.SbasType
+import com.android.gpstest.util.SatelliteUtil.altitudeComparedTo
+import com.android.gpstest.util.SatelliteUtil.isMissingData
+import com.android.gpstest.util.SatelliteUtil.isTimeApproxEqualTo
 import com.android.gpstest.util.SatelliteUtils
 import org.junit.Assert.*
 import org.junit.Test
@@ -226,4 +232,208 @@ class SatelliteUtilsTest {
         adrState = ADR_STATE_CYCLE_SLIP or ADR_STATE_HALF_CYCLE_REPORTED or ADR_STATE_RESET
         assertFalse(SatelliteUtils.isAccumulatedDeltaRangeStateValid(adrState))
     }
+
+    /**
+     * Test for comparing WGS84 altitude, height of the geoid above the WGS84 ellipsoid,
+     * and altitude above mean sea level.
+     *
+     * H = -N + h
+     *
+     * or
+     * N = h - H
+     *
+     * ..where:
+     * * H = geoidAltitude.altitudeMsl, or geoid altitude
+     * * N = geoidAltitude.heightOfGeoid above the WGS84 ellipsoid
+     * * h = Location.altitude], or the location WGS84 altitude (height above the WGS84 ellipsoid)
+     *
+     * See https://issuetracker.google.com/issues/191674805 for details.
+     */
+    @Test
+    fun testLocationAltitudeComparedToGeoidAltitude() {
+        val geoidAltitude = GeoidAltitude(altitudeMsl = 18.1, heightOfGeoid = -24.0)
+        val location = Location("test")
+        location.altitude = -5.9
+        assertTrue(location.altitudeComparedTo(geoidAltitude).isSame)
+
+        location.altitude = -5.91111
+        assertTrue(location.altitudeComparedTo(geoidAltitude).isSame)
+
+        location.altitude = -5.99999
+        assertFalse(location.altitudeComparedTo(geoidAltitude).isSame)
+
+        // Based on data from Samsung Galaxy S21+
+        val `geoidAltitude16-1` = GeoidAltitude(altitudeMsl = 16.1, heightOfGeoid = -24.0)
+        location.altitude = -7.88262939453125
+        assertTrue(location.altitudeComparedTo(`geoidAltitude16-1`).isSame)
+
+        val `geoidAltitude16-0` = GeoidAltitude(altitudeMsl = 16.0, heightOfGeoid = -24.0)
+        location.altitude = -7.979248046875
+        assertTrue(location.altitudeComparedTo(`geoidAltitude16-0`).isSame)
+
+        location.altitude = -7.99603271484375
+        assertTrue(location.altitudeComparedTo(`geoidAltitude16-0`).isSame)
+
+        location.altitude = -7.9793701171875
+        assertTrue(location.altitudeComparedTo(`geoidAltitude16-0`).isSame)
+
+        val `geoidAltitude15-7` = GeoidAltitude(altitudeMsl = 15.7, heightOfGeoid = -24.0)
+        location.altitude = -8.302093505859375
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-7`).isSame)
+
+        location.altitude = -8.3095703125
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-7`).isSame)
+
+        location.altitude = -8.311126708984375
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-7`).isSame)
+
+        location.altitude = -8.3275146484375
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-7`).isSame)
+
+        location.altitude = -8.252044677734375
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-7`).isSame)
+
+        location.altitude = -8.2552490234375
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-7`).isSame)
+
+        location.altitude = -8.277252197265625
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-7`).isSame)
+
+        location.altitude = -8.28192138671875
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-7`).isSame)
+
+        location.altitude = -8.284088134765625
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-7`).isSame)
+
+        location.altitude = -8.286651611328125
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-7`).isSame)
+
+        location.altitude = -8.30511474609375
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-7`).isSame)
+
+        location.altitude = -8.306427001953125
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-7`).isSame)
+
+        location.altitude = -8.346435546875
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-7`).isSame)
+
+        val `geoidAltitude15-8` = GeoidAltitude(altitudeMsl = 15.8, heightOfGeoid = -24.0)
+        location.altitude = -8.194122314453125
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-8`).isSame)
+
+        location.altitude = -8.181121826171875
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-8`).isSame)
+
+        location.altitude = -8.1817626953125
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-8`).isSame)
+
+        location.altitude = -8.185455322265625
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-8`).isSame)
+
+        location.altitude = -8.18609619140625
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-8`).isSame)
+
+        location.altitude = -8.2017822265625
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-8`).isSame)
+
+        location.altitude = -8.21240234375
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-8`).isSame)
+
+        location.altitude = -8.2166748046875
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-8`).isSame)
+
+        location.altitude = -8.237640380859375
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-8`).isSame)
+
+        location.altitude = -8.2392578125
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-8`).isSame)
+
+        location.altitude = -8.243896484375
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-8`).isSame)
+
+        location.altitude = -8.245269775390625
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-8`).isSame)
+
+        val `geoidAltitude15-6` = GeoidAltitude(altitudeMsl = 15.6, heightOfGeoid = -24.0)
+        location.altitude = -8.353424072265625
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-6`).isSame)
+
+        location.altitude = -8.37744140625
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-6`).isSame)
+
+        location.altitude = -8.37994384765625
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-6`).isSame)
+
+        location.altitude = -8.38427734375
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-6`).isSame)
+
+        val `geoidAltitude15-5` = GeoidAltitude(altitudeMsl = 15.5, heightOfGeoid = -24.0)
+        location.altitude = -8.51861572265625
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-5`).isSame)
+
+        location.altitude = -8.523681640625
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-5`).isSame)
+
+        location.altitude = -8.529998779296875
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-5`).isSame)
+
+        location.altitude = -8.53466796875
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-5`).isSame)
+
+        val `geoidAltitude15-4` = GeoidAltitude(altitudeMsl = 15.4, heightOfGeoid = -24.0)
+        location.altitude = -8.589202880859375
+        assertTrue(location.altitudeComparedTo(`geoidAltitude15-4`).isSame)
+    }
+
+    /**
+     * Tests if a location time is approximately equal to geoidAltitude time
+     */
+    @Test
+    fun testLocationIsTimeApproxEqualTo() {
+        val geoidAltitude = GeoidAltitude(1000, altitudeMsl = 18.1, heightOfGeoid = -24.0)
+        val location = Location("test")
+        location.time = 1000
+        assertTrue(location.isTimeApproxEqualTo(geoidAltitude))
+
+        location.time = 1899
+        assertTrue(location.isTimeApproxEqualTo(geoidAltitude))
+
+        location.time = 101
+        assertTrue(location.isTimeApproxEqualTo(geoidAltitude))
+
+        location.time = 1900
+        assertFalse(location.isTimeApproxEqualTo(geoidAltitude))
+
+        location.time = 100
+        assertFalse(location.isTimeApproxEqualTo(geoidAltitude))
+    }
+
+    @Test
+    fun testStatusMissingData() {
+        // GPS with missing data
+        val statusMissingDataNotUsed = SatelliteStatus(1,
+            GnssType.NAVSTAR,
+            30f,
+            false,
+            false,
+            false,
+            NO_DATA,
+            NO_DATA);
+        assertTrue(statusMissingDataNotUsed.isMissingData())
+
+        // FIXME - this is way too noisy for missing ephemeris data, so skip this check
+        // until we figure out how to handle this (separate check?)
+//        val statusMissingDataUsed = SatelliteStatus(1,
+//            GnssType.NAVSTAR,
+//            30f,
+//            false,
+//            true,
+//            true,
+//            NO_DATA,
+//            NO_DATA);
+//        assertTrue(statusMissingDataUsed.isMissingData())
+
+        // Good signal
+        assertFalse(gpsL1(1, true).isMissingData())
+    }
 }