Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Moved and renamed several classes
Arty Bishop55a827330f18
diff --git a/app/build.gradle b/app/build.gradleindex 870d50d7..f58f70ec 100644--- a/app/build.gradle+++ b/app/build.gradle@@ -24,8 +24,12 @@ android {}}+// def props = new Properties()+// file("../securityKeys.properties").withInputStream { props.load(it) }+buildTypes {release {+// buildConfigField "String", "ApiKey", props.getProperty("apiKey")// minifyEnabled true// shrinkResources true// proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'diff --git a/app/schemas/com.rtbishop.look4sat.framework.db.SatelliteDb/2.json b/app/schemas/com.rtbishop.look4sat.framework.local.SatelliteDb/2.jsonsimilarity index 100%rename from app/schemas/com.rtbishop.look4sat.framework.db.SatelliteDb/2.jsonrename to app/schemas/com.rtbishop.look4sat.framework.local.SatelliteDb/2.jsondiff --git a/app/src/main/java/com/rtbishop/look4sat/utility/DataMapper.kt b/app/src/main/java/com/rtbishop/look4sat/framework/DataMapper.ktsimilarity index 91%rename from app/src/main/java/com/rtbishop/look4sat/utility/DataMapper.ktrename to app/src/main/java/com/rtbishop/look4sat/framework/DataMapper.ktindex e6ef0648..969c3531 100644--- a/app/src/main/java/com/rtbishop/look4sat/utility/DataMapper.kt+++ b/app/src/main/java/com/rtbishop/look4sat/framework/DataMapper.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.utility+package com.rtbishop.look4sat.frameworkimport com.rtbishop.look4sat.framework.model.SatEntryimport com.rtbishop.look4sat.framework.model.SatItemimport com.rtbishop.look4sat.framework.model.Transmitter-import com.rtbishop.look4sat.data.SatEntry as DomainEntry-import com.rtbishop.look4sat.data.SatItem as DomainItem-import com.rtbishop.look4sat.domain.Transmitter as DomainTrans+import com.rtbishop.look4sat.model.SatEntry as DomainEntry+import com.rtbishop.look4sat.model.SatItem as DomainItem+import com.rtbishop.look4sat.model.Transmitter as DomainTransobject DataMapper {- // Framework to Domain+ // Presentation to Domainfun satEntryToDomainEntry(entry: SatEntry): DomainEntry {return DomainEntry(entry.tle, entry.catNum, entry.name, entry.isSelected)@@ -55,7 +55,7 @@ object DataMapper {return transmitters.map { transmitter -> satTransToDomainTrans(transmitter) }}- // Domain to Framework+ // Domain to Presentationfun domainEntryToSatEntry(entry: DomainEntry): SatEntry {return SatEntry(entry.tle, entry.catNum, entry.name, entry.isSelected)diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/PreferencesSource.kt b/app/src/main/java/com/rtbishop/look4sat/framework/PreferencesSource.ktindex b8627896..323eda69 100644--- a/app/src/main/java/com/rtbishop/look4sat/framework/PreferencesSource.kt+++ b/app/src/main/java/com/rtbishop/look4sat/framework/PreferencesSource.kt@@ -21,8 +21,8 @@ import android.content.SharedPreferencesimport android.hardware.GeomagneticFieldimport android.location.LocationManagerimport androidx.core.content.edit-import com.rtbishop.look4sat.data.Preferences-import com.rtbishop.look4sat.domain.GeoPos+import com.rtbishop.look4sat.common.Constants+import com.rtbishop.look4sat.predict4kotlin.GeoPosimport com.rtbishop.look4sat.domain.QthConverterimport com.rtbishop.look4sat.utility.roundimport com.squareup.moshi.Moshi@@ -33,12 +33,12 @@ class PreferencesSource @Inject constructor(moshi: Moshi,private val locationManager: LocationManager,private val preferences: SharedPreferences-) : Preferences {+) {private val sourcesType = Types.newParameterizedType(List::class.java, String::class.java)private val sourcesAdapter = moshi.adapter<List<String>>(sourcesType)- override fun loadTleSources(): List<String> {+ fun loadTleSources(): List<String> {return try {val sourcesString = preferences.getString(keySources, String())if (sourcesString.isNullOrEmpty()) {@@ -51,17 +51,15 @@ class PreferencesSource @Inject constructor(}}- override fun saveTleSources(sources: List<String>) {+ fun saveTleSources(sources: List<String>) {val sourcesJson = sourcesAdapter.toJson(sources)preferences.edit { putString(keySources, sourcesJson) }}- override fun loadDefaultSources(): List<String> {+ fun loadDefaultSources(): List<String> {return listOf(- "https://celestrak.com/NORAD/elements/active.txt",- "https://amsat.org/tle/current/nasabare.txt",- "https://www.prismnet.com/~mmccants/tles/classfd.zip",- "https://www.prismnet.com/~mmccants/tles/inttles.zip"+ Constants.URL_CELESTRAK, Constants.URL_AMSAT,+ Constants.URL_PRISM_CLASSFD, Constants.URL_PRISM_INTEL)}@@ -85,11 +83,11 @@ class PreferencesSource @Inject constructor(const val keyPositionQTH = "setPositionQTH"}- override fun positionToQTH(lat: Double, lon: Double): String? {+ fun positionToQTH(lat: Double, lon: Double): String? {return QthConverter.positionToQTH(lat, lon)}- override fun loadStationPosition(): GeoPos {+ fun loadStationPosition(): GeoPos {val defaultSP = "0.0"val latitude = preferences.getString(keyLatitude, null) ?: defaultSPval longitude = preferences.getString(keyLongitude, null) ?: defaultSP@@ -97,7 +95,7 @@ class PreferencesSource @Inject constructor(return GeoPos(latitude.toDouble(), longitude.toDouble(), altitude.toDouble())}- override fun saveStationPosition(pos: GeoPos) {+ fun saveStationPosition(pos: GeoPos) {preferences.edit {putString(keyLatitude, pos.latitude.toString())putString(keyLongitude, pos.longitude.toString())@@ -105,7 +103,7 @@ class PreferencesSource @Inject constructor(}}- override fun updatePositionFromGPS(): Boolean {+ fun updatePositionFromGPS(): Boolean {return try {val location = locationManager.getLastKnownLocation(LocationManager.PASSIVE_PROVIDER)if (location == null) false@@ -122,14 +120,14 @@ class PreferencesSource @Inject constructor(}}- override fun updatePositionFromQTH(qthString: String): Boolean {+ fun updatePositionFromQTH(qthString: String): Boolean {val position = QthConverter.qthToPosition(qthString) ?: return falseval stationPosition = GeoPos(position.latitude, position.longitude, 0.0)saveStationPosition(stationPosition)return true}- override fun getMagDeclination(): Float {+ fun getMagDeclination(): Float {val stationPosition = loadStationPosition()val lat = stationPosition.latitude.toFloat()val lon = stationPosition.longitude.toFloat()@@ -137,56 +135,60 @@ class PreferencesSource @Inject constructor(return GeomagneticField(lat, lon, alt, System.currentTimeMillis()).declination}- override fun getHoursAhead(): Int {+ fun getHoursAhead(): Int {return preferences.getInt(keyHoursAhead, 8)}- override fun getMinElevation(): Double {+ fun getMinElevation(): Double {return preferences.getInt(keyMinElevation, 16).toDouble()}- override fun shouldUseTextLabels(): Boolean {+ fun shouldUseTextLabels(): Boolean {return preferences.getBoolean(keyTextLabels, false)}- override fun shouldUseUTC(): Boolean {+ fun shouldUseUTC(): Boolean {return preferences.getBoolean(keyTimeUTC, false)}- override fun shouldUseCompass(): Boolean {+ fun shouldUseCompass(): Boolean {return preferences.getBoolean(keyCompass, true)}- override fun shouldShowSweep(): Boolean {+ fun shouldShowSweep(): Boolean {return preferences.getBoolean(keyRadarSweep, true)}- override fun isSetupDone(): Boolean {+ fun isSetupDone(): Boolean {return preferences.getBoolean(keyInitialSetup, false)}- override fun setSetupDone() {+ fun setSetupDone() {preferences.edit { putBoolean(keyInitialSetup, true) }}- override fun saveModesSelection(modes: List<String>) {+ fun saveModesSelection(modes: List<String>) {val modesSet = modes.toSet()preferences.edit {putStringSet(keyModes, modesSet)}}- override fun loadModesSelection(): List<String> {+ fun loadModesSelection(): List<String> {preferences.getStringSet(keyModes, setOf())?.let { modesSet ->return modesSet.toList().sorted()}return emptyList()}- override fun getRotatorServer(): Pair<String, Int>? {- return if (preferences.getBoolean(keyRotator, false)) {+ fun isRotatorEnabled(): Boolean {+ return preferences.getBoolean(keyRotator, false)+ }++ fun getRotatorServer(): Pair<String, Int>? {+ return if (isRotatorEnabled()) {val address = preferences.getString(keyRotatorAddress, null) ?: "127.0.0.1"- val port = preferences.getString(keyRotatorPort, null) ?: "4096"+ val port = preferences.getString(keyRotatorPort, null) ?: "4533"Pair(address, port.toInt())} else null}diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/db/RoomConverters.kt b/app/src/main/java/com/rtbishop/look4sat/framework/local/Converters.ktsimilarity index 89%rename from app/src/main/java/com/rtbishop/look4sat/framework/db/RoomConverters.ktrename to app/src/main/java/com/rtbishop/look4sat/framework/local/Converters.ktindex f9da541b..8a1077c2 100644--- a/app/src/main/java/com/rtbishop/look4sat/framework/db/RoomConverters.kt+++ b/app/src/main/java/com/rtbishop/look4sat/framework/local/Converters.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.framework.db+package com.rtbishop.look4sat.framework.localimport androidx.room.TypeConverter-import com.rtbishop.look4sat.domain.Satellite-import com.rtbishop.look4sat.domain.TLE+import com.rtbishop.look4sat.predict4kotlin.Satellite+import com.rtbishop.look4sat.predict4kotlin.TLEimport com.squareup.moshi.JsonAdapterimport com.squareup.moshi.Moshi-object RoomConverters {+object Converters {private lateinit var paramsAdapter: JsonAdapter<TLE>diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/db/LocalDataSource.kt b/app/src/main/java/com/rtbishop/look4sat/framework/local/LocalSource.ktsimilarity index 82%rename from app/src/main/java/com/rtbishop/look4sat/framework/db/LocalDataSource.ktrename to app/src/main/java/com/rtbishop/look4sat/framework/local/LocalSource.ktindex b52ccfb7..0e915b51 100644--- a/app/src/main/java/com/rtbishop/look4sat/framework/db/LocalDataSource.kt+++ b/app/src/main/java/com/rtbishop/look4sat/framework/local/LocalSource.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.framework.db--import com.rtbishop.look4sat.data.LocalSource-import com.rtbishop.look4sat.data.SatEntry-import com.rtbishop.look4sat.data.SatItem-import com.rtbishop.look4sat.domain.Satellite-import com.rtbishop.look4sat.domain.Transmitter-import com.rtbishop.look4sat.utility.DataMapper+package com.rtbishop.look4sat.framework.local++import com.rtbishop.look4sat.data.LocalDataSource+import com.rtbishop.look4sat.model.SatEntry+import com.rtbishop.look4sat.model.SatItem+import com.rtbishop.look4sat.predict4kotlin.Satellite+import com.rtbishop.look4sat.model.Transmitter+import com.rtbishop.look4sat.framework.DataMapperimport kotlinx.coroutines.flow.Flowimport kotlinx.coroutines.flow.map-class LocalDataSource(private val satelliteDao: SatelliteDao) : LocalSource {+class LocalSource(private val satelliteDao: SatelliteDao) : LocalDataSource {override fun getEntriesWithModes(): Flow<List<SatItem>> {return satelliteDao.getSatItems()diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/db/SatelliteDao.kt b/app/src/main/java/com/rtbishop/look4sat/framework/local/SatelliteDao.ktsimilarity index 96%rename from app/src/main/java/com/rtbishop/look4sat/framework/db/SatelliteDao.ktrename to app/src/main/java/com/rtbishop/look4sat/framework/local/SatelliteDao.ktindex d579b18e..71e2a9dc 100644--- a/app/src/main/java/com/rtbishop/look4sat/framework/db/SatelliteDao.kt+++ b/app/src/main/java/com/rtbishop/look4sat/framework/local/SatelliteDao.kt@@ -15,13 +15,13 @@* 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.framework.db+package com.rtbishop.look4sat.framework.localimport androidx.room.*import com.rtbishop.look4sat.framework.model.SatEntryimport com.rtbishop.look4sat.framework.model.SatItemimport com.rtbishop.look4sat.framework.model.Transmitter-import com.rtbishop.look4sat.domain.Satellite+import com.rtbishop.look4sat.predict4kotlin.Satelliteimport kotlinx.coroutines.flow.Flow@Daodiff --git a/app/src/main/java/com/rtbishop/look4sat/framework/db/SatelliteDb.kt b/app/src/main/java/com/rtbishop/look4sat/framework/local/SatelliteDb.ktsimilarity index 95%rename from app/src/main/java/com/rtbishop/look4sat/framework/db/SatelliteDb.ktrename to app/src/main/java/com/rtbishop/look4sat/framework/local/SatelliteDb.ktindex e543313d..bc08e8bd 100644--- a/app/src/main/java/com/rtbishop/look4sat/framework/db/SatelliteDb.kt+++ b/app/src/main/java/com/rtbishop/look4sat/framework/local/SatelliteDb.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.framework.db+package com.rtbishop.look4sat.framework.localimport androidx.room.Databaseimport androidx.room.RoomDatabase@@ -26,7 +26,7 @@ import com.rtbishop.look4sat.framework.model.SatEntryimport com.rtbishop.look4sat.framework.model.Transmitter@Database(entities = [SatEntry::class, Transmitter::class], version = 2, exportSchema = true)-@TypeConverters(RoomConverters::class)+@TypeConverters(Converters::class)abstract class SatelliteDb : RoomDatabase() {abstract fun satelliteDao(): SatelliteDaodiff --git a/app/src/main/java/com/rtbishop/look4sat/framework/model/SatEntry.kt b/app/src/main/java/com/rtbishop/look4sat/framework/model/SatEntry.ktindex 272c8048..4d7aec2a 100644--- a/app/src/main/java/com/rtbishop/look4sat/framework/model/SatEntry.kt+++ b/app/src/main/java/com/rtbishop/look4sat/framework/model/SatEntry.kt@@ -19,7 +19,7 @@ package com.rtbishop.look4sat.framework.modelimport androidx.room.Entityimport androidx.room.PrimaryKey-import com.rtbishop.look4sat.domain.TLE+import com.rtbishop.look4sat.predict4kotlin.TLE@Entity(tableName = "entries")data class SatEntry(diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/api/RemoteDataSource.kt b/app/src/main/java/com/rtbishop/look4sat/framework/remote/RemoteSource.ktsimilarity index 80%rename from app/src/main/java/com/rtbishop/look4sat/framework/api/RemoteDataSource.ktrename to app/src/main/java/com/rtbishop/look4sat/framework/remote/RemoteSource.ktindex 724c12ca..46efa2cb 100644--- a/app/src/main/java/com/rtbishop/look4sat/framework/api/RemoteDataSource.kt+++ b/app/src/main/java/com/rtbishop/look4sat/framework/remote/RemoteSource.kt@@ -15,14 +15,14 @@* 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.framework.api+package com.rtbishop.look4sat.framework.remote-import com.rtbishop.look4sat.data.RemoteSource-import com.rtbishop.look4sat.domain.Transmitter-import com.rtbishop.look4sat.utility.DataMapper+import com.rtbishop.look4sat.data.RemoteDataSource+import com.rtbishop.look4sat.model.Transmitter+import com.rtbishop.look4sat.framework.DataMapperimport java.io.InputStream-class RemoteDataSource(private val satelliteApi: SatelliteApi) : RemoteSource {+class RemoteSource(private val satelliteApi: SatelliteApi) : RemoteDataSource {override suspend fun fetchFileStream(url: String): InputStream? {return satelliteApi.fetchFileStream(url).body()?.byteStream()diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/api/SatelliteApi.kt b/app/src/main/java/com/rtbishop/look4sat/framework/remote/SatelliteApi.ktsimilarity index 96%rename from app/src/main/java/com/rtbishop/look4sat/framework/api/SatelliteApi.ktrename to app/src/main/java/com/rtbishop/look4sat/framework/remote/SatelliteApi.ktindex 3781f117..c829b4f0 100644--- a/app/src/main/java/com/rtbishop/look4sat/framework/api/SatelliteApi.kt+++ b/app/src/main/java/com/rtbishop/look4sat/framework/remote/SatelliteApi.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.framework.api+package com.rtbishop.look4sat.framework.remoteimport com.rtbishop.look4sat.framework.model.Transmitterimport okhttp3.ResponseBodydiff --git a/app/src/main/java/com/rtbishop/look4sat/injection/ThreadsModule.kt b/app/src/main/java/com/rtbishop/look4sat/injection/CoroutinesModule.ktsimilarity index 100%rename from app/src/main/java/com/rtbishop/look4sat/injection/ThreadsModule.ktrename to app/src/main/java/com/rtbishop/look4sat/injection/CoroutinesModule.ktdiff --git a/app/src/main/java/com/rtbishop/look4sat/injection/DataModule.kt b/app/src/main/java/com/rtbishop/look4sat/injection/Look4SatModule.ktsimilarity index 75%rename from app/src/main/java/com/rtbishop/look4sat/injection/DataModule.ktrename to app/src/main/java/com/rtbishop/look4sat/injection/Look4SatModule.ktindex 22d634c9..b8d6568b 100644--- a/app/src/main/java/com/rtbishop/look4sat/injection/DataModule.kt+++ b/app/src/main/java/com/rtbishop/look4sat/injection/Look4SatModule.kt@@ -21,16 +21,17 @@ import android.content.Contextimport android.content.SharedPreferencesimport android.location.LocationManagerimport androidx.room.Room-import com.rtbishop.look4sat.data.LocalSource-import com.rtbishop.look4sat.data.Preferences-import com.rtbishop.look4sat.data.RemoteSource-import com.rtbishop.look4sat.data.SatelliteRepo-import com.rtbishop.look4sat.domain.PassReporter-import com.rtbishop.look4sat.domain.Predictor+import com.rtbishop.look4sat.data.LocalDataSource+import com.rtbishop.look4sat.data.RemoteDataSource+import com.rtbishop.look4sat.data.DataRepository+import com.rtbishop.look4sat.framework.remote.SatelliteApi+import com.rtbishop.look4sat.common.Constants+import com.rtbishop.look4sat.domain.Repositoryimport com.rtbishop.look4sat.framework.PreferencesSource-import com.rtbishop.look4sat.framework.api.RemoteDataSource-import com.rtbishop.look4sat.framework.api.SatelliteApi-import com.rtbishop.look4sat.framework.db.*+import com.rtbishop.look4sat.domain.DataReporter+import com.rtbishop.look4sat.predict4kotlin.Predictor+import com.rtbishop.look4sat.framework.remote.RemoteSource+import com.rtbishop.look4sat.framework.local.*import com.squareup.moshi.Moshiimport dagger.Moduleimport dagger.Provides@@ -44,7 +45,7 @@ import javax.inject.Singleton@Module@InstallIn(SingletonComponent::class)-object DataModule {+object Look4SatModule {@Provides@Singleton@@ -58,7 +59,7 @@ object DataModule {moshi: Moshi,locationManager: LocationManager,preferences: SharedPreferences- ): Preferences {+ ): PreferencesSource {return PreferencesSource(moshi, locationManager, preferences)}@@ -71,17 +72,16 @@ object DataModule {@Provides@Singletonfun provideSatelliteRepo(- preferences: Preferences,- localSource: LocalSource,- remoteSource: RemoteSource,+ localSource: LocalDataSource,+ remoteSource: RemoteDataSource,@IoDispatcher dispatcher: CoroutineDispatcher- ): SatelliteRepo {- return SatelliteRepo(preferences, localSource, remoteSource, dispatcher)+ ): Repository {+ return DataRepository(localSource, remoteSource, dispatcher)}@Provides- fun provideLocalDataSource(satelliteDao: SatelliteDao): LocalSource {- return LocalDataSource(satelliteDao)+ fun provideLocalDataSource(satelliteDao: SatelliteDao): LocalDataSource {+ return LocalSource(satelliteDao)}@Provides@@ -93,29 +93,29 @@ object DataModule {@Provides@Singletonfun provideSatelliteDb(@ApplicationContext context: Context, moshi: Moshi): SatelliteDb {- RoomConverters.initialize(moshi)+ Converters.initialize(moshi)return Room.databaseBuilder(context, SatelliteDb::class.java, "SatelliteDb").addMigrations(MIGRATION_1_2).build()}@Provides@Singleton- fun provideRemoteDataSource(satelliteApi: SatelliteApi): RemoteSource {- return RemoteDataSource(satelliteApi)+ fun provideRemoteDataSource(satelliteApi: SatelliteApi): RemoteDataSource {+ return RemoteSource(satelliteApi)}@Provides@Singletonfun provideSatelliteService(): SatelliteApi {return Retrofit.Builder()- .baseUrl("https://db.satnogs.org/api/")+ .baseUrl(Constants.URL_BASE).addConverterFactory(MoshiConverterFactory.create()).build().create(SatelliteApi::class.java)}@Provides@Singleton- fun provideDataReporter(@IoDispatcher dispatcher: CoroutineDispatcher): PassReporter {- return PassReporter(dispatcher)+ fun provideDataReporter(@IoDispatcher dispatcher: CoroutineDispatcher): DataReporter {+ return DataReporter(dispatcher)}}diff --git a/app/src/main/java/com/rtbishop/look4sat/utility/Extensions.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/Extensions.ktsimilarity index 100%rename from app/src/main/java/com/rtbishop/look4sat/utility/Extensions.ktrename to app/src/main/java/com/rtbishop/look4sat/presentation/Extensions.ktdiff --git a/app/src/main/java/com/rtbishop/look4sat/utility/RecyclerDivider.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/ItemDivider.ktsimilarity index 93%rename from app/src/main/java/com/rtbishop/look4sat/utility/RecyclerDivider.ktrename to app/src/main/java/com/rtbishop/look4sat/presentation/ItemDivider.ktindex 206a2992..1a441e04 100644--- a/app/src/main/java/com/rtbishop/look4sat/utility/RecyclerDivider.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/ItemDivider.kt@@ -15,13 +15,13 @@* 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.utility+package com.rtbishop.look4sat.presentationimport android.graphics.Canvasimport androidx.core.content.ContextCompatimport androidx.recyclerview.widget.RecyclerView-class RecyclerDivider(private val resId: Int) : RecyclerView.ItemDecoration() {+class ItemDivider(private val resId: Int) : RecyclerView.ItemDecoration() {override fun onDrawOver(canvas: Canvas, parent: RecyclerView) {ContextCompat.getDrawable(parent.context, resId)?.let { drawable ->diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesAdapter.ktindex 0304a840..8fe5e4d3 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesAdapter.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesAdapter.kt@@ -22,10 +22,11 @@ import android.view.ViewGroupimport androidx.recyclerview.widget.AsyncListDifferimport androidx.recyclerview.widget.DiffUtilimport androidx.recyclerview.widget.RecyclerView-import com.rtbishop.look4sat.data.SatItem+import com.rtbishop.look4sat.model.SatItemimport com.rtbishop.look4sat.databinding.ItemEntryBinding-class EntriesAdapter : RecyclerView.Adapter<EntriesAdapter.SatItemHolder>() {+class EntriesAdapter(private val clickListener: EntriesClickListener) :+ RecyclerView.Adapter<EntriesAdapter.SatItemHolder>() {private val diffCallback = object : DiffUtil.ItemCallback<SatItem>() {override fun areItemsTheSame(oldItem: SatItem, newItem: SatItem): Boolean {@@ -37,15 +38,6 @@ class EntriesAdapter : RecyclerView.Adapter<EntriesAdapter.SatItemHolder>() {}}private val differ = AsyncListDiffer(this, diffCallback)- private lateinit var clickListener: EntriesClickListener-- interface EntriesClickListener {- fun updateSelection(catNums: List<Int>, isSelected: Boolean)- }-- fun setEntriesClickListener(listener: EntriesClickListener) {- clickListener = listener- }fun submitList(items: List<SatItem>) {differ.submitList(items)@@ -79,4 +71,8 @@ class EntriesAdapter : RecyclerView.Adapter<EntriesAdapter.SatItemHolder>() {}}}++ interface EntriesClickListener {+ fun updateSelection(catNums: List<Int>, isSelected: Boolean)+ }}diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesFragment.ktindex 3a3c87b2..a53e721f 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesFragment.kt@@ -27,10 +27,10 @@ import androidx.recyclerview.widget.LinearLayoutManagerimport androidx.recyclerview.widget.SimpleItemAnimatorimport com.google.android.material.dialog.MaterialAlertDialogBuilderimport com.rtbishop.look4sat.R-import com.rtbishop.look4sat.data.SatItem+import com.rtbishop.look4sat.model.SatItemimport com.rtbishop.look4sat.databinding.FragmentEntriesBinding-import com.rtbishop.look4sat.framework.model.DataState-import com.rtbishop.look4sat.utility.RecyclerDivider+import com.rtbishop.look4sat.common.DataState+import com.rtbishop.look4sat.presentation.ItemDividerimport com.rtbishop.look4sat.utility.getNavResultimport com.rtbishop.look4sat.utility.navigateSafeimport com.rtbishop.look4sat.utility.showSnack@@ -51,16 +51,18 @@ class EntriesFragment : Fragment(R.layout.fragment_entries) {}private fun setupComponents(view: View) {- val entriesAdapter = EntriesAdapter().apply {- setEntriesClickListener(viewModel)- }+ val entriesAdapter = EntriesAdapter(object: EntriesAdapter.EntriesClickListener {+ override fun updateSelection(catNums: List<Int>, isSelected: Boolean) {+ viewModel.updateSelection(catNums, isSelected)+ }+ })val binding = FragmentEntriesBinding.bind(view).apply {entriesRecycler.apply {setHasFixedSize(true)adapter = entriesAdapterlayoutManager = LinearLayoutManager(requireContext())(itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false- addItemDecoration(RecyclerDivider(R.drawable.rec_divider_light))+ addItemDecoration(ItemDivider(R.drawable.rec_divider_light))}entriesImportWeb.setOnClickListener {findNavController().navigateSafe(R.id.action_entries_to_sources)@@ -98,6 +100,8 @@ class EntriesFragment : Fragment(R.layout.fragment_entries) {binding.entriesRecycler.visibility = View.VISIBLErequireView().showSnack(getString(R.string.entries_update_error))}+ else -> {+ }}}diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesViewModel.ktindex b56b291a..f28d5f15 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesViewModel.kt@@ -21,10 +21,10 @@ import android.content.ContentResolverimport android.net.Uriimport android.widget.SearchViewimport androidx.lifecycle.*-import com.rtbishop.look4sat.data.Preferences-import com.rtbishop.look4sat.data.SatelliteRepo-import com.rtbishop.look4sat.data.SatItem-import com.rtbishop.look4sat.framework.model.DataState+import com.rtbishop.look4sat.model.SatItem+import com.rtbishop.look4sat.common.DataState+import com.rtbishop.look4sat.domain.Repository+import com.rtbishop.look4sat.framework.PreferencesSourceimport dagger.hilt.android.lifecycle.HiltViewModelimport kotlinx.coroutines.CoroutineExceptionHandlerimport kotlinx.coroutines.flow.collect@@ -35,16 +35,16 @@ import javax.inject.Inject@HiltViewModelclass EntriesViewModel @Inject constructor(- private val preferences: Preferences,+ private val preferences: PreferencesSource,private val resolver: ContentResolver,- private val satelliteRepo: SatelliteRepo,-) : ViewModel(), EntriesAdapter.EntriesClickListener, SearchView.OnQueryTextListener {+ private val satelliteRepo: Repository,+) : ViewModel(), SearchView.OnQueryTextListener {private val coroutineHandler = CoroutineExceptionHandler { _, throwable ->Timber.d(throwable)_satData.value = DataState.Error(throwable)}- private val transModes = MutableLiveData(satelliteRepo.loadSelectedModes())+ private val transModes = MutableLiveData(preferences.loadModesSelection())private val currentQuery = MutableLiveData(String())private val itemsWithModes = transModes.switchMap { modes ->liveData { satelliteRepo.getSatItems().collect { emit(filterByModes(it, modes)) } }@@ -86,12 +86,12 @@ class EntriesViewModel @Inject constructor(}fun loadSelectedModes(): List<String> {- return satelliteRepo.loadSelectedModes()+ return preferences.loadModesSelection()}fun saveSelectedModes(modes: List<String>) {transModes.value = modes- satelliteRepo.saveSelectedModes(modes)+ preferences.saveModesSelection(modes)}override fun onQueryTextSubmit(query: String): Boolean {@@ -103,7 +103,7 @@ class EntriesViewModel @Inject constructor(return true}- override fun updateSelection(catNums: List<Int>, isSelected: Boolean) {+ fun updateSelection(catNums: List<Int>, isSelected: Boolean) {viewModelScope.launch { satelliteRepo.updateEntriesSelection(catNums, isSelected) }}diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapData.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapData.ktindex 92c8dc11..aef324f5 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapData.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapData.kt@@ -17,8 +17,8 @@*/package com.rtbishop.look4sat.presentation.mapScreen-import com.rtbishop.look4sat.domain.GeoPos-import com.rtbishop.look4sat.domain.Satellite+import com.rtbishop.look4sat.predict4kotlin.GeoPos+import com.rtbishop.look4sat.predict4kotlin.Satellitedata class MapData(val pass: Satellite,diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapFragment.ktindex 93ca4e2e..ec97c2ef 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapFragment.kt@@ -29,8 +29,8 @@ import androidx.fragment.app.Fragmentimport androidx.fragment.app.viewModelsimport com.rtbishop.look4sat.Rimport com.rtbishop.look4sat.databinding.FragmentMapBinding-import com.rtbishop.look4sat.domain.GeoPos-import com.rtbishop.look4sat.domain.Satellite+import com.rtbishop.look4sat.predict4kotlin.GeoPos+import com.rtbishop.look4sat.predict4kotlin.Satelliteimport dagger.hilt.android.AndroidEntryPointimport org.osmdroid.config.Configurationimport org.osmdroid.tileprovider.tilesource.TileSourceFactorydiff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapViewModel.ktindex d69f80f0..81f4f45f 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapViewModel.kt@@ -18,10 +18,12 @@package com.rtbishop.look4sat.presentation.mapScreenimport androidx.lifecycle.*-import com.rtbishop.look4sat.domain.Predictor-import com.rtbishop.look4sat.data.Preferences-import com.rtbishop.look4sat.data.SatelliteRepo-import com.rtbishop.look4sat.domain.*+import com.rtbishop.look4sat.predict4kotlin.Predictor+import com.rtbishop.look4sat.domain.Repository+import com.rtbishop.look4sat.framework.PreferencesSource+import com.rtbishop.look4sat.predict4kotlin.GeoPos+import com.rtbishop.look4sat.domain.QthConverter+import com.rtbishop.look4sat.predict4kotlin.Satelliteimport dagger.hilt.android.lifecycle.HiltViewModelimport kotlinx.coroutines.*import java.util.*@@ -31,9 +33,9 @@ import kotlin.math.min@HiltViewModelclass MapViewModel @Inject constructor(- private val satelliteRepo: SatelliteRepo,+ private val satelliteRepo: Repository,private val predictor: Predictor,- private val preferences: Preferences,+ private val preferences: PreferencesSource,) : ViewModel() {private val stationPos = preferences.loadStationPosition()diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesAdapter.ktindex 95f169bd..2c08d42f 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesAdapter.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesAdapter.kt@@ -25,7 +25,7 @@ import androidx.recyclerview.widget.RecyclerViewimport com.rtbishop.look4sat.Rimport com.rtbishop.look4sat.databinding.ItemPassGeoBindingimport com.rtbishop.look4sat.databinding.ItemPassLeoBinding-import com.rtbishop.look4sat.domain.SatPass+import com.rtbishop.look4sat.predict4kotlin.SatPassimport java.text.SimpleDateFormatimport java.util.*diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesFragment.ktindex ae02f7d0..651c85a0 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesFragment.kt@@ -29,9 +29,9 @@ import androidx.recyclerview.widget.LinearLayoutManagerimport androidx.recyclerview.widget.SimpleItemAnimatorimport com.rtbishop.look4sat.Rimport com.rtbishop.look4sat.databinding.FragmentPassesBinding-import com.rtbishop.look4sat.domain.SatPass-import com.rtbishop.look4sat.framework.model.DataState-import com.rtbishop.look4sat.utility.RecyclerDivider+import com.rtbishop.look4sat.predict4kotlin.SatPass+import com.rtbishop.look4sat.common.DataState+import com.rtbishop.look4sat.presentation.ItemDividerimport com.rtbishop.look4sat.utility.navigateSafeimport com.rtbishop.look4sat.utility.toTimerStringimport dagger.hilt.android.AndroidEntryPoint@@ -60,7 +60,7 @@ class PassesFragment : Fragment(R.layout.fragment_passes), PassesAdapter.PassesCisVerticalScrollBarEnabled = falselayoutManager = LinearLayoutManager(context)(itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false- addItemDecoration(RecyclerDivider(R.drawable.rec_divider_dark))+ addItemDecoration(ItemDivider(R.drawable.rec_divider_dark))}passesRefresh.setOnClickListener { passesViewModel.forceCalculation() }}diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesViewModel.ktindex 8ab74768..17969d4b 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesViewModel.kt@@ -21,11 +21,11 @@ import androidx.lifecycle.LiveDataimport androidx.lifecycle.MutableLiveDataimport androidx.lifecycle.ViewModelimport androidx.lifecycle.viewModelScope-import com.rtbishop.look4sat.data.Preferences-import com.rtbishop.look4sat.data.SatelliteRepo-import com.rtbishop.look4sat.domain.Predictor-import com.rtbishop.look4sat.domain.SatPass-import com.rtbishop.look4sat.framework.model.DataState+import com.rtbishop.look4sat.predict4kotlin.Predictor+import com.rtbishop.look4sat.predict4kotlin.SatPass+import com.rtbishop.look4sat.common.DataState+import com.rtbishop.look4sat.domain.Repository+import com.rtbishop.look4sat.framework.PreferencesSourceimport dagger.hilt.android.lifecycle.HiltViewModelimport kotlinx.coroutines.*import kotlinx.coroutines.flow.collect@@ -34,9 +34,9 @@ import javax.inject.Inject@HiltViewModelclass PassesViewModel @Inject constructor(- private val satelliteRepo: SatelliteRepo,+ private val satelliteRepo: Repository,private val predictor: Predictor,- private val preferences: Preferences+ private val preferences: PreferencesSource) : ViewModel() {private val _passes = MutableLiveData<DataState<List<SatPass>>>(DataState.Loading)diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarData.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarData.ktindex 93341801..8a0946bc 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarData.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarData.kt@@ -1,5 +1,22 @@+/*+ * 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.presentation.radarScreen-import com.rtbishop.look4sat.domain.SatPos+import com.rtbishop.look4sat.predict4kotlin.SatPosdata class RadarData(val satPos: SatPos, val satTrack: List<SatPos> = emptyList())diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.ktindex a5e7b4ab..dc6b9627 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.kt@@ -25,11 +25,11 @@ import androidx.navigation.fragment.findNavControllerimport androidx.recyclerview.widget.LinearLayoutManagerimport androidx.recyclerview.widget.SimpleItemAnimatorimport com.rtbishop.look4sat.R-import com.rtbishop.look4sat.data.Preferencesimport com.rtbishop.look4sat.databinding.FragmentRadarBinding-import com.rtbishop.look4sat.domain.SatPass-import com.rtbishop.look4sat.domain.SatPos-import com.rtbishop.look4sat.utility.RecyclerDivider+import com.rtbishop.look4sat.framework.PreferencesSource+import com.rtbishop.look4sat.predict4kotlin.SatPass+import com.rtbishop.look4sat.predict4kotlin.SatPos+import com.rtbishop.look4sat.presentation.ItemDividerimport com.rtbishop.look4sat.utility.navigateSafeimport com.rtbishop.look4sat.utility.toTimerStringimport dagger.hilt.android.AndroidEntryPoint@@ -39,7 +39,7 @@ import javax.inject.Injectclass RadarFragment : Fragment(R.layout.fragment_radar) {@Inject- lateinit var preferences: Preferences+ lateinit var preferences: PreferencesSourceprivate val viewModel: RadarViewModel by viewModels()private var radarView: RadarView? = null@@ -53,7 +53,7 @@ class RadarFragment : Fragment(R.layout.fragment_radar) {isVerticalScrollBarEnabled = falselayoutManager = LinearLayoutManager(context)(itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false- addItemDecoration(RecyclerDivider(R.drawable.rec_divider_dark))+ addItemDecoration(ItemDivider(R.drawable.rec_divider_dark))}setupObservers(transAdapter, this)}diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarView.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarView.ktindex 273c2be7..576ed258 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarView.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarView.kt@@ -22,7 +22,7 @@ import android.graphics.*import android.view.Viewimport androidx.core.content.ContextCompatimport com.rtbishop.look4sat.R-import com.rtbishop.look4sat.domain.SatPos+import com.rtbishop.look4sat.predict4kotlin.SatPosimport kotlin.math.cosimport kotlin.math.minimport kotlin.math.sindiff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarViewModel.ktindex 39a13045..38939e51 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarViewModel.kt@@ -18,14 +18,14 @@package com.rtbishop.look4sat.presentation.radarScreenimport androidx.lifecycle.*-import com.rtbishop.look4sat.domain.PassReporter-import com.rtbishop.look4sat.data.Preferences-import com.rtbishop.look4sat.data.SatelliteRepo-import com.rtbishop.look4sat.domain.Predictor-import com.rtbishop.look4sat.domain.SatPass-import com.rtbishop.look4sat.domain.SatPos-import com.rtbishop.look4sat.domain.Transmitter+import com.rtbishop.look4sat.domain.DataReporter+import com.rtbishop.look4sat.domain.Repository+import com.rtbishop.look4sat.predict4kotlin.Predictor+import com.rtbishop.look4sat.predict4kotlin.SatPass+import com.rtbishop.look4sat.predict4kotlin.SatPos+import com.rtbishop.look4sat.model.Transmitterimport com.rtbishop.look4sat.framework.OrientationSource+import com.rtbishop.look4sat.framework.PreferencesSourceimport com.rtbishop.look4sat.utility.roundimport dagger.hilt.android.lifecycle.HiltViewModelimport kotlinx.coroutines.delay@@ -38,10 +38,10 @@ import javax.inject.Inject@HiltViewModelclass RadarViewModel @Inject constructor(private val orientationSource: OrientationSource,- private val preferences: Preferences,+ private val preferences: PreferencesSource,private val predictor: Predictor,- private val satelliteRepo: SatelliteRepo,- private val passReporter: PassReporter+ private val satelliteRepo: Repository,+ private val dataReporter: DataReporter) : ViewModel(), OrientationSource.OrientationListener {private val stationPos = preferences.loadStationPosition()@@ -80,7 +80,7 @@ class RadarViewModel @Inject constructor(var satTrack: List<SatPos> = emptyList()val rotatorPrefs = preferences.getRotatorServer()if (rotatorPrefs != null) {- passReporter.setupRotatorSocket(rotatorPrefs.first, rotatorPrefs.second)+ dataReporter.setupRotatorSocket(rotatorPrefs.first, rotatorPrefs.second)}if (!satPass.isDeepSpace) {val startDate = Date(satPass.aosTime)@@ -91,7 +91,7 @@ class RadarViewModel @Inject constructor(val satPos = predictor.getSatPos(satPass.satellite, stationPos, Date())val azimuth = Math.toDegrees(satPos.azimuth).round(1)val elevation = Math.toDegrees(satPos.elevation).round(1)- passReporter.reportRotation(azimuth, elevation)+ dataReporter.reportRotation(azimuth, elevation)_passData.postValue(RadarData(satPos, satTrack))delay(1000)}diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/TransmittersAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/TransmittersAdapter.ktindex 53702f73..8d69c5a6 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/TransmittersAdapter.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/TransmittersAdapter.kt@@ -24,7 +24,7 @@ import androidx.recyclerview.widget.DiffUtilimport androidx.recyclerview.widget.RecyclerViewimport com.rtbishop.look4sat.Rimport com.rtbishop.look4sat.databinding.ItemTransBinding-import com.rtbishop.look4sat.domain.Transmitter+import com.rtbishop.look4sat.model.Transmitterimport java.util.*class TransmittersAdapter : RecyclerView.Adapter<TransmittersAdapter.TransHolder>() {diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsFragment.ktindex 8cd878a9..1634469b 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsFragment.kt@@ -29,7 +29,6 @@ import androidx.preference.Preferenceimport androidx.preference.PreferenceFragmentCompatimport com.google.android.material.snackbar.Snackbarimport com.rtbishop.look4sat.R-import com.rtbishop.look4sat.data.Preferencesimport com.rtbishop.look4sat.framework.PreferencesSourceimport dagger.hilt.android.AndroidEntryPointimport javax.inject.Inject@@ -38,7 +37,7 @@ import javax.inject.Injectclass SettingsFragment : PreferenceFragmentCompat() {@Inject- lateinit var preferences: Preferences+ lateinit var preferences: PreferencesSourceprivate val requestPermissionLauncher =registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/sourcesScreen/SourcesDialog.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/sourcesScreen/SourcesDialog.ktindex 7ccfd3b0..7f7dede8 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/sourcesScreen/SourcesDialog.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/sourcesScreen/SourcesDialog.kt@@ -25,8 +25,8 @@ import android.view.WindowManagerimport androidx.appcompat.app.AppCompatDialogFragmentimport androidx.recyclerview.widget.LinearLayoutManagerimport com.rtbishop.look4sat.R-import com.rtbishop.look4sat.data.Preferencesimport com.rtbishop.look4sat.databinding.DialogSourcesBinding+import com.rtbishop.look4sat.framework.PreferencesSourceimport com.rtbishop.look4sat.utility.setNavResultimport dagger.hilt.android.AndroidEntryPointimport javax.inject.Inject@@ -35,7 +35,7 @@ import javax.inject.Injectclass SourcesDialog : AppCompatDialogFragment() {@Inject- lateinit var prefsManager: Preferences+ lateinit var prefsManager: PreferencesSourceoverride fun onCreateView(inflater: LayoutInflater, group: ViewGroup?, state: Bundle?): View? {return inflater.inflate(R.layout.dialog_sources, group, false)diff --git a/app/src/main/java/com/rtbishop/look4sat/utility/CustomHandler.kt b/app/src/main/java/com/rtbishop/look4sat/utility/CustomHandler.ktdeleted file mode 100644index 387d09a4..00000000--- a/app/src/main/java/com/rtbishop/look4sat/utility/CustomHandler.kt+++ /dev/null@@ -1,18 +0,0 @@-package com.rtbishop.look4sat.utility--import android.app.Activity--class CustomHandler(private val activity: Activity) : Thread.UncaughtExceptionHandler {-- private val rootHandler = Thread.getDefaultUncaughtExceptionHandler()-- init {- Thread.setDefaultUncaughtExceptionHandler(this)- }-- override fun uncaughtException(thread: Thread, throwable: Throwable) {-// Custom exception handling, use intents instead of dialogs-// Process.killProcess(Process.myPid())-// exitProcess(0)- }-}diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xmlindex 66460680..910e472c 100644--- a/app/src/main/res/xml/preference.xml+++ b/app/src/main/res/xml/preference.xml@@ -50,7 +50,7 @@app:iconSpaceReserved="false"app:useSimpleSummaryProvider="true" /><EditTextPreference- android:defaultValue="4096"+ android:defaultValue="4533"android:dependency="isRotatorEnabled"android:key="rotatorPort"android:title="@string/tracking_rotator_port"diff --git a/build.gradle b/build.gradleindex f1247ee1..eca85953 100644--- a/build.gradle+++ b/build.gradle@@ -1,7 +1,7 @@buildscript {ext {gradle_version = '7.0.2'- kotlin_version = '1.5.30'+ kotlin_version = '1.5.31'coroutines_version = '1.5.2-native-mt'material_version = '1.4.0'splash_screen_version = '1.0.0-alpha01'@@ -10,7 +10,7 @@ buildscript {navigation_version = '2.3.5'preference_version = '1.1.1'room_version = '2.3.0'- hilt_version = '2.39'+ hilt_version = '2.39.1'retrofit_version = '2.9.0'osmdroid_version = '6.1.11'timber_version = '5.0.1'diff --git a/core/src/main/java/com/rtbishop/look4sat/common/Constants.kt b/core/src/main/java/com/rtbishop/look4sat/common/Constants.ktnew file mode 100644index 00000000..4cbca6e8--- /dev/null+++ b/core/src/main/java/com/rtbishop/look4sat/common/Constants.kt@@ -0,0 +1,28 @@+/*+ * 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.common++object Constants {++ const val URL_BASE = "https://db.satnogs.org/api/"+ const val URL_CELESTRAK = "https://celestrak.com/NORAD/elements/active.txt"+ const val URL_AMSAT = "https://amsat.org/tle/current/nasabare.txt"+ const val URL_PRISM_CLASSFD = "https://www.prismnet.com/~mmccants/tles/classfd.zip"+ const val URL_PRISM_INTEL = "https://www.prismnet.com/~mmccants/tles/inttles.zip"++}diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/model/DataState.kt b/core/src/main/java/com/rtbishop/look4sat/common/DataState.ktsimilarity index 95%rename from app/src/main/java/com/rtbishop/look4sat/framework/model/DataState.ktrename to core/src/main/java/com/rtbishop/look4sat/common/DataState.ktindex 07d9d788..d6c00810 100644--- a/app/src/main/java/com/rtbishop/look4sat/framework/model/DataState.kt+++ b/core/src/main/java/com/rtbishop/look4sat/common/DataState.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.framework.model+package com.rtbishop.look4sat.commonsealed class DataState<out T> {data class Success<out T>(val data: T) : DataState<T>()diff --git a/core/src/main/java/com/rtbishop/look4sat/data/SatelliteRepo.kt b/core/src/main/java/com/rtbishop/look4sat/data/DataRepository.ktsimilarity index 74%rename from core/src/main/java/com/rtbishop/look4sat/data/SatelliteRepo.ktrename to core/src/main/java/com/rtbishop/look4sat/data/DataRepository.ktindex 07d1bc63..8454331a 100644--- a/core/src/main/java/com/rtbishop/look4sat/data/SatelliteRepo.kt+++ b/core/src/main/java/com/rtbishop/look4sat/data/DataRepository.kt@@ -17,9 +17,12 @@*/package com.rtbishop.look4sat.data-import com.rtbishop.look4sat.domain.Transmitter-import com.rtbishop.look4sat.domain.Satellite-import com.rtbishop.look4sat.domain.TLE+import com.rtbishop.look4sat.domain.Repository+import com.rtbishop.look4sat.model.SatEntry+import com.rtbishop.look4sat.model.SatItem+import com.rtbishop.look4sat.model.Transmitter+import com.rtbishop.look4sat.predict4kotlin.Satellite+import com.rtbishop.look4sat.predict4kotlin.TLEimport kotlinx.coroutines.CoroutineDispatcherimport kotlinx.coroutines.coroutineScopeimport kotlinx.coroutines.flow.Flow@@ -28,38 +31,29 @@ import kotlinx.coroutines.withContextimport java.io.InputStreamimport java.util.zip.ZipInputStream-class SatelliteRepo(- private val preferences: Preferences,- private val localSource: LocalSource,- private val remoteSource: RemoteSource,+class DataRepository(+ private val localSource: LocalDataSource,+ private val remoteSource: RemoteDataSource,private val repoDispatcher: CoroutineDispatcher-) {+) : Repository {- fun saveSelectedModes(modes: List<String>) {- preferences.saveModesSelection(modes)- }-- fun loadSelectedModes(): List<String> {- return preferences.loadModesSelection()- }-- fun getSatItems(): Flow<List<SatItem>> {+ override fun getSatItems(): Flow<List<SatItem>> {return localSource.getEntriesWithModes()}- fun getSatTransmitters(catNum: Int): Flow<List<Transmitter>> {+ override fun getSatTransmitters(catNum: Int): Flow<List<Transmitter>> {return localSource.getTransmitters(catNum)}- suspend fun getSelectedSatellites(): List<Satellite> {+ override suspend fun getSelectedSatellites(): List<Satellite> {return localSource.getSelectedSatellites()}- suspend fun updateEntriesFromFile(stream: InputStream) = withContext(repoDispatcher) {+ override suspend fun updateEntriesFromFile(stream: InputStream) = withContext(repoDispatcher) {localSource.updateEntries(importSatEntries(stream))}- suspend fun updateEntriesFromWeb(sources: List<String>) {+ override suspend fun updateEntriesFromWeb(sources: List<String>) {coroutineScope {launch(repoDispatcher) {val streams = mutableListOf<InputStream>()@@ -84,7 +78,7 @@ class SatelliteRepo(}}- suspend fun updateEntriesSelection(catNums: List<Int>, isSelected: Boolean) {+ override suspend fun updateEntriesSelection(catNums: List<Int>, isSelected: Boolean) {localSource.updateEntriesSelection(catNums, isSelected)}diff --git a/core/src/main/java/com/rtbishop/look4sat/data/LocalSource.kt b/core/src/main/java/com/rtbishop/look4sat/data/LocalDataSource.ktsimilarity index 85%rename from core/src/main/java/com/rtbishop/look4sat/data/LocalSource.ktrename to core/src/main/java/com/rtbishop/look4sat/data/LocalDataSource.ktindex 604b5630..e7d74964 100644--- a/core/src/main/java/com/rtbishop/look4sat/data/LocalSource.kt+++ b/core/src/main/java/com/rtbishop/look4sat/data/LocalDataSource.kt@@ -17,11 +17,13 @@*/package com.rtbishop.look4sat.data-import com.rtbishop.look4sat.domain.Transmitter-import com.rtbishop.look4sat.domain.Satellite+import com.rtbishop.look4sat.model.SatEntry+import com.rtbishop.look4sat.model.SatItem+import com.rtbishop.look4sat.model.Transmitter+import com.rtbishop.look4sat.predict4kotlin.Satelliteimport kotlinx.coroutines.flow.Flow-interface LocalSource {+interface LocalDataSource {fun getEntriesWithModes(): Flow<List<SatItem>>diff --git a/core/src/main/java/com/rtbishop/look4sat/data/Preferences.kt b/core/src/main/java/com/rtbishop/look4sat/data/Preferences.ktdeleted file mode 100644index 08a20883..00000000--- a/core/src/main/java/com/rtbishop/look4sat/data/Preferences.kt+++ /dev/null@@ -1,63 +0,0 @@-/*- * 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--import com.rtbishop.look4sat.domain.GeoPos--interface Preferences {-- fun positionToQTH(lat: Double, lon: Double): String?-- fun loadStationPosition(): GeoPos-- fun saveStationPosition(pos: GeoPos)-- fun updatePositionFromGPS(): Boolean-- fun updatePositionFromQTH(qthString: String): Boolean-- fun getMagDeclination(): Float-- fun getHoursAhead(): Int-- fun getMinElevation(): Double-- fun shouldUseTextLabels(): Boolean-- fun shouldUseUTC(): Boolean-- fun shouldUseCompass(): Boolean-- fun shouldShowSweep(): Boolean-- fun isSetupDone(): Boolean-- fun setSetupDone()-- fun saveModesSelection(modes: List<String>)-- fun loadModesSelection(): List<String>-- fun getRotatorServer(): Pair<String, Int>?-- fun loadTleSources(): List<String>-- fun saveTleSources(sources: List<String>)-- fun loadDefaultSources(): List<String>-}diff --git a/core/src/main/java/com/rtbishop/look4sat/data/RemoteSource.kt b/core/src/main/java/com/rtbishop/look4sat/data/RemoteDataSource.ktsimilarity index 92%rename from core/src/main/java/com/rtbishop/look4sat/data/RemoteSource.ktrename to core/src/main/java/com/rtbishop/look4sat/data/RemoteDataSource.ktindex 9a1e1c98..73ab2924 100644--- a/core/src/main/java/com/rtbishop/look4sat/data/RemoteSource.kt+++ b/core/src/main/java/com/rtbishop/look4sat/data/RemoteDataSource.kt@@ -17,10 +17,10 @@*/package com.rtbishop.look4sat.data-import com.rtbishop.look4sat.domain.Transmitter+import com.rtbishop.look4sat.model.Transmitterimport java.io.InputStream-interface RemoteSource {+interface RemoteDataSource {suspend fun fetchFileStream(url: String): InputStream?diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/PassReporter.kt b/core/src/main/java/com/rtbishop/look4sat/domain/DataReporter.ktsimilarity index 68%rename from core/src/main/java/com/rtbishop/look4sat/domain/PassReporter.ktrename to core/src/main/java/com/rtbishop/look4sat/domain/DataReporter.ktindex 8b350692..3dcd7cbd 100644--- a/core/src/main/java/com/rtbishop/look4sat/domain/PassReporter.kt+++ b/core/src/main/java/com/rtbishop/look4sat/domain/DataReporter.kt@@ -1,3 +1,20 @@+/*+ * 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.domainimport kotlinx.coroutines.CoroutineDispatcher@@ -5,7 +22,7 @@ import kotlinx.coroutines.withContextimport java.io.BufferedWriterimport java.net.Socket-class PassReporter(private val reporterDispatcher: CoroutineDispatcher) {+class DataReporter(private val reporterDispatcher: CoroutineDispatcher) {private var radioSocket: Socket? = nullprivate var radioWriter: BufferedWriter? = nulldiff --git a/core/src/main/java/com/rtbishop/look4sat/domain/QthConverter.kt b/core/src/main/java/com/rtbishop/look4sat/domain/QthConverter.ktindex 80aacccd..b53c8fd6 100644--- a/core/src/main/java/com/rtbishop/look4sat/domain/QthConverter.kt+++ b/core/src/main/java/com/rtbishop/look4sat/domain/QthConverter.kt@@ -17,6 +17,7 @@*/package com.rtbishop.look4sat.domain+import com.rtbishop.look4sat.predict4kotlin.GeoPosimport kotlin.math.roundobject QthConverter {diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/Repository.kt b/core/src/main/java/com/rtbishop/look4sat/domain/Repository.ktnew file mode 100644index 00000000..2651be83--- /dev/null+++ b/core/src/main/java/com/rtbishop/look4sat/domain/Repository.kt@@ -0,0 +1,39 @@+/*+ * 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.domain++import com.rtbishop.look4sat.model.SatItem+import com.rtbishop.look4sat.model.Transmitter+import com.rtbishop.look4sat.predict4kotlin.Satellite+import kotlinx.coroutines.flow.Flow+import java.io.InputStream++interface Repository {++ fun getSatItems(): Flow<List<SatItem>>++ fun getSatTransmitters(catNum: Int): Flow<List<Transmitter>>++ suspend fun getSelectedSatellites(): List<Satellite>++ suspend fun updateEntriesFromFile(stream: InputStream)++ suspend fun updateEntriesFromWeb(sources: List<String>)++ suspend fun updateEntriesSelection(catNums: List<Int>, isSelected: Boolean)+}diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/model/OMM.kt b/core/src/main/java/com/rtbishop/look4sat/model/OMM.ktsimilarity index 55%rename from app/src/main/java/com/rtbishop/look4sat/framework/model/OMM.ktrename to core/src/main/java/com/rtbishop/look4sat/model/OMM.ktindex 468db128..519126f6 100644--- a/app/src/main/java/com/rtbishop/look4sat/framework/model/OMM.kt+++ b/core/src/main/java/com/rtbishop/look4sat/model/OMM.kt@@ -15,19 +15,17 @@* 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.framework.model--import com.squareup.moshi.Json+package com.rtbishop.look4sat.modeldata class OMM(- @field:Json(name = "OBJECT_NAME") val name: String,- @field:Json(name = "EPOCH") val epochString: String,- @field:Json(name = "MEAN_MOTION") val meanmo: Double,- @field:Json(name = "ECCENTRICITY") val eccn: Double,- @field:Json(name = "INCLINATION") val incl: Double,- @field:Json(name = "RA_OF_ASC_NODE") val raan: Double,- @field:Json(name = "ARG_OF_PERICENTER") val argper: Double,- @field:Json(name = "MEAN_ANOMALY") val meanan: Double,- @field:Json(name = "NORAD_CAT_ID") val catnum: Int,- @field:Json(name = "BSTAR") val bstar: Double,+ val name: String,+ val epochString: String,+ val meanmo: Double,+ val eccn: Double,+ val incl: Double,+ val raan: Double,+ val argper: Double,+ val meanan: Double,+ val catnum: Int,+ val bstar: Double,)diff --git a/core/src/main/java/com/rtbishop/look4sat/data/SatEntry.kt b/core/src/main/java/com/rtbishop/look4sat/model/SatEntry.ktsimilarity index 91%rename from core/src/main/java/com/rtbishop/look4sat/data/SatEntry.ktrename to core/src/main/java/com/rtbishop/look4sat/model/SatEntry.ktindex 1b7157b0..fe6d9b55 100644--- a/core/src/main/java/com/rtbishop/look4sat/data/SatEntry.kt+++ b/core/src/main/java/com/rtbishop/look4sat/model/SatEntry.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.data+package com.rtbishop.look4sat.model-import com.rtbishop.look4sat.domain.TLE+import com.rtbishop.look4sat.predict4kotlin.TLEdata class SatEntry(val tle: TLE,diff --git a/core/src/main/java/com/rtbishop/look4sat/data/SatItem.kt b/core/src/main/java/com/rtbishop/look4sat/model/SatItem.ktsimilarity index 96%rename from core/src/main/java/com/rtbishop/look4sat/data/SatItem.ktrename to core/src/main/java/com/rtbishop/look4sat/model/SatItem.ktindex e754b461..21752953 100644--- a/core/src/main/java/com/rtbishop/look4sat/data/SatItem.kt+++ b/core/src/main/java/com/rtbishop/look4sat/model/SatItem.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.modeldata class SatItem(val catNum: Int,diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/Transmitter.kt b/core/src/main/java/com/rtbishop/look4sat/model/Transmitter.ktsimilarity index 96%rename from core/src/main/java/com/rtbishop/look4sat/domain/Transmitter.ktrename to core/src/main/java/com/rtbishop/look4sat/model/Transmitter.ktindex 882400c7..62daa909 100644--- a/core/src/main/java/com/rtbishop/look4sat/domain/Transmitter.kt+++ b/core/src/main/java/com/rtbishop/look4sat/model/Transmitter.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.domain+package com.rtbishop.look4sat.modeldata class Transmitter(val uuid: String,diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/DeepSpaceSat.kt b/core/src/main/java/com/rtbishop/look4sat/predict4kotlin/DeepSpaceSat.ktsimilarity index 99%rename from core/src/main/java/com/rtbishop/look4sat/domain/DeepSpaceSat.ktrename to core/src/main/java/com/rtbishop/look4sat/predict4kotlin/DeepSpaceSat.ktindex f1d1fc6b..483c11fe 100644--- a/core/src/main/java/com/rtbishop/look4sat/domain/DeepSpaceSat.kt+++ b/core/src/main/java/com/rtbishop/look4sat/predict4kotlin/DeepSpaceSat.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.domain+package com.rtbishop.look4sat.predict4kotlinimport kotlin.math.*diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/GeoPos.kt b/core/src/main/java/com/rtbishop/look4sat/predict4kotlin/GeoPos.ktsimilarity index 95%rename from core/src/main/java/com/rtbishop/look4sat/domain/GeoPos.ktrename to core/src/main/java/com/rtbishop/look4sat/predict4kotlin/GeoPos.ktindex b1c779c8..4213ff5b 100644--- a/core/src/main/java/com/rtbishop/look4sat/domain/GeoPos.kt+++ b/core/src/main/java/com/rtbishop/look4sat/predict4kotlin/GeoPos.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.domain+package com.rtbishop.look4sat.predict4kotlindata class GeoPos(val latitude: Double, val longitude: Double, val altitude: Double = 0.0)diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/NearEarthSat.kt b/core/src/main/java/com/rtbishop/look4sat/predict4kotlin/NearEarthSat.ktsimilarity index 99%rename from core/src/main/java/com/rtbishop/look4sat/domain/NearEarthSat.ktrename to core/src/main/java/com/rtbishop/look4sat/predict4kotlin/NearEarthSat.ktindex 38a526df..00bf9f06 100644--- a/core/src/main/java/com/rtbishop/look4sat/domain/NearEarthSat.kt+++ b/core/src/main/java/com/rtbishop/look4sat/predict4kotlin/NearEarthSat.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.domain+package com.rtbishop.look4sat.predict4kotlinimport kotlin.math.*diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/Predictor.kt b/core/src/main/java/com/rtbishop/look4sat/predict4kotlin/Predictor.ktsimilarity index 99%rename from core/src/main/java/com/rtbishop/look4sat/domain/Predictor.ktrename to core/src/main/java/com/rtbishop/look4sat/predict4kotlin/Predictor.ktindex b0b454d3..cdaf9b5a 100644--- a/core/src/main/java/com/rtbishop/look4sat/domain/Predictor.kt+++ b/core/src/main/java/com/rtbishop/look4sat/predict4kotlin/Predictor.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.domain+package com.rtbishop.look4sat.predict4kotlinimport com.rtbishop.look4sat.domain.*import kotlinx.coroutines.CoroutineDispatcherdiff --git a/core/src/main/java/com/rtbishop/look4sat/domain/SatPass.kt b/core/src/main/java/com/rtbishop/look4sat/predict4kotlin/SatPass.ktsimilarity index 96%rename from core/src/main/java/com/rtbishop/look4sat/domain/SatPass.ktrename to core/src/main/java/com/rtbishop/look4sat/predict4kotlin/SatPass.ktindex 3ea2dd90..3f2a9558 100644--- a/core/src/main/java/com/rtbishop/look4sat/domain/SatPass.kt+++ b/core/src/main/java/com/rtbishop/look4sat/predict4kotlin/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.domain+package com.rtbishop.look4sat.predict4kotlindata class SatPass(val aosTime: Long,diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/SatPos.kt b/core/src/main/java/com/rtbishop/look4sat/predict4kotlin/SatPos.ktsimilarity index 98%rename from core/src/main/java/com/rtbishop/look4sat/domain/SatPos.ktrename to core/src/main/java/com/rtbishop/look4sat/predict4kotlin/SatPos.ktindex 4b80f874..e787dd34 100644--- a/core/src/main/java/com/rtbishop/look4sat/domain/SatPos.kt+++ b/core/src/main/java/com/rtbishop/look4sat/predict4kotlin/SatPos.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.domain+package com.rtbishop.look4sat.predict4kotlinimport kotlin.math.*diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/Satellite.kt b/core/src/main/java/com/rtbishop/look4sat/predict4kotlin/Satellite.ktsimilarity index 99%rename from core/src/main/java/com/rtbishop/look4sat/domain/Satellite.ktrename to core/src/main/java/com/rtbishop/look4sat/predict4kotlin/Satellite.ktindex 585119a4..90c46286 100644--- a/core/src/main/java/com/rtbishop/look4sat/domain/Satellite.kt+++ b/core/src/main/java/com/rtbishop/look4sat/predict4kotlin/Satellite.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.domain+package com.rtbishop.look4sat.predict4kotlinimport java.util.*import java.util.concurrent.atomic.AtomicReferencediff --git a/core/src/main/java/com/rtbishop/look4sat/domain/TLE.kt b/core/src/main/java/com/rtbishop/look4sat/predict4kotlin/TLE.ktsimilarity index 98%rename from core/src/main/java/com/rtbishop/look4sat/domain/TLE.ktrename to core/src/main/java/com/rtbishop/look4sat/predict4kotlin/TLE.ktindex df3ef2dc..b86f4932 100644--- a/core/src/main/java/com/rtbishop/look4sat/domain/TLE.kt+++ b/core/src/main/java/com/rtbishop/look4sat/predict4kotlin/TLE.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.domain+package com.rtbishop.look4sat.predict4kotlinimport java.io.InputStreamimport kotlin.math.powdiff --git a/core/src/main/java/com/rtbishop/look4sat/usecases/GetSelectedSatellites.kt b/core/src/main/java/com/rtbishop/look4sat/usecases/GetSelectedSatellites.ktnew file mode 100644index 00000000..81338f90--- /dev/null+++ b/core/src/main/java/com/rtbishop/look4sat/usecases/GetSelectedSatellites.kt@@ -0,0 +1,24 @@+/*+ * 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.usecases++import com.rtbishop.look4sat.domain.Repository++class GetSelectedSatellites(private val dataRepository: Repository) {+ suspend operator fun invoke() = dataRepository.getSelectedSatellites()+}diff --git a/core/src/test/java/com/rtbishop/look4sat/QthConverterTest.kt b/core/src/test/java/com/rtbishop/look4sat/domain/QthConverterTest.ktsimilarity index 96%rename from core/src/test/java/com/rtbishop/look4sat/QthConverterTest.ktrename to core/src/test/java/com/rtbishop/look4sat/domain/QthConverterTest.ktindex 9667fb7b..11d2b936 100644--- a/core/src/test/java/com/rtbishop/look4sat/QthConverterTest.kt+++ b/core/src/test/java/com/rtbishop/look4sat/domain/QthConverterTest.kt@@ -15,9 +15,8 @@* 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+package com.rtbishop.look4sat.domain-import com.rtbishop.look4sat.domain.QthConverterimport org.junit.Testclass QthConverterTest {diff --git a/core/src/test/java/com/rtbishop/look4sat/TleParserTest.kt b/core/src/test/java/com/rtbishop/look4sat/predict4kotlin/TleParserTest.ktsimilarity index 65%rename from core/src/test/java/com/rtbishop/look4sat/TleParserTest.ktrename to core/src/test/java/com/rtbishop/look4sat/predict4kotlin/TleParserTest.ktindex 2b92a872..3e9feaa5 100644--- a/core/src/test/java/com/rtbishop/look4sat/TleParserTest.kt+++ b/core/src/test/java/com/rtbishop/look4sat/predict4kotlin/TleParserTest.kt@@ -1,6 +1,22 @@-package com.rtbishop.look4sat+/*+ * 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.predict4kotlin-import com.rtbishop.look4sat.domain.TLEimport org.junit.Testclass TleParserTest {