Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Changes to DAO and file structure
Arty Bishop46f1ea988037
diff --git a/app/src/main/java/com/rtbishop/look4sat/repository/remoteData/SatelliteService.kt b/app/src/main/java/com/rtbishop/look4sat/data/api/SatelliteService.ktsimilarity index 86%rename from app/src/main/java/com/rtbishop/look4sat/repository/remoteData/SatelliteService.ktrename to app/src/main/java/com/rtbishop/look4sat/data/api/SatelliteService.ktindex 6334e400..3d11217e 100644--- a/app/src/main/java/com/rtbishop/look4sat/repository/remoteData/SatelliteService.kt+++ b/app/src/main/java/com/rtbishop/look4sat/data/api/SatelliteService.kt@@ -15,9 +15,9 @@* You should have received a copy of the GNU General Public License* along with this program. If not, see <https://www.gnu.org/licenses/>.*/-package com.rtbishop.look4sat.repository.remoteData+package com.rtbishop.look4sat.data.api-import com.rtbishop.look4sat.data.SatTrans+import com.rtbishop.look4sat.data.model.SatTransimport okhttp3.ResponseBodyimport retrofit2.Responseimport retrofit2.http.GET@@ -25,10 +25,10 @@ import retrofit2.http.Streamingimport retrofit2.http.Urlinterface SatelliteService {-+@Streaming@GET- suspend fun fetchFile(@Url fileUrl: String): Response<ResponseBody>+ suspend fun fetchFileByUrl(@Url url: String): Response<ResponseBody>@GET("transmitters/")suspend fun fetchTransmitters(): List<SatTrans>diff --git a/app/src/main/java/com/rtbishop/look4sat/repository/localData/RoomConverters.kt b/app/src/main/java/com/rtbishop/look4sat/data/database/RoomConverters.ktsimilarity index 97%rename from app/src/main/java/com/rtbishop/look4sat/repository/localData/RoomConverters.ktrename to app/src/main/java/com/rtbishop/look4sat/data/database/RoomConverters.ktindex b4857866..5528a062 100644--- a/app/src/main/java/com/rtbishop/look4sat/repository/localData/RoomConverters.kt+++ b/app/src/main/java/com/rtbishop/look4sat/data/database/RoomConverters.kt@@ -15,7 +15,7 @@* You should have received a copy of the GNU General Public License* along with this program. If not, see <https://www.gnu.org/licenses/>.*/-package com.rtbishop.look4sat.repository.localData+package com.rtbishop.look4sat.data.databaseimport androidx.room.TypeConverterimport com.github.amsacode.predict4java.Satellitediff --git a/app/src/main/java/com/rtbishop/look4sat/repository/localData/SatelliteDao.kt b/app/src/main/java/com/rtbishop/look4sat/data/database/SatelliteDao.ktsimilarity index 61%rename from app/src/main/java/com/rtbishop/look4sat/repository/localData/SatelliteDao.ktrename to app/src/main/java/com/rtbishop/look4sat/data/database/SatelliteDao.ktindex 4616627c..acc2e52d 100644--- a/app/src/main/java/com/rtbishop/look4sat/repository/localData/SatelliteDao.kt+++ b/app/src/main/java/com/rtbishop/look4sat/data/database/SatelliteDao.kt@@ -15,26 +15,22 @@* You should have received a copy of the GNU General Public License* along with this program. If not, see <https://www.gnu.org/licenses/>.*/-package com.rtbishop.look4sat.repository.localData+package com.rtbishop.look4sat.data.databaseimport androidx.room.*import com.github.amsacode.predict4java.Satellite-import com.rtbishop.look4sat.data.SatEntry-import com.rtbishop.look4sat.data.SatItem-import com.rtbishop.look4sat.data.SatTrans+import com.rtbishop.look4sat.data.model.SatEntry+import com.rtbishop.look4sat.data.model.SatItem+import com.rtbishop.look4sat.data.model.SatTransimport kotlinx.coroutines.flow.Flow@Daointerface SatelliteDao {- @Query("SELECT * FROM entries ORDER BY name ASC")- fun getEntries(): Flow<List<SatEntry>>+ // Query@Query("SELECT catNum, name, isSelected FROM entries ORDER BY name ASC")- fun getSatItems(): Flow<List<SatItem>>-- @Insert(onConflict = OnConflictStrategy.REPLACE)- suspend fun insertEntries(entries: List<SatEntry>)+ fun getAllSatItems(): Flow<List<SatItem>>@Query("SELECT tle FROM entries WHERE isSelected = 1")suspend fun getSelectedSatellites(): List<Satellite>@@ -42,21 +38,47 @@ interface SatelliteDao {@Query("SELECT catNum FROM entries WHERE isSelected = 1")suspend fun getSelectedCatNums(): List<Int>+ @Query("SELECT * FROM transmitters WHERE isAlive = 1 ORDER BY mode ASC")+ fun getAllTransmitters(): Flow<List<SatTrans>>++ @Query("SELECT * FROM transmitters WHERE isAlive = 1 and catNum = :catNum")+ fun getTransmittersByCatNum(catNum: Int): Flow<List<SatTrans>>++ // Insert++ @Insert(onConflict = OnConflictStrategy.REPLACE)+ suspend fun insertEntries(entries: List<SatEntry>)++ @Insert(onConflict = OnConflictStrategy.REPLACE)+ suspend fun insertTransmitters(transmitters: List<SatTrans>)++ // Update++ @Query("UPDATE entries SET isSelected = 0")+ suspend fun clearSelection()++ @Query("UPDATE entries SET isSelected = :isSelected WHERE catNum = :catNum")+ suspend fun updateSelectionByCatNum(catNum: Int, isSelected: Boolean)+@Transaction- suspend fun updateEntriesSelection(catNums: List<Int>) {+ suspend fun updateSelection(catNums: List<Int>) {clearSelection()- catNums.forEach { catNum -> updateSelection(catNum) }+ catNums.forEach { catNum ->+ updateSelectionByCatNum(catNum, true)+ }}- @Query("UPDATE entries SET isSelected = 0")- suspend fun clearSelection()+ // Delete- @Query("UPDATE entries SET isSelected = 1 WHERE catNum = :catNum")- suspend fun updateSelection(catNum: Int)+ @Query("DELETE from entries")+ suspend fun deleteEntries()- @Insert(onConflict = OnConflictStrategy.REPLACE)- suspend fun insertTransmitters(transmitters: List<SatTrans>)+ @Query("DELETE from transmitters")+ suspend fun deleteTransmitters()- @Query("SELECT * FROM transmitters WHERE isAlive = 1 and catNum = :catNum")- fun getTransmittersForSat(catNum: Int): Flow<List<SatTrans>>+ @Transaction+ suspend fun deleteAllData() {+ deleteEntries()+ deleteTransmitters()+ }}diff --git a/app/src/main/java/com/rtbishop/look4sat/repository/localData/SatelliteDb.kt b/app/src/main/java/com/rtbishop/look4sat/data/database/SatelliteDb.ktsimilarity index 90%rename from app/src/main/java/com/rtbishop/look4sat/repository/localData/SatelliteDb.ktrename to app/src/main/java/com/rtbishop/look4sat/data/database/SatelliteDb.ktindex 33446ade..75162780 100644--- a/app/src/main/java/com/rtbishop/look4sat/repository/localData/SatelliteDb.kt+++ b/app/src/main/java/com/rtbishop/look4sat/data/database/SatelliteDb.kt@@ -15,15 +15,15 @@* You should have received a copy of the GNU General Public License* along with this program. If not, see <https://www.gnu.org/licenses/>.*/-package com.rtbishop.look4sat.repository.localData+package com.rtbishop.look4sat.data.databaseimport androidx.room.Databaseimport androidx.room.RoomDatabaseimport androidx.room.TypeConvertersimport androidx.room.migration.Migrationimport androidx.sqlite.db.SupportSQLiteDatabase-import com.rtbishop.look4sat.data.SatEntry-import com.rtbishop.look4sat.data.SatTrans+import com.rtbishop.look4sat.data.model.SatEntry+import com.rtbishop.look4sat.data.model.SatTrans@Database(entities = [SatEntry::class, SatTrans::class], version = 2)@TypeConverters(RoomConverters::class)diff --git a/app/src/main/java/com/rtbishop/look4sat/data/Result.kt b/app/src/main/java/com/rtbishop/look4sat/data/model/Result.ktsimilarity index 95%rename from app/src/main/java/com/rtbishop/look4sat/data/Result.ktrename to app/src/main/java/com/rtbishop/look4sat/data/model/Result.ktindex 8bd02d00..9a849352 100644--- a/app/src/main/java/com/rtbishop/look4sat/data/Result.kt+++ b/app/src/main/java/com/rtbishop/look4sat/data/model/Result.kt@@ -15,10 +15,10 @@* You should have received a copy of the GNU General Public License* along with this program. If not, see <https://www.gnu.org/licenses/>.*/-package com.rtbishop.look4sat.data+package com.rtbishop.look4sat.data.modelsealed class Result<out T : Any> {data class Success<out T : Any>(val data: T) : Result<T>()data class Error(val exception: Throwable) : Result<Nothing>()object InProgress : Result<Nothing>()-}\ No newline at end of file+}diff --git a/app/src/main/java/com/rtbishop/look4sat/data/SatEntry.kt b/app/src/main/java/com/rtbishop/look4sat/data/model/SatEntry.ktsimilarity index 96%rename from app/src/main/java/com/rtbishop/look4sat/data/SatEntry.ktrename to app/src/main/java/com/rtbishop/look4sat/data/model/SatEntry.ktindex cf803d70..60734a6a 100644--- a/app/src/main/java/com/rtbishop/look4sat/data/SatEntry.kt+++ b/app/src/main/java/com/rtbishop/look4sat/data/model/SatEntry.kt@@ -15,7 +15,7 @@* You should have received a copy of the GNU General Public License* along with this program. If not, see <https://www.gnu.org/licenses/>.*/-package com.rtbishop.look4sat.data+package com.rtbishop.look4sat.data.modelimport androidx.room.Entityimport androidx.room.PrimaryKey@@ -27,4 +27,4 @@ class SatEntry(var isSelected: Boolean = false,@PrimaryKey val catNum: Int = tle.catnum,val name: String = tle.name-)\ No newline at end of file+)diff --git a/app/src/main/java/com/rtbishop/look4sat/data/SatItem.kt b/app/src/main/java/com/rtbishop/look4sat/data/model/SatItem.ktsimilarity index 94%rename from app/src/main/java/com/rtbishop/look4sat/data/SatItem.ktrename to app/src/main/java/com/rtbishop/look4sat/data/model/SatItem.ktindex 0f25124e..687652e6 100644--- a/app/src/main/java/com/rtbishop/look4sat/data/SatItem.kt+++ b/app/src/main/java/com/rtbishop/look4sat/data/model/SatItem.kt@@ -15,6 +15,6 @@* You should have received a copy of the GNU General Public License* along with this program. If not, see <https://www.gnu.org/licenses/>.*/-package com.rtbishop.look4sat.data+package com.rtbishop.look4sat.data.model-class SatItem(val catNum: Int, val name: String, var isSelected: Boolean)\ No newline at end of file+class SatItem(val catNum: Int, val name: String, var isSelected: Boolean)diff --git a/app/src/main/java/com/rtbishop/look4sat/data/SatPass.kt b/app/src/main/java/com/rtbishop/look4sat/data/model/SatPass.ktsimilarity index 96%rename from app/src/main/java/com/rtbishop/look4sat/data/SatPass.ktrename to app/src/main/java/com/rtbishop/look4sat/data/model/SatPass.ktindex 406a35c4..0e2e2f30 100644--- a/app/src/main/java/com/rtbishop/look4sat/data/SatPass.kt+++ b/app/src/main/java/com/rtbishop/look4sat/data/model/SatPass.kt@@ -15,7 +15,7 @@* You should have received a copy of the GNU General Public License* along with this program. If not, see <https://www.gnu.org/licenses/>.*/-package com.rtbishop.look4sat.data+package com.rtbishop.look4sat.data.modelimport com.github.amsacode.predict4java.SatPassTimeimport com.github.amsacode.predict4java.TLEdiff --git a/app/src/main/java/com/rtbishop/look4sat/data/SatTrans.kt b/app/src/main/java/com/rtbishop/look4sat/data/model/SatTrans.ktsimilarity index 97%rename from app/src/main/java/com/rtbishop/look4sat/data/SatTrans.ktrename to app/src/main/java/com/rtbishop/look4sat/data/model/SatTrans.ktindex bd360793..b8a330ed 100644--- a/app/src/main/java/com/rtbishop/look4sat/data/SatTrans.kt+++ b/app/src/main/java/com/rtbishop/look4sat/data/model/SatTrans.kt@@ -15,7 +15,7 @@* You should have received a copy of the GNU General Public License* along with this program. If not, see <https://www.gnu.org/licenses/>.*/-package com.rtbishop.look4sat.data+package com.rtbishop.look4sat.data.modelimport androidx.room.Entityimport androidx.room.PrimaryKeydiff --git a/app/src/main/java/com/rtbishop/look4sat/data/SelectedSat.kt b/app/src/main/java/com/rtbishop/look4sat/data/model/SelectedSat.ktsimilarity index 96%rename from app/src/main/java/com/rtbishop/look4sat/data/SelectedSat.ktrename to app/src/main/java/com/rtbishop/look4sat/data/model/SelectedSat.ktindex 19eba502..e015d680 100644--- a/app/src/main/java/com/rtbishop/look4sat/data/SelectedSat.kt+++ b/app/src/main/java/com/rtbishop/look4sat/data/model/SelectedSat.kt@@ -15,7 +15,7 @@* You should have received a copy of the GNU General Public License* along with this program. If not, see <https://www.gnu.org/licenses/>.*/-package com.rtbishop.look4sat.data+package com.rtbishop.look4sat.data.modelimport com.github.amsacode.predict4java.Positionimport org.osmdroid.views.overlay.Overlay@@ -32,4 +32,4 @@ class SelectedSat(val coverage: Double,val footprint: Overlay,val groundTrack: Overlay-)\ No newline at end of file+)diff --git a/app/src/main/java/com/rtbishop/look4sat/data/TleSource.kt b/app/src/main/java/com/rtbishop/look4sat/data/model/TleSource.ktsimilarity index 90%rename from app/src/main/java/com/rtbishop/look4sat/data/TleSource.ktrename to app/src/main/java/com/rtbishop/look4sat/data/model/TleSource.ktindex 0e81cf9e..58c261df 100644--- a/app/src/main/java/com/rtbishop/look4sat/data/TleSource.kt+++ b/app/src/main/java/com/rtbishop/look4sat/data/model/TleSource.kt@@ -15,6 +15,6 @@* You should have received a copy of the GNU General Public License* along with this program. If not, see <https://www.gnu.org/licenses/>.*/-package com.rtbishop.look4sat.data+package com.rtbishop.look4sat.data.model-class TleSource(var url: String = String())\ No newline at end of file+class TleSource(var url: String = String())diff --git a/app/src/main/java/com/rtbishop/look4sat/repository/PrefsRepo.kt b/app/src/main/java/com/rtbishop/look4sat/data/repository/PrefsRepo.ktsimilarity index 84%rename from app/src/main/java/com/rtbishop/look4sat/repository/PrefsRepo.ktrename to app/src/main/java/com/rtbishop/look4sat/data/repository/PrefsRepo.ktindex d8b89c74..4a435723 100644--- a/app/src/main/java/com/rtbishop/look4sat/repository/PrefsRepo.kt+++ b/app/src/main/java/com/rtbishop/look4sat/data/repository/PrefsRepo.kt@@ -15,13 +15,30 @@* You should have received a copy of the GNU General Public License* along with this program. If not, see <https://www.gnu.org/licenses/>.*/-package com.rtbishop.look4sat.repository+/*+ * Look4Sat. Amateur radio satellite tracker and pass predictor.+ * Copyright (C) 2019-2021 Arty Bishop ([email protected])+ *+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU General Public License as published by+ * the Free Software Foundation, either version 3 of the License, or+ * (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU General Public License for more details.+ *+ * You should have received a copy of the GNU General Public License+ * along with this program. If not, see <https://www.gnu.org/licenses/>.+ */+package com.rtbishop.look4sat.data.repositoryimport android.content.SharedPreferencesimport android.hardware.GeomagneticFieldimport androidx.core.content.editimport com.github.amsacode.predict4java.GroundStationPosition-import com.rtbishop.look4sat.data.TleSource+import com.rtbishop.look4sat.data.model.TleSourceimport com.squareup.moshi.Moshiimport com.squareup.moshi.Typesimport javax.inject.Injectdiff --git a/app/src/main/java/com/rtbishop/look4sat/repository/SatelliteRepo.kt b/app/src/main/java/com/rtbishop/look4sat/data/repository/SatelliteRepo.ktsimilarity index 82%rename from app/src/main/java/com/rtbishop/look4sat/repository/SatelliteRepo.ktrename to app/src/main/java/com/rtbishop/look4sat/data/repository/SatelliteRepo.ktindex fd596f88..592c7058 100644--- a/app/src/main/java/com/rtbishop/look4sat/repository/SatelliteRepo.kt+++ b/app/src/main/java/com/rtbishop/look4sat/data/repository/SatelliteRepo.kt@@ -15,18 +15,18 @@* You should have received a copy of the GNU General Public License* along with this program. If not, see <https://www.gnu.org/licenses/>.*/-package com.rtbishop.look4sat.repository+package com.rtbishop.look4sat.data.repositoryimport android.content.ContentResolverimport android.net.Uriimport com.github.amsacode.predict4java.Satelliteimport com.github.amsacode.predict4java.TLE-import com.rtbishop.look4sat.data.SatEntry-import com.rtbishop.look4sat.data.SatTrans-import com.rtbishop.look4sat.data.TleSource+import com.rtbishop.look4sat.data.model.SatEntry+import com.rtbishop.look4sat.data.model.SatTrans+import com.rtbishop.look4sat.data.model.TleSourceimport com.rtbishop.look4sat.di.IoDispatcher-import com.rtbishop.look4sat.repository.localData.SatelliteDao-import com.rtbishop.look4sat.repository.remoteData.SatelliteService+import com.rtbishop.look4sat.data.database.SatelliteDao+import com.rtbishop.look4sat.data.api.SatelliteServiceimport kotlinx.coroutines.CoroutineDispatcherimport kotlinx.coroutines.coroutineScopeimport kotlinx.coroutines.flow.Flow@@ -45,10 +45,10 @@ class SatelliteRepo @Inject constructor(@IoDispatcher private val ioDispatcher: CoroutineDispatcher) {- val satDataFlow = satelliteDao.getSatItems()+ val satDataFlow = satelliteDao.getAllSatItems()fun getTransmittersForSat(catNum: Int): Flow<List<SatTrans>> {- return satelliteDao.getTransmittersForSat(catNum)+ return satelliteDao.getTransmittersByCatNum(catNum)}suspend fun getSelectedSatellites(): List<Satellite> {@@ -56,7 +56,7 @@ class SatelliteRepo @Inject constructor(}suspend fun updateEntriesSelection(catNums: List<Int>) {- satelliteDao.updateEntriesSelection(catNums)+ satelliteDao.updateSelection(catNums)}suspend fun updateSatDataFromFile(uri: Uri) {@@ -91,13 +91,14 @@ class SatelliteRepo @Inject constructor(private suspend fun getStreamsForSources(sources: List<TleSource>): List<InputStream> {val streams = mutableListOf<InputStream>()sources.forEach { tleSource ->- satelliteService.fetchFile(tleSource.url).body()?.byteStream()?.let { inputStream ->- if (tleSource.url.contains(".zip", true)) {- streams.add(getZipStream(inputStream))- } else {- streams.add(inputStream)+ satelliteService.fetchFileByUrl(tleSource.url).body()?.byteStream()+ ?.let { inputStream ->+ if (tleSource.url.contains(".zip", true)) {+ streams.add(getZipStream(inputStream))+ } else {+ streams.add(inputStream)+ }}- }}return streams}@@ -127,6 +128,6 @@ class SatelliteRepo @Inject constructor(private suspend fun insertEntriesAndRestoreSelection(entries: List<SatEntry>) {val selectedCatNums = satelliteDao.getSelectedCatNums()satelliteDao.insertEntries(entries)- satelliteDao.updateEntriesSelection(selectedCatNums)+ satelliteDao.updateSelection(selectedCatNums)}}\ No newline at end of filediff --git a/app/src/main/java/com/rtbishop/look4sat/di/CoroutinesModule.kt b/app/src/main/java/com/rtbishop/look4sat/di/CoroutinesModule.ktindex 926c6b4b..fd86bf08 100644--- a/app/src/main/java/com/rtbishop/look4sat/di/CoroutinesModule.kt+++ b/app/src/main/java/com/rtbishop/look4sat/di/CoroutinesModule.kt@@ -22,19 +22,13 @@ import dagger.Providesimport dagger.hilt.InstallInimport dagger.hilt.components.SingletonComponentimport kotlinx.coroutines.CoroutineDispatcher-import kotlinx.coroutines.CoroutineScopeimport kotlinx.coroutines.Dispatchers-import kotlinx.coroutines.SupervisorJobimport javax.inject.Qualifier@Module@InstallIn(SingletonComponent::class)object CoroutinesModule {- @Provides- @ExternalScope- fun provideExternalScope(): CoroutineScope = CoroutineScope(SupervisorJob())-@Provides@DefaultDispatcherfun provideDefaultDispatcher(): CoroutineDispatcher = Dispatchers.Default@@ -48,10 +42,6 @@ object CoroutinesModule {fun provideMainDispatcher(): CoroutineDispatcher = Dispatchers.Main}-@Qualifier-@Retention(AnnotationRetention.BINARY)-annotation class ExternalScope-@Qualifier@Retention(AnnotationRetention.BINARY)annotation class DefaultDispatcher@@ -62,4 +52,4 @@ annotation class IoDispatcher@Qualifier@Retention(AnnotationRetention.BINARY)-annotation class MainDispatcher\ No newline at end of file+annotation class MainDispatcherdiff --git a/app/src/main/java/com/rtbishop/look4sat/di/NetworkModule.kt b/app/src/main/java/com/rtbishop/look4sat/di/NetworkModule.ktindex e2acf5bb..e4340bdb 100644--- a/app/src/main/java/com/rtbishop/look4sat/di/NetworkModule.kt+++ b/app/src/main/java/com/rtbishop/look4sat/di/NetworkModule.kt@@ -17,7 +17,7 @@*/package com.rtbishop.look4sat.di-import com.rtbishop.look4sat.repository.remoteData.SatelliteService+import com.rtbishop.look4sat.data.api.SatelliteServiceimport com.squareup.moshi.Moshiimport dagger.Moduleimport dagger.Providesdiff --git a/app/src/main/java/com/rtbishop/look4sat/di/RepositoryModule.kt b/app/src/main/java/com/rtbishop/look4sat/di/RepositoryModule.ktindex 4296ca32..73191661 100644--- a/app/src/main/java/com/rtbishop/look4sat/di/RepositoryModule.kt+++ b/app/src/main/java/com/rtbishop/look4sat/di/RepositoryModule.kt@@ -19,10 +19,10 @@ package com.rtbishop.look4sat.diimport android.content.Contextimport androidx.room.Room-import com.rtbishop.look4sat.repository.localData.MIGRATION_1_2-import com.rtbishop.look4sat.repository.localData.RoomConverters-import com.rtbishop.look4sat.repository.localData.SatelliteDao-import com.rtbishop.look4sat.repository.localData.SatelliteDb+import com.rtbishop.look4sat.data.database.MIGRATION_1_2+import com.rtbishop.look4sat.data.database.RoomConverters+import com.rtbishop.look4sat.data.database.SatelliteDao+import com.rtbishop.look4sat.data.database.SatelliteDbimport com.squareup.moshi.Moshiimport dagger.Moduleimport dagger.Providesdiff --git a/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt b/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.ktindex 4078a0c2..22335213 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt@@ -23,7 +23,7 @@ import androidx.navigation.fragment.NavHostFragmentimport androidx.navigation.ui.setupWithNavControllerimport com.rtbishop.look4sat.Rimport com.rtbishop.look4sat.databinding.ActivityMainBinding-import com.rtbishop.look4sat.repository.PrefsRepo+import com.rtbishop.look4sat.data.repository.PrefsRepoimport dagger.hilt.android.AndroidEntryPointimport javax.inject.Injectdiff --git a/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.ktindex 8d44adb9..50423beb 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt@@ -20,12 +20,12 @@ package com.rtbishop.look4sat.uiimport android.net.Uriimport androidx.lifecycle.*import com.github.amsacode.predict4java.Satellite-import com.rtbishop.look4sat.data.Result-import com.rtbishop.look4sat.data.SatItem-import com.rtbishop.look4sat.data.SatPass-import com.rtbishop.look4sat.data.TleSource-import com.rtbishop.look4sat.repository.PrefsRepo-import com.rtbishop.look4sat.repository.SatelliteRepo+import com.rtbishop.look4sat.data.model.Result+import com.rtbishop.look4sat.data.model.SatItem+import com.rtbishop.look4sat.data.model.SatPass+import com.rtbishop.look4sat.data.model.TleSource+import com.rtbishop.look4sat.data.repository.PrefsRepo+import com.rtbishop.look4sat.data.repository.SatelliteRepoimport com.rtbishop.look4sat.utility.getPredictorimport dagger.hilt.android.lifecycle.HiltViewModelimport kotlinx.coroutines.Dispatchersdiff --git a/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesAdapter.ktindex 938ca831..53771020 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesAdapter.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesAdapter.kt@@ -21,7 +21,7 @@ import android.view.LayoutInflaterimport android.view.ViewGroupimport android.widget.SearchViewimport androidx.recyclerview.widget.RecyclerView-import com.rtbishop.look4sat.data.SatItem+import com.rtbishop.look4sat.data.model.SatItemimport com.rtbishop.look4sat.databinding.ItemSatEntryBindingimport java.util.*diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesFragment.ktindex 5f3bc20e..a9a9a81c 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesFragment.kt@@ -27,7 +27,7 @@ import androidx.navigation.fragment.findNavControllerimport androidx.recyclerview.widget.LinearLayoutManagerimport com.google.android.material.snackbar.Snackbarimport com.rtbishop.look4sat.R-import com.rtbishop.look4sat.data.Result+import com.rtbishop.look4sat.data.model.Resultimport com.rtbishop.look4sat.databinding.FragmentEntriesBindingimport com.rtbishop.look4sat.ui.SharedViewModelimport com.rtbishop.look4sat.utility.RecyclerDividerdiff --git a/app/src/main/java/com/rtbishop/look4sat/ui/mapScreen/MapFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/mapScreen/MapFragment.ktindex db1d28e2..47ad5d01 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/mapScreen/MapFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/mapScreen/MapFragment.kt@@ -28,13 +28,14 @@ import androidx.fragment.app.activityViewModelsimport androidx.fragment.app.viewModelsimport com.github.amsacode.predict4java.Positionimport com.rtbishop.look4sat.R-import com.rtbishop.look4sat.data.Result-import com.rtbishop.look4sat.data.SatPass-import com.rtbishop.look4sat.data.SelectedSat+import com.rtbishop.look4sat.data.model.Result+import com.rtbishop.look4sat.data.model.SatPass+import com.rtbishop.look4sat.data.model.SelectedSatimport com.rtbishop.look4sat.databinding.FragmentMapBindingimport com.rtbishop.look4sat.ui.SharedViewModel-import com.rtbishop.look4sat.repository.PrefsRepo+import com.rtbishop.look4sat.data.repository.PrefsRepoimport dagger.hilt.android.AndroidEntryPoint+import kotlinx.coroutines.FlowPreviewimport org.osmdroid.config.Configurationimport org.osmdroid.tileprovider.tilesource.ITileSourceimport org.osmdroid.tileprovider.tilesource.TileSourcePolicy@@ -47,6 +48,7 @@ import timber.log.Timberimport java.util.*import javax.inject.Inject+@FlowPreview@AndroidEntryPointclass MapFragment : Fragment(R.layout.fragment_map) {diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/mapScreen/MapViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/ui/mapScreen/MapViewModel.ktindex 058ca4ab..73637d62 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/mapScreen/MapViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/mapScreen/MapViewModel.kt@@ -25,9 +25,9 @@ import androidx.lifecycle.ViewModelimport androidx.lifecycle.viewModelScopeimport com.github.amsacode.predict4java.Positionimport com.github.amsacode.predict4java.SatPos-import com.rtbishop.look4sat.data.SatPass-import com.rtbishop.look4sat.data.SelectedSat-import com.rtbishop.look4sat.repository.PrefsRepo+import com.rtbishop.look4sat.data.model.SatPass+import com.rtbishop.look4sat.data.model.SelectedSat+import com.rtbishop.look4sat.data.repository.PrefsRepoimport com.rtbishop.look4sat.utility.QthConverterimport dagger.hilt.android.lifecycle.HiltViewModelimport kotlinx.coroutines.Dispatchersdiff --git a/app/src/main/java/com/rtbishop/look4sat/ui/passesScreen/PassesAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/ui/passesScreen/PassesAdapter.ktindex 8e8cbbbc..9ac7af06 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/passesScreen/PassesAdapter.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/passesScreen/PassesAdapter.kt@@ -24,7 +24,7 @@ import androidx.core.os.bundleOfimport androidx.navigation.findNavControllerimport androidx.recyclerview.widget.RecyclerViewimport com.rtbishop.look4sat.R-import com.rtbishop.look4sat.data.SatPass+import com.rtbishop.look4sat.data.model.SatPassimport com.rtbishop.look4sat.databinding.ItemPassGeoBindingimport com.rtbishop.look4sat.databinding.ItemPassLeoBindingimport com.rtbishop.look4sat.utility.navigateSafediff --git a/app/src/main/java/com/rtbishop/look4sat/ui/passesScreen/PassesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/passesScreen/PassesFragment.ktindex 45a595d2..5690f43d 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/passesScreen/PassesFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/passesScreen/PassesFragment.kt@@ -24,17 +24,19 @@ import androidx.fragment.app.activityViewModelsimport androidx.recyclerview.widget.LinearLayoutManagerimport androidx.recyclerview.widget.SimpleItemAnimatorimport com.rtbishop.look4sat.R-import com.rtbishop.look4sat.data.Result-import com.rtbishop.look4sat.data.SatPass+import com.rtbishop.look4sat.data.model.Result+import com.rtbishop.look4sat.data.model.SatPassimport com.rtbishop.look4sat.databinding.FragmentPassesBindingimport com.rtbishop.look4sat.ui.SharedViewModel-import com.rtbishop.look4sat.repository.PrefsRepo+import com.rtbishop.look4sat.data.repository.PrefsRepoimport com.rtbishop.look4sat.utility.RecyclerDividerimport com.rtbishop.look4sat.utility.formatForTimerimport dagger.hilt.android.AndroidEntryPoint+import kotlinx.coroutines.FlowPreviewimport java.util.*import javax.inject.Inject+@FlowPreview@AndroidEntryPointclass PassesFragment : Fragment(R.layout.fragment_passes) {diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/polarScreen/PolarFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/polarScreen/PolarFragment.ktindex 97773f41..05bcecbb 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/polarScreen/PolarFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/polarScreen/PolarFragment.kt@@ -30,18 +30,20 @@ import androidx.navigation.fragment.findNavControllerimport androidx.recyclerview.widget.LinearLayoutManagerimport androidx.recyclerview.widget.SimpleItemAnimatorimport com.rtbishop.look4sat.R-import com.rtbishop.look4sat.data.Result-import com.rtbishop.look4sat.data.SatPass+import com.rtbishop.look4sat.data.model.Result+import com.rtbishop.look4sat.data.model.SatPassimport com.rtbishop.look4sat.databinding.FragmentPolarBinding-import com.rtbishop.look4sat.repository.PrefsRepo+import com.rtbishop.look4sat.data.repository.PrefsRepoimport com.rtbishop.look4sat.ui.SharedViewModelimport com.rtbishop.look4sat.utility.RecyclerDividerimport com.rtbishop.look4sat.utility.formatForTimerimport dagger.hilt.android.AndroidEntryPoint+import kotlinx.coroutines.FlowPreviewimport java.util.*import javax.inject.Injectimport kotlin.math.round+@FlowPreview@AndroidEntryPointclass PolarFragment : Fragment(R.layout.fragment_polar), SensorEventListener {diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/polarScreen/PolarView.kt b/app/src/main/java/com/rtbishop/look4sat/ui/polarScreen/PolarView.ktindex a45bcaed..9339e50e 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/polarScreen/PolarView.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/polarScreen/PolarView.kt@@ -25,7 +25,7 @@ import android.graphics.Pathimport android.view.Viewimport androidx.core.content.ContextCompatimport com.rtbishop.look4sat.R-import com.rtbishop.look4sat.data.SatPass+import com.rtbishop.look4sat.data.model.SatPassimport java.util.*import kotlin.math.cosimport kotlin.math.sindiff --git a/app/src/main/java/com/rtbishop/look4sat/ui/polarScreen/TransAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/ui/polarScreen/TransAdapter.ktindex 3cc9fbc9..3df37cfb 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/polarScreen/TransAdapter.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/polarScreen/TransAdapter.kt@@ -22,8 +22,8 @@ import android.view.LayoutInflaterimport android.view.ViewGroupimport androidx.recyclerview.widget.RecyclerViewimport com.rtbishop.look4sat.R-import com.rtbishop.look4sat.data.SatPass-import com.rtbishop.look4sat.data.SatTrans+import com.rtbishop.look4sat.data.model.SatPass+import com.rtbishop.look4sat.data.model.SatTransimport com.rtbishop.look4sat.databinding.ItemTransBindingimport java.util.*diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/prefsScreen/PrefsFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/prefsScreen/PrefsFragment.ktindex 3310d3e0..952410cf 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/prefsScreen/PrefsFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/prefsScreen/PrefsFragment.kt@@ -28,7 +28,7 @@ import androidx.preference.Preferenceimport androidx.preference.PreferenceFragmentCompatimport com.google.android.material.snackbar.Snackbarimport com.rtbishop.look4sat.R-import com.rtbishop.look4sat.repository.PrefsRepo+import com.rtbishop.look4sat.data.repository.PrefsRepoimport com.rtbishop.look4sat.utility.QthConverterimport com.rtbishop.look4sat.utility.roundimport dagger.hilt.android.AndroidEntryPointdiff --git a/app/src/main/java/com/rtbishop/look4sat/ui/sourcesDialog/SourcesAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/ui/sourcesDialog/SourcesAdapter.ktindex 2a24cba0..af0ffe01 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/sourcesDialog/SourcesAdapter.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/sourcesDialog/SourcesAdapter.kt@@ -21,7 +21,7 @@ import android.view.LayoutInflaterimport android.view.ViewGroupimport androidx.core.widget.doOnTextChangedimport androidx.recyclerview.widget.RecyclerView-import com.rtbishop.look4sat.data.TleSource+import com.rtbishop.look4sat.data.model.TleSourceimport com.rtbishop.look4sat.databinding.ItemTleSourceBindingclass SourcesAdapter : RecyclerView.Adapter<SourcesAdapter.TleSourceHolder>() {