Various tweaks and minor refactoring, fixed issue #84

app/schemas/com.rtbishop.look4sat.framework.data.LocalDatabase/2.json

@@ -0,0 +1,204 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 2,
+    "identityHash": "f43ab966fb7b0508057c359530582ff5",
+    "entities": [
+      {
+        "tableName": "entries",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`comment` TEXT, `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, PRIMARY KEY(`catnum`))",
+        "fields": [
+          {
+            "fieldPath": "comment",
+            "columnName": "comment",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "data.name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data.epoch",
+            "columnName": "epoch",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data.meanmo",
+            "columnName": "meanmo",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data.eccn",
+            "columnName": "eccn",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data.incl",
+            "columnName": "incl",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data.raan",
+            "columnName": "raan",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data.argper",
+            "columnName": "argper",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data.meanan",
+            "columnName": "meanan",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data.catnum",
+            "columnName": "catnum",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data.bstar",
+            "columnName": "bstar",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data.xincl",
+            "columnName": "xincl",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data.xnodeo",
+            "columnName": "xnodeo",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data.omegao",
+            "columnName": "omegao",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data.xmo",
+            "columnName": "xmo",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data.xno",
+            "columnName": "xno",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data.orbitalPeriod",
+            "columnName": "orbitalPeriod",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data.isDeepSpace",
+            "columnName": "isDeepSpace",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "catnum"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "radios",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uuid` TEXT NOT NULL, `info` TEXT NOT NULL, `isAlive` INTEGER NOT NULL, `downlink` INTEGER, `uplink` INTEGER, `mode` TEXT, `isInverted` INTEGER NOT NULL, `catnum` INTEGER, `comment` TEXT, PRIMARY KEY(`uuid`))",
+        "fields": [
+          {
+            "fieldPath": "uuid",
+            "columnName": "uuid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "info",
+            "columnName": "info",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAlive",
+            "columnName": "isAlive",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "downlink",
+            "columnName": "downlink",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "uplink",
+            "columnName": "uplink",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "mode",
+            "columnName": "mode",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isInverted",
+            "columnName": "isInverted",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "catnum",
+            "columnName": "catnum",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "comment",
+            "columnName": "comment",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "uuid"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'f43ab966fb7b0508057c359530582ff5')"
+    ]
+  }
+}

app/src/main/java/com/rtbishop/look4sat/framework/data/LocalDatabase.kt

@@ -19,15 +19,26 @@ package com.rtbishop.look4sat.framework.data
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
 import com.rtbishop.look4sat.framework.data.dao.EntriesDao
 import com.rtbishop.look4sat.framework.data.dao.RadiosDao
 import com.rtbishop.look4sat.framework.model.SatEntry
 import com.rtbishop.look4sat.framework.model.SatRadio
 
-@Database(entities = [SatEntry::class, SatRadio::class], version = 1, exportSchema = true)
+@Database(entities = [SatEntry::class, SatRadio::class], version = 2, exportSchema = true)
 abstract class LocalDatabase : RoomDatabase() {
 
     abstract fun entriesDao(): EntriesDao
 
     abstract fun radiosDao(): RadiosDao
 }
+
+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")
+    }
+}

app/src/main/java/com/rtbishop/look4sat/framework/data/LocalEntrySource.kt

@@ -37,7 +37,7 @@ class LocalEntrySource(private val entriesDao: EntriesDao) : ILocalEntrySource {
         val selectedSatellites = mutableListOf<Satellite>()
         ids.chunked(999).forEach { idsPart ->
             val entries = entriesDao.getEntriesWithIds(idsPart)
-            selectedSatellites.addAll(entries.map { entry -> entry.data.createSat() })
+            selectedSatellites.addAll(entries.map { entry -> entry.data.getSatellite() })
         }
         return selectedSatellites
     }

app/src/main/java/com/rtbishop/look4sat/injection/BaseModule.kt

@@ -48,7 +48,7 @@ object BaseModule {
     @Singleton
     fun provideDataRepository(@ApplicationContext context: Context): IDataRepository {
         val db = Room.databaseBuilder(context, LocalDatabase::class.java, "Look4SatDb")
-            .fallbackToDestructiveMigration().build()
+            .addMigrations(MIGRATION_1_2).fallbackToDestructiveMigration().build()
         val parser = DataParser(Dispatchers.Default)
         val fileSource = FileDataSource(context.contentResolver, Dispatchers.IO)
         val entries = LocalEntrySource(db.entriesDao())

app/src/main/java/com/rtbishop/look4sat/presentation/MainActivity.kt

@@ -22,6 +22,8 @@ import android.content.Context
 import android.content.pm.ActivityInfo
 import android.content.res.Configuration
 import android.os.Bundle
+import android.os.SystemClock
+import android.view.View
 import androidx.annotation.IdRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
@@ -68,3 +70,15 @@ fun <T> Fragment.getNavResult(@IdRes id: Int, key: String, onResult: (result: T)
 fun <T> Fragment.setNavResult(key: String, value: T) {
     findNavController().previousBackStackEntry?.savedStateHandle?.set(key, value)
 }
+
+fun View.clickWithDebounce(debounceTime: Long = 875L, action: () -> Unit) {
+    this.setOnClickListener(object : View.OnClickListener {
+        private var lastClickTime: Long = 0
+
+        override fun onClick(v: View) {
+            if (SystemClock.elapsedRealtime() - lastClickTime < debounceTime) return
+            else action()
+            lastClickTime = SystemClock.elapsedRealtime()
+        }
+    })
+}

app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesFragment.kt

@@ -31,6 +31,7 @@ import com.rtbishop.look4sat.R
 import com.rtbishop.look4sat.databinding.FragmentEntriesBinding
 import com.rtbishop.look4sat.domain.model.DataState
 import com.rtbishop.look4sat.domain.model.SatItem
+import com.rtbishop.look4sat.presentation.clickWithDebounce
 import com.rtbishop.look4sat.presentation.getNavResult
 import com.rtbishop.look4sat.presentation.setNavResult
 import dagger.hilt.android.AndroidEntryPoint
@@ -58,21 +59,21 @@ class EntriesFragment : Fragment(R.layout.fragment_entries) {
                     }
                 })
             }
-            entriesBtnBack.setOnClickListener { findNavController().navigateUp() }
+            entriesBtnBack.clickWithDebounce { findNavController().navigateUp() }
             entriesSearch.doOnTextChanged { text, _, _, _ -> viewModel.setQuery(text.toString()) }
-            entriesBtnModes.setOnClickListener {
+            entriesBtnModes.clickWithDebounce {
                 val direction = EntriesFragmentDirections.entriesToModes()
                 findNavController().navigate(direction)
             }
-            entriesBtnSelect.setOnClickListener { viewModel.selectCurrentItems(true) }
-            entriesBtnClear.setOnClickListener { viewModel.selectCurrentItems(false) }
-            entriesFab.setOnClickListener {
-                setNavResult("selection", viewModel.saveSelection())
-                findNavController().popBackStack()
-            }
+            entriesBtnSelect.clickWithDebounce { viewModel.selectCurrentItems(true) }
+            entriesBtnClear.clickWithDebounce { viewModel.selectCurrentItems(false) }
         }
         viewModel.satData.observe(viewLifecycleOwner) { satData ->
             handleSatData(satData, entriesAdapter)
+            binding.entriesFab.clickWithDebounce {
+                setNavResult("selection", viewModel.saveSelection())
+                findNavController().popBackStack()
+            }
         }
         getNavResult<List<String>>(R.id.nav_entries, "modes") { modes ->
             viewModel.saveSelectedModes(modes)

app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapData.kt

@@ -18,10 +18,8 @@
 package com.rtbishop.look4sat.presentation.mapScreen
 
 import com.rtbishop.look4sat.domain.predict.GeoPos
-import com.rtbishop.look4sat.domain.predict.Satellite
 
 data class MapData(
-    val pass: Satellite,
     val catNum: Int,
     val name: String,
     val aosTime: String,
@@ -32,6 +30,7 @@ data class MapData(
     val velocity: Double,
     val qthLoc: String,
     val osmPos: GeoPos,
+    val period: Double,
     val phase: Double,
     val eclipsed: Boolean
 )

app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapFragment.kt

@@ -33,6 +33,7 @@ import com.rtbishop.look4sat.databinding.FragmentMapBinding
 import com.rtbishop.look4sat.domain.predict.GeoPos
 import com.rtbishop.look4sat.domain.predict.SatPos
 import com.rtbishop.look4sat.domain.predict.Satellite
+import com.rtbishop.look4sat.presentation.clickWithDebounce
 import dagger.hilt.android.AndroidEntryPoint
 import org.osmdroid.config.Configuration
 import org.osmdroid.tileprovider.tilesource.TileSourceFactory
@@ -98,7 +99,7 @@ class MapFragment : Fragment(R.layout.fragment_map) {
                 // add overlays: 0 - GSP, 1 - SatTrack, 2 - SatFootprint, 3 - SatIcons
                 overlays.addAll(Array(4) { FolderOverlay() })
             }
-            mapBtnBack.setOnClickListener { findNavController().navigateUp() }
+            mapBtnBack.clickWithDebounce { findNavController().navigateUp() }
             mapBtnPrev.setOnClickListener { viewModel.scrollSelection(true) }
             mapBtnNext.setOnClickListener { viewModel.scrollSelection(false) }
         }
@@ -199,24 +200,22 @@ class MapFragment : Fragment(R.layout.fragment_map) {
     private fun handleMapData(mapData: MapData) {
         binding.apply {
             mapTimer.text = mapData.aosTime
+            mapDataPeriod.text = String.format(getString(R.string.map_period, mapData.period))
+            mapDataPhase.text = String.format(getString(R.string.map_phase), mapData.phase)
             mapAzimuth.text = String.format(getString(R.string.map_azimuth), mapData.azimuth)
             mapElevation.text = String.format(getString(R.string.map_elevation), mapData.elevation)
-            mapDataId.text = String.format(getString(R.string.map_sat_id), mapData.catNum)
-            mapDataQth.text = String.format(getString(R.string.map_qth), mapData.qthLoc)
             mapDataAlt.text = String.format(getString(R.string.map_altitude), mapData.altitude)
             mapDataDst.text = String.format(getString(R.string.map_distance), mapData.range)
-            mapDataVel.text = String.format(getString(R.string.map_velocity), mapData.velocity)
             mapDataLat.text =
                 String.format(getString(R.string.map_latitude), mapData.osmPos.lat)
             mapDataLon.text =
                 String.format(getString(R.string.map_longitude), mapData.osmPos.lon)
-            mapDataPhase.text = String.format(getString(R.string.map_phase), mapData.phase)
+            mapDataQth.text = String.format(getString(R.string.map_qth), mapData.qthLoc)
+            mapDataVel.text = String.format(getString(R.string.map_velocity), mapData.velocity)
             if (mapData.eclipsed) {
-                val eclipsed = getString(R.string.map_eclipsed)
-                mapDataVisibility.text = String.format(getString(R.string.map_visibility), eclipsed)
+                mapDataVisibility.text = getString(R.string.map_eclipsed)
             } else {
-                val visible = getString(R.string.map_visible)
-                mapDataVisibility.text = String.format(getString(R.string.map_visibility), visible)
+                mapDataVisibility.text = getString(R.string.map_visible)
             }
         }
         binding.mapView.invalidate()