Implemented Clean architecture, removed redundant dependencies

core/build.gradle

@@ -11,4 +11,7 @@ java {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
-}
+
+    testImplementation "junit:junit:$junit_version"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_test_version"
+}

core/src/main/java/com/rtbishop/look4sat/data/DefaultSatelliteRepo.kt

@@ -4,7 +4,7 @@ import com.rtbishop.look4sat.domain.SatelliteRepo
 import com.rtbishop.look4sat.domain.model.SatEntry
 import com.rtbishop.look4sat.domain.model.SatItem
 import com.rtbishop.look4sat.domain.model.SatTrans
-import com.rtbishop.look4sat.predict4kotlin.Satellite
+import com.rtbishop.look4sat.domain.predict4kotlin.Satellite
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.Flow
@@ -32,15 +32,13 @@ class DefaultSatelliteRepo(
     }
 
     override suspend fun importDataFromFile(stream: InputStream) = withContext(ioDispatcher) {
-        val entries = mutableListOf<SatEntry>()
-        val tleList = Satellite.importTLE(stream)
-        tleList.forEach { tle -> entries.add(SatEntry(tle)) }
+        val entries = Satellite.importTLE(stream).map { tle -> SatEntry(tle) }
         localSource.updateEntries(entries)
     }
 
     override suspend fun importDataFromWeb(sources: List<String>) {
         coroutineScope {
-            launch {
+            launch(ioDispatcher) {
                 val entries = mutableListOf<SatEntry>()
                 val streams = mutableListOf<InputStream>()
                 sources.forEach { source ->
@@ -59,7 +57,7 @@ class DefaultSatelliteRepo(
                 }
                 localSource.updateEntries(entries)
             }
-            launch {
+            launch(ioDispatcher) {
                 val transmitters = remoteSource.fetchTransmitters().filter { it.isAlive }
                 localSource.updateTransmitters(transmitters)
             }

core/src/main/java/com/rtbishop/look4sat/data/LocalDataSource.kt

@@ -3,7 +3,7 @@ package com.rtbishop.look4sat.data
 import com.rtbishop.look4sat.domain.model.SatEntry
 import com.rtbishop.look4sat.domain.model.SatItem
 import com.rtbishop.look4sat.domain.model.SatTrans
-import com.rtbishop.look4sat.predict4kotlin.Satellite
+import com.rtbishop.look4sat.domain.predict4kotlin.Satellite
 import kotlinx.coroutines.flow.Flow
 
 interface LocalDataSource {

core/src/main/java/com/rtbishop/look4sat/domain/SatelliteRepo.kt

@@ -2,7 +2,7 @@ package com.rtbishop.look4sat.domain
 
 import com.rtbishop.look4sat.domain.model.SatItem
 import com.rtbishop.look4sat.domain.model.SatTrans
-import com.rtbishop.look4sat.predict4kotlin.Satellite
+import com.rtbishop.look4sat.domain.predict4kotlin.Satellite
 import kotlinx.coroutines.flow.Flow
 import java.io.InputStream
 
@@ -19,4 +19,4 @@ interface SatelliteRepo {
     suspend fun importDataFromWeb(sources: List<String>)
 
     suspend fun updateEntriesSelection(catNums: List<Int>, isSelected: Boolean)
-}
+}

core/src/main/java/com/rtbishop/look4sat/domain/model/SatEntry.kt

@@ -1,6 +1,6 @@
 package com.rtbishop.look4sat.domain.model
 
-import com.rtbishop.look4sat.predict4kotlin.TLE
+import com.rtbishop.look4sat.domain.predict4kotlin.TLE
 
 data class SatEntry(
     val tle: TLE,

core/src/main/java/com/rtbishop/look4sat/domain/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.predict4kotlin
+package com.rtbishop.look4sat.domain.predict4kotlin
 
 import kotlin.math.*
 

core/src/main/java/com/rtbishop/look4sat/domain/predict4kotlin/GroundPos.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.predict4kotlin
+package com.rtbishop.look4sat.domain.predict4kotlin
 
 data class GroundPos(val lat: Double, val lon: Double, val alt: Double, val name: String = "base")

core/src/main/java/com/rtbishop/look4sat/domain/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.predict4kotlin
+package com.rtbishop.look4sat.domain.predict4kotlin
 
 import kotlin.math.*
 

core/src/main/java/com/rtbishop/look4sat/domain/predict4kotlin/PassPredictor.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.predict4kotlin
+package com.rtbishop.look4sat.domain.predict4kotlin
 
 import java.util.*
 

core/src/main/java/com/rtbishop/look4sat/domain/predict4kotlin/Position.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.predict4kotlin
+package com.rtbishop.look4sat.domain.predict4kotlin
 
 data class Position(val lat: Double, val lon: Double)

core/src/main/java/com/rtbishop/look4sat/domain/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.predict4kotlin
+package com.rtbishop.look4sat.domain.predict4kotlin
 
 import java.util.*
 

core/src/main/java/com/rtbishop/look4sat/domain/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.predict4kotlin
+package com.rtbishop.look4sat.domain.predict4kotlin
 
 import java.util.*
 import kotlin.math.*

core/src/main/java/com/rtbishop/look4sat/domain/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.predict4kotlin
+package com.rtbishop.look4sat.domain.predict4kotlin
 
 import java.io.InputStream
 import java.util.*

core/src/main/java/com/rtbishop/look4sat/domain/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.predict4kotlin
+package com.rtbishop.look4sat.domain.predict4kotlin
 
 data class TLE(
     val name: String,

core/src/main/java/com/rtbishop/look4sat/interactors/GetSatItems.kt

@@ -9,4 +9,4 @@ class GetSatItems(private val satelliteRepo: SatelliteRepo) {
     operator fun invoke(): Flow<List<SatItem>> {
         return satelliteRepo.getSatItems()
     }
-}
+}

core/src/main/java/com/rtbishop/look4sat/interactors/GetSelectedSatellites.kt

@@ -1,11 +1,11 @@
 package com.rtbishop.look4sat.interactors
 
 import com.rtbishop.look4sat.domain.SatelliteRepo
-import com.rtbishop.look4sat.predict4kotlin.Satellite
+import com.rtbishop.look4sat.domain.predict4kotlin.Satellite
 
 class GetSelectedSatellites(private val satelliteRepo: SatelliteRepo) {
 
     suspend operator fun invoke(): List<Satellite> {
         return satelliteRepo.getSelectedSatellites()
     }
-}
+}

core/src/main/java/com/rtbishop/look4sat/interactors/GetTransmittersForSat.kt

@@ -9,4 +9,4 @@ class GetTransmittersForSat(private val satelliteRepo: SatelliteRepo) {
     operator fun invoke(catNum: Int): Flow<List<SatTrans>> {
         return satelliteRepo.getTransmittersForSat(catNum)
     }
-}
+}

core/src/main/java/com/rtbishop/look4sat/interactors/ImportDataFromFile.kt

@@ -8,4 +8,4 @@ class ImportDataFromFile(private val satelliteRepo: SatelliteRepo) {
     suspend operator fun invoke(stream: InputStream) {
         satelliteRepo.importDataFromFile(stream)
     }
-}
+}

core/src/main/java/com/rtbishop/look4sat/interactors/ImportDataFromWeb.kt

@@ -7,4 +7,4 @@ class ImportDataFromWeb(private val satelliteRepo: SatelliteRepo) {
     suspend operator fun invoke(sources: List<String>) {
         satelliteRepo.importDataFromWeb(sources)
     }
-}
+}

core/src/main/java/com/rtbishop/look4sat/interactors/UpdateEntriesSelection.kt

@@ -7,4 +7,4 @@ class UpdateEntriesSelection(private val satelliteRepo: SatelliteRepo) {
     suspend operator fun invoke(catNums: List<Int>, isSelected: Boolean) {
         satelliteRepo.updateEntriesSelection(catNums, isSelected)
     }
-}
+}