Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Updated dependencies and gradle plugin, minor fixes
Arty Bishopfcec36ec68ed
diff --git a/app/build.gradle.kts b/app/build.gradle.ktsindex 385b941d..5ed56135 100644--- a/app/build.gradle.kts+++ b/app/build.gradle.kts@@ -13,8 +13,8 @@ android {namespace = "com.rtbishop.look4sat"compileSdk = 35defaultConfig {- applicationId = "com.rtbishop.look4satic705"- minSdk = 32+ applicationId = "com.rtbishop.look4sat"+ minSdk = 24targetSdk = 35versionCode = 400versionName = "4.0.0"diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xmlindex 6db38f39..baa973ef 100644--- a/app/src/main/AndroidManifest.xml+++ b/app/src/main/AndroidManifest.xml@@ -1,11 +1,11 @@<?xml version="1.0" encoding="utf-8"?><manifest xmlns:android="http://schemas.android.com/apk/res/android">- <uses-permission android:name="android.permission.BLUETOOTH" />- <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />+ <uses-permission android:name="android.permission.BLUETOOTH" /><uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />+ <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" /><uses-permission android:name="android.permission.BLUETOOTH_SCAN" />- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /><uses-permission android:name="android.permission.INTERNET" /><uses-permission android:name="android.permission.VIBRATE" />diff --git a/app/src/main/java/com/rtbishop/look4sat/MainActivity.kt b/app/src/main/java/com/rtbishop/look4sat/MainActivity.ktindex eb822950..392d7a06 100644--- a/app/src/main/java/com/rtbishop/look4sat/MainActivity.kt+++ b/app/src/main/java/com/rtbishop/look4sat/MainActivity.kt@@ -28,6 +28,7 @@ import com.rtbishop.look4sat.presentation.MainThemeimport com.rtbishop.look4sat.presentation.MainScreenclass MainActivity : ComponentActivity() {+override fun onCreate(savedInstanceState: Bundle?) {installSplashScreen()enableEdgeToEdge()@@ -39,5 +40,3 @@ class MainActivity : ComponentActivity() {}}}--// Check and Request BT Permission?diff --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 75727e05..7a9982e3 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@@ -179,7 +179,7 @@ class MapViewModel(private val satelliteRepo: ISatelliteRepo, settingsRepo: ISetvar orbitalPass = defaultPassvar aosTime = 0L.toTimerString()var isTimeAos = true- allPasses.find { pass -> pass.catNum == sat.data.catnum && pass.progress < 100 }+ allPasses.find { pass -> pass.catNum == sat.data.catnum && pass.progress < 1 }?.let { satPass ->orbitalPass = satPassif (!satPass.isDeepSpace) {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 8f9abc46..5a9f00af 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@@ -1,6 +1,5 @@package com.rtbishop.look4sat.presentation.radar-import android.util.Logimport androidx.compose.animation.core.LinearEasingimport androidx.compose.animation.core.RepeatModeimport androidx.compose.animation.core.animateFloat@@ -11,7 +10,6 @@ import androidx.compose.foundation.MarqueeSpacingimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.basicMarqueeimport androidx.compose.foundation.border-import androidx.compose.foundation.clickableimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.Column@@ -33,13 +31,11 @@ import androidx.compose.material3.Scaffoldimport androidx.compose.material3.Surfaceimport androidx.compose.material3.Textimport androidx.compose.runtime.Composable-import androidx.compose.runtime.LaunchedEffectimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.ui.draw.alphaimport androidx.compose.ui.draw.rotateimport androidx.compose.ui.graphics.Color-import androidx.compose.ui.platform.LocalContextimport androidx.compose.ui.res.painterResourceimport androidx.compose.ui.res.stringResourceimport androidx.compose.ui.text.font.FontWeight@@ -55,7 +51,6 @@ import androidx.navigation.navArgumentimport com.rtbishop.look4sat.Rimport com.rtbishop.look4sat.domain.model.SatRadioimport com.rtbishop.look4sat.domain.utility.toDegrees-import com.rtbishop.look4sat.framework.BluetoothCIVimport com.rtbishop.look4sat.presentation.MainThemeimport com.rtbishop.look4sat.presentation.Screenimport com.rtbishop.look4sat.presentation.components.CardIcon@@ -79,7 +74,7 @@ fun NavGraphBuilder.radarDestination(navigateBack: () -> Unit) {@Composableprivate fun RadarScreen(uiState: RadarState, navigateBack: () -> Unit) {- BluetoothCIV.init(LocalContext.current)+// BluetoothCIV.init(LocalContext.current)val addToCalendar: () -> Unit = {uiState.currentPass?.let { pass ->@@ -257,19 +252,19 @@ private fun EclipsedIndicator() {@Composableprivate fun TransmitterItem(radio: SatRadio) {- LaunchedEffect(radio) {- BluetoothCIV.updateOnce(radio)- }+// LaunchedEffect(radio) {+// BluetoothCIV.updateOnce(radio)+// }Surface(color = MaterialTheme.colorScheme.background,- modifier = Modifier.clickable(onClick = {- Log.d("BluetoothCivManager", radio.toString())- if(radio.uuid == BluetoothCIV.selected) BluetoothCIV.selected = "NONE" else- {- BluetoothCIV.connect(radio)- BluetoothCIV.updateOnce(radio)- }- })+// modifier = Modifier.clickable(onClick = {+// Log.d("BluetoothCivManager", radio.toString())+// if(radio.uuid == BluetoothCIV.selected) BluetoothCIV.selected = "NONE" else+// {+// BluetoothCIV.connect(radio)+// BluetoothCIV.updateOnce(radio)+// }+// })) {Surface(modifier = Modifier.padding(bottom = 2.dp)) {Column(diff --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 895f07c6..27cd7780 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@@ -95,17 +95,24 @@ class RadarViewModel(while (isActive) {val timeNow = System.currentTimeMillis()val pos = satelliteRepo.getPosition(satPass.orbitalObject, stationPos, timeNow)- if (satPass.aosTime > timeNow) {- val time = satPass.aosTime.minus(timeNow).toTimerString()- _uiState.update { it.copy(currentTime = time, isCurrentTimeAos = true) }- } else {- val time = satPass.losTime.minus(timeNow).toTimerString()- _uiState.update { it.copy(currentTime = time, isCurrentTimeAos = false) }+ when {+ satPass.isDeepSpace -> {+ val time = 0L.toTimerString()+ _uiState.update { it.copy(currentTime = time, isCurrentTimeAos = false) }+ }+ satPass.aosTime > timeNow -> {+ val time = satPass.aosTime.minus(timeNow).toTimerString()+ _uiState.update { it.copy(currentTime = time, isCurrentTimeAos = true) }+ }+ else -> {+ val time = satPass.losTime.minus(timeNow).toTimerString()+ _uiState.update { it.copy(currentTime = time, isCurrentTimeAos = false) }+ }}sendPassData(satPass, pos, satPass.orbitalObject)sendPassDataBT(pos)processRadios(transmitters, satPass.orbitalObject, timeNow)- delay(1000) //TODO: Change me maybe if smaller freq steps are better?? maybe dynamically?+ delay(1000)}}}diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/satellites/SatellitesDialog.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/satellites/SatellitesDialog.ktindex ec4b4642..96942282 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/satellites/SatellitesDialog.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/satellites/SatellitesDialog.kt@@ -28,7 +28,7 @@ import com.rtbishop.look4sat.presentation.components.SharedDialog@Preview(showBackground = true)@Composableprivate fun MultiTypesDialogPreview() {- val types = listOf("All", "Amateur", "Geostationary", "Military", "Weather")+ val types = listOf("Amateur", "Geostationary", "Military", "Weather")MainTheme { MultiTypesDialog(types, emptyList(), {}) {} }}diff --git a/data/src/main/java/com/rtbishop/look4sat/data/framework/BluetoothCIV.kt b/data/src/main/java/com/rtbishop/look4sat/data/framework/BluetoothCIV.ktindex 08c08d0b..f2d8c0f4 100644--- a/data/src/main/java/com/rtbishop/look4sat/data/framework/BluetoothCIV.kt+++ b/data/src/main/java/com/rtbishop/look4sat/data/framework/BluetoothCIV.kt@@ -1,4 +1,4 @@-package com.rtbishop.look4sat.framework+package com.rtbishop.look4sat.data.frameworkimport android.bluetooth.BluetoothAdapterimport android.bluetooth.BluetoothSocket@@ -46,7 +46,7 @@ public object BluetoothCIV {private var inputStream: InputStream? = nullpublic fun init(context: Context) {- bluetoothAdapter= getBluetoothAdapter(context)+ bluetoothAdapter = getBluetoothAdapter(context)}private fun ensureConnected():Boolean {@@ -100,7 +100,7 @@ public object BluetoothCIV {}data class RMsg(val broadcast: Boolean, val cmd: Int, val payload: ByteArray)- private fun receiveCommand():RMsg? {+ private fun receiveCommand(): RMsg? {if (inputStream!!.read()!=0xFE) {return null;}@@ -124,7 +124,7 @@ public object BluetoothCIV {return RMsg(to==0x00, cmd, buffer.toByteArray())}- private fun receiveSpecificCommand():RMsg? {+ private fun receiveSpecificCommand(): RMsg? {while (true) {val msg = receiveCommand() ?: return nullif (!msg.broadcast) {@@ -144,7 +144,7 @@ public object BluetoothCIV {}data class Result(val subcmd: Int?, val data: ByteArray)- private fun callFunction(cmd: Int, sub: Int? = null, retsub: Boolean): Result{+ private fun callFunction(cmd: Int, sub: Int? = null, retsub: Boolean): Result {if(ensureConnected()){sendCommand(cmd, sub)val res = receiveSpecificCommand();diff --git a/data/src/main/java/com/rtbishop/look4sat/data/repository/SatelliteRepo.kt b/data/src/main/java/com/rtbishop/look4sat/data/repository/SatelliteRepo.ktindex 2607f8e8..639b5188 100644--- a/data/src/main/java/com/rtbishop/look4sat/data/repository/SatelliteRepo.kt+++ b/data/src/main/java/com/rtbishop/look4sat/data/repository/SatelliteRepo.kt@@ -82,8 +82,8 @@ class SatelliteRepo(val copiedList = radios.map { it.copy() }copiedList.forEach { transmitter ->transmitter.downlinkLow?.let { transmitter.downlinkLow = satPos.getDownlinkFreq(it) }- transmitter.downlinkHigh?.let { transmitter.downlinkHigh = satPos.getDownlinkFreq(it) }- transmitter.uplinkLow?.let { transmitter.uplinkLow = satPos.getUplinkFreq(it) }+ transmitter.downlinkHigh?.let { transmitter.downlinkHigh = satPos.getDownlinkFreq(it) }+ transmitter.uplinkLow?.let { transmitter.uplinkLow = satPos.getUplinkFreq(it) }transmitter.uplinkHigh?.let { transmitter.uplinkHigh = satPos.getUplinkFreq(it) }}copiedList.map { it.copy() }diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex bbf55fb8..66377895 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -1,16 +1,16 @@[versions]-android-gradle-plugin = "8.8.0"-google-ksp = "2.0.21-1.0.26"-kotlin = "2.0.21"+android-gradle-plugin = "8.8.1"+google-ksp = "2.1.10-1.0.30"+kotlin = "2.1.10"androidx-core-ktx = "1.15.0"androidx-core-splashscreen = "1.0.1"androidx-room = "2.6.1"-compose-bom = "2025.01.00"+compose-bom = "2025.02.00"compose-activity = "1.10.0"compose-lifecycle = "2.8.7"-compose-navigation = "2.8.5"+compose-navigation = "2.8.7"other-coroutines = "1.10.1"other-json = "20240303"