Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
v4.0.1 - Hotfix for RadarScreen track projection display
Arty Bishopa6a59877a882
diff --git a/.github/workflows/release.yml b/.github/workflows/release.ymlindex f4f6bd2b..d95771c1 100644--- a/.github/workflows/release.yml+++ b/.github/workflows/release.yml@@ -17,6 +17,8 @@ jobs:steps:- name: Checkout Repositoryuses: actions/checkout@v6+ with:+ fetch-depth: 0- name: Setup Javauses: actions/setup-java@v5diff --git a/app/build.gradle.kts b/app/build.gradle.ktsindex d21e65c2..ddefe22c 100644--- a/app/build.gradle.kts+++ b/app/build.gradle.kts@@ -13,8 +13,8 @@ android {defaultConfig {applicationId = "com.rtbishop.look4sat"minSdk = 24- versionCode = 400- versionName = "4.0.0"+ versionCode = 401+ versionName = "4.0.1"}buildFeatures {compose = truediff --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 c4d1362a..8762c733 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@@ -64,6 +64,7 @@ import com.rtbishop.look4sat.domain.model.SatRadioimport com.rtbishop.look4sat.domain.utility.toDegreesimport com.rtbishop.look4sat.presentation.MainThemeimport com.rtbishop.look4sat.presentation.Screen+import com.rtbishop.look4sat.presentation.common.EmptyListCardimport com.rtbishop.look4sat.presentation.common.IconCardimport com.rtbishop.look4sat.presentation.common.NextPassRowimport com.rtbishop.look4sat.presentation.common.TimerRow@@ -115,89 +116,18 @@ private fun RadarScreen(uiState: RadarState, navigateUp: () -> Unit) {if(isVerticalLayout()) {ElevatedCard(modifier = Modifier.weight(1f)) {Box(contentAlignment = Alignment.Center) {- RadarViewCompose(- item = uiState.orbitalPos,- items = uiState.satTrack,- azimElev = uiState.orientationValues,- shouldShowSweep = uiState.shouldShowSweep,- shouldUseCompass = uiState.shouldUseCompass,- modifier = Modifier.align(Alignment.Center)- )- Column(- verticalArrangement = Arrangement.SpaceBetween,- modifier = Modifier- .fillMaxSize()- .padding(horizontal = 6.dp, vertical = 4.dp)- ) {- Row(- horizontalArrangement = Arrangement.SpaceBetween,- modifier = Modifier.fillMaxWidth()- ) {- RadarTextTop(- uiState.orbitalPos?.azimuth ?: 0.0,- stringResource(R.string.radar_az_text),- true- )- RadarTextTop(- uiState.orbitalPos?.elevation ?: 0.0,- stringResource(R.string.radar_el_text),- false- )- }- Row(- horizontalArrangement = Arrangement.SpaceBetween,- modifier = Modifier.fillMaxWidth()- ) {- RadarTextBottom(- uiState.orbitalPos?.altitude ?: 0.0,- stringResource(R.string.radar_alt_text),- true- )- RadarTextBottom(- uiState.orbitalPos?.distance ?: 0.0,- stringResource(R.string.radar_dist_text),- false- )- }- }- }- }- ElevatedCard(modifier = Modifier.weight(1f)) {- if (uiState.transmitters.isEmpty()) {- Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize()) {- Column(- horizontalAlignment = Alignment.CenterHorizontally,- verticalArrangement = Arrangement.spacedBy(24.dp),- modifier = Modifier.padding(32.dp)- ) {- Text(text = """¯\_(ツ)_/¯""", fontSize = 32.sp)- Text(text = stringResource(R.string.empty_list_message), fontSize = 21.sp)- Text(- text = stringResource(R.string.radar_no_data),- fontSize = 18.sp,- textAlign = TextAlign.Center- )- }- }- } else {- Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {- TransmittersList(transmitters = uiState.transmitters)- if (uiState.orbitalPos?.eclipsed == true) {- EclipsedIndicator()+ if (uiState.orbitalPos == null) {+ ElevatedCard(modifier = Modifier.fillMaxSize()) {+ EmptyListCard(message = "")}}- }- }- } else {- Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {- ElevatedCard(modifier = Modifier.weight(1f)) {- Box(contentAlignment = Alignment.Center) {+ uiState.orbitalPos?.let { position ->RadarViewCompose(- item = uiState.orbitalPos,+ item = position,items = uiState.satTrack,azimElev = uiState.orientationValues,shouldShowSweep = uiState.shouldShowSweep,- shouldUseCompass = false,+ shouldUseCompass = uiState.shouldUseCompass,modifier = Modifier.align(Alignment.Center))Column(@@ -211,12 +141,12 @@ private fun RadarScreen(uiState: RadarState, navigateUp: () -> Unit) {modifier = Modifier.fillMaxWidth()) {RadarTextTop(- uiState.orbitalPos?.azimuth ?: 0.0,+ position.azimuth,stringResource(R.string.radar_az_text),true)RadarTextTop(- uiState.orbitalPos?.elevation ?: 0.0,+ position.elevation,stringResource(R.string.radar_el_text),false)@@ -226,12 +156,12 @@ private fun RadarScreen(uiState: RadarState, navigateUp: () -> Unit) {modifier = Modifier.fillMaxWidth()) {RadarTextBottom(- uiState.orbitalPos?.altitude ?: 0.0,+ position.altitude,stringResource(R.string.radar_alt_text),true)RadarTextBottom(- uiState.orbitalPos?.distance ?: 0.0,+ position.distance,stringResource(R.string.radar_dist_text),false)@@ -239,6 +169,91 @@ private fun RadarScreen(uiState: RadarState, navigateUp: () -> Unit) {}}}+ }+ ElevatedCard(modifier = Modifier.weight(1f)) {+ if (uiState.transmitters.isEmpty()) {+ Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize()) {+ Column(+ horizontalAlignment = Alignment.CenterHorizontally,+ verticalArrangement = Arrangement.spacedBy(24.dp),+ modifier = Modifier.padding(32.dp)+ ) {+ Text(text = """¯\_(ツ)_/¯""", fontSize = 32.sp)+ Text(text = stringResource(R.string.empty_list_message), fontSize = 21.sp)+ Text(+ text = stringResource(R.string.radar_no_data),+ fontSize = 18.sp,+ textAlign = TextAlign.Center+ )+ }+ }+ } else {+ Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {+ TransmittersList(transmitters = uiState.transmitters)+ if (uiState.orbitalPos?.eclipsed == true) {+ EclipsedIndicator()+ }+ }+ }+ }+ } else {+ Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {+ ElevatedCard(modifier = Modifier.weight(1f)) {+ Box(contentAlignment = Alignment.Center) {+ if (uiState.orbitalPos == null) {+ ElevatedCard(modifier = Modifier.fillMaxSize()) {+ EmptyListCard(message = "")+ }+ }+ uiState.orbitalPos?.let { position ->+ RadarViewCompose(+ item = position,+ items = uiState.satTrack,+ azimElev = uiState.orientationValues,+ shouldShowSweep = uiState.shouldShowSweep,+ shouldUseCompass = false,+ modifier = Modifier.align(Alignment.Center)+ )+ Column(+ verticalArrangement = Arrangement.SpaceBetween,+ modifier = Modifier+ .fillMaxSize()+ .padding(horizontal = 6.dp, vertical = 4.dp)+ ) {+ Row(+ horizontalArrangement = Arrangement.SpaceBetween,+ modifier = Modifier.fillMaxWidth()+ ) {+ RadarTextTop(+ position.azimuth,+ stringResource(R.string.radar_az_text),+ true+ )+ RadarTextTop(+ position.elevation,+ stringResource(R.string.radar_el_text),+ false+ )+ }+ Row(+ horizontalArrangement = Arrangement.SpaceBetween,+ modifier = Modifier.fillMaxWidth()+ ) {+ RadarTextBottom(+ position.altitude,+ stringResource(R.string.radar_alt_text),+ true+ )+ RadarTextBottom(+ position.distance,+ stringResource(R.string.radar_dist_text),+ false+ )+ }+ }+ }+ }+ }ElevatedCard(modifier = Modifier.weight(1f)) {if (uiState.transmitters.isEmpty()) {Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize()) {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 628bd89b..6895316b 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@@ -17,7 +17,6 @@*/package com.rtbishop.look4sat.presentation.radar-import android.media.SoundPoolimport androidx.compose.animation.core.animateFloatimport androidx.compose.animation.core.infiniteRepeatableimport androidx.compose.animation.core.rememberInfiniteTransition@@ -27,7 +26,6 @@ import androidx.compose.foundation.layout.aspectRatioimport androidx.compose.material3.MaterialThemeimport androidx.compose.runtime.Composableimport androidx.compose.runtime.mutableFloatStateOf-import androidx.compose.runtime.mutableIntStateOfimport androidx.compose.runtime.mutableStateOfimport androidx.compose.runtime.rememberimport androidx.compose.ui.Modifier@@ -44,8 +42,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.platform.LocalContext-import androidx.compose.ui.platform.LocalViewimport androidx.compose.ui.text.TextMeasurerimport androidx.compose.ui.text.TextStyleimport androidx.compose.ui.text.drawText@@ -59,15 +55,15 @@ import kotlin.math.sin@Composablefun RadarViewCompose(- item: OrbitalPos?,+ item: OrbitalPos,items: List<OrbitalPos>,azimElev: Pair<Float, Float>,shouldShowSweep: Boolean,shouldUseCompass: Boolean,modifier: Modifier = Modifier) {- val context = LocalContext.current- val view = LocalView.current+// val context = LocalContext.current+// val view = LocalView.currentval radarColor = MaterialTheme.colorScheme.secondaryval trackColor = MaterialTheme.colorScheme.primaryval aimColor = MaterialTheme.colorScheme.error@@ -75,15 +71,15 @@ fun RadarViewCompose(val animTransition = rememberInfiniteTransition(label = "animScale")val animSpec = infiniteRepeatable<Float>(tween(1000))val animScale = animTransition.animateFloat(16f, 64f, animSpec, label = "animScale")- val aimThreshold = 0.05f+// val aimThreshold = 0.05fval measurer = rememberTextMeasurer()val sweepDegrees = remember { mutableFloatStateOf(0f) }val trackCreated = remember { mutableStateOf(false) }val trackPath = remember { mutableStateOf(Path()) }val trackEffect = remember { mutableStateOf(PathEffect.cornerPathEffect(0f)) }- val soundPool = remember { mutableStateOf<SoundPool?>(null) }- val beepSoundId = remember { mutableIntStateOf(0) }- val aimTargetDifference = remember { mutableFloatStateOf(0f) }+// val soundPool = remember { mutableStateOf<SoundPool?>(null) }+// val beepSoundId = remember { mutableIntStateOf(0) }+// val aimTargetDifference = remember { mutableFloatStateOf(0f) }// LaunchedEffect(item.azimuth, item.elevation, azimElev.first, azimElev.second) {// val aimAzimuthRadians = azimElev.first.toDouble().toRadians()@@ -95,13 +91,10 @@ fun RadarViewCompose(// val satX = sph2CartX(item.azimuth, item.elevation, radius)// val satY = sph2CartY(item.azimuth, item.elevation, radius)// aimTargetDifference.floatValue = sqrt((satX - aimX).pow(2) + (satY - aimY).pow(2))-//-//// val minPlaybackRate = 0.5f// val maxPlaybackRate = 2.0f// val playbackRate =// maxPlaybackRate - (aimTargetDifference.floatValue / (maxPlaybackRate - minPlaybackRate))-//// soundPool.value?.setRate(beepSoundId.intValue, playbackRate)// }//@@ -127,20 +120,16 @@ fun RadarViewCompose(// .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION)// .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)// .build()-//// soundPool.value = SoundPool.Builder()// .setMaxStreams(1)// .setAudioAttributes(audioAttributes)// .build()-//// beepSoundId.intValue = soundPool.value?.load(context, R.raw.beep, 1) ?: 0-//// soundPool.value?.setOnLoadCompleteListener { soundPool, _, status ->// if (status == 0) {// soundPool.play(beepSoundId.intValue, 0.5f, 0.5f, 0, -1, 1f)// }// }-//// onDispose {// soundPool.value?.release()// }@@ -161,7 +150,7 @@ fun RadarViewCompose(drawInfo(radius, trackColor, measurer, 3)translate(center.x, center.y) {drawTrack(trackPath.value, trackEffect.value, aimColor, trackColor)- if (item != null && item.elevation > 0) {+ if (item.elevation > 0) {drawPosition(item, radius, animScale.value, trackColor)}if (shouldUseCompass) {