Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Now observing transmitters as LiveData from the database
Arty Bishopc4abf214f61f
diff --git a/app/src/main/java/com/rtbishop/look4sat/dagger/modules/PersistenceModule.kt b/app/src/main/java/com/rtbishop/look4sat/dagger/modules/PersistenceModule.ktindex fd4067a2..869538cc 100644--- a/app/src/main/java/com/rtbishop/look4sat/dagger/modules/PersistenceModule.kt+++ b/app/src/main/java/com/rtbishop/look4sat/dagger/modules/PersistenceModule.kt@@ -22,7 +22,7 @@ package com.rtbishop.look4sat.dagger.modulesimport android.content.Contextimport androidx.room.Roomimport com.rtbishop.look4sat.repo.local.EntriesDao-import com.rtbishop.look4sat.repo.local.SatDb+import com.rtbishop.look4sat.repo.local.SatelliteDbimport com.rtbishop.look4sat.repo.local.SourcesDaoimport com.rtbishop.look4sat.repo.local.TransmittersDaoimport dagger.Module@@ -34,26 +34,25 @@ class PersistenceModule {@Singleton@Provides- fun provideEntriesDao(db: SatDb): EntriesDao {+ fun provideEntriesDao(db: SatelliteDb): EntriesDao {return db.entriesDao()}@Singleton@Provides- fun provideTransDao(db: SatDb): TransmittersDao {+ fun provideTransDao(db: SatelliteDb): TransmittersDao {return db.transmittersDao()}@Singleton@Provides- fun providesSourcesDao(db: SatDb): SourcesDao {+ fun providesSourcesDao(db: SatelliteDb): SourcesDao {return db.sourcesDao()}@Singleton@Provides- fun provideSatDb(context: Context): SatDb {- return Room.databaseBuilder(context, SatDb::class.java, "satDb")- .build()+ fun provideSatDb(context: Context): SatelliteDb {+ return Room.databaseBuilder(context, SatelliteDb::class.java, "satDb").build()}}diff --git a/app/src/main/java/com/rtbishop/look4sat/repo/DefaultRepository.kt b/app/src/main/java/com/rtbishop/look4sat/repo/DefaultRepository.ktindex fb23d58d..35e7d554 100644--- a/app/src/main/java/com/rtbishop/look4sat/repo/DefaultRepository.kt+++ b/app/src/main/java/com/rtbishop/look4sat/repo/DefaultRepository.kt@@ -92,8 +92,8 @@ class DefaultRepository @Inject constructor(entriesDao.updateEntriesSelection(satIds)}- override suspend fun getTransmittersForSatId(satId: Int): List<SatTrans> {- return transmittersDao.getTransmittersForSatId(satId)+ override fun getTransmittersForSat(satId: Int): LiveData<List<SatTrans>> {+ return transmittersDao.getTransmittersForSat(satId)}override suspend fun updateTransmitters() {diff --git a/app/src/main/java/com/rtbishop/look4sat/repo/Repository.kt b/app/src/main/java/com/rtbishop/look4sat/repo/Repository.ktindex 49aee24b..745c6133 100644--- a/app/src/main/java/com/rtbishop/look4sat/repo/Repository.kt+++ b/app/src/main/java/com/rtbishop/look4sat/repo/Repository.kt@@ -26,5 +26,5 @@ interface Repository {suspend fun updateTransmitters()- suspend fun getTransmittersForSatId(satId: Int): List<SatTrans>+ fun getTransmittersForSat(satId: Int): LiveData<List<SatTrans>>}diff --git a/app/src/main/java/com/rtbishop/look4sat/repo/local/SatDb.kt b/app/src/main/java/com/rtbishop/look4sat/repo/local/SatelliteDb.ktsimilarity index 97%rename from app/src/main/java/com/rtbishop/look4sat/repo/local/SatDb.ktrename to app/src/main/java/com/rtbishop/look4sat/repo/local/SatelliteDb.ktindex 69f9bb1d..fc104a94 100644--- a/app/src/main/java/com/rtbishop/look4sat/repo/local/SatDb.kt+++ b/app/src/main/java/com/rtbishop/look4sat/repo/local/SatelliteDb.kt@@ -33,7 +33,7 @@ import com.rtbishop.look4sat.utility.ConvertersexportSchema = false)@TypeConverters(Converters::class)-abstract class SatDb : RoomDatabase() {+abstract class SatelliteDb : RoomDatabase() {abstract fun sourcesDao(): SourcesDaodiff --git a/app/src/main/java/com/rtbishop/look4sat/repo/local/TransmittersDao.kt b/app/src/main/java/com/rtbishop/look4sat/repo/local/TransmittersDao.ktindex 56d58680..0b4e69ce 100644--- a/app/src/main/java/com/rtbishop/look4sat/repo/local/TransmittersDao.kt+++ b/app/src/main/java/com/rtbishop/look4sat/repo/local/TransmittersDao.kt@@ -1,5 +1,6 @@package com.rtbishop.look4sat.repo.local+import androidx.lifecycle.LiveDataimport androidx.room.*import com.rtbishop.look4sat.data.SatTrans@@ -7,7 +8,7 @@ import com.rtbishop.look4sat.data.SatTransinterface TransmittersDao {@Query("SELECT * FROM transmitters WHERE isAlive = 1 and catNum = :satId")- suspend fun getTransmittersForSatId(satId: Int): List<SatTrans>+ fun getTransmittersForSat(satId: Int): LiveData<List<SatTrans>>@Transactionsuspend fun updateTransmitters(transmitters: List<SatTrans>) {diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.ktindex 5dec5e65..857b18bb 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt@@ -20,7 +20,10 @@package com.rtbishop.look4sat.uiimport android.net.Uri-import androidx.lifecycle.*+import androidx.lifecycle.LiveData+import androidx.lifecycle.MutableLiveData+import androidx.lifecycle.ViewModel+import androidx.lifecycle.viewModelScopeimport com.github.amsacode.predict4java.GroundStationPositionimport com.rtbishop.look4sat.data.Resultimport com.rtbishop.look4sat.data.SatEntry@@ -57,7 +60,7 @@ class SharedViewModel @Inject constructor(fun getSources() = repository.getSources()fun getEntries() = repository.getEntries()fun getPasses(): LiveData<Result<MutableList<SatPass>>> = _passes- fun getTransmittersForSat(id: Int) = liveData { emit(repository.getTransmittersForSatId(id)) }+ fun getTransmittersForSat(satId: Int) = repository.getTransmittersForSat(satId)fun updateEntriesFromFile(uri: Uri) {viewModelScope.launch {