Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Moved satellite selections storage to SharedPreferences
Arty Bishop92eec290b187
diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/SettingsHandler.kt b/app/src/main/java/com/rtbishop/look4sat/framework/SettingsHandler.ktindex f5b20e22..473966db 100644--- a/app/src/main/java/com/rtbishop/look4sat/framework/SettingsHandler.kt+++ b/app/src/main/java/com/rtbishop/look4sat/framework/SettingsHandler.kt@@ -44,6 +44,7 @@ class SettingsHandler @Inject constructor(private val prefs: SharedPreferences)const val keyLongitude = "stationLon"// const val keyPositionGPS = "setPositionGPS"// const val keyPositionQTH = "setPositionQTH"+ const val keySelection = "selection"}override fun loadStationPosition(): GeoPos {@@ -60,6 +61,16 @@ class SettingsHandler @Inject constructor(private val prefs: SharedPreferences)}}+ override fun saveSatelliteSelection(catnums: List<Int>) {+ val stringList = catnums.map { catnum -> catnum.toString() }+ prefs.edit { putStringSet(keySelection, stringList.toSet()) }+ }++ override fun loadSatelliteSelection(): List<Int> {+ val catnums = prefs.getStringSet(keySelection, emptySet())?.map { catnum -> catnum.toInt() }+ return catnums?.sorted() ?: emptyList()+ }+override fun getHoursAhead(): Int {return prefs.getInt(keyHoursAhead, 8)}diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/local/EntriesDao.kt b/app/src/main/java/com/rtbishop/look4sat/framework/local/EntriesDao.ktindex edbd4e84..d5cc9e62 100644--- a/app/src/main/java/com/rtbishop/look4sat/framework/local/EntriesDao.kt+++ b/app/src/main/java/com/rtbishop/look4sat/framework/local/EntriesDao.kt@@ -20,47 +20,28 @@ package com.rtbishop.look4sat.framework.localimport androidx.room.*import com.rtbishop.look4sat.framework.model.SatEntryimport com.rtbishop.look4sat.framework.model.SatItem-import kotlinx.coroutines.flow.Flow@Daointerface EntriesDao {@Transaction@Query("SELECT catnum, name, isSelected FROM entries ORDER BY name ASC")- fun getSatelliteItems(): Flow<List<SatItem>>-- @Query("SELECT catnum FROM entries WHERE isSelected = 1")- suspend fun getEntriesSelection(): List<Int>-- @Query("SELECT * FROM entries WHERE isSelected = 1")- suspend fun getSelectedSatellites(): List<SatEntry>-- @Insert(onConflict = OnConflictStrategy.REPLACE)- suspend fun insertEntries(entries: List<SatEntry>)+ suspend fun getAllSatellites(): List<SatItem>@Transaction- suspend fun updateEntries(entries: List<SatEntry>) {- val entriesSelection = getEntriesSelection()- insertEntries(entries)- restoreEntriesSelection(entriesSelection)+ suspend fun getSelectedSatellites(catnums: List<Int>): List<SatEntry> {+ val selectedSatellites = mutableListOf<SatEntry>()+ catnums.chunked(999).forEach { chunkedList ->+ selectedSatellites.addAll(getSelectedSatellitesChunked(chunkedList))+ }+ return selectedSatellites}- @Transaction- suspend fun restoreEntriesSelection(catnums: List<Int>) {- updateEntriesSelection(catnums)- }+ @Query("SELECT * FROM entries WHERE catnum IN (:catnums)")+ suspend fun getSelectedSatellitesChunked(catnums: List<Int>): List<SatEntry>- @Transaction- suspend fun updateEntriesSelection(catnums: List<Int>) {- clearEntriesSelection()- catnums.forEach { catnum -> updateEntrySelection(catnum) }- }-- @Query("UPDATE entries SET isSelected = 1 WHERE catnum = :catnum")- suspend fun updateEntrySelection(catnum: Int)-- @Query("UPDATE entries SET isSelected = 0")- suspend fun clearEntriesSelection()+ @Insert(onConflict = OnConflictStrategy.REPLACE)+ suspend fun insertEntries(entries: List<SatEntry>)@Query("DELETE FROM entries")suspend fun deleteEntries()diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/local/LocalSource.kt b/app/src/main/java/com/rtbishop/look4sat/framework/local/LocalSource.ktindex fd4415a8..404fddae 100644--- a/app/src/main/java/com/rtbishop/look4sat/framework/local/LocalSource.kt+++ b/app/src/main/java/com/rtbishop/look4sat/framework/local/LocalSource.kt@@ -29,8 +29,6 @@ import com.rtbishop.look4sat.framework.toDomainItemsimport com.rtbishop.look4sat.framework.toFrameworkimport com.rtbishop.look4sat.framework.toFrameworkEntriesimport kotlinx.coroutines.CoroutineDispatcher-import kotlinx.coroutines.flow.Flow-import kotlinx.coroutines.flow.mapimport kotlinx.coroutines.withContextimport java.io.InputStream@@ -41,36 +39,32 @@ class LocalSource(private val transmittersDao: TransmittersDao,) : ILocalSource {- override fun getSatelliteItems(): Flow<List<SatItem>> {- return entriesDao.getSatelliteItems().map { items -> items.toDomainItems() }+ override suspend fun getAllSatellites(): List<SatItem> {+ return entriesDao.getAllSatellites().toDomainItems()}- @Suppress("BlockingMethodInNonBlockingContext")- override suspend fun getFileStream(uri: String): InputStream? {- return withContext(ioDispatcher) { resolver.openInputStream(Uri.parse(uri)) }- }-- override suspend fun getSelectedSatellites(): List<Satellite> {- return entriesDao.getSelectedSatellites().map { entry -> entry.tle.createSat() }+ override suspend fun getSelectedSatellites(catnums: List<Int>): List<Satellite> {+ return entriesDao.getSelectedSatellites(catnums).map { entry -> entry.tle.createSat() }}override suspend fun getTransmitters(catnum: Int): List<Transmitter> {return transmittersDao.getTransmitters(catnum).toDomain()}- override suspend fun updateEntries(entries: List<SatEntry>) {- entriesDao.updateEntries(entries.toFrameworkEntries())+ @Suppress("BlockingMethodInNonBlockingContext")+ override suspend fun getFileStream(uri: String): InputStream? {+ return withContext(ioDispatcher) { resolver.openInputStream(Uri.parse(uri)) }}- override suspend fun updateEntriesSelection(catnums: List<Int>) {- entriesDao.updateEntriesSelection(catnums)+ override suspend fun updateEntries(entries: List<SatEntry>) {+ entriesDao.insertEntries(entries.toFrameworkEntries())}override suspend fun updateTransmitters(transmitters: List<Transmitter>) {transmittersDao.updateTransmitters(transmitters.toFramework())}- override suspend fun clearData() {+ override suspend fun clearAllData() {entriesDao.deleteEntries()transmittersDao.deleteTransmitters()}diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/model/SatItem.kt b/app/src/main/java/com/rtbishop/look4sat/framework/model/SatItem.ktindex cc183f14..c18289fc 100644--- a/app/src/main/java/com/rtbishop/look4sat/framework/model/SatItem.kt+++ b/app/src/main/java/com/rtbishop/look4sat/framework/model/SatItem.kt@@ -22,7 +22,7 @@ import androidx.room.Relationdata class SatItem(val catnum: Int,val name: String,- var isSelected: Boolean,+ var isSelected: Boolean = false,@Relation(parentColumn = "catnum",entity = Transmitter::class,diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesViewModel.ktindex 4b73e452..b9ec76cd 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesViewModel.kt@@ -34,9 +34,7 @@ class EntriesViewModel @Inject constructor(private val transModes = MutableLiveData(preferences.loadModesSelection())private val currentQuery = MutableLiveData(String())- private val itemsFromRepo = liveData {- repository.getSatelliteItems().collect { itemsAll -> emit(itemsAll) }- } as MutableLiveData+ private val itemsFromRepo = liveData { emit(repository.getAllSatellites()) } as MutableLiveDataprivate val itemsWithModes = transModes.switchMap { modes ->itemsFromRepo.map { items -> filterByModes(items, modes) }}@@ -69,8 +67,8 @@ class EntriesViewModel @Inject constructor(fun saveSelection() {itemsFromRepo.value?.let { itemsAll ->- val selectedIds = itemsAll.filter { it.isSelected }.map { it.catnum }- repository.updateSelection(selectedIds)+ val filteredItems = itemsAll.filter { item -> item.isSelected }+ repository.updatesSelection(filteredItems.map { item -> item.catnum })}}diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsViewModel.ktindex 7304a05c..5bf0a81b 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsViewModel.kt@@ -18,15 +18,15 @@ class SettingsViewModel @Inject constructor() : ViewModel() {fun updateDataFromFile(uri: String) {- repository.updateDataFromFile(uri)+ repository.updateFromFile(uri)}fun updateDataFromWeb(sources: List<String>) {- repository.updateDataFromWeb(sources)+ repository.updateFromWeb(sources)}fun clearData() {- repository.clearData()+ repository.clearAllData()}fun getUseUTC(): Boolean = settings.getUseUTC()@@ -53,9 +53,9 @@ class SettingsViewModel @Inject constructor(fun setRotatorPort(value: String) = settings.setRotatorPort(value)- fun getUpdateState() = repository.dataUpdateState+ fun getUpdateState() = repository.updateState- fun setUpdateHandled() = repository.setDataUpdateHandled()+ fun setUpdateHandled() = repository.setUpdateStateHandled()val stationPosition: SharedFlow<DataState<GeoPos>> = locationHandler.stationPositiondiff --git a/core/src/main/java/com/rtbishop/look4sat/data/DataRepository.kt b/core/src/main/java/com/rtbishop/look4sat/data/DataRepository.ktindex 2439a932..0d4c3342 100644--- a/core/src/main/java/com/rtbishop/look4sat/data/DataRepository.kt+++ b/core/src/main/java/com/rtbishop/look4sat/data/DataRepository.kt@@ -22,8 +22,8 @@ import com.rtbishop.look4sat.domain.IDataRepositoryimport com.rtbishop.look4sat.domain.model.DataStateimport com.rtbishop.look4sat.domain.model.SatEntryimport com.rtbishop.look4sat.domain.model.SatItem+import com.rtbishop.look4sat.domain.predict.Satelliteimport kotlinx.coroutines.*-import kotlinx.coroutines.flow.Flowimport kotlinx.coroutines.flow.MutableStateFlowimport kotlinx.coroutines.flow.StateFlowimport java.io.InputStream@@ -43,13 +43,23 @@ class DataRepository(_updateState.value = DataState.Error(exception.message)}private val _updateState = MutableStateFlow<DataState<Long>>(DataState.Handled)- override val dataUpdateState: StateFlow<DataState<Long>> = _updateState+ override val updateState: StateFlow<DataState<Long>> = _updateState- override fun setDataUpdateHandled() {- _updateState.value = DataState.Handled+ override suspend fun getAllSatellites(): List<SatItem> {+ val selection = settings.loadSatelliteSelection()+ val satellites = localSource.getAllSatellites()+ satellites.forEach { satItem -> satItem.isSelected = satItem.catnum in selection }+ return satellites+ }++ override suspend fun getSelectedSatellites(): List<Satellite> {+ val selection = settings.loadSatelliteSelection()+ return localSource.getSelectedSatellites(selection)}- override fun updateDataFromFile(uri: String) {+ override suspend fun getTransmitters(catnum: Int) = localSource.getTransmitters(catnum)++ override fun updateFromFile(uri: String) {repositoryScope.launch(exceptionHandler) {_updateState.value = DataState.Loadingval updateTimeMillis = measureTimeMillis {@@ -61,7 +71,7 @@ class DataRepository(}}- override fun updateDataFromWeb(sources: List<String>) {+ override fun updateFromWeb(sources: List<String>) {_updateState.value = DataState.LoadingrepositoryScope.launch(exceptionHandler) {settings.saveDataSources(sources)@@ -102,23 +112,21 @@ class DataRepository(}}- override fun clearData() {+ override fun updatesSelection(catnums: List<Int>) {repositoryScope.launch {- _updateState.value = DataState.Loading- localSource.clearData()- _updateState.value = DataState.Success(0L)+ settings.saveSatelliteSelection(catnums)}}- override fun getSatelliteItems(): Flow<List<SatItem>> = localSource.getSatelliteItems()-- override suspend fun getSelectedSatellites() = localSource.getSelectedSatellites()-- override suspend fun getTransmitters(catnum: Int) = localSource.getTransmitters(catnum)+ override fun setUpdateStateHandled() {+ _updateState.value = DataState.Handled+ }- override fun updateSelection(catnums: List<Int>) {+ override fun clearAllData() {repositoryScope.launch {- localSource.updateEntriesSelection(catnums)+ _updateState.value = DataState.Loading+ localSource.clearAllData()+ _updateState.value = DataState.Success(0L)}}diff --git a/core/src/main/java/com/rtbishop/look4sat/data/ILocalSource.kt b/core/src/main/java/com/rtbishop/look4sat/data/ILocalSource.ktindex 5e8ebb45..b30cd2a3 100644--- a/core/src/main/java/com/rtbishop/look4sat/data/ILocalSource.kt+++ b/core/src/main/java/com/rtbishop/look4sat/data/ILocalSource.kt@@ -21,24 +21,21 @@ import com.rtbishop.look4sat.domain.model.SatEntryimport com.rtbishop.look4sat.domain.model.SatItemimport com.rtbishop.look4sat.domain.model.Transmitterimport com.rtbishop.look4sat.domain.predict.Satellite-import kotlinx.coroutines.flow.Flowimport java.io.InputStreaminterface ILocalSource {- fun getSatelliteItems(): Flow<List<SatItem>>+ suspend fun getAllSatellites(): List<SatItem>- suspend fun getFileStream(uri: String): InputStream?-- suspend fun getSelectedSatellites(): List<Satellite>+ suspend fun getSelectedSatellites(catnums: List<Int>): List<Satellite>suspend fun getTransmitters(catnum: Int): List<Transmitter>- suspend fun updateEntries(entries: List<SatEntry>)+ suspend fun getFileStream(uri: String): InputStream?- suspend fun updateEntriesSelection(catnums: List<Int>)+ suspend fun updateEntries(entries: List<SatEntry>)suspend fun updateTransmitters(transmitters: List<Transmitter>)- suspend fun clearData()+ suspend fun clearAllData()}diff --git a/core/src/main/java/com/rtbishop/look4sat/data/ISettingsHandler.kt b/core/src/main/java/com/rtbishop/look4sat/data/ISettingsHandler.ktindex 5d5c3590..5b403449 100644--- a/core/src/main/java/com/rtbishop/look4sat/data/ISettingsHandler.kt+++ b/core/src/main/java/com/rtbishop/look4sat/data/ISettingsHandler.kt@@ -59,6 +59,10 @@ interface ISettingsHandler {fun loadModesSelection(): List<String>+ fun saveSatelliteSelection(catnums: List<Int>)++ fun loadSatelliteSelection(): List<Int>+fun getRotatorEnabled(): Booleanfun setRotatorEnabled(value: Boolean)diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/IDataRepository.kt b/core/src/main/java/com/rtbishop/look4sat/domain/IDataRepository.ktindex 280bb3f8..5bfbd963 100644--- a/core/src/main/java/com/rtbishop/look4sat/domain/IDataRepository.kt+++ b/core/src/main/java/com/rtbishop/look4sat/domain/IDataRepository.kt@@ -21,26 +21,25 @@ import com.rtbishop.look4sat.domain.model.DataStateimport com.rtbishop.look4sat.domain.model.SatItemimport com.rtbishop.look4sat.domain.model.Transmitterimport com.rtbishop.look4sat.domain.predict.Satellite-import kotlinx.coroutines.flow.Flowimport kotlinx.coroutines.flow.StateFlowinterface IDataRepository {- val dataUpdateState: StateFlow<DataState<Long>>+ val updateState: StateFlow<DataState<Long>>- fun setDataUpdateHandled()+ suspend fun getAllSatellites(): List<SatItem>- fun updateDataFromFile(uri: String)+ suspend fun getSelectedSatellites(): List<Satellite>- fun updateDataFromWeb(sources: List<String>)+ suspend fun getTransmitters(catnum: Int): List<Transmitter>- fun clearData()+ fun updateFromFile(uri: String)- fun getSatelliteItems(): Flow<List<SatItem>>+ fun updateFromWeb(sources: List<String>)- suspend fun getSelectedSatellites(): List<Satellite>+ fun updatesSelection(catnums: List<Int>)- suspend fun getTransmitters(catnum: Int): List<Transmitter>+ fun setUpdateStateHandled()- fun updateSelection(catnums: List<Int>)+ fun clearAllData()}