Added more frequency data fields to Radio class

data/build.gradle.kts

@@ -20,7 +20,7 @@ android {
 dependencies {
     implementation(project(":domain"))
 
-    implementation("androidx.core:core-ktx:1.10.1")
+    implementation("androidx.core:core-ktx:1.12.0")
     implementation("androidx.room:room-runtime:2.5.2")
     implementation("androidx.room:room-ktx:2.5.2")
     ksp("androidx.room:room-compiler:2.5.2")

data/src/main/java/com/rtbishop/look4sat/data/database/MainDatabase.kt

@@ -19,23 +19,20 @@ package com.rtbishop.look4sat.data.database
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
 import com.rtbishop.look4sat.data.database.dao.StorageDao
 import com.rtbishop.look4sat.data.database.entity.SatEntry
 import com.rtbishop.look4sat.data.database.entity.SatRadio
 
-@Database(entities = [SatEntry::class, SatRadio::class], version = 2, exportSchema = false)
+@Database(entities = [SatEntry::class, SatRadio::class], version = 1, exportSchema = false)
 abstract class MainDatabase : RoomDatabase() {
-
     abstract fun storageDao(): StorageDao
 }
 
-val MIGRATION_1_2 = object : Migration(1, 2) {
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("CREATE TABLE entries_backup (name TEXT NOT NULL, epoch REAL NOT NULL, meanmo REAL NOT NULL, eccn REAL NOT NULL, incl REAL NOT NULL, raan REAL NOT NULL, argper REAL NOT NULL, meanan REAL NOT NULL, catnum INTEGER NOT NULL, bstar REAL NOT NULL, xincl REAL NOT NULL, xnodeo REAL NOT NULL, omegao REAL NOT NULL, xmo REAL NOT NULL, xno REAL NOT NULL, orbitalPeriod REAL NOT NULL, isDeepSpace INTEGER NOT NULL, comment TEXT, PRIMARY KEY(catnum))")
-        database.execSQL("INSERT INTO entries_backup (name, epoch, meanmo, eccn, incl, raan, argper, meanan, catnum, bstar, xincl, xnodeo, omegao, xmo, xno, orbitalPeriod, isDeepSpace, comment) SELECT name, epoch, meanmo, eccn, incl, raan, argper, meanan, catnum, bstar, xincl, xnodeo, omegao, xmo, xno, 1440 / meanmo, 1440 / meanmo >= 225.0, comment FROM entries")
-        database.execSQL("DROP TABLE entries")
-        database.execSQL("ALTER TABLE entries_backup RENAME TO entries")
-    }
-}
+//val MIGRATION_1_2 = object : Migration(1, 2) {
+//    override fun migrate(database: SupportSQLiteDatabase) {
+//        database.execSQL("CREATE TABLE entries_backup (name TEXT NOT NULL, epoch REAL NOT NULL, meanmo REAL NOT NULL, eccn REAL NOT NULL, incl REAL NOT NULL, raan REAL NOT NULL, argper REAL NOT NULL, meanan REAL NOT NULL, catnum INTEGER NOT NULL, bstar REAL NOT NULL, xincl REAL NOT NULL, xnodeo REAL NOT NULL, omegao REAL NOT NULL, xmo REAL NOT NULL, xno REAL NOT NULL, orbitalPeriod REAL NOT NULL, isDeepSpace INTEGER NOT NULL, comment TEXT, PRIMARY KEY(catnum))")
+//        database.execSQL("INSERT INTO entries_backup (name, epoch, meanmo, eccn, incl, raan, argper, meanan, catnum, bstar, xincl, xnodeo, omegao, xmo, xno, orbitalPeriod, isDeepSpace, comment) SELECT name, epoch, meanmo, eccn, incl, raan, argper, meanan, catnum, bstar, xincl, xnodeo, omegao, xmo, xno, 1440 / meanmo, 1440 / meanmo >= 225.0, comment FROM entries")
+//        database.execSQL("DROP TABLE entries")
+//        database.execSQL("ALTER TABLE entries_backup RENAME TO entries")
+//    }
+//}

data/src/main/java/com/rtbishop/look4sat/data/database/dao/StorageDao.kt

@@ -46,7 +46,7 @@ interface StorageDao {
     @Query("DELETE FROM entries")
     suspend fun deleteEntries()
 
-    @Query("SELECT catnum FROM radios WHERE mode IN (:modes)")
+    @Query("SELECT catnum FROM radios WHERE downlinkMode IN (:modes)")
     suspend fun getIdsWithModes(modes: List<String>): List<Int>
 
     @Query("SELECT COUNT(*) FROM radios")

data/src/main/java/com/rtbishop/look4sat/data/database/entity/SatItem.kt

@@ -17,14 +17,4 @@
  */
 package com.rtbishop.look4sat.data.database.entity
 
-data class SatItem(
-    val catnum: Int,
-    val name: String
-//    @Relation(
-//        parentColumn = "catnum",
-//        entity = SatRadio::class,
-//        entityColumn = "catnum",
-//        projection = ["mode"]
-//    )
-//    val modes: List<String>
-)
+data class SatItem(val catnum: Int, val name: String)

data/src/main/java/com/rtbishop/look4sat/data/database/entity/SatRadio.kt

@@ -25,9 +25,12 @@ data class SatRadio(
     @PrimaryKey val uuid: String,
     val info: String,
     val isAlive: Boolean,
-    var downlink: Long?,
-    var uplink: Long?,
-    val mode: String?,
+    var downlinkLow: Long?,
+    var downlinkHigh: Long?,
+    val downlinkMode: String?,
+    var uplinkLow: Long?,
+    var uplinkHigh: Long?,
+    val uplinkMode: String?,
     val isInverted: Boolean,
     val catnum: Int?,
     var comment: String? = null

data/src/main/java/com/rtbishop/look4sat/data/repository/SatelliteRepo.kt

@@ -76,8 +76,8 @@ class SatelliteRepo(
             val satPos = sat.getPosition(pos, time)
             val copiedList = radios.map { it.copy() }
             copiedList.forEach { transmitter ->
-                transmitter.downlink?.let { transmitter.downlink = satPos.getDownlinkFreq(it) }
-                transmitter.uplink?.let { transmitter.uplink = satPos.getUplinkFreq(it) }
+                transmitter.downlinkLow?.let { transmitter.downlinkLow = satPos.getDownlinkFreq(it) }
+                transmitter.uplinkLow?.let { transmitter.uplinkLow = satPos.getUplinkFreq(it) }
             }
             copiedList.map { it.copy() }
         }

data/src/main/java/com/rtbishop/look4sat/data/source/LocalSource.kt

@@ -80,13 +80,13 @@ class LocalSource(private val storageDao: StorageDao) : ILocalSource {
     override suspend fun deleteRadios() = storageDao.deleteRadios()
 
     private fun DomainRadio.toFramework() = FrameworkRadio(
-        this.uuid, this.info, this.isAlive, this.downlink, this.uplink,
-        this.mode, this.isInverted, this.catnum, this.comment
+        this.uuid, this.info, this.isAlive, this.downlinkLow, this.downlinkHigh, this.downlinkMode,
+        this.uplinkLow, this.uplinkHigh, this.uplinkMode, this.isInverted, this.catnum, this.comment
     )
 
     private fun FrameworkRadio.toDomain() = DomainRadio(
-        this.uuid, this.info, this.isAlive, this.downlink, this.uplink,
-        this.mode, this.isInverted, this.catnum, this.comment
+        this.uuid, this.info, this.isAlive, this.downlinkLow, this.downlinkHigh, this.downlinkMode,
+        this.uplinkLow, this.uplinkHigh, this.uplinkMode, this.isInverted, this.catnum, this.comment
     )
 
     private fun List<DomainRadio>.toFrameworkRadios() = this.map { radio -> radio.toFramework() }