Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Renamed base module into domain
Arty Bishopf8d5542af580
diff --git a/app/build.gradle b/app/build.gradleindex 242e27f5..0af4ebbe 100644--- a/app/build.gradle+++ b/app/build.gradle@@ -13,7 +13,7 @@ android {minSdk 21targetSdk 33versionCode 313- versionName '3.1.3'+ versionName "3.1.3"testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"}@@ -53,7 +53,7 @@ kotlin {}dependencies {- implementation project(":base")+ implementation project(":domain")// Androidimplementation "androidx.core:core-splashscreen:$splashscreen_version"implementation "androidx.room:room-runtime:$room_version"diff --git a/app/src/main/java/com/rtbishop/look4sat/MainContainer.kt b/app/src/main/java/com/rtbishop/look4sat/MainContainer.ktindex 648f8438..ef60bcdf 100644--- a/app/src/main/java/com/rtbishop/look4sat/MainContainer.kt+++ b/app/src/main/java/com/rtbishop/look4sat/MainContainer.kt@@ -6,15 +6,15 @@ import android.hardware.Sensorimport android.hardware.SensorManagerimport android.location.LocationManagerimport androidx.room.Room-import com.rtbishop.look4sat.data.DataParser-import com.rtbishop.look4sat.data.DatabaseRepo-import com.rtbishop.look4sat.data.ISensorSource-import com.rtbishop.look4sat.data.SatelliteRepo-import com.rtbishop.look4sat.data.SelectionRepo-import com.rtbishop.look4sat.domain.IDatabaseRepo-import com.rtbishop.look4sat.domain.ISatelliteRepo-import com.rtbishop.look4sat.domain.ISelectionRepo-import com.rtbishop.look4sat.domain.ISettingsRepo+import com.rtbishop.look4sat.domain.data.DataParser+import com.rtbishop.look4sat.domain.data.DatabaseRepo+import com.rtbishop.look4sat.domain.data.ISensorSource+import com.rtbishop.look4sat.domain.data.SatelliteRepo+import com.rtbishop.look4sat.domain.data.SelectionRepo+import com.rtbishop.look4sat.domain.predict.IDatabaseRepo+import com.rtbishop.look4sat.domain.predict.ISatelliteRepo+import com.rtbishop.look4sat.domain.predict.ISelectionRepo+import com.rtbishop.look4sat.domain.predict.ISettingsRepoimport com.rtbishop.look4sat.framework.BluetoothReporterimport com.rtbishop.look4sat.framework.NetworkReporterimport com.rtbishop.look4sat.framework.SettingsRepodiff --git a/app/src/main/java/com/rtbishop/look4sat/framework/SettingsRepo.kt b/app/src/main/java/com/rtbishop/look4sat/framework/SettingsRepo.ktindex 0f594228..204087d9 100644--- a/app/src/main/java/com/rtbishop/look4sat/framework/SettingsRepo.kt+++ b/app/src/main/java/com/rtbishop/look4sat/framework/SettingsRepo.kt@@ -23,13 +23,13 @@ import android.location.LocationManagerimport androidx.core.content.editimport androidx.core.location.LocationManagerCompatimport androidx.core.os.CancellationSignal-import com.rtbishop.look4sat.domain.ISettingsRepo-import com.rtbishop.look4sat.model.DatabaseState-import com.rtbishop.look4sat.model.GeoPos-import com.rtbishop.look4sat.model.OtherSettings-import com.rtbishop.look4sat.model.PassesSettings-import com.rtbishop.look4sat.utility.QthConverter-import com.rtbishop.look4sat.utility.round+import com.rtbishop.look4sat.domain.model.DatabaseState+import com.rtbishop.look4sat.domain.model.GeoPos+import com.rtbishop.look4sat.domain.model.OtherSettings+import com.rtbishop.look4sat.domain.model.PassesSettings+import com.rtbishop.look4sat.domain.predict.ISettingsRepo+import com.rtbishop.look4sat.domain.utility.QthConverter+import com.rtbishop.look4sat.domain.utility.roundimport kotlinx.coroutines.flow.MutableStateFlowimport kotlinx.coroutines.flow.StateFlowimport java.util.concurrent.Executorsdiff --git a/app/src/main/java/com/rtbishop/look4sat/framework/data/DataSource.kt b/app/src/main/java/com/rtbishop/look4sat/framework/data/DataSource.ktindex a4f472a4..ae4635b7 100644--- a/app/src/main/java/com/rtbishop/look4sat/framework/data/DataSource.kt+++ b/app/src/main/java/com/rtbishop/look4sat/framework/data/DataSource.kt@@ -19,7 +19,7 @@ package com.rtbishop.look4sat.framework.dataimport android.content.ContentResolverimport android.net.Uri-import com.rtbishop.look4sat.data.IDataSource+import com.rtbishop.look4sat.domain.data.IDataSourceimport kotlinx.coroutines.CoroutineDispatcherimport kotlinx.coroutines.withContextimport okhttp3.OkHttpClientdiff --git a/app/src/main/java/com/rtbishop/look4sat/framework/data/LocalStorage.kt b/app/src/main/java/com/rtbishop/look4sat/framework/data/LocalStorage.ktindex 55caf0ea..6eaa5b51 100644--- a/app/src/main/java/com/rtbishop/look4sat/framework/data/LocalStorage.kt+++ b/app/src/main/java/com/rtbishop/look4sat/framework/data/LocalStorage.kt@@ -17,15 +17,15 @@*/package com.rtbishop.look4sat.framework.data-import com.rtbishop.look4sat.data.ILocalStorage-import com.rtbishop.look4sat.domain.Satellite-import com.rtbishop.look4sat.model.SatRadio+import com.rtbishop.look4sat.domain.data.ILocalStorage+import com.rtbishop.look4sat.domain.model.SatRadio+import com.rtbishop.look4sat.domain.predict.Satellite+import com.rtbishop.look4sat.domain.model.SatEntry as DomainEntry+import com.rtbishop.look4sat.domain.model.SatItem as DomainItem+import com.rtbishop.look4sat.domain.model.SatRadio as DomainRadioimport com.rtbishop.look4sat.framework.model.SatEntry as FrameworkEntryimport com.rtbishop.look4sat.framework.model.SatItem as FrameworkItemimport com.rtbishop.look4sat.framework.model.SatRadio as FrameworkRadio-import com.rtbishop.look4sat.model.SatEntry as DomainEntry-import com.rtbishop.look4sat.model.SatItem as DomainItem-import com.rtbishop.look4sat.model.SatRadio as DomainRadioclass LocalStorage(private val storageDao: StorageDao) : ILocalStorage {diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/data/SensorSource.kt b/app/src/main/java/com/rtbishop/look4sat/framework/data/SensorSource.ktindex 26122641..de440c70 100644--- a/app/src/main/java/com/rtbishop/look4sat/framework/data/SensorSource.kt+++ b/app/src/main/java/com/rtbishop/look4sat/framework/data/SensorSource.kt@@ -21,8 +21,8 @@ import android.hardware.Sensorimport android.hardware.SensorEventimport android.hardware.SensorEventListenerimport android.hardware.SensorManager-import com.rtbishop.look4sat.data.ISensorSource-import com.rtbishop.look4sat.domain.RAD2DEG+import com.rtbishop.look4sat.domain.data.ISensorSource+import com.rtbishop.look4sat.domain.predict.RAD2DEGimport kotlinx.coroutines.flow.MutableStateFlowimport kotlinx.coroutines.flow.StateFlowimport kotlin.math.rounddiff --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 d39b8a16..7c9f2dad 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.Embeddedimport androidx.room.Entity-import com.rtbishop.look4sat.model.OrbitalData+import com.rtbishop.look4sat.domain.model.OrbitalData@Entity(tableName = "entries", primaryKeys = ["catnum"])data class SatEntry(@Embedded val data: OrbitalData, var comment: String? = null)diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesScreen.ktindex 6a929530..337db202 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesScreen.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesScreen.kt@@ -25,7 +25,7 @@ import androidx.compose.ui.unit.dpimport androidx.compose.ui.unit.spimport androidx.lifecycle.viewmodel.compose.viewModelimport com.rtbishop.look4sat.R-import com.rtbishop.look4sat.model.SatItem+import com.rtbishop.look4sat.domain.model.SatItemimport com.rtbishop.look4sat.presentation.CardIconimport com.rtbishop.look4sat.presentation.CardLoadingIndicatorimport com.rtbishop.look4sat.presentation.MainThemediff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesUiState.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesUiState.ktindex 13f27d39..c65200bb 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesUiState.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesUiState.kt@@ -1,6 +1,6 @@package com.rtbishop.look4sat.presentation.entries-import com.rtbishop.look4sat.model.SatItem+import com.rtbishop.look4sat.domain.model.SatItemdata class EntriesUiState(val isLoading: Boolean,diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesViewModel.ktindex 3b7ea64c..e0f894df 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesViewModel.kt@@ -24,7 +24,7 @@ import androidx.lifecycle.viewModelScopeimport androidx.lifecycle.viewmodel.initializerimport androidx.lifecycle.viewmodel.viewModelFactoryimport com.rtbishop.look4sat.MainApplication-import com.rtbishop.look4sat.domain.ISelectionRepo+import com.rtbishop.look4sat.domain.predict.ISelectionRepoimport kotlinx.coroutines.delayimport kotlinx.coroutines.launchdiff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/map/MapData.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/map/MapData.ktindex 02e20ca9..a0ecd2a6 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/map/MapData.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/map/MapData.kt@@ -17,7 +17,7 @@*/package com.rtbishop.look4sat.presentation.map-import com.rtbishop.look4sat.model.GeoPos+import com.rtbishop.look4sat.domain.model.GeoPosdata class MapData(val catNum: Int,diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/map/MapScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/map/MapScreen.ktindex cfd8d254..cb4121b2 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/map/MapScreen.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/map/MapScreen.kt@@ -28,9 +28,9 @@ import androidx.lifecycle.Lifecycleimport androidx.lifecycle.LifecycleEventObserverimport androidx.lifecycle.viewmodel.compose.viewModelimport com.rtbishop.look4sat.R-import com.rtbishop.look4sat.domain.Satellite-import com.rtbishop.look4sat.model.GeoPos-import com.rtbishop.look4sat.model.SatPos+import com.rtbishop.look4sat.domain.model.GeoPos+import com.rtbishop.look4sat.domain.model.SatPos+import com.rtbishop.look4sat.domain.predict.Satelliteimport org.osmdroid.tileprovider.tilesource.XYTileSourceimport org.osmdroid.util.GeoPointimport org.osmdroid.views.CustomZoomButtonsControllerdiff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/map/MapViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/map/MapViewModel.ktindex 4b80d9cd..ed8b0c32 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/map/MapViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/map/MapViewModel.kt@@ -23,14 +23,14 @@ import androidx.lifecycle.viewModelScopeimport androidx.lifecycle.viewmodel.initializerimport androidx.lifecycle.viewmodel.viewModelFactoryimport com.rtbishop.look4sat.MainApplication-import com.rtbishop.look4sat.domain.ISatelliteRepo-import com.rtbishop.look4sat.domain.ISettingsRepo-import com.rtbishop.look4sat.domain.Satellite-import com.rtbishop.look4sat.model.GeoPos-import com.rtbishop.look4sat.model.SatPos-import com.rtbishop.look4sat.utility.QthConverter-import com.rtbishop.look4sat.utility.toDegrees-import com.rtbishop.look4sat.utility.toTimerString+import com.rtbishop.look4sat.domain.model.GeoPos+import com.rtbishop.look4sat.domain.model.SatPos+import com.rtbishop.look4sat.domain.predict.ISatelliteRepo+import com.rtbishop.look4sat.domain.predict.ISettingsRepo+import com.rtbishop.look4sat.domain.predict.Satellite+import com.rtbishop.look4sat.domain.utility.QthConverter+import com.rtbishop.look4sat.domain.utility.toDegrees+import com.rtbishop.look4sat.domain.utility.toTimerStringimport kotlinx.coroutines.Jobimport kotlinx.coroutines.cancelAndJoinimport kotlinx.coroutines.delaydiff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesScreen.ktindex df174d03..8a194f9b 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesScreen.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesScreen.kt@@ -22,10 +22,10 @@ import androidx.compose.ui.tooling.preview.Previewimport androidx.compose.ui.unit.*import androidx.lifecycle.viewmodel.compose.viewModelimport com.rtbishop.look4sat.R-import com.rtbishop.look4sat.domain.NearEarthSatellite-import com.rtbishop.look4sat.model.DataState-import com.rtbishop.look4sat.model.OrbitalData-import com.rtbishop.look4sat.model.SatPass+import com.rtbishop.look4sat.domain.model.DataState+import com.rtbishop.look4sat.domain.model.OrbitalData+import com.rtbishop.look4sat.domain.model.SatPass+import com.rtbishop.look4sat.domain.predict.NearEarthSatelliteimport com.rtbishop.look4sat.presentation.*import com.rtbishop.look4sat.presentation.dialogs.FilterDialogimport com.rtbishop.look4sat.presentation.pullRefresh.PullRefreshIndicatordiff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesViewModel.ktindex 982a6a7d..1e2f9cdc 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesViewModel.kt@@ -23,12 +23,12 @@ import androidx.lifecycle.viewModelScopeimport androidx.lifecycle.viewmodel.initializerimport androidx.lifecycle.viewmodel.viewModelFactoryimport com.rtbishop.look4sat.MainApplication-import com.rtbishop.look4sat.domain.ISatelliteRepo-import com.rtbishop.look4sat.domain.ISettingsRepo-import com.rtbishop.look4sat.model.DataState-import com.rtbishop.look4sat.model.PassesSettings-import com.rtbishop.look4sat.model.SatPass-import com.rtbishop.look4sat.utility.toTimerString+import com.rtbishop.look4sat.domain.model.DataState+import com.rtbishop.look4sat.domain.model.PassesSettings+import com.rtbishop.look4sat.domain.model.SatPass+import com.rtbishop.look4sat.domain.predict.ISatelliteRepo+import com.rtbishop.look4sat.domain.predict.ISettingsRepo+import com.rtbishop.look4sat.domain.utility.toTimerStringimport kotlinx.coroutines.Jobimport kotlinx.coroutines.cancelAndJoinimport kotlinx.coroutines.delaydiff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarData.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarData.ktindex c68123b6..dde0e8c0 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarData.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarData.kt@@ -17,6 +17,6 @@*/package com.rtbishop.look4sat.presentation.radar-import com.rtbishop.look4sat.model.SatPos+import com.rtbishop.look4sat.domain.model.SatPosdata class RadarData(val satPos: SatPos, val satTrack: List<SatPos> = emptyList())diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarScreen.ktindex 11bac330..f5465148 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarScreen.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarScreen.kt@@ -29,7 +29,7 @@ import androidx.compose.ui.unit.dpimport androidx.compose.ui.unit.spimport androidx.lifecycle.viewmodel.compose.viewModelimport com.rtbishop.look4sat.R-import com.rtbishop.look4sat.model.SatRadio+import com.rtbishop.look4sat.domain.model.SatRadio@Composablefun RadarScreen() {diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarView.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarView.ktindex 3f257337..ae6bae5e 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarView.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarView.kt@@ -14,9 +14,9 @@ import androidx.compose.ui.graphics.*import androidx.compose.ui.graphics.drawscope.*import androidx.compose.ui.text.*import androidx.compose.ui.unit.sp-import com.rtbishop.look4sat.domain.PI_2-import com.rtbishop.look4sat.model.SatPos-import com.rtbishop.look4sat.utility.toRadians+import com.rtbishop.look4sat.domain.model.SatPos+import com.rtbishop.look4sat.domain.predict.PI_2+import com.rtbishop.look4sat.domain.utility.toRadiansimport kotlin.math.cosimport kotlin.math.sindiff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarViewModel.ktindex 0f4b9c0c..68d9b52f 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarViewModel.kt@@ -28,18 +28,18 @@ import androidx.lifecycle.viewModelScopeimport androidx.lifecycle.viewmodel.initializerimport androidx.lifecycle.viewmodel.viewModelFactoryimport com.rtbishop.look4sat.MainApplication-import com.rtbishop.look4sat.data.ISensorSource-import com.rtbishop.look4sat.domain.ISatelliteRepo-import com.rtbishop.look4sat.domain.ISettingsRepo-import com.rtbishop.look4sat.domain.Satellite+import com.rtbishop.look4sat.domain.data.ISensorSource+import com.rtbishop.look4sat.domain.model.GeoPos+import com.rtbishop.look4sat.domain.model.SatPass+import com.rtbishop.look4sat.domain.model.SatPos+import com.rtbishop.look4sat.domain.model.SatRadio+import com.rtbishop.look4sat.domain.predict.ISatelliteRepo+import com.rtbishop.look4sat.domain.predict.ISettingsRepo+import com.rtbishop.look4sat.domain.predict.Satellite+import com.rtbishop.look4sat.domain.utility.round+import com.rtbishop.look4sat.domain.utility.toDegreesimport com.rtbishop.look4sat.framework.BluetoothReporterimport com.rtbishop.look4sat.framework.NetworkReporter-import com.rtbishop.look4sat.model.GeoPos-import com.rtbishop.look4sat.model.SatPass-import com.rtbishop.look4sat.model.SatPos-import com.rtbishop.look4sat.model.SatRadio-import com.rtbishop.look4sat.utility.round-import com.rtbishop.look4sat.utility.toDegreesimport kotlinx.coroutines.delayimport kotlinx.coroutines.flow.flowimport kotlinx.coroutines.isActivediff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsScreen.ktindex 80a0b572..45028511 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsScreen.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsScreen.kt@@ -37,8 +37,8 @@ import androidx.compose.ui.unit.spimport androidx.lifecycle.viewmodel.compose.viewModelimport com.rtbishop.look4sat.BuildConfigimport com.rtbishop.look4sat.R-import com.rtbishop.look4sat.model.GeoPos-import com.rtbishop.look4sat.model.OtherSettings+import com.rtbishop.look4sat.domain.model.GeoPos+import com.rtbishop.look4sat.domain.model.OtherSettingsimport com.rtbishop.look4sat.presentation.CardButtonimport com.rtbishop.look4sat.presentation.MainThemeimport com.rtbishop.look4sat.presentation.dialogs.LocatorDialogdiff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsUiState.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsUiState.ktindex 800dffd0..c1c2fdd9 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsUiState.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsUiState.kt@@ -1,6 +1,6 @@package com.rtbishop.look4sat.presentation.settings-import com.rtbishop.look4sat.model.GeoPos+import com.rtbishop.look4sat.domain.model.GeoPosdata class PositionSettings(val isUpdating: Boolean, val stationPos: GeoPos, val messageResId: Int)diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsViewModel.ktindex e674c4f6..37c86747 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsViewModel.kt@@ -26,9 +26,9 @@ import androidx.lifecycle.viewmodel.initializerimport androidx.lifecycle.viewmodel.viewModelFactoryimport com.rtbishop.look4sat.MainApplicationimport com.rtbishop.look4sat.R-import com.rtbishop.look4sat.domain.IDatabaseRepo-import com.rtbishop.look4sat.domain.ISettingsRepo-import com.rtbishop.look4sat.model.OtherSettings+import com.rtbishop.look4sat.domain.model.OtherSettings+import com.rtbishop.look4sat.domain.predict.IDatabaseRepo+import com.rtbishop.look4sat.domain.predict.ISettingsRepoimport kotlinx.coroutines.launchclass SettingsViewModel(diff --git a/base/.gitignore b/domain/.gitignoresimilarity index 100%rename from base/.gitignorerename to domain/.gitignorediff --git a/base/build.gradle b/domain/build.gradlesimilarity index 100%rename from base/build.gradlerename to domain/build.gradlediff --git a/base/src/main/java/com/rtbishop/look4sat/data/DataParser.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/data/DataParser.ktsimilarity index 97%rename from base/src/main/java/com/rtbishop/look4sat/data/DataParser.ktrename to domain/src/main/java/com/rtbishop/look4sat/domain/data/DataParser.ktindex 62388ad6..21f4161d 100644--- a/base/src/main/java/com/rtbishop/look4sat/data/DataParser.kt+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/data/DataParser.kt@@ -15,10 +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.data+package com.rtbishop.look4sat.domain.data-import com.rtbishop.look4sat.model.OrbitalData-import com.rtbishop.look4sat.model.SatRadio+import com.rtbishop.look4sat.domain.model.OrbitalData+import com.rtbishop.look4sat.domain.model.SatRadioimport kotlinx.coroutines.CoroutineDispatcherimport kotlinx.coroutines.withContextimport org.json.JSONArraydiff --git a/base/src/main/java/com/rtbishop/look4sat/data/DatabaseRepo.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/data/DatabaseRepo.ktsimilarity index 93%rename from base/src/main/java/com/rtbishop/look4sat/data/DatabaseRepo.ktrename to domain/src/main/java/com/rtbishop/look4sat/domain/data/DatabaseRepo.ktindex a3a656fa..63c4503e 100644--- a/base/src/main/java/com/rtbishop/look4sat/data/DatabaseRepo.kt+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/data/DatabaseRepo.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.data+package com.rtbishop.look4sat.domain.data-import com.rtbishop.look4sat.domain.IDatabaseRepo-import com.rtbishop.look4sat.domain.ISettingsRepo-import com.rtbishop.look4sat.model.DatabaseState-import com.rtbishop.look4sat.model.SatEntry-import com.rtbishop.look4sat.model.SatRadio+import com.rtbishop.look4sat.domain.model.DatabaseState+import com.rtbishop.look4sat.domain.model.SatEntry+import com.rtbishop.look4sat.domain.model.SatRadio+import com.rtbishop.look4sat.domain.predict.IDatabaseRepo+import com.rtbishop.look4sat.domain.predict.ISettingsRepoimport kotlinx.coroutines.CoroutineDispatcherimport kotlinx.coroutines.asyncimport kotlinx.coroutines.withContextdiff --git a/base/src/main/java/com/rtbishop/look4sat/data/IDataSource.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/data/IDataSource.ktsimilarity index 95%rename from base/src/main/java/com/rtbishop/look4sat/data/IDataSource.ktrename to domain/src/main/java/com/rtbishop/look4sat/domain/data/IDataSource.ktindex 4a34237e..d5b97c32 100644--- a/base/src/main/java/com/rtbishop/look4sat/data/IDataSource.kt+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/data/IDataSource.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.domain.dataimport java.io.InputStreamdiff --git a/base/src/main/java/com/rtbishop/look4sat/data/ILocalStorage.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/data/ILocalStorage.ktsimilarity index 83%rename from base/src/main/java/com/rtbishop/look4sat/data/ILocalStorage.ktrename to domain/src/main/java/com/rtbishop/look4sat/domain/data/ILocalStorage.ktindex 0be3378e..1b0f5034 100644--- a/base/src/main/java/com/rtbishop/look4sat/data/ILocalStorage.kt+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/data/ILocalStorage.kt@@ -15,12 +15,12 @@* 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.domain.data-import com.rtbishop.look4sat.domain.Satellite-import com.rtbishop.look4sat.model.SatEntry-import com.rtbishop.look4sat.model.SatItem-import com.rtbishop.look4sat.model.SatRadio+import com.rtbishop.look4sat.domain.model.SatEntry+import com.rtbishop.look4sat.domain.model.SatItem+import com.rtbishop.look4sat.domain.model.SatRadio+import com.rtbishop.look4sat.domain.predict.Satelliteinterface ILocalStorage {diff --git a/base/src/main/java/com/rtbishop/look4sat/data/ISensorSource.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/data/ISensorSource.ktsimilarity index 80%rename from base/src/main/java/com/rtbishop/look4sat/data/ISensorSource.ktrename to domain/src/main/java/com/rtbishop/look4sat/domain/data/ISensorSource.ktindex 30b64b09..d7d5b7b3 100644--- a/base/src/main/java/com/rtbishop/look4sat/data/ISensorSource.kt+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/data/ISensorSource.kt@@ -1,4 +1,4 @@-package com.rtbishop.look4sat.data+package com.rtbishop.look4sat.domain.dataimport kotlinx.coroutines.flow.StateFlowdiff --git a/base/src/main/java/com/rtbishop/look4sat/data/SatelliteRepo.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/data/SatelliteRepo.ktsimilarity index 94%rename from base/src/main/java/com/rtbishop/look4sat/data/SatelliteRepo.ktrename to domain/src/main/java/com/rtbishop/look4sat/domain/data/SatelliteRepo.ktindex 7ae59c75..2dace970 100644--- a/base/src/main/java/com/rtbishop/look4sat/data/SatelliteRepo.kt+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/data/SatelliteRepo.kt@@ -15,17 +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.data--import com.rtbishop.look4sat.domain.ISatelliteRepo-import com.rtbishop.look4sat.domain.ISettingsRepo-import com.rtbishop.look4sat.domain.Satellite-import com.rtbishop.look4sat.model.GeoPos-import com.rtbishop.look4sat.model.SatPass-import com.rtbishop.look4sat.model.SatPos-import com.rtbishop.look4sat.model.SatRadio-import com.rtbishop.look4sat.utility.round-import com.rtbishop.look4sat.utility.toDegrees+package com.rtbishop.look4sat.domain.data++import com.rtbishop.look4sat.domain.model.GeoPos+import com.rtbishop.look4sat.domain.model.SatPass+import com.rtbishop.look4sat.domain.model.SatPos+import com.rtbishop.look4sat.domain.model.SatRadio+import com.rtbishop.look4sat.domain.predict.ISatelliteRepo+import com.rtbishop.look4sat.domain.predict.ISettingsRepo+import com.rtbishop.look4sat.domain.predict.Satellite+import com.rtbishop.look4sat.domain.utility.round+import com.rtbishop.look4sat.domain.utility.toDegreesimport kotlinx.coroutines.CoroutineDispatcherimport kotlinx.coroutines.flow.MutableStateFlowimport kotlinx.coroutines.flow.StateFlowdiff --git a/base/src/main/java/com/rtbishop/look4sat/data/SelectionRepo.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/data/SelectionRepo.ktsimilarity index 93%rename from base/src/main/java/com/rtbishop/look4sat/data/SelectionRepo.ktrename to domain/src/main/java/com/rtbishop/look4sat/domain/data/SelectionRepo.ktindex 5b1182ec..6ad093b8 100644--- a/base/src/main/java/com/rtbishop/look4sat/data/SelectionRepo.kt+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/data/SelectionRepo.kt@@ -1,8 +1,8 @@-package com.rtbishop.look4sat.data+package com.rtbishop.look4sat.domain.data-import com.rtbishop.look4sat.domain.ISelectionRepo-import com.rtbishop.look4sat.domain.ISettingsRepo-import com.rtbishop.look4sat.model.SatItem+import com.rtbishop.look4sat.domain.model.SatItem+import com.rtbishop.look4sat.domain.predict.ISelectionRepo+import com.rtbishop.look4sat.domain.predict.ISettingsRepoimport kotlinx.coroutines.CoroutineDispatcherimport kotlinx.coroutines.ExperimentalCoroutinesApiimport kotlinx.coroutines.flow.MutableStateFlowdiff --git a/base/src/main/java/com/rtbishop/look4sat/model/DataState.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/model/DataState.ktsimilarity index 96%rename from base/src/main/java/com/rtbishop/look4sat/model/DataState.ktrename to domain/src/main/java/com/rtbishop/look4sat/domain/model/DataState.ktindex 125daa75..0530c885 100644--- a/base/src/main/java/com/rtbishop/look4sat/model/DataState.kt+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/model/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.model+package com.rtbishop.look4sat.domain.modelsealed class DataState<out T> {data class Success<out T>(val data: T) : DataState<T>()diff --git a/base/src/main/java/com/rtbishop/look4sat/model/GeoPos.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/model/GeoPos.ktsimilarity index 95%rename from base/src/main/java/com/rtbishop/look4sat/model/GeoPos.ktrename to domain/src/main/java/com/rtbishop/look4sat/domain/model/GeoPos.ktindex 131327c6..02c2f8b7 100644--- a/base/src/main/java/com/rtbishop/look4sat/model/GeoPos.kt+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/model/GeoPos.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.model+package com.rtbishop.look4sat.domain.modeldata class GeoPos(val latitude: Double,diff --git a/base/src/main/java/com/rtbishop/look4sat/model/OrbitalData.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/model/OrbitalData.ktsimilarity index 80%rename from base/src/main/java/com/rtbishop/look4sat/model/OrbitalData.ktrename to domain/src/main/java/com/rtbishop/look4sat/domain/model/OrbitalData.ktindex c92528fb..c4393ea1 100644--- a/base/src/main/java/com/rtbishop/look4sat/model/OrbitalData.kt+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/model/OrbitalData.kt@@ -15,9 +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.model+package com.rtbishop.look4sat.domain.model-import com.rtbishop.look4sat.domain.*+import com.rtbishop.look4sat.domain.predict.DEG2RAD+import com.rtbishop.look4sat.domain.predict.DeepSpaceSatellite+import com.rtbishop.look4sat.domain.predict.MIN_PER_DAY+import com.rtbishop.look4sat.domain.predict.NearEarthSatellite+import com.rtbishop.look4sat.domain.predict.Satellite+import com.rtbishop.look4sat.domain.predict.TWO_PIdata class OrbitalData(val name: String,diff --git a/base/src/main/java/com/rtbishop/look4sat/model/SatEntry.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/model/SatEntry.ktsimilarity index 95%rename from base/src/main/java/com/rtbishop/look4sat/model/SatEntry.ktrename to domain/src/main/java/com/rtbishop/look4sat/domain/model/SatEntry.ktindex 4c4fac3b..c0740813 100644--- a/base/src/main/java/com/rtbishop/look4sat/model/SatEntry.kt+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/model/SatEntry.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.model+package com.rtbishop.look4sat.domain.modeldata class SatEntry(val data: OrbitalData, var comment: String? = null)diff --git a/base/src/main/java/com/rtbishop/look4sat/model/SatItem.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/model/SatItem.ktsimilarity index 95%rename from base/src/main/java/com/rtbishop/look4sat/model/SatItem.ktrename to domain/src/main/java/com/rtbishop/look4sat/domain/model/SatItem.ktindex 1c163b97..cc202c86 100644--- a/base/src/main/java/com/rtbishop/look4sat/model/SatItem.kt+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/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.model+package com.rtbishop.look4sat.domain.modeldata class SatItem(val catnum: Int,diff --git a/base/src/main/java/com/rtbishop/look4sat/model/SatPass.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/model/SatPass.ktsimilarity index 92%rename from base/src/main/java/com/rtbishop/look4sat/model/SatPass.ktrename to domain/src/main/java/com/rtbishop/look4sat/domain/model/SatPass.ktindex d5573a91..db1557d1 100644--- a/base/src/main/java/com/rtbishop/look4sat/model/SatPass.kt+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/model/SatPass.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.model+package com.rtbishop.look4sat.domain.model-import com.rtbishop.look4sat.domain.Satellite+import com.rtbishop.look4sat.domain.predict.Satellitedata class SatPass(val aosTime: Long = 0L,diff --git a/base/src/main/java/com/rtbishop/look4sat/model/SatPos.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/model/SatPos.ktsimilarity index 85%rename from base/src/main/java/com/rtbishop/look4sat/model/SatPos.ktrename to domain/src/main/java/com/rtbishop/look4sat/domain/model/SatPos.ktindex 36ca0c3b..40b414b9 100644--- a/base/src/main/java/com/rtbishop/look4sat/model/SatPos.kt+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/model/SatPos.kt@@ -15,13 +15,19 @@* 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.model+package com.rtbishop.look4sat.domain.model-import com.rtbishop.look4sat.domain.DEG2RAD-import com.rtbishop.look4sat.domain.EARTH_RADIUS-import com.rtbishop.look4sat.domain.RAD2DEG-import com.rtbishop.look4sat.domain.SPEED_OF_LIGHT-import kotlin.math.*+import com.rtbishop.look4sat.domain.predict.DEG2RAD+import com.rtbishop.look4sat.domain.predict.EARTH_RADIUS+import com.rtbishop.look4sat.domain.predict.RAD2DEG+import com.rtbishop.look4sat.domain.predict.SPEED_OF_LIGHT+import kotlin.math.acos+import kotlin.math.asin+import kotlin.math.atan2+import kotlin.math.cos+import kotlin.math.pow+import kotlin.math.sin+import kotlin.math.sqrtdata class SatPos(var azimuth: Double = 0.0,diff --git a/base/src/main/java/com/rtbishop/look4sat/model/SatRadio.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/model/SatRadio.ktsimilarity index 96%rename from base/src/main/java/com/rtbishop/look4sat/model/SatRadio.ktrename to domain/src/main/java/com/rtbishop/look4sat/domain/model/SatRadio.ktindex 734aacad..250e42d4 100644--- a/base/src/main/java/com/rtbishop/look4sat/model/SatRadio.kt+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/model/SatRadio.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.model+package com.rtbishop.look4sat.domain.modeldata class SatRadio(val uuid: String,diff --git a/base/src/main/java/com/rtbishop/look4sat/model/Settings.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/model/Settings.ktsimilarity index 87%rename from base/src/main/java/com/rtbishop/look4sat/model/Settings.ktrename to domain/src/main/java/com/rtbishop/look4sat/domain/model/Settings.ktindex 45800c44..9de940c2 100644--- a/base/src/main/java/com/rtbishop/look4sat/model/Settings.kt+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/model/Settings.kt@@ -1,4 +1,4 @@-package com.rtbishop.look4sat.model+package com.rtbishop.look4sat.domain.modeldata class DatabaseState(val entriesTotal: Int, val radiosTotal: Int, val timestamp: Long)diff --git a/base/src/main/java/com/rtbishop/look4sat/domain/DeepSpaceSatellite.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/predict/DeepSpaceSatellite.ktsimilarity index 99%rename from base/src/main/java/com/rtbishop/look4sat/domain/DeepSpaceSatellite.ktrename to domain/src/main/java/com/rtbishop/look4sat/domain/predict/DeepSpaceSatellite.ktindex 8f4b9899..bfc0138d 100644--- a/base/src/main/java/com/rtbishop/look4sat/domain/DeepSpaceSatellite.kt+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/predict/DeepSpaceSatellite.kt@@ -15,10 +15,16 @@* 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.domain.predict-import com.rtbishop.look4sat.model.OrbitalData-import kotlin.math.*+import com.rtbishop.look4sat.domain.model.OrbitalData+import kotlin.math.abs+import kotlin.math.atan2+import kotlin.math.cos+import kotlin.math.floor+import kotlin.math.pow+import kotlin.math.sin+import kotlin.math.sqrtclass DeepSpaceSatellite(data: OrbitalData) : Satellite(data) {diff --git a/base/src/main/java/com/rtbishop/look4sat/domain/IDatabaseRepo.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/predict/IDatabaseRepo.ktsimilarity index 95%rename from base/src/main/java/com/rtbishop/look4sat/domain/IDatabaseRepo.ktrename to domain/src/main/java/com/rtbishop/look4sat/domain/predict/IDatabaseRepo.ktindex 6485c577..5e465383 100644--- a/base/src/main/java/com/rtbishop/look4sat/domain/IDatabaseRepo.kt+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/predict/IDatabaseRepo.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.domain.predictinterface IDatabaseRepo {diff --git a/base/src/main/java/com/rtbishop/look4sat/domain/ISatelliteRepo.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/predict/ISatelliteRepo.ktsimilarity index 74%rename from base/src/main/java/com/rtbishop/look4sat/domain/ISatelliteRepo.ktrename to domain/src/main/java/com/rtbishop/look4sat/domain/predict/ISatelliteRepo.ktindex 554421aa..944cc5cf 100644--- a/base/src/main/java/com/rtbishop/look4sat/domain/ISatelliteRepo.kt+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/predict/ISatelliteRepo.kt@@ -1,9 +1,9 @@-package com.rtbishop.look4sat.domain+package com.rtbishop.look4sat.domain.predict-import com.rtbishop.look4sat.model.GeoPos-import com.rtbishop.look4sat.model.SatPass-import com.rtbishop.look4sat.model.SatPos-import com.rtbishop.look4sat.model.SatRadio+import com.rtbishop.look4sat.domain.model.GeoPos+import com.rtbishop.look4sat.domain.model.SatPass+import com.rtbishop.look4sat.domain.model.SatPos+import com.rtbishop.look4sat.domain.model.SatRadioimport kotlinx.coroutines.flow.StateFlowinterface ISatelliteRepo {diff --git a/base/src/main/java/com/rtbishop/look4sat/domain/ISelectionRepo.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/predict/ISelectionRepo.ktsimilarity index 81%rename from base/src/main/java/com/rtbishop/look4sat/domain/ISelectionRepo.ktrename to domain/src/main/java/com/rtbishop/look4sat/domain/predict/ISelectionRepo.ktindex 6c70b5c1..a57f52d0 100644--- a/base/src/main/java/com/rtbishop/look4sat/domain/ISelectionRepo.kt+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/predict/ISelectionRepo.kt@@ -1,6 +1,6 @@-package com.rtbishop.look4sat.domain+package com.rtbishop.look4sat.domain.predict-import com.rtbishop.look4sat.model.SatItem+import com.rtbishop.look4sat.domain.model.SatItemimport kotlinx.coroutines.flow.Flowinterface ISelectionRepo {diff --git a/base/src/main/java/com/rtbishop/look4sat/domain/ISettingsRepo.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/predict/ISettingsRepo.ktsimilarity index 95%rename from base/src/main/java/com/rtbishop/look4sat/domain/ISettingsRepo.ktrename to domain/src/main/java/com/rtbishop/look4sat/domain/predict/ISettingsRepo.ktindex 43413c4d..b8ff60f1 100644--- a/base/src/main/java/com/rtbishop/look4sat/domain/ISettingsRepo.kt+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/predict/ISettingsRepo.kt@@ -15,12 +15,12 @@* 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.domain.predict-import com.rtbishop.look4sat.model.DatabaseState-import com.rtbishop.look4sat.model.GeoPos-import com.rtbishop.look4sat.model.OtherSettings-import com.rtbishop.look4sat.model.PassesSettings+import com.rtbishop.look4sat.domain.model.DatabaseState+import com.rtbishop.look4sat.domain.model.GeoPos+import com.rtbishop.look4sat.domain.model.OtherSettings+import com.rtbishop.look4sat.domain.model.PassesSettingsimport kotlinx.coroutines.flow.StateFlowinterface ISettingsRepo {diff --git a/base/src/main/java/com/rtbishop/look4sat/domain/NearEarthSatellite.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/predict/NearEarthSatellite.ktsimilarity index 97%rename from base/src/main/java/com/rtbishop/look4sat/domain/NearEarthSatellite.ktrename to domain/src/main/java/com/rtbishop/look4sat/domain/predict/NearEarthSatellite.ktindex 15610e29..f324a318 100644--- a/base/src/main/java/com/rtbishop/look4sat/domain/NearEarthSatellite.kt+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/predict/NearEarthSatellite.kt@@ -15,10 +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.domain+package com.rtbishop.look4sat.domain.predict-import com.rtbishop.look4sat.model.OrbitalData-import kotlin.math.*+import com.rtbishop.look4sat.domain.model.OrbitalData+import kotlin.math.abs+import kotlin.math.atan2+import kotlin.math.cos+import kotlin.math.pow+import kotlin.math.sin+import kotlin.math.sqrtclass NearEarthSatellite(data: OrbitalData) : Satellite(data) {diff --git a/base/src/main/java/com/rtbishop/look4sat/domain/Satellite.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/predict/Satellite.ktsimilarity index 96%rename from base/src/main/java/com/rtbishop/look4sat/domain/Satellite.ktrename to domain/src/main/java/com/rtbishop/look4sat/domain/predict/Satellite.ktindex dc1f8283..fe4392f5 100644--- a/base/src/main/java/com/rtbishop/look4sat/domain/Satellite.kt+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/predict/Satellite.kt@@ -15,12 +15,23 @@* 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.GeoPos-import com.rtbishop.look4sat.model.OrbitalData-import com.rtbishop.look4sat.model.SatPos-import kotlin.math.*+package com.rtbishop.look4sat.domain.predict++import com.rtbishop.look4sat.domain.model.GeoPos+import com.rtbishop.look4sat.domain.model.OrbitalData+import com.rtbishop.look4sat.domain.model.SatPos+import kotlin.math.abs+import kotlin.math.acos+import kotlin.math.asin+import kotlin.math.atan+import kotlin.math.atan2+import kotlin.math.cos+import kotlin.math.exp+import kotlin.math.floor+import kotlin.math.ln+import kotlin.math.pow+import kotlin.math.sin+import kotlin.math.sqrtconst val ASTRONOMICAL_UNIT = 1.49597870691E8const val DEG2RAD = 0.017453292519943295diff --git a/base/src/main/java/com/rtbishop/look4sat/utility/Extensions.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/utility/Extensions.ktsimilarity index 94%rename from base/src/main/java/com/rtbishop/look4sat/utility/Extensions.ktrename to domain/src/main/java/com/rtbishop/look4sat/domain/utility/Extensions.ktindex e5844c69..c40fc2e4 100644--- a/base/src/main/java/com/rtbishop/look4sat/utility/Extensions.kt+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/utility/Extensions.kt@@ -15,10 +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.utility+package com.rtbishop.look4sat.domain.utility-import com.rtbishop.look4sat.domain.DEG2RAD-import com.rtbishop.look4sat.domain.RAD2DEG+import com.rtbishop.look4sat.domain.predict.DEG2RAD+import com.rtbishop.look4sat.domain.predict.RAD2DEGimport java.util.concurrent.TimeUnitfun Long.toTimerString(): String {diff --git a/base/src/main/java/com/rtbishop/look4sat/utility/QthConverter.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/utility/QthConverter.ktsimilarity index 96%rename from base/src/main/java/com/rtbishop/look4sat/utility/QthConverter.ktrename to domain/src/main/java/com/rtbishop/look4sat/domain/utility/QthConverter.ktindex 650f50f3..ce6a7811 100644--- a/base/src/main/java/com/rtbishop/look4sat/utility/QthConverter.kt+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/utility/QthConverter.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.utility+package com.rtbishop.look4sat.domain.utility-import com.rtbishop.look4sat.model.GeoPos+import com.rtbishop.look4sat.domain.model.GeoPosobject QthConverter {diff --git a/base/src/test/java/com/rtbishop/look4sat/DataParserTest.kt b/domain/src/test/java/com/rtbishop/look4sat/domain/DataParserTest.ktsimilarity index 98%rename from base/src/test/java/com/rtbishop/look4sat/DataParserTest.ktrename to domain/src/test/java/com/rtbishop/look4sat/domain/DataParserTest.ktindex c49833e6..65aa1575 100644--- a/base/src/test/java/com/rtbishop/look4sat/DataParserTest.kt+++ b/domain/src/test/java/com/rtbishop/look4sat/domain/DataParserTest.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+package com.rtbishop.look4sat.domain-import com.rtbishop.look4sat.data.DataParser+import com.rtbishop.look4sat.domain.data.DataParserimport kotlinx.coroutines.ExperimentalCoroutinesApiimport kotlinx.coroutines.test.StandardTestDispatcherimport kotlinx.coroutines.test.runTestdiff --git a/base/src/test/java/com/rtbishop/look4sat/QthConverterTest.kt b/domain/src/test/java/com/rtbishop/look4sat/domain/QthConverterTest.ktsimilarity index 95%rename from base/src/test/java/com/rtbishop/look4sat/QthConverterTest.ktrename to domain/src/test/java/com/rtbishop/look4sat/domain/QthConverterTest.ktindex e5f0317d..0090a0bb 100644--- a/base/src/test/java/com/rtbishop/look4sat/QthConverterTest.kt+++ b/domain/src/test/java/com/rtbishop/look4sat/domain/QthConverterTest.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+package com.rtbishop.look4sat.domain-import com.rtbishop.look4sat.utility.QthConverter+import com.rtbishop.look4sat.domain.utility.QthConverterimport org.junit.Testclass QthConverterTest {diff --git a/settings.gradle b/settings.gradleindex ff2dc4be..076288fc 100644--- a/settings.gradle+++ b/settings.gradle@@ -14,4 +14,4 @@ dependencyResolutionManagement {}rootProject.name = "Look4Sat"include ":app"-include ":base"+include ":domain"