Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Enabled StrictMode, removed several deprecations
Arty Bishop1aefb04eb51e
diff --git a/app/src/main/java/com/rtbishop/look4sat/MainApplication.kt b/app/src/main/java/com/rtbishop/look4sat/MainApplication.ktindex 570eead7..5fcba384 100644--- a/app/src/main/java/com/rtbishop/look4sat/MainApplication.kt+++ b/app/src/main/java/com/rtbishop/look4sat/MainApplication.kt@@ -18,6 +18,9 @@package com.rtbishop.look4satimport android.app.Application+import android.os.StrictMode+import android.os.StrictMode.ThreadPolicy+import android.os.StrictMode.VmPolicyimport java.text.SimpleDateFormatimport java.util.Dateimport java.util.Locale@@ -28,6 +31,7 @@ class MainApplication : Application() {lateinit var container: MainContaineroverride fun onCreate() {+ if (BuildConfig.DEBUG) enableStrictMode()super.onCreate()container = MainContainer(this)container.mainScope.launch { checkAutoUpdate() }@@ -37,11 +41,21 @@ class MainApplication : Application() {val settingsRepo = container.settingsRepoif (settingsRepo.otherSettings.value.updateState) {val timeDelta = System.currentTimeMillis() - settingsRepo.databaseState.value.timestamp- if (timeDelta > 172800000) { // 48 hours in ms+ if (timeDelta > AUTO_UPDATE_DELTA_MS) {val sdf = SimpleDateFormat("d MMM yyyy - HH:mm:ss", Locale.getDefault())println("Started periodic data update on ${sdf.format(Date())}")container.databaseRepo.updateFromRemote()}}}++ private fun enableStrictMode() {+ StrictMode.setThreadPolicy(ThreadPolicy.Builder().detectAll().penaltyLog().build())+ StrictMode.setVmPolicy(VmPolicy.Builder().detectAll().penaltyLog().build())+ }++ companion object {+ private const val AUTO_UPDATE_DELTA_MS = 172_800_000L // 48 hours in ms+ const val MAX_OKHTTP_CACHE_SIZE = 10_000_000L // 10 Megabytes+ }}diff --git a/app/src/main/java/com/rtbishop/look4sat/MainContainer.kt b/app/src/main/java/com/rtbishop/look4sat/MainContainer.ktindex ce4cc1f8..47b4bae5 100644--- a/app/src/main/java/com/rtbishop/look4sat/MainContainer.kt+++ b/app/src/main/java/com/rtbishop/look4sat/MainContainer.kt@@ -84,7 +84,7 @@ class MainContainer(private val context: Context) {}private fun provideRemoteSource(): IRemoteSource {- val cache = Cache(context.cacheDir, 1000 * 1000 * 10L)+ val cache = Cache(context.cacheDir, MainApplication.MAX_OKHTTP_CACHE_SIZE)val httpClient = OkHttpClient.Builder().cache(cache).build()return RemoteSource(httpClient, Dispatchers.IO)}diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/dialogs/FilterDialog.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/dialogs/FilterDialog.ktindex 277252fc..21f23650 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/dialogs/FilterDialog.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/dialogs/FilterDialog.kt@@ -26,7 +26,8 @@ import androidx.compose.material3.MaterialThemeimport androidx.compose.material3.OutlinedTextFieldimport androidx.compose.material3.Textimport androidx.compose.runtime.Composable-import androidx.compose.runtime.mutableStateOf+import androidx.compose.runtime.mutableDoubleStateOf+import androidx.compose.runtime.mutableIntStateOfimport androidx.compose.runtime.saveable.rememberSaveableimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifier@@ -43,35 +44,35 @@ private fun FilterDialogPreview() {@Composablefun FilterDialog(hours: Int, elevation: Double, toggle: () -> Unit, save: (Int, Double) -> Unit) {- val hoursValue = rememberSaveable { mutableStateOf(hours) }- val elevValue = rememberSaveable { mutableStateOf(elevation) }+ val hoursValue = rememberSaveable { mutableIntStateOf(hours) }+ val elevValue = rememberSaveable { mutableDoubleStateOf(elevation) }Dialog(onDismissRequest = { toggle() }) {ElevatedCard {Column(horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier.fillMaxWidth(1f)) {Text(text = "Filter passes", color = MaterialTheme.colorScheme.primary)Text(text = "Show passes that occur within X hours")- OutlinedTextField(value = hoursValue.value.toString(), onValueChange = { newValue ->+ OutlinedTextField(value = hoursValue.intValue.toString(), onValueChange = { newValue ->val hoursAhead = try {newValue.toInt()} catch (exception: Exception) {12}- hoursValue.value = hoursAhead+ hoursValue.intValue = hoursAhead})Text(text = "Show passes with max elevation above")- OutlinedTextField(value = elevValue.value.toString(), onValueChange = { newValue ->+ OutlinedTextField(value = elevValue.doubleValue.toString(), onValueChange = { newValue ->val maxElevation = try {newValue.toDouble()} catch (exception: Exception) {16.0}- elevValue.value = maxElevation+ elevValue.doubleValue = maxElevation})Row(horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) {CardButton(onClick = { toggle() }, text = "Cancel")CardButton(onClick = {- save(hoursValue.value, elevValue.value)+ save(hoursValue.intValue, elevValue.doubleValue)toggle()}, text = "Accept")diff --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 bb805536..bb7554c1 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@@ -70,7 +70,7 @@ class PassesViewModel(val millisBeforeStart = nextPass.aosTime.minus(timeNow)val timerString = millisBeforeStart.toTimerString()_timerText.emit(Triple("Next - Id:$catNum", name, timerString))- } catch (e: NoSuchElementException) {+ } catch (exception: NoSuchElementException) {val lastPass = newPasses.last()val catNum = lastPass.catNumval name = lastPass.namediff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/pullRefresh/PullRefreshModifier.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/pullRefresh/PullRefreshModifier.ktindex 2a6299af..54139050 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/pullRefresh/PullRefreshModifier.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/pullRefresh/PullRefreshModifier.kt@@ -18,7 +18,7 @@ package com.rtbishop.look4sat.presentation.pullRefreshimport androidx.compose.animation.core.LinearOutSlowInEasingimport androidx.compose.runtime.getValue-import androidx.compose.runtime.mutableStateOf+import androidx.compose.runtime.mutableIntStateOfimport androidx.compose.runtime.rememberimport androidx.compose.runtime.setValueimport androidx.compose.ui.Modifier@@ -48,7 +48,7 @@ fun Modifier.pullRefreshIndicatorTransform(properties["state"] = stateproperties["scale"] = scale}) {- var height by remember { mutableStateOf(0) }+ var height by remember { mutableIntStateOf(0) }Modifier.onSizeChanged { height = it.height }.graphicsLayer {diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/pullRefresh/PullRefreshState.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/pullRefresh/PullRefreshState.ktindex 4c72dff2..7d6405fa 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/pullRefresh/PullRefreshState.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/pullRefresh/PullRefreshState.kt@@ -22,6 +22,7 @@ import androidx.compose.runtime.SideEffectimport androidx.compose.runtime.Stateimport androidx.compose.runtime.derivedStateOfimport androidx.compose.runtime.getValue+import androidx.compose.runtime.mutableFloatStateOfimport androidx.compose.runtime.mutableStateOfimport androidx.compose.runtime.rememberimport androidx.compose.runtime.rememberCoroutineScope@@ -103,8 +104,8 @@ class PullRefreshState internal constructor(private val adjustedDistancePulled by derivedStateOf { distancePulled * DRAG_MULTIPLIER }private var _refreshing by mutableStateOf(false)- private var _position by mutableStateOf(0f)- private var distancePulled by mutableStateOf(0f)+ private var _position by mutableFloatStateOf(0f)+ private var distancePulled by mutableFloatStateOf(0f)internal fun onPull(pullDelta: Float): Float {if (this._refreshing) return 0f // Already refreshing, do nothing.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 d62b0ce2..0fff1ea9 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@@ -1,5 +1,3 @@-@file:OptIn(ExperimentalTextApi::class)-package com.rtbishop.look4sat.presentation.radarimport androidx.compose.animation.core.animateFloat@@ -9,6 +7,7 @@ import androidx.compose.animation.core.tweenimport androidx.compose.foundation.Canvasimport androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.runtime.Composable+import androidx.compose.runtime.mutableFloatStateOfimport androidx.compose.runtime.mutableStateOfimport androidx.compose.runtime.rememberimport androidx.compose.ui.Modifier@@ -25,7 +24,6 @@ import androidx.compose.ui.graphics.drawscope.Fillimport androidx.compose.ui.graphics.drawscope.Strokeimport androidx.compose.ui.graphics.drawscope.rotateimport androidx.compose.ui.graphics.drawscope.translate-import androidx.compose.ui.text.ExperimentalTextApiimport androidx.compose.ui.text.TextMeasurerimport androidx.compose.ui.text.TextStyleimport androidx.compose.ui.text.drawText@@ -47,7 +45,7 @@ fun RadarViewCompose(item: SatPos, items: List<SatPos>, azimElev: Pair<Float, Flval animSpec = infiniteRepeatable<Float>(tween(1000))val animScale = animTransition.animateFloat(16f, 64f, animSpec, label = "animScale")val measurer = rememberTextMeasurer()- val sweepDegrees = remember { mutableStateOf(0f) }+ val sweepDegrees = remember { mutableFloatStateOf(0f) }val trackCreated = remember { mutableStateOf(false) }val trackPath = remember { mutableStateOf(Path()) }val trackEffect = remember { mutableStateOf(PathEffect.cornerPathEffect(0f)) }@@ -59,7 +57,7 @@ fun RadarViewCompose(item: SatPos, items: List<SatPos>, azimElev: Pair<Float, FltrackCreated.value = true}rotate(-azimElev.first) {- drawSweep(center, sweepDegrees.value, radius, primaryColor)+ drawSweep(center, sweepDegrees.floatValue, radius, primaryColor)drawRadar(radius, radarColor, strokeWidth, 3)drawInfo(radius, primaryColor, measurer, 3)translate(center.x, center.y) {@@ -67,7 +65,7 @@ fun RadarViewCompose(item: SatPos, items: List<SatPos>, azimElev: Pair<Float, Flif (item.elevation > 0) drawPosition(item, radius, animScale.value, primaryColor)drawAim(azimElev.first, azimElev.second, radius, strokeWidth, secondaryColor)}- sweepDegrees.value = (sweepDegrees.value + 360 / 12.0f / 60) % 360+ sweepDegrees.floatValue = (sweepDegrees.floatValue + 360 / 12.0f / 60) % 360}}}@@ -113,7 +111,7 @@ private fun DrawScope.drawAim(azim: Float, elev: Float, radius: Float, width: FldrawLine(color, center.copy(aimX, -aimY - size), center.copy(aimX, -aimY + size), width)drawCircle(color, size / 2, center.copy(aimX, -aimY), style = Stroke(width))} catch (exception: Exception) {-// Timber.d(exception)+ println(exception)}}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 66fd28f9..2d7ede83 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@@ -109,7 +109,7 @@ class SettingsViewModel(databaseRepo.updateFromRemote()} catch (exception: Exception) {_dataSettings.value = _dataSettings.value.copy(isUpdating = false)- println(exception.printStackTrace())+ println(exception)}}@@ -119,7 +119,7 @@ class SettingsViewModel(databaseRepo.updateFromFile(uri)} catch (exception: Exception) {_dataSettings.value = _dataSettings.value.copy(isUpdating = false)- println(exception.printStackTrace())+ println(exception)}}diff --git a/data/src/main/java/com/rtbishop/look4sat/data/repository/SettingsRepo.kt b/data/src/main/java/com/rtbishop/look4sat/data/repository/SettingsRepo.ktindex dac86330..e50d8ffc 100644--- a/data/src/main/java/com/rtbishop/look4sat/data/repository/SettingsRepo.kt+++ b/data/src/main/java/com/rtbishop/look4sat/data/repository/SettingsRepo.kt@@ -18,7 +18,6 @@package com.rtbishop.look4sat.data.repositoryimport android.content.SharedPreferences-import android.location.Criteriaimport android.location.LocationManagerimport androidx.core.content.editimport androidx.core.location.LocationManagerCompat@@ -66,7 +65,9 @@ class SettingsRepo(//region # Station position settingsprivate val _stationPosition = MutableStateFlow(loadStationPosition())- private val defaultProvider = LocationManager.PASSIVE_PROVIDER+ private val providerDef = LocationManager.PASSIVE_PROVIDER+ private val providerGps = LocationManager.GPS_PROVIDER+ private val providerNet = LocationManager.NETWORK_PROVIDERprivate val executor = Executors.newSingleThreadExecutor()private val timeoutSignal = CancellationSignal().apply {setOnCancelListener { _stationPosition.value = loadStationPosition() }@@ -76,14 +77,15 @@ class SettingsRepo(override fun setGpsPosition(): Boolean {if (!LocationManagerCompat.isLocationEnabled(locationManager)) return falsetry {- val criteria = Criteria().apply { isCostAllowed = true }- val provider = locationManager.getBestProvider(criteria, true) ?: defaultProvider+ val hasGps = LocationManagerCompat.hasProvider(locationManager, providerGps)+ val hasNet = LocationManagerCompat.hasProvider(locationManager, providerNet)+ val provider = if (hasGps) providerGps else if (hasNet) providerNet else providerDefprintln("Requesting location for $provider provider")LocationManagerCompat.getCurrentLocation(locationManager, provider, timeoutSignal, executor) {it?.let { setGeoPosition(it.latitude, it.longitude, it.altitude) }}} catch (exception: SecurityException) {- println("No permissions were given")+ println("No permissions were given - $exception")}return true}