Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Moved and refactored several classes
Arty Bishop94751519ac2d
diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/api/RemoteSource.kt b/app/src/main/java/com/rtbishop/look4sat/framework/api/RemoteSource.ktindex e1270576..7cd1165c 100644--- a/app/src/main/java/com/rtbishop/look4sat/framework/api/RemoteSource.kt+++ b/app/src/main/java/com/rtbishop/look4sat/framework/api/RemoteSource.kt@@ -18,7 +18,7 @@package com.rtbishop.look4sat.framework.apiimport com.rtbishop.look4sat.data.RemoteDataSource-import com.rtbishop.look4sat.domain.SatTrans+import com.rtbishop.look4sat.domain.Transmitterimport com.rtbishop.look4sat.utility.DataMapperimport java.io.InputStream@@ -28,7 +28,7 @@ class RemoteSource(private val api: SatelliteService) : RemoteDataSource {return api.fetchFileByUrl(url).body()?.byteStream()}- override suspend fun fetchTransmitters(): List<SatTrans> {+ override suspend fun fetchTransmitters(): List<Transmitter> {return DataMapper.satTransListToDomainTransList(api.fetchTransmitters())}}diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/api/SatelliteService.kt b/app/src/main/java/com/rtbishop/look4sat/framework/api/SatelliteService.ktindex 2034d482..32e479e9 100644--- a/app/src/main/java/com/rtbishop/look4sat/framework/api/SatelliteService.kt+++ b/app/src/main/java/com/rtbishop/look4sat/framework/api/SatelliteService.kt@@ -17,7 +17,7 @@*/package com.rtbishop.look4sat.framework.api-import com.rtbishop.look4sat.framework.model.SatTrans+import com.rtbishop.look4sat.framework.model.Transmitterimport okhttp3.ResponseBodyimport retrofit2.Responseimport retrofit2.http.GET@@ -31,5 +31,5 @@ interface SatelliteService {suspend fun fetchFileByUrl(@Url url: String): Response<ResponseBody>@GET("transmitters/")- suspend fun fetchTransmitters(): List<SatTrans>+ suspend fun fetchTransmitters(): List<Transmitter>}diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/db/LocalSource.kt b/app/src/main/java/com/rtbishop/look4sat/framework/db/LocalSource.ktindex 8a5e9c1c..e57ef1e3 100644--- a/app/src/main/java/com/rtbishop/look4sat/framework/db/LocalSource.kt+++ b/app/src/main/java/com/rtbishop/look4sat/framework/db/LocalSource.kt@@ -18,9 +18,9 @@package com.rtbishop.look4sat.framework.dbimport com.rtbishop.look4sat.data.LocalDataSource-import com.rtbishop.look4sat.domain.SatEntry-import com.rtbishop.look4sat.domain.SatItem-import com.rtbishop.look4sat.domain.SatTrans+import com.rtbishop.look4sat.data.SatEntry+import com.rtbishop.look4sat.data.SatItem+import com.rtbishop.look4sat.domain.Transmitterimport com.rtbishop.look4sat.domain.Satelliteimport com.rtbishop.look4sat.utility.DataMapperimport kotlinx.coroutines.flow.Flow@@ -46,12 +46,12 @@ class LocalSource(private val satelliteDao: SatelliteDao) : LocalDataSource {satelliteDao.updateEntriesSelection(catNums, isSelected)}- override fun getSatTransmitters(catNum: Int): Flow<List<SatTrans>> {+ override fun getSatTransmitters(catNum: Int): Flow<List<Transmitter>> {return satelliteDao.getSatTransmitters(catNum).map { satTransList -> DataMapper.satTransListToDomainTransList(satTransList) }}- override suspend fun updateTransmitters(satelliteTrans: List<SatTrans>) {+ override suspend fun updateTransmitters(satelliteTrans: List<Transmitter>) {val satTransList = DataMapper.domainTransListToSatTransList(satelliteTrans)satelliteDao.updateTransmitters(satTransList)}diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/db/SatelliteDao.kt b/app/src/main/java/com/rtbishop/look4sat/framework/db/SatelliteDao.ktindex c0304911..d579b18e 100644--- a/app/src/main/java/com/rtbishop/look4sat/framework/db/SatelliteDao.kt+++ b/app/src/main/java/com/rtbishop/look4sat/framework/db/SatelliteDao.kt@@ -20,7 +20,7 @@ package com.rtbishop.look4sat.framework.dbimport androidx.room.*import com.rtbishop.look4sat.framework.model.SatEntryimport com.rtbishop.look4sat.framework.model.SatItem-import com.rtbishop.look4sat.framework.model.SatTrans+import com.rtbishop.look4sat.framework.model.Transmitterimport com.rtbishop.look4sat.domain.Satelliteimport kotlinx.coroutines.flow.Flow@@ -32,7 +32,7 @@ interface SatelliteDao {fun getSatItems(): Flow<List<SatItem>>@Query("SELECT * FROM transmitters WHERE catNum = :catNum")- fun getSatTransmitters(catNum: Int): Flow<List<SatTrans>>+ fun getSatTransmitters(catNum: Int): Flow<List<Transmitter>>@Query("SELECT tle FROM entries WHERE isSelected = 1")suspend fun getSelectedSatellites(): List<Satellite>@@ -68,7 +68,7 @@ interface SatelliteDao {}@Transaction- suspend fun updateTransmitters(transmitters: List<SatTrans>) {+ suspend fun updateTransmitters(transmitters: List<Transmitter>) {deleteTransmitters()insertTransmitters(transmitters)}@@ -77,5 +77,5 @@ interface SatelliteDao {suspend fun deleteTransmitters()@Insert(onConflict = OnConflictStrategy.REPLACE)- suspend fun insertTransmitters(transmitters: List<SatTrans>)+ suspend fun insertTransmitters(transmitters: List<Transmitter>)}diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/db/SatelliteDb.kt b/app/src/main/java/com/rtbishop/look4sat/framework/db/SatelliteDb.ktindex bf05ed11..a3e9721d 100644--- a/app/src/main/java/com/rtbishop/look4sat/framework/db/SatelliteDb.kt+++ b/app/src/main/java/com/rtbishop/look4sat/framework/db/SatelliteDb.kt@@ -21,9 +21,9 @@ import androidx.room.Databaseimport androidx.room.RoomDatabaseimport androidx.room.TypeConvertersimport com.rtbishop.look4sat.framework.model.SatEntry-import com.rtbishop.look4sat.framework.model.SatTrans+import com.rtbishop.look4sat.framework.model.Transmitter-@Database(entities = [SatEntry::class, SatTrans::class], version = 1, exportSchema = false)+@Database(entities = [SatEntry::class, Transmitter::class], version = 1, exportSchema = false)@TypeConverters(Converters::class)abstract class SatelliteDb : RoomDatabase() {diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/model/SatItem.kt b/app/src/main/java/com/rtbishop/look4sat/framework/model/SatItem.ktindex e03580eb..46fd7739 100644--- a/app/src/main/java/com/rtbishop/look4sat/framework/model/SatItem.kt+++ b/app/src/main/java/com/rtbishop/look4sat/framework/model/SatItem.kt@@ -25,7 +25,7 @@ data class SatItem(var isSelected: Boolean,@Relation(parentColumn = "catNum",- entity = SatTrans::class,+ entity = Transmitter::class,entityColumn = "catNum",projection = ["mode"])diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/model/SatTrans.kt b/app/src/main/java/com/rtbishop/look4sat/framework/model/Transmitter.ktsimilarity index 98%rename from app/src/main/java/com/rtbishop/look4sat/framework/model/SatTrans.ktrename to app/src/main/java/com/rtbishop/look4sat/framework/model/Transmitter.ktindex d79eb513..5431ddb9 100644--- a/app/src/main/java/com/rtbishop/look4sat/framework/model/SatTrans.kt+++ b/app/src/main/java/com/rtbishop/look4sat/framework/model/Transmitter.kt@@ -22,7 +22,7 @@ import androidx.room.PrimaryKeyimport com.squareup.moshi.Json@Entity(tableName = "transmitters")-data class SatTrans(+data class Transmitter(@PrimaryKey @field:Json(name = "uuid") val uuid: String,@field:Json(name = "description") val info: String,@field:Json(name = "alive") val isAlive: Boolean,diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/satItemScreen/SatItemAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/satItemScreen/SatItemAdapter.ktindex 49a6a6d9..b9a06ac6 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/satItemScreen/SatItemAdapter.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/satItemScreen/SatItemAdapter.kt@@ -23,7 +23,7 @@ import androidx.recyclerview.widget.AsyncListDifferimport androidx.recyclerview.widget.DiffUtilimport androidx.recyclerview.widget.RecyclerViewimport com.rtbishop.look4sat.databinding.SatItemBinding-import com.rtbishop.look4sat.domain.SatItem+import com.rtbishop.look4sat.data.SatItemclass SatItemAdapter : RecyclerView.Adapter<SatItemAdapter.SatItemHolder>() {diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/satItemScreen/SatItemFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/satItemScreen/SatItemFragment.ktindex 48b58810..b66dfb78 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/satItemScreen/SatItemFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/satItemScreen/SatItemFragment.kt@@ -28,7 +28,7 @@ import androidx.recyclerview.widget.SimpleItemAnimatorimport com.google.android.material.dialog.MaterialAlertDialogBuilderimport com.rtbishop.look4sat.Rimport com.rtbishop.look4sat.databinding.FragmentEntriesBinding-import com.rtbishop.look4sat.domain.SatItem+import com.rtbishop.look4sat.data.SatItemimport com.rtbishop.look4sat.framework.model.Resultimport com.rtbishop.look4sat.utility.RecyclerDividerimport com.rtbishop.look4sat.utility.getNavResultdiff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/satItemScreen/SatItemViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/satItemScreen/SatItemViewModel.ktindex 9e36dcb1..ccbf1981 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/satItemScreen/SatItemViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/satItemScreen/SatItemViewModel.kt@@ -23,7 +23,7 @@ import android.widget.SearchViewimport androidx.lifecycle.*import com.rtbishop.look4sat.data.PreferencesSourceimport com.rtbishop.look4sat.data.SatelliteRepo-import com.rtbishop.look4sat.domain.SatItem+import com.rtbishop.look4sat.data.SatItemimport com.rtbishop.look4sat.framework.model.Resultimport dagger.hilt.android.lifecycle.HiltViewModelimport kotlinx.coroutines.flow.collectdiff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/satMapScreen/SatMapFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/satMapScreen/SatMapFragment.ktindex b8483150..857525e4 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/satMapScreen/SatMapFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/satMapScreen/SatMapFragment.kt@@ -31,7 +31,7 @@ import com.rtbishop.look4sat.Rimport com.rtbishop.look4sat.databinding.FragmentMapBindingimport com.rtbishop.look4sat.domain.GeoPosimport com.rtbishop.look4sat.domain.Satellite-import com.rtbishop.look4sat.domain.SatData+import com.rtbishop.look4sat.data.SatDataimport dagger.hilt.android.AndroidEntryPointimport org.osmdroid.config.Configurationimport org.osmdroid.tileprovider.tilesource.TileSourceFactorydiff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/satMapScreen/SatMapViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/satMapScreen/SatMapViewModel.ktindex 08189085..813e7b2a 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/satMapScreen/SatMapViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/satMapScreen/SatMapViewModel.kt@@ -20,6 +20,7 @@ package com.rtbishop.look4sat.presentation.satMapScreenimport androidx.lifecycle.*import com.rtbishop.look4sat.domain.Predictorimport com.rtbishop.look4sat.data.PreferencesSource+import com.rtbishop.look4sat.data.SatDataimport com.rtbishop.look4sat.data.SatelliteRepoimport com.rtbishop.look4sat.domain.*import dagger.hilt.android.lifecycle.HiltViewModeldiff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/satPassInfoScreen/PassInfoViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/satPassInfoScreen/PassInfoViewModel.ktindex d9fc80ac..08efe72b 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/satPassInfoScreen/PassInfoViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/satPassInfoScreen/PassInfoViewModel.kt@@ -18,13 +18,13 @@package com.rtbishop.look4sat.presentation.satPassInfoScreenimport androidx.lifecycle.*-import com.rtbishop.look4sat.domain.Predictorimport com.rtbishop.look4sat.data.PreferencesSourceimport com.rtbishop.look4sat.data.SatelliteRepo-import com.rtbishop.look4sat.injection.IoDispatcher-import com.rtbishop.look4sat.domain.SatTrans+import com.rtbishop.look4sat.domain.Predictorimport com.rtbishop.look4sat.domain.SatPass+import com.rtbishop.look4sat.domain.Transmitterimport com.rtbishop.look4sat.framework.OrientationProvider+import com.rtbishop.look4sat.injection.IoDispatcherimport com.rtbishop.look4sat.utility.roundimport dagger.hilt.android.lifecycle.HiltViewModelimport kotlinx.coroutines.*@@ -44,9 +44,9 @@ class PassInfoViewModel @Inject constructor() : ViewModel(), OrientationProvider.OrientationListener {private val stationPos = preferences.loadStationPosition()- private val _transmitters = MutableLiveData<List<SatTrans>>()+ private val _transmitters = MutableLiveData<List<Transmitter>>()private val _orientation = MutableLiveData<Triple<Float, Float, Float>>()- val transmitters: LiveData<List<SatTrans>> = _transmitters+ val transmitters: LiveData<List<Transmitter>> = _transmittersval orientation: LiveData<Triple<Float, Float, Float>> = _orientationfun getPass(catNum: Int, aosTime: Long) = liveData {@@ -81,7 +81,7 @@ class PassInfoViewModel @Inject constructor(val socket = Socket(rotatorPrefs.first, rotatorPrefs.second)val writer = socket.getOutputStream().bufferedWriter()while (isActive) {- val satPos = satPass.satellite.getPosition(stationPos, Date().time)+ val satPos = predictor.getSatPos(satPass.satellite, stationPos, Date())val azimuth = Math.toDegrees(satPos.azimuth).round(1)val elevation = Math.toDegrees(satPos.elevation).round(1)writer.write("\\set_pos $azimuth $elevation")@@ -100,7 +100,7 @@ class PassInfoViewModel @Inject constructor(viewModelScope.launch {satelliteRepo.getSatTransmitters(satPass.catNum).collect { transList ->while (isActive) {- val satPos = satPass.satellite.getPosition(stationPos, Date().time)+ val satPos = predictor.getSatPos(satPass.satellite, stationPos, Date())val copiedList = transList.map { it.copy() }copiedList.forEach { transmitter ->transmitter.downlink?.let {diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/satPassInfoScreen/SatTransAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/satPassInfoScreen/SatTransAdapter.ktindex d15c09e5..6b9438c1 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/satPassInfoScreen/SatTransAdapter.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/satPassInfoScreen/SatTransAdapter.kt@@ -24,23 +24,23 @@ import androidx.recyclerview.widget.DiffUtilimport androidx.recyclerview.widget.RecyclerViewimport com.rtbishop.look4sat.Rimport com.rtbishop.look4sat.databinding.ItemTransBinding-import com.rtbishop.look4sat.domain.SatTrans+import com.rtbishop.look4sat.domain.Transmitterimport java.util.*class SatTransAdapter : RecyclerView.Adapter<SatTransAdapter.TransHolder>() {- private val diffCallback = object : DiffUtil.ItemCallback<SatTrans>() {- override fun areItemsTheSame(oldItem: SatTrans, newItem: SatTrans): Boolean {+ private val diffCallback = object : DiffUtil.ItemCallback<Transmitter>() {+ override fun areItemsTheSame(oldItem: Transmitter, newItem: Transmitter): Boolean {return oldItem.uuid == newItem.uuid}- override fun areContentsTheSame(oldItem: SatTrans, newItem: SatTrans): Boolean {+ override fun areContentsTheSame(oldItem: Transmitter, newItem: Transmitter): Boolean {return oldItem.downlink == newItem.downlink}}private val differ = AsyncListDiffer(this, diffCallback)- fun submitList(transmitters: List<SatTrans>) {+ fun submitList(transmitters: List<Transmitter>) {differ.submitList(transmitters)}@@ -65,27 +65,27 @@ class SatTransAdapter : RecyclerView.Adapter<SatTransAdapter.TransHolder>() {private val formatLinkNull = itemView.context.getString(R.string.trans_no_link)private val isInverted = itemView.context.getString(R.string.trans_inverted)- fun bind(satTrans: SatTrans) {- binding.description.text = satTrans.info+ fun bind(transmitter: Transmitter) {+ binding.description.text = transmitter.info- satTrans.downlink.let { downlink ->+ transmitter.downlink.let { downlink ->if (downlink != null) {val downlinkFreq = downlink / dividerbinding.downlink.text = String.format(Locale.ENGLISH, formatLink, downlinkFreq)} else binding.downlink.text = formatLinkNull}- satTrans.uplink.let { uplink ->+ transmitter.uplink.let { uplink ->if (uplink != null) {val uplinkFreq = uplink / dividerbinding.uplink.text = String.format(Locale.ENGLISH, formatLink, uplinkFreq)} else binding.uplink.text = formatLinkNull}- if (satTrans.mode != null) binding.mode.text = String.format(mode, satTrans.mode)+ if (transmitter.mode != null) binding.mode.text = String.format(mode, transmitter.mode)else binding.mode.text = String.format(mode, strNo)- if (satTrans.isInverted) binding.isInverted.text = String.format(isInverted, strYes)+ if (transmitter.isInverted) binding.isInverted.text = String.format(isInverted, strYes)else binding.isInverted.text = String.format(isInverted, strNo)}diff --git a/app/src/main/java/com/rtbishop/look4sat/utility/DataMapper.kt b/app/src/main/java/com/rtbishop/look4sat/utility/DataMapper.ktindex 38ff789b..e6ef0648 100644--- a/app/src/main/java/com/rtbishop/look4sat/utility/DataMapper.kt+++ b/app/src/main/java/com/rtbishop/look4sat/utility/DataMapper.kt@@ -19,10 +19,10 @@ package com.rtbishop.look4sat.utilityimport com.rtbishop.look4sat.framework.model.SatEntryimport com.rtbishop.look4sat.framework.model.SatItem-import com.rtbishop.look4sat.framework.model.SatTrans-import com.rtbishop.look4sat.domain.SatEntry as DomainEntry-import com.rtbishop.look4sat.domain.SatItem as DomainItem-import com.rtbishop.look4sat.domain.SatTrans as DomainTrans+import 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 DomainTransobject DataMapper {@@ -44,14 +44,14 @@ object DataMapper {return items.map { item -> satItemToDomainItem(item) }}- fun satTransToDomainTrans(transmitter: SatTrans): DomainTrans {+ fun satTransToDomainTrans(transmitter: Transmitter): DomainTrans {return DomainTrans(transmitter.uuid, transmitter.info, transmitter.isAlive, transmitter.downlink,transmitter.uplink, transmitter.mode, transmitter.isInverted, transmitter.catNum)}- fun satTransListToDomainTransList(transmitters: List<SatTrans>): List<DomainTrans> {+ fun satTransListToDomainTransList(transmitters: List<Transmitter>): List<DomainTrans> {return transmitters.map { transmitter -> satTransToDomainTrans(transmitter) }}@@ -73,14 +73,14 @@ object DataMapper {return items.map { item -> domainItemToSatItem(item) }}- fun domainTransToSatTrans(transmitter: DomainTrans): SatTrans {- return SatTrans(+ fun domainTransToSatTrans(transmitter: DomainTrans): Transmitter {+ return Transmitter(transmitter.uuid, transmitter.info, transmitter.isAlive, transmitter.downlink,transmitter.uplink, transmitter.mode, transmitter.isInverted, transmitter.catNum)}- fun domainTransListToSatTransList(transmitters: List<DomainTrans>): List<SatTrans> {+ fun domainTransListToSatTransList(transmitters: List<DomainTrans>): List<Transmitter> {return transmitters.map { transmitter -> domainTransToSatTrans(transmitter) }}}diff --git a/core/src/main/java/com/rtbishop/look4sat/data/LocalDataSource.kt b/core/src/main/java/com/rtbishop/look4sat/data/LocalDataSource.ktindex d2c654bc..9ac884fc 100644--- a/core/src/main/java/com/rtbishop/look4sat/data/LocalDataSource.kt+++ b/core/src/main/java/com/rtbishop/look4sat/data/LocalDataSource.kt@@ -17,9 +17,7 @@*/package com.rtbishop.look4sat.data-import com.rtbishop.look4sat.domain.SatEntry-import com.rtbishop.look4sat.domain.SatItem-import com.rtbishop.look4sat.domain.SatTrans+import com.rtbishop.look4sat.domain.Transmitterimport com.rtbishop.look4sat.domain.Satelliteimport kotlinx.coroutines.flow.Flow@@ -27,7 +25,7 @@ interface LocalDataSource {fun getSatItems(): Flow<List<SatItem>>- fun getSatTransmitters(catNum: Int): Flow<List<SatTrans>>+ fun getSatTransmitters(catNum: Int): Flow<List<Transmitter>>suspend fun getSelectedSatellites(): List<Satellite>@@ -35,5 +33,5 @@ interface LocalDataSource {suspend fun updateEntriesSelection(catNums: List<Int>, isSelected: Boolean)- suspend fun updateTransmitters(satelliteTrans: List<SatTrans>)+ suspend fun updateTransmitters(satelliteTrans: List<Transmitter>)}diff --git a/core/src/main/java/com/rtbishop/look4sat/data/RemoteDataSource.kt b/core/src/main/java/com/rtbishop/look4sat/data/RemoteDataSource.ktindex a1a2164f..eb05a3da 100644--- a/core/src/main/java/com/rtbishop/look4sat/data/RemoteDataSource.kt+++ b/core/src/main/java/com/rtbishop/look4sat/data/RemoteDataSource.kt@@ -17,12 +17,12 @@*/package com.rtbishop.look4sat.data-import com.rtbishop.look4sat.domain.SatTrans+import com.rtbishop.look4sat.domain.Transmitterimport java.io.InputStreaminterface RemoteDataSource {suspend fun fetchDataStream(url: String): InputStream?- suspend fun fetchTransmitters(): List<SatTrans>+ suspend fun fetchTransmitters(): List<Transmitter>}diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/SatData.kt b/core/src/main/java/com/rtbishop/look4sat/data/SatData.ktsimilarity index 88%rename from core/src/main/java/com/rtbishop/look4sat/domain/SatData.ktrename to core/src/main/java/com/rtbishop/look4sat/data/SatData.ktindex c6c7d972..0252e46b 100644--- a/core/src/main/java/com/rtbishop/look4sat/domain/SatData.kt+++ b/core/src/main/java/com/rtbishop/look4sat/data/SatData.kt@@ -15,7 +15,10 @@* You should have received a copy of the GNU General Public License* along with this program. If not, see <https://www.gnu.org/licenses/>.*/-package com.rtbishop.look4sat.domain+package com.rtbishop.look4sat.data++import com.rtbishop.look4sat.domain.GeoPos+import com.rtbishop.look4sat.domain.Satellitedata class SatData(val pass: Satellite,diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/SatEntry.kt b/core/src/main/java/com/rtbishop/look4sat/data/SatEntry.ktsimilarity index 92%rename from core/src/main/java/com/rtbishop/look4sat/domain/SatEntry.ktrename to core/src/main/java/com/rtbishop/look4sat/data/SatEntry.ktindex 4cb6f6ab..1b7157b0 100644--- a/core/src/main/java/com/rtbishop/look4sat/domain/SatEntry.kt+++ b/core/src/main/java/com/rtbishop/look4sat/data/SatEntry.kt@@ -15,7 +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.domain+package com.rtbishop.look4sat.data++import com.rtbishop.look4sat.domain.TLEdata class SatEntry(val tle: TLE,diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/SatItem.kt b/core/src/main/java/com/rtbishop/look4sat/data/SatItem.ktsimilarity index 96%rename from core/src/main/java/com/rtbishop/look4sat/domain/SatItem.ktrename to core/src/main/java/com/rtbishop/look4sat/data/SatItem.ktindex ae3d8e9b..e754b461 100644--- a/core/src/main/java/com/rtbishop/look4sat/domain/SatItem.kt+++ b/core/src/main/java/com/rtbishop/look4sat/data/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.domain+package com.rtbishop.look4sat.datadata class SatItem(val catNum: Int,diff --git a/core/src/main/java/com/rtbishop/look4sat/data/SatelliteRepo.kt b/core/src/main/java/com/rtbishop/look4sat/data/SatelliteRepo.ktindex 2f4c35a8..2ffbeb63 100644--- a/core/src/main/java/com/rtbishop/look4sat/data/SatelliteRepo.kt+++ b/core/src/main/java/com/rtbishop/look4sat/data/SatelliteRepo.kt@@ -17,9 +17,7 @@*/package com.rtbishop.look4sat.data-import com.rtbishop.look4sat.domain.SatEntry-import com.rtbishop.look4sat.domain.SatItem-import com.rtbishop.look4sat.domain.SatTrans+import com.rtbishop.look4sat.domain.Transmitterimport com.rtbishop.look4sat.domain.Satelliteimport com.rtbishop.look4sat.domain.TLEimport kotlinx.coroutines.CoroutineDispatcher@@ -49,7 +47,7 @@ class SatelliteRepo(return localDataSource.getSatItems()}- fun getSatTransmitters(catNum: Int): Flow<List<SatTrans>> {+ fun getSatTransmitters(catNum: Int): Flow<List<Transmitter>> {return localDataSource.getSatTransmitters(catNum)}diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/SatTrans.kt b/core/src/main/java/com/rtbishop/look4sat/domain/Transmitter.ktsimilarity index 97%rename from core/src/main/java/com/rtbishop/look4sat/domain/SatTrans.ktrename to core/src/main/java/com/rtbishop/look4sat/domain/Transmitter.ktindex f85d510e..a9175f91 100644--- a/core/src/main/java/com/rtbishop/look4sat/domain/SatTrans.kt+++ b/core/src/main/java/com/rtbishop/look4sat/domain/Transmitter.kt@@ -17,7 +17,7 @@*/package com.rtbishop.look4sat.domain-data class SatTrans(+data class Transmitter(val uuid: String,val info: String,val isAlive: Boolean,