Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Code refactoring, moving classes to new packages
Arty Bishop4c83cd2e2109
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xmlindex 41d76fe6..d0c562cb 100644--- a/app/src/main/AndroidManifest.xml+++ b/app/src/main/AndroidManifest.xml@@ -11,7 +11,7 @@android:icon="@mipmap/ic_launcher"android:label="@string/app_name"><activity- android:name=".ui.mainScreen.MainActivity"+ android:name=".ui.MainActivity"android:screenOrientation="portrait"android:theme="@style/AppTheme.Splash"><intent-filter>diff --git a/app/src/main/java/com/rtbishop/look4sat/data/Result.kt b/app/src/main/java/com/rtbishop/look4sat/data/Result.ktindex c7d3416f..604a2f7c 100644--- a/app/src/main/java/com/rtbishop/look4sat/data/Result.kt+++ b/app/src/main/java/com/rtbishop/look4sat/data/Result.kt@@ -1,20 +1,20 @@/*******************************************************************************- Look4Sat. Amateur radio satellite tracker and pass predictor.- Copyright (C) 2019, 2020 Arty Bishop ([email protected])+Look4Sat. Amateur radio satellite tracker and pass predictor.+Copyright (C) 2019, 2020 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 2 of the License, or- (at your option) any later version.+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 2 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.+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, write to the Free Software Foundation, Inc.,- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.+You should have received a copy of the GNU General Public License along+with this program; if not, write to the Free Software Foundation, Inc.,+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.******************************************************************************/package com.rtbishop.look4sat.datadiff --git a/app/src/main/java/com/rtbishop/look4sat/data/SatEntry.kt b/app/src/main/java/com/rtbishop/look4sat/data/SatEntry.ktindex 132f1964..347da288 100644--- a/app/src/main/java/com/rtbishop/look4sat/data/SatEntry.kt+++ b/app/src/main/java/com/rtbishop/look4sat/data/SatEntry.kt@@ -1,20 +1,20 @@/*******************************************************************************- Look4Sat. Amateur radio satellite tracker and pass predictor.- Copyright (C) 2019, 2020 Arty Bishop ([email protected])+Look4Sat. Amateur radio satellite tracker and pass predictor.+Copyright (C) 2019, 2020 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 2 of the License, or- (at your option) any later version.+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 2 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.+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, write to the Free Software Foundation, Inc.,- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.+You should have received a copy of the GNU General Public License along+with this program; if not, write to the Free Software Foundation, Inc.,+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.******************************************************************************/package com.rtbishop.look4sat.data@@ -24,8 +24,9 @@ import androidx.room.PrimaryKeyimport com.github.amsacode.predict4java.TLE@Entity(tableName = "entries")-data class SatEntry(val tle: TLE, var isSelected: Boolean = false) {- @PrimaryKey- var catNum: Int = tle.catnum- var name: String = tle.name-}+data class SatEntry(+ val tle: TLE,+ var isSelected: Boolean = false,+ @PrimaryKey val catNum: Int = tle.catnum,+ val name: String = tle.name+)\ No newline at end of filediff --git a/app/src/main/java/com/rtbishop/look4sat/data/SatTrans.kt b/app/src/main/java/com/rtbishop/look4sat/data/SatTrans.ktindex 71374a11..03b3adbb 100644--- a/app/src/main/java/com/rtbishop/look4sat/data/SatTrans.kt+++ b/app/src/main/java/com/rtbishop/look4sat/data/SatTrans.kt@@ -1,20 +1,20 @@/*******************************************************************************- Look4Sat. Amateur radio satellite tracker and pass predictor.- Copyright (C) 2019, 2020 Arty Bishop ([email protected])+Look4Sat. Amateur radio satellite tracker and pass predictor.+Copyright (C) 2019, 2020 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 2 of the License, or- (at your option) any later version.+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 2 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.+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, write to the Free Software Foundation, Inc.,- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.+You should have received a copy of the GNU General Public License along+with this program; if not, write to the Free Software Foundation, Inc.,+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.******************************************************************************/package com.rtbishop.look4sat.datadiff --git a/app/src/main/java/com/rtbishop/look4sat/data/TleSource.kt b/app/src/main/java/com/rtbishop/look4sat/data/TleSource.ktindex 00830fd8..10869cf4 100644--- a/app/src/main/java/com/rtbishop/look4sat/data/TleSource.kt+++ b/app/src/main/java/com/rtbishop/look4sat/data/TleSource.kt@@ -1,20 +1,20 @@/*******************************************************************************- Look4Sat. Amateur radio satellite tracker and pass predictor.- Copyright (C) 2019, 2020 Arty Bishop ([email protected])+Look4Sat. Amateur radio satellite tracker and pass predictor.+Copyright (C) 2019, 2020 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 2 of the License, or- (at your option) any later version.+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 2 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.+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, write to the Free Software Foundation, Inc.,- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.+You should have received a copy of the GNU General Public License along+with this program; if not, write to the Free Software Foundation, Inc.,+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.******************************************************************************/package com.rtbishop.look4sat.datadiff --git a/app/src/main/java/com/rtbishop/look4sat/di/DispatchersModule.kt b/app/src/main/java/com/rtbishop/look4sat/di/DispatchersModule.ktindex 416330e5..d3ee5aa0 100644--- a/app/src/main/java/com/rtbishop/look4sat/di/DispatchersModule.kt+++ b/app/src/main/java/com/rtbishop/look4sat/di/DispatchersModule.kt@@ -33,15 +33,15 @@ object DispatchersModule {@Provides@DefaultDispatcher- fun provideDefaultDispatcher(): CoroutineDispatcher = Dispatchers.Default+ fun getDefaultDispatcher(): CoroutineDispatcher = Dispatchers.Default@Provides@IoDispatcher- fun provideIoDispatcher(): CoroutineDispatcher = Dispatchers.IO+ fun getIoDispatcher(): CoroutineDispatcher = Dispatchers.IO@Provides@MainDispatcher- fun provideMainDispatcher(): CoroutineDispatcher = Dispatchers.Main+ fun getMainDispatcher(): CoroutineDispatcher = Dispatchers.Main}@Qualifierdiff --git a/app/src/main/java/com/rtbishop/look4sat/di/NetworkModule.kt b/app/src/main/java/com/rtbishop/look4sat/di/NetworkModule.ktindex e3d936b2..b506e6ef 100644--- a/app/src/main/java/com/rtbishop/look4sat/di/NetworkModule.kt+++ b/app/src/main/java/com/rtbishop/look4sat/di/NetworkModule.kt@@ -19,7 +19,7 @@package com.rtbishop.look4sat.di-import com.rtbishop.look4sat.repo.remote.TransmittersApi+import com.rtbishop.look4sat.repository.remoteData.TransmittersApiimport com.squareup.moshi.Moshiimport dagger.Moduleimport dagger.Provides@@ -42,7 +42,7 @@ object NetworkModule {@Provides@Singleton- fun provideMoshi(): Moshi {+ fun getMoshi(): Moshi {return Moshi.Builder().build()}diff --git a/app/src/main/java/com/rtbishop/look4sat/di/RepositoryModule.kt b/app/src/main/java/com/rtbishop/look4sat/di/RepositoryModule.ktindex e7ed0df4..beee5edf 100644--- a/app/src/main/java/com/rtbishop/look4sat/di/RepositoryModule.kt+++ b/app/src/main/java/com/rtbishop/look4sat/di/RepositoryModule.kt@@ -22,11 +22,11 @@ package com.rtbishop.look4sat.diimport android.content.ContentResolverimport android.content.Contextimport androidx.room.Room-import com.rtbishop.look4sat.repo.local.EntriesDao-import com.rtbishop.look4sat.repo.local.SatelliteDb-import com.rtbishop.look4sat.repo.local.SourcesDao-import com.rtbishop.look4sat.repo.local.TransmittersDao-import com.rtbishop.look4sat.utility.TypeConverters+import com.rtbishop.look4sat.repository.localData.EntriesDao+import com.rtbishop.look4sat.repository.localData.SatelliteDb+import com.rtbishop.look4sat.repository.localData.SourcesDao+import com.rtbishop.look4sat.repository.localData.TransmittersDao+import com.rtbishop.look4sat.utility.RoomConvertersimport com.squareup.moshi.Moshiimport dagger.Moduleimport dagger.Provides@@ -66,7 +66,7 @@ object RepositoryModule {@Provides@Singletonfun getSatelliteDb(@ApplicationContext context: Context, moshi: Moshi): SatelliteDb {- TypeConverters.initialize(moshi)+ RoomConverters.initialize(moshi)return Room.databaseBuilder(context, SatelliteDb::class.java, "satDb").build()}}diff --git a/app/src/main/java/com/rtbishop/look4sat/repo/local/SatelliteDb.kt b/app/src/main/java/com/rtbishop/look4sat/repo/local/SatelliteDb.ktdeleted file mode 100644index 01b00e3a..00000000--- a/app/src/main/java/com/rtbishop/look4sat/repo/local/SatelliteDb.kt+++ /dev/null@@ -1,42 +0,0 @@-/*******************************************************************************- Look4Sat. Amateur radio satellite tracker and pass predictor.- Copyright (C) 2019, 2020 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 2 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, write to the Free Software Foundation, Inc.,- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.- ******************************************************************************/--package com.rtbishop.look4sat.repo.local--import androidx.room.Database-import androidx.room.RoomDatabase-import androidx.room.TypeConverters-import com.rtbishop.look4sat.data.SatEntry-import com.rtbishop.look4sat.data.SatTrans-import com.rtbishop.look4sat.data.TleSource--@Database(- entities = [TleSource::class, SatEntry::class, SatTrans::class],- version = 1,- exportSchema = false-)-@TypeConverters(com.rtbishop.look4sat.utility.TypeConverters::class)-abstract class SatelliteDb : RoomDatabase() {-- abstract fun sourcesDao(): SourcesDao-- abstract fun entriesDao(): EntriesDao-- abstract fun transmittersDao(): TransmittersDao-}diff --git a/app/src/main/java/com/rtbishop/look4sat/repo/EntriesRepo.kt b/app/src/main/java/com/rtbishop/look4sat/repository/EntriesRepo.ktsimilarity index 65%rename from app/src/main/java/com/rtbishop/look4sat/repo/EntriesRepo.ktrename to app/src/main/java/com/rtbishop/look4sat/repository/EntriesRepo.ktindex 2ead16fc..3497757f 100644--- a/app/src/main/java/com/rtbishop/look4sat/repo/EntriesRepo.kt+++ b/app/src/main/java/com/rtbishop/look4sat/repository/EntriesRepo.kt@@ -17,15 +17,16 @@51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.******************************************************************************/-package com.rtbishop.look4sat.repo+package com.rtbishop.look4sat.repositoryimport android.content.ContentResolverimport android.net.Uriimport com.github.amsacode.predict4java.TLEimport com.rtbishop.look4sat.data.SatEntryimport com.rtbishop.look4sat.data.TleSource-import com.rtbishop.look4sat.repo.local.EntriesDao-import kotlinx.coroutines.Dispatchers+import com.rtbishop.look4sat.di.IoDispatcher+import com.rtbishop.look4sat.repository.localData.EntriesDao+import kotlinx.coroutines.CoroutineDispatcherimport kotlinx.coroutines.flow.Flowimport kotlinx.coroutines.withContextimport okhttp3.OkHttpClient@@ -34,30 +35,37 @@ import java.io.InputStreamimport javax.inject.Injectclass EntriesRepo @Inject constructor(- private val resolver: ContentResolver,+ private val entriesDao: EntriesDao,private val client: OkHttpClient,- private val entriesDao: EntriesDao+ private val resolver: ContentResolver,+ @IoDispatcher private val ioDispatcher: CoroutineDispatcher) {fun getEntries(): Flow<List<SatEntry>> {return entriesDao.getEntries()}- suspend fun updateEntriesFromFile(fileUri: Uri) {- withContext(Dispatchers.IO) {- kotlin.runCatching {- resolver.openInputStream(fileUri)?.use { stream ->- val importedEntries = TLE.importSat(stream).map { SatEntry(it) }- val selection = entriesDao.getEntriesSelection()- entriesDao.insertEntries(importedEntries)- entriesDao.updateEntriesSelection(selection)+ suspend fun getSelectedEntries(): List<SatEntry> {+ return entriesDao.getSelectedEntries()+ }++ suspend fun updateEntriesSelection(catNums: List<Int>) {+ entriesDao.updateEntriesSelection(catNums)+ }++ suspend fun updateEntriesFromFile(uri: Uri) {+ withContext(ioDispatcher) {+ runCatching {+ resolver.openInputStream(uri)?.use { stream ->+ val importedEntries = TLE.importSat(stream).map { tle -> SatEntry(tle) }+ updateAndRestoreSelection(importedEntries)}}}}- suspend fun updateEntriesFromSources(sources: List<TleSource>) {- withContext(Dispatchers.IO) {+ suspend fun updateEntriesFromWeb(sources: List<TleSource>) {+ withContext(ioDispatcher) {val streams = mutableListOf<InputStream>()sources.forEach { source ->val request = Request.Builder().url(source.url).build()@@ -69,13 +77,13 @@ class EntriesRepo @Inject constructor(val entries = TLE.importSat(stream).map { tle -> SatEntry(tle) }importedEntries.addAll(entries)}- val selection = entriesDao.getEntriesSelection()- entriesDao.insertEntries(importedEntries)- entriesDao.updateEntriesSelection(selection)+ updateAndRestoreSelection(importedEntries)}}- suspend fun updateEntriesSelection(satIds: List<Int>) {- entriesDao.updateEntriesSelection(satIds)+ private suspend fun updateAndRestoreSelection(entries: List<SatEntry>) {+ val selectedCatNums = entriesDao.getSelectedCatNums()+ entriesDao.insertEntries(entries)+ entriesDao.updateEntriesSelection(selectedCatNums)}}\ No newline at end of filediff --git a/app/src/main/java/com/rtbishop/look4sat/repo/SourcesRepo.kt b/app/src/main/java/com/rtbishop/look4sat/repository/SourcesRepo.ktsimilarity index 93%rename from app/src/main/java/com/rtbishop/look4sat/repo/SourcesRepo.ktrename to app/src/main/java/com/rtbishop/look4sat/repository/SourcesRepo.ktindex cd8166bd..2b1506fc 100644--- a/app/src/main/java/com/rtbishop/look4sat/repo/SourcesRepo.kt+++ b/app/src/main/java/com/rtbishop/look4sat/repository/SourcesRepo.kt@@ -17,10 +17,10 @@51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.******************************************************************************/-package com.rtbishop.look4sat.repo+package com.rtbishop.look4sat.repositoryimport com.rtbishop.look4sat.data.TleSource-import com.rtbishop.look4sat.repo.local.SourcesDao+import com.rtbishop.look4sat.repository.localData.SourcesDaoimport kotlinx.coroutines.flow.Flowimport javax.inject.Injectdiff --git a/app/src/main/java/com/rtbishop/look4sat/repo/TransmittersRepo.kt b/app/src/main/java/com/rtbishop/look4sat/repository/TransmittersRepo.ktsimilarity index 71%rename from app/src/main/java/com/rtbishop/look4sat/repo/TransmittersRepo.ktrename to app/src/main/java/com/rtbishop/look4sat/repository/TransmittersRepo.ktindex 7886158a..b2566dac 100644--- a/app/src/main/java/com/rtbishop/look4sat/repo/TransmittersRepo.kt+++ b/app/src/main/java/com/rtbishop/look4sat/repository/TransmittersRepo.kt@@ -17,24 +17,24 @@51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.******************************************************************************/-package com.rtbishop.look4sat.repo+package com.rtbishop.look4sat.repositoryimport com.rtbishop.look4sat.data.SatTrans-import com.rtbishop.look4sat.repo.local.TransmittersDao-import com.rtbishop.look4sat.repo.remote.TransmittersApi+import com.rtbishop.look4sat.repository.localData.TransmittersDao+import com.rtbishop.look4sat.repository.remoteData.TransmittersApiimport kotlinx.coroutines.flow.Flowimport javax.inject.Injectclass TransmittersRepo @Inject constructor(- private val transmittersDao: TransmittersDao,- private val transmittersApi: TransmittersApi+ private val transmittersApi: TransmittersApi,+ private val transmittersDao: TransmittersDao) {- fun getTransmittersForSat(satId: Int): Flow<List<SatTrans>> {- return transmittersDao.getTransmittersForSat(satId)+ fun getTransmittersForSat(catNum: Int): Flow<List<SatTrans>> {+ return transmittersDao.getTransmittersForSat(catNum)}suspend fun updateTransmitters() {- transmittersDao.updateTransmitters(transmittersApi.getTransmitters())+ transmittersDao.insertTransmitters(transmittersApi.fetchTransmitters())}}\ No newline at end of filediff --git a/app/src/main/java/com/rtbishop/look4sat/repo/local/EntriesDao.kt b/app/src/main/java/com/rtbishop/look4sat/repository/localData/EntriesDao.ktsimilarity index 76%rename from app/src/main/java/com/rtbishop/look4sat/repo/local/EntriesDao.ktrename to app/src/main/java/com/rtbishop/look4sat/repository/localData/EntriesDao.ktindex 8915038f..ae6741e1 100644--- a/app/src/main/java/com/rtbishop/look4sat/repo/local/EntriesDao.kt+++ b/app/src/main/java/com/rtbishop/look4sat/repository/localData/EntriesDao.kt@@ -17,7 +17,7 @@51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.******************************************************************************/-package com.rtbishop.look4sat.repo.local+package com.rtbishop.look4sat.repository.localDataimport androidx.room.*import com.rtbishop.look4sat.data.SatEntry@@ -28,22 +28,25 @@ interface EntriesDao {@Query("SELECT * FROM entries ORDER BY name ASC")fun getEntries(): Flow<List<SatEntry>>-+@Insert(onConflict = OnConflictStrategy.REPLACE)suspend fun insertEntries(entries: List<SatEntry>)-++ @Query("SELECT * FROM entries WHERE isSelected = 1")+ suspend fun getSelectedEntries(): List<SatEntry>+@Query("SELECT catNum FROM entries WHERE isSelected = 1")- suspend fun getEntriesSelection(): List<Int>-+ suspend fun getSelectedCatNums(): List<Int>+@Transaction- suspend fun updateEntriesSelection(satIds: List<Int>) {+ suspend fun updateEntriesSelection(catNums: List<Int>) {clearSelection()- satIds.forEach { updateSelection(it) }+ catNums.forEach { catNum -> updateSelection(catNum) }}-+@Query("UPDATE entries SET isSelected = 0")suspend fun clearSelection()-- @Query("UPDATE entries SET isSelected = 1 WHERE catNum = :satId")- suspend fun updateSelection(satId: Int)++ @Query("UPDATE entries SET isSelected = 1 WHERE catNum = :catNum")+ suspend fun updateSelection(catNum: Int)}diff --git a/app/src/main/java/com/rtbishop/look4sat/repository/localData/SatelliteDb.kt b/app/src/main/java/com/rtbishop/look4sat/repository/localData/SatelliteDb.ktnew file mode 100644index 00000000..a14cc1a2--- /dev/null+++ b/app/src/main/java/com/rtbishop/look4sat/repository/localData/SatelliteDb.kt@@ -0,0 +1,39 @@+/*******************************************************************************+Look4Sat. Amateur radio satellite tracker and pass predictor.+Copyright (C) 2019, 2020 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 2 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, write to the Free Software Foundation, Inc.,+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.+ ******************************************************************************/++package com.rtbishop.look4sat.repository.localData++import androidx.room.Database+import androidx.room.RoomDatabase+import androidx.room.TypeConverters+import com.rtbishop.look4sat.data.SatEntry+import com.rtbishop.look4sat.data.SatTrans+import com.rtbishop.look4sat.data.TleSource+import com.rtbishop.look4sat.utility.RoomConverters++@Database(entities = [TleSource::class, SatEntry::class, SatTrans::class], version = 1)+@TypeConverters(RoomConverters::class)+abstract class SatelliteDb : RoomDatabase() {++ abstract fun sourcesDao(): SourcesDao++ abstract fun entriesDao(): EntriesDao++ abstract fun transmittersDao(): TransmittersDao+}diff --git a/app/src/main/java/com/rtbishop/look4sat/repo/local/SourcesDao.kt b/app/src/main/java/com/rtbishop/look4sat/repository/localData/SourcesDao.ktsimilarity index 96%rename from app/src/main/java/com/rtbishop/look4sat/repo/local/SourcesDao.ktrename to app/src/main/java/com/rtbishop/look4sat/repository/localData/SourcesDao.ktindex 669f4619..3ec28715 100644--- a/app/src/main/java/com/rtbishop/look4sat/repo/local/SourcesDao.kt+++ b/app/src/main/java/com/rtbishop/look4sat/repository/localData/SourcesDao.kt@@ -17,7 +17,7 @@51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.******************************************************************************/-package com.rtbishop.look4sat.repo.local+package com.rtbishop.look4sat.repository.localDataimport androidx.room.*import com.rtbishop.look4sat.data.TleSourcediff --git a/app/src/main/java/com/rtbishop/look4sat/repo/local/TransmittersDao.kt b/app/src/main/java/com/rtbishop/look4sat/repository/localData/TransmittersDao.ktsimilarity index 77%rename from app/src/main/java/com/rtbishop/look4sat/repo/local/TransmittersDao.ktrename to app/src/main/java/com/rtbishop/look4sat/repository/localData/TransmittersDao.ktindex d00ba674..5082dee3 100644--- a/app/src/main/java/com/rtbishop/look4sat/repo/local/TransmittersDao.kt+++ b/app/src/main/java/com/rtbishop/look4sat/repository/localData/TransmittersDao.kt@@ -17,27 +17,21 @@51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.******************************************************************************/-package com.rtbishop.look4sat.repo.local+package com.rtbishop.look4sat.repository.localData-import androidx.room.*+import androidx.room.Dao+import androidx.room.Insert+import androidx.room.OnConflictStrategy+import androidx.room.Queryimport com.rtbishop.look4sat.data.SatTransimport kotlinx.coroutines.flow.Flow@Daointerface TransmittersDao {- @Query("SELECT * FROM transmitters WHERE isAlive = 1 and catNum = :satId")- fun getTransmittersForSat(satId: Int): Flow<List<SatTrans>>-- @Transaction- suspend fun updateTransmitters(transmitters: List<SatTrans>) {- clearTransmitters()- insertTransmitters(transmitters)- }-- @Query("DELETE FROM transmitters")- suspend fun clearTransmitters()-+ @Query("SELECT * FROM transmitters WHERE isAlive = 1 and catNum = :catNum")+ fun getTransmittersForSat(catNum: Int): Flow<List<SatTrans>>+@Insert(onConflict = OnConflictStrategy.REPLACE)suspend fun insertTransmitters(transmitters: List<SatTrans>)}diff --git a/app/src/main/java/com/rtbishop/look4sat/repo/remote/TransmittersApi.kt b/app/src/main/java/com/rtbishop/look4sat/repository/remoteData/TransmittersApi.ktsimilarity index 91%rename from app/src/main/java/com/rtbishop/look4sat/repo/remote/TransmittersApi.ktrename to app/src/main/java/com/rtbishop/look4sat/repository/remoteData/TransmittersApi.ktindex 73d4f8be..cdb75164 100644--- a/app/src/main/java/com/rtbishop/look4sat/repo/remote/TransmittersApi.kt+++ b/app/src/main/java/com/rtbishop/look4sat/repository/remoteData/TransmittersApi.kt@@ -17,7 +17,7 @@51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.******************************************************************************/-package com.rtbishop.look4sat.repo.remote+package com.rtbishop.look4sat.repository.remoteDataimport com.rtbishop.look4sat.data.SatTransimport retrofit2.http.GET@@ -25,5 +25,5 @@ import retrofit2.http.GETinterface TransmittersApi {@GET("transmitters/")- suspend fun getTransmitters(): List<SatTrans>+ suspend fun fetchTransmitters(): List<SatTrans>}diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/MainActivity.kt b/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.ktsimilarity index 97%rename from app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/MainActivity.ktrename to app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.ktindex b3e6e42f..9bb49470 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/MainActivity.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt@@ -17,7 +17,7 @@51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.******************************************************************************/-package com.rtbishop.look4sat.ui.mainScreen+package com.rtbishop.look4sat.uiimport android.os.Bundleimport androidx.appcompat.app.AppCompatActivitydiff --git a/app/src/main/java/com/rtbishop/look4sat/SharedViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.ktsimilarity index 95%rename from app/src/main/java/com/rtbishop/look4sat/SharedViewModel.ktrename to app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.ktindex 7ac01b12..18c18da5 100644--- a/app/src/main/java/com/rtbishop/look4sat/SharedViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt@@ -17,15 +17,15 @@51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.******************************************************************************/-package com.rtbishop.look4sat+package com.rtbishop.look4sat.uiimport android.net.Uriimport androidx.lifecycle.*import com.github.amsacode.predict4java.SatelliteFactoryimport com.rtbishop.look4sat.data.*-import com.rtbishop.look4sat.repo.EntriesRepo-import com.rtbishop.look4sat.repo.SourcesRepo-import com.rtbishop.look4sat.repo.TransmittersRepo+import com.rtbishop.look4sat.repository.EntriesRepo+import com.rtbishop.look4sat.repository.SourcesRepo+import com.rtbishop.look4sat.repository.TransmittersRepoimport com.rtbishop.look4sat.utility.PrefsManagerimport com.rtbishop.look4sat.utility.getPredictorimport dagger.hilt.android.lifecycle.HiltViewModel@@ -107,7 +107,7 @@ class SharedViewModel @Inject constructor(viewModelScope.launch {try {sourcesRepo.updateSources(sources)- entriesRepo.updateEntriesFromSources(sources)+ entriesRepo.updateEntriesFromWeb(sources)transmittersRepo.updateTransmitters()} catch (exception: Exception) {postAppEvent(Event(1))diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/EntriesAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesAdapter.ktsimilarity index 79%rename from app/src/main/java/com/rtbishop/look4sat/ui/adapters/EntriesAdapter.ktrename to app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesAdapter.ktindex 7cf6cf71..cbb2ec83 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/EntriesAdapter.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesAdapter.kt@@ -1,23 +1,23 @@/*******************************************************************************- Look4Sat. Amateur radio satellite tracker and pass predictor.- Copyright (C) 2019, 2020 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 2 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, write to the Free Software Foundation, Inc.,- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.+Look4Sat. Amateur radio satellite tracker and pass predictor.+Copyright (C) 2019, 2020 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 2 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, write to the Free Software Foundation, Inc.,+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.******************************************************************************/-package com.rtbishop.look4sat.ui.adapters+package com.rtbishop.look4sat.ui.entriesScreenimport android.view.LayoutInflaterimport android.view.ViewGroupdiff --git a/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/EntriesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesFragment.ktsimilarity index 93%rename from app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/EntriesFragment.ktrename to app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesFragment.ktindex 8ef7e867..c3bbff1d 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/EntriesFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesFragment.kt@@ -2,22 +2,22 @@Look4Sat. Amateur radio satellite tracker and pass predictor.Copyright (C) 2019, 2020 Arty Bishop ([email protected])- This program is free software; you can redistribute it and/or modify+This program is free software; you can redistribute it and/or modifyit under the terms of the GNU General Public License as published bythe Free Software Foundation; either version 2 of the License, or(at your option) any later version.- This program is distributed in the hope that it will be useful,+This program is distributed in the hope that it will be useful,but WITHOUT ANY WARRANTY; without even the implied warranty ofMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See theGNU General Public License for more details.- You should have received a copy of the GNU General Public License along+You should have received a copy of the GNU General Public License alongwith this program; if not, write to the Free Software Foundation, Inc.,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.******************************************************************************/-package com.rtbishop.look4sat.ui.mainScreen+package com.rtbishop.look4sat.ui.entriesScreenimport android.os.Bundleimport android.view.View@@ -29,10 +29,9 @@ import androidx.navigation.fragment.findNavControllerimport androidx.recyclerview.widget.LinearLayoutManagerimport com.google.android.material.snackbar.Snackbarimport com.rtbishop.look4sat.R-import com.rtbishop.look4sat.SharedViewModelimport com.rtbishop.look4sat.data.SatEntryimport com.rtbishop.look4sat.databinding.FragmentEntriesBinding-import com.rtbishop.look4sat.ui.adapters.EntriesAdapter+import com.rtbishop.look4sat.ui.SharedViewModelimport com.rtbishop.look4sat.utility.RecyclerDividerimport dagger.hilt.android.AndroidEntryPointdiff --git a/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/InfoFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/infoScreen/InfoFragment.ktsimilarity index 98%rename from app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/InfoFragment.ktrename to app/src/main/java/com/rtbishop/look4sat/ui/infoScreen/InfoFragment.ktindex 53a3373e..9d064cd4 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/InfoFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/infoScreen/InfoFragment.kt@@ -17,7 +17,7 @@51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.******************************************************************************/-package com.rtbishop.look4sat.ui.mainScreen+package com.rtbishop.look4sat.ui.infoScreenimport android.content.Intentimport android.net.Uridiff --git a/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/MapFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/mapScreen/MapFragment.ktsimilarity index 96%rename from app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/MapFragment.ktrename to app/src/main/java/com/rtbishop/look4sat/ui/mapScreen/MapFragment.ktindex efe9e986..45a5f4be 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/MapFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/mapScreen/MapFragment.kt@@ -2,22 +2,22 @@Look4Sat. Amateur radio satellite tracker and pass predictor.Copyright (C) 2019, 2020 Arty Bishop ([email protected])- This program is free software; you can redistribute it and/or modify+This program is free software; you can redistribute it and/or modifyit under the terms of the GNU General Public License as published bythe Free Software Foundation; either version 2 of the License, or(at your option) any later version.- This program is distributed in the hope that it will be useful,+This program is distributed in the hope that it will be useful,but WITHOUT ANY WARRANTY; without even the implied warranty ofMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See theGNU General Public License for more details.- You should have received a copy of the GNU General Public License along+You should have received a copy of the GNU General Public License alongwith this program; if not, write to the Free Software Foundation, Inc.,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.******************************************************************************/-package com.rtbishop.look4sat.ui.mainScreen+package com.rtbishop.look4sat.ui.mapScreenimport android.graphics.Colorimport android.graphics.ColorMatrix@@ -30,11 +30,11 @@ import androidx.fragment.app.activityViewModelsimport androidx.fragment.app.viewModelsimport com.github.amsacode.predict4java.Positionimport com.rtbishop.look4sat.R-import com.rtbishop.look4sat.SharedViewModelimport com.rtbishop.look4sat.data.Resultimport com.rtbishop.look4sat.data.SatPassimport com.rtbishop.look4sat.data.SelectedSatimport com.rtbishop.look4sat.databinding.FragmentMapBinding+import com.rtbishop.look4sat.ui.SharedViewModelimport com.rtbishop.look4sat.utility.PrefsManagerimport dagger.hilt.android.AndroidEntryPointimport org.osmdroid.config.Configurationdiff --git a/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/MapViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/ui/mapScreen/MapViewModel.ktsimilarity index 99%rename from app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/MapViewModel.ktrename to app/src/main/java/com/rtbishop/look4sat/ui/mapScreen/MapViewModel.ktindex 6eb66bd7..4089d6f4 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/MapViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/mapScreen/MapViewModel.kt@@ -17,7 +17,7 @@51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.******************************************************************************/-package com.rtbishop.look4sat.ui.mainScreen+package com.rtbishop.look4sat.ui.mapScreenimport android.graphics.Colorimport android.graphics.Paintdiff --git a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/PassesAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/ui/passesScreen/PassesAdapter.ktsimilarity index 96%rename from app/src/main/java/com/rtbishop/look4sat/ui/adapters/PassesAdapter.ktrename to app/src/main/java/com/rtbishop/look4sat/ui/passesScreen/PassesAdapter.ktindex feb1c471..408ff130 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/PassesAdapter.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/passesScreen/PassesAdapter.kt@@ -2,22 +2,22 @@Look4Sat. Amateur radio satellite tracker and pass predictor.Copyright (C) 2019, 2020 Arty Bishop ([email protected])- This program is free software; you can redistribute it and/or modify+This program is free software; you can redistribute it and/or modifyit under the terms of the GNU General Public License as published bythe Free Software Foundation; either version 2 of the License, or(at your option) any later version.- This program is distributed in the hope that it will be useful,+This program is distributed in the hope that it will be useful,but WITHOUT ANY WARRANTY; without even the implied warranty ofMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See theGNU General Public License for more details.- You should have received a copy of the GNU General Public License along+You should have received a copy of the GNU General Public License alongwith this program; if not, write to the Free Software Foundation, Inc.,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.******************************************************************************/-package com.rtbishop.look4sat.ui.adapters+package com.rtbishop.look4sat.ui.passesScreenimport android.content.Contextimport android.view.LayoutInflaterdiff --git a/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/PassesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/passesScreen/PassesFragment.ktsimilarity index 93%rename from app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/PassesFragment.ktrename to app/src/main/java/com/rtbishop/look4sat/ui/passesScreen/PassesFragment.ktindex d5e4c273..c9533bf0 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/PassesFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/passesScreen/PassesFragment.kt@@ -2,22 +2,22 @@Look4Sat. Amateur radio satellite tracker and pass predictor.Copyright (C) 2019, 2020 Arty Bishop ([email protected])- This program is free software; you can redistribute it and/or modify+This program is free software; you can redistribute it and/or modifyit under the terms of the GNU General Public License as published bythe Free Software Foundation; either version 2 of the License, or(at your option) any later version.- This program is distributed in the hope that it will be useful,+This program is distributed in the hope that it will be useful,but WITHOUT ANY WARRANTY; without even the implied warranty ofMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See theGNU General Public License for more details.- You should have received a copy of the GNU General Public License along+You should have received a copy of the GNU General Public License alongwith this program; if not, write to the Free Software Foundation, Inc.,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.******************************************************************************/-package com.rtbishop.look4sat.ui.mainScreen+package com.rtbishop.look4sat.ui.passesScreenimport android.os.Bundleimport android.view.View@@ -26,11 +26,10 @@ import androidx.fragment.app.activityViewModelsimport androidx.recyclerview.widget.LinearLayoutManagerimport androidx.recyclerview.widget.SimpleItemAnimatorimport com.rtbishop.look4sat.R-import com.rtbishop.look4sat.SharedViewModelimport com.rtbishop.look4sat.data.Resultimport com.rtbishop.look4sat.data.SatPassimport com.rtbishop.look4sat.databinding.FragmentPassesBinding-import com.rtbishop.look4sat.ui.adapters.PassesAdapter+import com.rtbishop.look4sat.ui.SharedViewModelimport com.rtbishop.look4sat.utility.PrefsManagerimport com.rtbishop.look4sat.utility.RecyclerDividerimport com.rtbishop.look4sat.utility.formatForTimerdiff --git a/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/PolarFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/polarScreen/PolarFragment.ktsimilarity index 85%rename from app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/PolarFragment.ktrename to app/src/main/java/com/rtbishop/look4sat/ui/polarScreen/PolarFragment.ktindex 4964ce6d..07384562 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/PolarFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/polarScreen/PolarFragment.kt@@ -1,23 +1,23 @@/*******************************************************************************- Look4Sat. Amateur radio satellite tracker and pass predictor.- Copyright (C) 2019, 2020 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 2 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, write to the Free Software Foundation, Inc.,- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.+Look4Sat. Amateur radio satellite tracker and pass predictor.+Copyright (C) 2019, 2020 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 2 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, write to the Free Software Foundation, Inc.,+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.******************************************************************************/-package com.rtbishop.look4sat.ui.mainScreen+package com.rtbishop.look4sat.ui.polarScreenimport android.content.Contextimport android.hardware.Sensor@@ -32,12 +32,10 @@ import androidx.navigation.fragment.findNavControllerimport androidx.recyclerview.widget.LinearLayoutManagerimport androidx.recyclerview.widget.SimpleItemAnimatorimport com.rtbishop.look4sat.R-import com.rtbishop.look4sat.SharedViewModelimport com.rtbishop.look4sat.data.Resultimport com.rtbishop.look4sat.data.SatPassimport com.rtbishop.look4sat.databinding.FragmentPolarBinding-import com.rtbishop.look4sat.ui.adapters.TransAdapter-import com.rtbishop.look4sat.ui.views.PolarView+import com.rtbishop.look4sat.ui.SharedViewModelimport com.rtbishop.look4sat.utility.PrefsManagerimport com.rtbishop.look4sat.utility.RecyclerDividerimport com.rtbishop.look4sat.utility.formatForTimer@@ -104,7 +102,7 @@ class PolarFragment : Fragment(R.layout.fragment_polar), SensorEventListener {viewModel.getPasses().observe(viewLifecycleOwner, { result ->if (result is Result.Success) {satPass = result.data[requireArguments().getInt("index")]- polarView = PolarView(requireContext(), satPass)+ polarView = PolarView(requireContext()).apply { setPass(satPass) }binding.frame.addView(polarView)observeTransmitters()}diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/views/PolarView.kt b/app/src/main/java/com/rtbishop/look4sat/ui/polarScreen/PolarView.ktsimilarity index 94%rename from app/src/main/java/com/rtbishop/look4sat/ui/views/PolarView.ktrename to app/src/main/java/com/rtbishop/look4sat/ui/polarScreen/PolarView.ktindex 567ec378..dc4e877b 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/views/PolarView.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/polarScreen/PolarView.kt@@ -17,7 +17,7 @@51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.******************************************************************************/-package com.rtbishop.look4sat.ui.views+package com.rtbishop.look4sat.ui.polarScreenimport android.content.Contextimport android.graphics.Canvas@@ -33,12 +33,8 @@ import kotlin.math.cosimport kotlin.math.sinclass PolarView(context: Context) : View(context) {-- constructor(context: Context, satPass: SatPass) : this(context) {- pass = satPass- }-- private lateinit var pass: SatPass++ private lateinit var satPass: SatPassprivate val polarWidth = resources.displayMetrics.widthPixelsprivate val polarCenter = polarWidth / 2fprivate val scale = resources.displayMetrics.density@@ -69,15 +65,19 @@ class PolarView(context: Context) : View(context) {color = ContextCompat.getColor(context, R.color.themeLight)style = Paint.Style.FILL}-++ fun setPass(satPass: SatPass) {+ this.satPass = satPass+ }+override fun onDraw(canvas: Canvas) {canvas.translate(polarCenter, polarCenter)drawRadarView(canvas)drawRadarText(canvas)- if (!pass.tle.isDeepspace) drawPassTrajectory(canvas, pass)- drawSatellite(canvas, pass)+ if (!satPass.tle.isDeepspace) drawPassTrajectory(canvas, satPass)+ drawSatellite(canvas, satPass)}-+private fun drawRadarView(cvs: Canvas) {cvs.drawLine(-radius, 0f, radius, 0f, radarPaint)cvs.drawLine(0f, -radius, 0f, radius, radarPaint)diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/TransAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/ui/polarScreen/TransAdapter.ktsimilarity index 94%rename from app/src/main/java/com/rtbishop/look4sat/ui/adapters/TransAdapter.ktrename to app/src/main/java/com/rtbishop/look4sat/ui/polarScreen/TransAdapter.ktindex 9b72cd29..23034cd6 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/TransAdapter.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/polarScreen/TransAdapter.kt@@ -2,22 +2,22 @@Look4Sat. Amateur radio satellite tracker and pass predictor.Copyright (C) 2019, 2020 Arty Bishop ([email protected])- This program is free software; you can redistribute it and/or modify+This program is free software; you can redistribute it and/or modifyit under the terms of the GNU General Public License as published bythe Free Software Foundation; either version 2 of the License, or(at your option) any later version.- This program is distributed in the hope that it will be useful,+This program is distributed in the hope that it will be useful,but WITHOUT ANY WARRANTY; without even the implied warranty ofMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See theGNU General Public License for more details.- You should have received a copy of the GNU General Public License along+You should have received a copy of the GNU General Public License alongwith this program; if not, write to the Free Software Foundation, Inc.,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.******************************************************************************/-package com.rtbishop.look4sat.ui.adapters+package com.rtbishop.look4sat.ui.polarScreenimport android.content.Contextimport android.view.LayoutInflaterdiff --git a/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/PrefsFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/prefsScreen/PrefsFragment.ktsimilarity index 99%rename from app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/PrefsFragment.ktrename to app/src/main/java/com/rtbishop/look4sat/ui/prefsScreen/PrefsFragment.ktindex 4e351346..35269d45 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/PrefsFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/prefsScreen/PrefsFragment.kt@@ -17,7 +17,7 @@51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.******************************************************************************/-package com.rtbishop.look4sat.ui.mainScreen+package com.rtbishop.look4sat.ui.prefsScreenimport android.Manifestimport android.content.pm.PackageManagerdiff --git a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/SourcesAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/ui/sourcesDialog/SourcesAdapter.ktsimilarity index 79%rename from app/src/main/java/com/rtbishop/look4sat/ui/adapters/SourcesAdapter.ktrename to app/src/main/java/com/rtbishop/look4sat/ui/sourcesDialog/SourcesAdapter.ktindex f27d9a61..ffb5c814 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/SourcesAdapter.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/sourcesDialog/SourcesAdapter.kt@@ -2,22 +2,22 @@Look4Sat. Amateur radio satellite tracker and pass predictor.Copyright (C) 2019, 2020 Arty Bishop ([email protected])- This program is free software; you can redistribute it and/or modify+This program is free software; you can redistribute it and/or modifyit under the terms of the GNU General Public License as published bythe Free Software Foundation; either version 2 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.+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, write to the Free Software Foundation, Inc.,- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.+You should have received a copy of the GNU General Public License along+with this program; if not, write to the Free Software Foundation, Inc.,+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.******************************************************************************/-package com.rtbishop.look4sat.ui.adapters+package com.rtbishop.look4sat.ui.sourcesDialogimport android.view.LayoutInflaterimport android.view.ViewGroupdiff --git a/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/SourcesDialog.kt b/app/src/main/java/com/rtbishop/look4sat/ui/sourcesDialog/SourcesDialog.ktsimilarity index 95%rename from app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/SourcesDialog.ktrename to app/src/main/java/com/rtbishop/look4sat/ui/sourcesDialog/SourcesDialog.ktindex 98253a6e..cc5fc89e 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/SourcesDialog.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/sourcesDialog/SourcesDialog.kt@@ -1,23 +1,23 @@/*******************************************************************************Look4Sat. Amateur radio satellite tracker and pass predictor.Copyright (C) 2019, 2020 Arty Bishop ([email protected])-+This program is free software; you can redistribute it and/or modifyit under the terms of the GNU General Public License as published bythe Free Software Foundation; either version 2 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 ofMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See theGNU General Public License for more details.-+You should have received a copy of the GNU General Public License alongwith this program; if not, write to the Free Software Foundation, Inc.,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.******************************************************************************/-package com.rtbishop.look4sat.ui.mainScreen+package com.rtbishop.look4sat.ui.sourcesDialogimport android.os.Bundleimport android.view.LayoutInflater@@ -28,10 +28,9 @@ import androidx.appcompat.app.AppCompatDialogFragmentimport androidx.fragment.app.activityViewModelsimport androidx.recyclerview.widget.LinearLayoutManagerimport com.rtbishop.look4sat.R-import com.rtbishop.look4sat.SharedViewModel+import com.rtbishop.look4sat.ui.SharedViewModelimport com.rtbishop.look4sat.data.TleSourceimport com.rtbishop.look4sat.databinding.DialogSourcesBinding-import com.rtbishop.look4sat.ui.adapters.SourcesAdapterimport dagger.hilt.android.AndroidEntryPoint@AndroidEntryPointdiff --git a/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/SplashDialog.kt b/app/src/main/java/com/rtbishop/look4sat/ui/splashDialog/SplashDialog.ktsimilarity index 97%rename from app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/SplashDialog.ktrename to app/src/main/java/com/rtbishop/look4sat/ui/splashDialog/SplashDialog.ktindex cac061be..1b9250b0 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/SplashDialog.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/splashDialog/SplashDialog.kt@@ -17,7 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.******************************************************************************/-package com.rtbishop.look4sat.ui.mainScreen+package com.rtbishop.look4sat.ui.splashDialogimport android.os.Bundleimport android.view.LayoutInflaterdiff --git a/app/src/main/java/com/rtbishop/look4sat/utility/PrefsManager.kt b/app/src/main/java/com/rtbishop/look4sat/utility/PrefsManager.ktindex 38562185..937a7058 100644--- a/app/src/main/java/com/rtbishop/look4sat/utility/PrefsManager.kt+++ b/app/src/main/java/com/rtbishop/look4sat/utility/PrefsManager.kt@@ -26,6 +26,7 @@ import com.github.amsacode.predict4java.GroundStationPositionimport javax.inject.Injectclass PrefsManager @Inject constructor(val preferences: SharedPreferences) {+companion object {const val keyLatitude = "latitude"const val keyLongitude = "longitude"@@ -61,7 +62,6 @@ class PrefsManager @Inject constructor(val preferences: SharedPreferences) {putString(keyLatitude, latitude.toString())putString(keyLongitude, longitude.toString())putString(keyAltitude, altitude.toString())- apply()}}@@ -90,9 +90,6 @@ class PrefsManager @Inject constructor(val preferences: SharedPreferences) {}fun setFirstLaunchDone() {- preferences.edit {- putBoolean(keyIsFirstLaunch, false)- apply()- }+ preferences.edit { putBoolean(keyIsFirstLaunch, false) }}}diff --git a/app/src/main/java/com/rtbishop/look4sat/utility/RecyclerDivider.kt b/app/src/main/java/com/rtbishop/look4sat/utility/RecyclerDivider.ktindex 7d2c33dc..3877bcdf 100644--- a/app/src/main/java/com/rtbishop/look4sat/utility/RecyclerDivider.kt+++ b/app/src/main/java/com/rtbishop/look4sat/utility/RecyclerDivider.kt@@ -26,18 +26,19 @@ import androidx.recyclerview.widget.RecyclerViewclass RecyclerDivider(private val resId: Int) : RecyclerView.ItemDecoration() {override fun onDrawOver(c: Canvas, parent: RecyclerView) {- val divider = ContextCompat.getDrawable(parent.context, resId)!!- val left = parent.paddingLeft- val right = parent.width - parent.paddingRight- parent.adapter?.itemCount?.let { childCount ->- for (i in 0 until childCount) {- if (i == (childCount - 1)) continue- parent.getChildAt(i)?.let {- val params = it.layoutParams as RecyclerView.LayoutParams- val top = it.bottom + params.bottomMargin- val bottom = top + divider.intrinsicHeight- divider.setBounds(left, top, right, bottom)- divider.draw(c)+ ContextCompat.getDrawable(parent.context, resId)?.let { drawable ->+ val leftPos = parent.paddingLeft+ val rightPos = parent.width - parent.paddingRight+ parent.adapter?.itemCount?.let { childCount ->+ for (i in 0 until childCount) {+ if (i == (childCount - 1)) continue+ parent.getChildAt(i)?.let { view ->+ val params = view.layoutParams as RecyclerView.LayoutParams+ val topPos = view.bottom + params.bottomMargin+ val bottomPos = topPos + drawable.intrinsicHeight+ drawable.setBounds(leftPos, topPos, rightPos, bottomPos)+ drawable.draw(c)+ }}}}diff --git a/app/src/main/java/com/rtbishop/look4sat/utility/TypeConverters.kt b/app/src/main/java/com/rtbishop/look4sat/utility/RoomConverters.ktsimilarity index 98%rename from app/src/main/java/com/rtbishop/look4sat/utility/TypeConverters.ktrename to app/src/main/java/com/rtbishop/look4sat/utility/RoomConverters.ktindex baee777f..0370cec4 100644--- a/app/src/main/java/com/rtbishop/look4sat/utility/TypeConverters.kt+++ b/app/src/main/java/com/rtbishop/look4sat/utility/RoomConverters.kt@@ -24,7 +24,7 @@ import com.github.amsacode.predict4java.TLEimport com.squareup.moshi.JsonAdapterimport com.squareup.moshi.Moshi-object TypeConverters {+object RoomConverters {private lateinit var tleAdapter: JsonAdapter<TLE>diff --git a/app/src/main/res/layout/fragment_info.xml b/app/src/main/res/layout/fragment_info.xmlindex 1896154f..6aaf2d64 100644--- a/app/src/main/res/layout/fragment_info.xml+++ b/app/src/main/res/layout/fragment_info.xml@@ -4,7 +4,7 @@xmlns:tools="http://schemas.android.com/tools"android:layout_width="match_parent"android:layout_height="match_parent"- tools:context=".ui.mainScreen.InfoFragment">+ tools:context=".ui.infoScreen.InfoFragment"><androidx.constraintlayout.widget.ConstraintLayoutandroid:layout_width="match_parent"diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xmlindex 5d300060..1d14b291 100644--- a/app/src/main/res/navigation/nav_graph.xml+++ b/app/src/main/res/navigation/nav_graph.xml@@ -7,7 +7,7 @@<fragmentandroid:id="@+id/nav_entries"- android:name="com.rtbishop.look4sat.ui.mainScreen.EntriesFragment"+ android:name="com.rtbishop.look4sat.ui.entriesScreen.EntriesFragment"tools:layout="@layout/fragment_entries"><actionandroid:id="@+id/action_entries_to_passes"@@ -27,7 +27,7 @@<fragmentandroid:id="@+id/nav_passes"- android:name="com.rtbishop.look4sat.ui.mainScreen.PassesFragment"+ android:name="com.rtbishop.look4sat.ui.passesScreen.PassesFragment"tools:layout="@layout/fragment_passes"><actionandroid:id="@+id/action_passes_to_polar"@@ -40,7 +40,7 @@<fragmentandroid:id="@+id/nav_polar"- android:name="com.rtbishop.look4sat.ui.mainScreen.PolarFragment"+ android:name="com.rtbishop.look4sat.ui.polarScreen.PolarFragment"tools:layout="@layout/fragment_polar"><actionandroid:id="@+id/action_polar_to_passes"@@ -55,24 +55,24 @@<fragmentandroid:id="@+id/nav_map"- android:name="com.rtbishop.look4sat.ui.mainScreen.MapFragment"+ android:name="com.rtbishop.look4sat.ui.mapScreen.MapFragment"tools:layout="@layout/fragment_map" /><fragmentandroid:id="@+id/nav_prefs"- android:name="com.rtbishop.look4sat.ui.mainScreen.PrefsFragment" />+ android:name="com.rtbishop.look4sat.ui.prefsScreen.PrefsFragment" /><fragmentandroid:id="@+id/nav_info"- android:name="com.rtbishop.look4sat.ui.mainScreen.InfoFragment"+ android:name="com.rtbishop.look4sat.ui.infoScreen.InfoFragment"tools:layout="@layout/fragment_info" /><dialogandroid:id="@+id/nav_dialog_sources"- android:name="com.rtbishop.look4sat.ui.mainScreen.SourcesDialog"+ android:name="com.rtbishop.look4sat.ui.sourcesDialog.SourcesDialog"tools:layout="@layout/dialog_sources" /><dialogandroid:id="@+id/nav_dialog_splash"- android:name="com.rtbishop.look4sat.ui.mainScreen.SplashDialog"+ android:name="com.rtbishop.look4sat.ui.splashDialog.SplashDialog"tools:layout="@layout/dialog_splash" /></navigation>