Moved and refactored several classes

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.Transmitter
 import com.rtbishop.look4sat.domain.Satellite
 import 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>)
 }

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.Transmitter
 import java.io.InputStream
 
 interface RemoteDataSource {
 
     suspend fun fetchDataStream(url: String): InputStream?
 
-    suspend fun fetchTransmitters(): List<SatTrans>
+    suspend fun fetchTransmitters(): List<Transmitter>
 }

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.Satellite
 
 data class SatData(
     val pass: Satellite,

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.TLE
 
 data class SatEntry(
     val tle: TLE,

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.data
 
 data class SatItem(
     val catNum: Int,

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.Transmitter
 import com.rtbishop.look4sat.domain.Satellite
 import com.rtbishop.look4sat.domain.TLE
 import 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)
     }
 

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,