mckero/Look4Sat-rt-bishop
1
0 Fork 0
mirror of https://github.com/rt-bishop/Look4Sat.git synced 2026-10-02 03:15:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed base module into domain

Browse Source
This commit is contained in:
Arty Bishop committed 2025-12-27 15:01:45 +00:00
1 parent 9bb73f28b7
commit f8d5542af5
52 files changed
+187 -154
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/build.gradle
+2 -2
View File
@@ -13,7 +13,7 @@ android {
minSdk 21
targetSdk 33
versionCode 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")
// Android
implementation "androidx.core:core-splashscreen:$splashscreen_version"
implementation "androidx.room:room-runtime:$room_version"
app/src/main/java/com/rtbishop/look4sat/MainContainer.kt
+9 -9
View File
@@ -6,15 +6,15 @@ import android.hardware.Sensor
import android.hardware.SensorManager
import android.location.LocationManager
import 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.ISettingsRepo
import com.rtbishop.look4sat.framework.BluetoothReporter
import com.rtbishop.look4sat.framework.NetworkReporter
import com.rtbishop.look4sat.framework.SettingsRepo
app/src/main/java/com/rtbishop/look4sat/framework/SettingsRepo.kt
+7 -7
View File
@@ -23,13 +23,13 @@ import android.location.LocationManager
import androidx.core.content.edit
import androidx.core.location.LocationManagerCompat
import 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.round
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import java.util.concurrent.Executors
app/src/main/java/com/rtbishop/look4sat/framework/data/DataSource.kt
+1 -1
View File
@@ -19,7 +19,7 @@ package com.rtbishop.look4sat.framework.data
import android.content.ContentResolver
import android.net.Uri
import com.rtbishop.look4sat.data.IDataSource
import com.rtbishop.look4sat.domain.data.IDataSource
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.withContext
import okhttp3.OkHttpClient
app/src/main/java/com/rtbishop/look4sat/framework/data/LocalStorage.kt
+6 -6
View File
@@ -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 DomainRadio
import com.rtbishop.look4sat.framework.model.SatEntry as FrameworkEntry
import com.rtbishop.look4sat.framework.model.SatItem as FrameworkItem
import 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 DomainRadio
class LocalStorage(private val storageDao: StorageDao) : ILocalStorage {
app/src/main/java/com/rtbishop/look4sat/framework/data/SensorSource.kt
+2 -2
View File
@@ -21,8 +21,8 @@ import android.hardware.Sensor
import android.hardware.SensorEvent
import android.hardware.SensorEventListener
import 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.RAD2DEG
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlin.math.round
app/src/main/java/com/rtbishop/look4sat/framework/model/SatEntry.kt
+1 -1
View File
@@ -19,7 +19,7 @@ package com.rtbishop.look4sat.framework.model
import androidx.room.Embedded
import 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)
app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesScreen.kt
+1 -1
View File
@@ -25,7 +25,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.lifecycle.viewmodel.compose.viewModel
import com.rtbishop.look4sat.R
import com.rtbishop.look4sat.model.SatItem
import com.rtbishop.look4sat.domain.model.SatItem
import com.rtbishop.look4sat.presentation.CardIcon
import com.rtbishop.look4sat.presentation.CardLoadingIndicator
import com.rtbishop.look4sat.presentation.MainTheme
app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesUiState.kt
+1 -1
View File
@@ -1,6 +1,6 @@
package com.rtbishop.look4sat.presentation.entries
import com.rtbishop.look4sat.model.SatItem
import com.rtbishop.look4sat.domain.model.SatItem
data class EntriesUiState(
val isLoading: Boolean,
app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesViewModel.kt
+1 -1
View File
@@ -24,7 +24,7 @@ import androidx.lifecycle.viewModelScope
import androidx.lifecycle.viewmodel.initializer
import androidx.lifecycle.viewmodel.viewModelFactory
import com.rtbishop.look4sat.MainApplication
import com.rtbishop.look4sat.domain.ISelectionRepo
import com.rtbishop.look4sat.domain.predict.ISelectionRepo
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
app/src/main/java/com/rtbishop/look4sat/presentation/map/MapData.kt
+1 -1
View File
@@ -17,7 +17,7 @@
*/
package com.rtbishop.look4sat.presentation.map
import com.rtbishop.look4sat.model.GeoPos
import com.rtbishop.look4sat.domain.model.GeoPos
data class MapData(
val catNum: Int,
app/src/main/java/com/rtbishop/look4sat/presentation/map/MapScreen.kt
+3 -3
View File
@@ -28,9 +28,9 @@ import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleEventObserver
import androidx.lifecycle.viewmodel.compose.viewModel
import 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.Satellite
import org.osmdroid.tileprovider.tilesource.XYTileSource
import org.osmdroid.util.GeoPoint
import org.osmdroid.views.CustomZoomButtonsController
app/src/main/java/com/rtbishop/look4sat/presentation/map/MapViewModel.kt
+8 -8
View File
@@ -23,14 +23,14 @@ import androidx.lifecycle.viewModelScope
import androidx.lifecycle.viewmodel.initializer
import androidx.lifecycle.viewmodel.viewModelFactory
import 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.toTimerString
import kotlinx.coroutines.Job
import kotlinx.coroutines.cancelAndJoin
import kotlinx.coroutines.delay
app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesScreen.kt
+4 -4
View File
@@ -22,10 +22,10 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.*
import androidx.lifecycle.viewmodel.compose.viewModel
import 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.NearEarthSatellite
import com.rtbishop.look4sat.presentation.*
import com.rtbishop.look4sat.presentation.dialogs.FilterDialog
import com.rtbishop.look4sat.presentation.pullRefresh.PullRefreshIndicator
app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesViewModel.kt
+6 -6
View File
@@ -23,12 +23,12 @@ import androidx.lifecycle.viewModelScope
import androidx.lifecycle.viewmodel.initializer
import androidx.lifecycle.viewmodel.viewModelFactory
import 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.toTimerString
import kotlinx.coroutines.Job
import kotlinx.coroutines.cancelAndJoin
import kotlinx.coroutines.delay
app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarData.kt
+1 -1
View File
@@ -17,6 +17,6 @@
*/
package com.rtbishop.look4sat.presentation.radar
import com.rtbishop.look4sat.model.SatPos
import com.rtbishop.look4sat.domain.model.SatPos
data class RadarData(val satPos: SatPos, val satTrack: List<SatPos> = emptyList())
app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarScreen.kt
+1 -1
View File
@@ -29,7 +29,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.lifecycle.viewmodel.compose.viewModel
import com.rtbishop.look4sat.R
import com.rtbishop.look4sat.model.SatRadio
import com.rtbishop.look4sat.domain.model.SatRadio
@Composable
fun RadarScreen() {
app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarView.kt
+3 -3
View File
@@ -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.toRadians
import kotlin.math.cos
import kotlin.math.sin
app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarViewModel.kt
+10 -10
View File
@@ -28,18 +28,18 @@ import androidx.lifecycle.viewModelScope
import androidx.lifecycle.viewmodel.initializer
import androidx.lifecycle.viewmodel.viewModelFactory
import 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.toDegrees
import com.rtbishop.look4sat.framework.BluetoothReporter
import 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.toDegrees
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.isActive
app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsScreen.kt
+2 -2
View File
@@ -37,8 +37,8 @@ import androidx.compose.ui.unit.sp
import androidx.lifecycle.viewmodel.compose.viewModel
import com.rtbishop.look4sat.BuildConfig
import 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.OtherSettings
import com.rtbishop.look4sat.presentation.CardButton
import com.rtbishop.look4sat.presentation.MainTheme
import com.rtbishop.look4sat.presentation.dialogs.LocatorDialog
app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsUiState.kt
+1 -1
View File
@@ -1,6 +1,6 @@
package com.rtbishop.look4sat.presentation.settings
import com.rtbishop.look4sat.model.GeoPos
import com.rtbishop.look4sat.domain.model.GeoPos
data class PositionSettings(val isUpdating: Boolean, val stationPos: GeoPos, val messageResId: Int)
app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsViewModel.kt
+3 -3
View File
@@ -26,9 +26,9 @@ import androidx.lifecycle.viewmodel.initializer
import androidx.lifecycle.viewmodel.viewModelFactory
import com.rtbishop.look4sat.MainApplication
import 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.ISettingsRepo
import kotlinx.coroutines.launch
class SettingsViewModel(