Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Added a few minor fixes to Dialogs and RadarScreen
Arty Bishop6c3aeab041b3
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/common/Components.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/common/Components.ktindex f0b83921..fd1905f2 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/common/Components.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/common/Components.kt@@ -1,5 +1,6 @@package com.rtbishop.look4sat.presentation.common+import androidx.compose.foundation.MarqueeSpacingimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.basicMarqueeimport androidx.compose.foundation.clickable@@ -119,7 +120,7 @@ fun NextPassRow(pass: OrbitalPass, modifier: Modifier = Modifier) {modifier = Modifier.weight(1f).padding(end = 6.dp)- .basicMarquee(),+ .infiniteMarquee(),fontWeight = FontWeight.Medium,maxLines = 1,overflow = TextOverflow.Ellipsis@@ -287,6 +288,11 @@ fun isVerticalLayout(): Boolean {return windowSizeClass.windowWidthSizeClass == WindowWidthSizeClass.COMPACT}+@Composable+fun Modifier.infiniteMarquee(): Modifier {+ return basicMarquee(iterations = Int.MAX_VALUE, spacing = MarqueeSpacing(16.dp))+}+@Composablefun Modifier.layoutPadding(): Modifier {val statusBarMod = this.statusBarsPadding()diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesDialog.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesDialog.ktindex 3f6b51c0..ee732ae1 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesDialog.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesDialog.kt@@ -29,7 +29,6 @@ import androidx.compose.foundation.lazy.grid.GridCellsimport androidx.compose.foundation.lazy.grid.LazyVerticalGridimport androidx.compose.foundation.lazy.grid.itemsIndexedimport androidx.compose.material3.Checkbox-import androidx.compose.material3.HorizontalDividerimport androidx.compose.material3.Iconimport androidx.compose.material3.MaterialThemeimport androidx.compose.material3.Slider@@ -155,7 +154,6 @@ fun RadiosDialog(modes: List<String>, cancel: () -> Unit, accept: (List<String>)horizontalArrangement = Arrangement.spacedBy(1.dp),verticalArrangement = Arrangement.spacedBy(1.dp)) {- item { HorizontalDivider(color = MaterialTheme.colorScheme.surface) }itemsIndexed(allModes) { index, item ->Surface {Row(@@ -185,7 +183,6 @@ fun RadiosDialog(modes: List<String>, cancel: () -> Unit, accept: (List<String>)}}}- item { HorizontalDivider(color = MaterialTheme.colorScheme.surface) }}}}diff --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 3750c2ac..a605e51d 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@@ -1,7 +1,6 @@package com.rtbishop.look4sat.presentation.passesimport androidx.compose.foundation.background-import androidx.compose.foundation.basicMarqueeimport androidx.compose.foundation.clickableimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Column@@ -51,6 +50,7 @@ import com.rtbishop.look4sat.presentation.common.InfoDialogimport com.rtbishop.look4sat.presentation.common.NextPassRowimport com.rtbishop.look4sat.presentation.common.TimerRowimport com.rtbishop.look4sat.presentation.common.TopBar+import com.rtbishop.look4sat.presentation.common.infiniteMarqueeimport com.rtbishop.look4sat.presentation.common.isVerticalLayoutimport com.rtbishop.look4sat.presentation.common.layoutPaddingimport java.text.SimpleDateFormat@@ -203,7 +203,7 @@ private fun NearEarthPass(modifier = Modifier.weight(1f).padding(end = 6.dp)- .basicMarquee(),+ .infiniteMarquee(),fontWeight = FontWeight.Medium,maxLines = 1,overflow = TextOverflow.Ellipsisdiff --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 ed37390e..6b564659 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@@ -6,9 +6,7 @@ import androidx.compose.animation.core.animateFloatimport androidx.compose.animation.core.infiniteRepeatableimport androidx.compose.animation.core.rememberInfiniteTransitionimport androidx.compose.animation.core.tween-import androidx.compose.foundation.MarqueeSpacingimport androidx.compose.foundation.background-import androidx.compose.foundation.basicMarqueeimport androidx.compose.foundation.borderimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Box@@ -16,7 +14,6 @@ import androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.RowScopeimport androidx.compose.foundation.layout.Spacer-import androidx.compose.foundation.layout.aspectRatioimport androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.height@@ -57,6 +54,7 @@ import com.rtbishop.look4sat.presentation.common.NextPassRowimport com.rtbishop.look4sat.presentation.common.TimerRowimport com.rtbishop.look4sat.presentation.common.TopBarimport com.rtbishop.look4sat.presentation.common.getDefaultPass+import com.rtbishop.look4sat.presentation.common.infiniteMarqueeimport com.rtbishop.look4sat.presentation.common.isVerticalLayoutimport com.rtbishop.look4sat.presentation.common.layoutPadding@@ -100,57 +98,58 @@ private fun RadarScreen(uiState: RadarState, navigateUp: () -> Unit) {}}if(isVerticalLayout()) {- Box(contentAlignment = Alignment.BottomCenter, modifier = Modifier.aspectRatio(1f)) {- uiState.orbitalPos?.let { position ->- ElevatedCard {+ ElevatedCard(modifier = Modifier.weight(1f)) {+ Box(contentAlignment = Alignment.Center) {+ uiState.orbitalPos?.let { position ->RadarViewCompose(item = position,items = uiState.satTrack,azimElev = uiState.orientationValues,shouldShowSweep = uiState.shouldShowSweep,- shouldUseCompass = uiState.shouldUseCompass+ 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(- 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()+ Column(+ verticalArrangement = Arrangement.SpaceBetween,+ modifier = Modifier+ .fillMaxSize()+ .padding(horizontal = 6.dp, vertical = 4.dp)) {- RadarTextBottom(- position.altitude,- stringResource(R.string.radar_alt_text),- true- )- RadarTextBottom(- position.distance,- stringResource(R.string.radar_dist_text),- false- )+ 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.fillMaxSize()) {+ ElevatedCard(modifier = Modifier.weight(1f)) {if (uiState.transmitters.isEmpty()) {Column(modifier = Modifier.fillMaxSize(),@@ -181,57 +180,58 @@ private fun RadarScreen(uiState: RadarState, navigateUp: () -> Unit) {}} else {Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {- Box(contentAlignment = Alignment.BottomCenter, modifier = Modifier.weight(1f)) {- uiState.orbitalPos?.let { position ->- ElevatedCard {+ ElevatedCard(modifier = Modifier.weight(1f)) {+ Box(contentAlignment = Alignment.Center) {+ uiState.orbitalPos?.let { position ->RadarViewCompose(item = position,items = uiState.satTrack,azimElev = uiState.orientationValues,shouldShowSweep = uiState.shouldShowSweep,- shouldUseCompass = false+ 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()+ Column(+ verticalArrangement = Arrangement.SpaceBetween,+ modifier = Modifier+ .fillMaxSize()+ .padding(horizontal = 6.dp, vertical = 4.dp)) {- 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- )+ 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.fillMaxSize().weight(1f)) {+ ElevatedCard(modifier = Modifier.weight(1f)) {if (uiState.transmitters.isEmpty()) {Column(modifier = Modifier.fillMaxSize(),@@ -378,10 +378,7 @@ private fun TransmitterItem(radio: SatRadio) {text = if (radio.isInverted) "INVERTED: ${radio.info} " else "${radio.info} ",textAlign = TextAlign.Center,modifier = Modifier- .basicMarquee(- iterations = Int.MAX_VALUE,- spacing = MarqueeSpacing(16.dp)- )+ .infiniteMarquee().weight(0.7f))Icon(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 e253e924..06c15c15 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@@ -6,7 +6,7 @@ import androidx.compose.animation.core.infiniteRepeatableimport androidx.compose.animation.core.rememberInfiniteTransitionimport androidx.compose.animation.core.tweenimport androidx.compose.foundation.Canvas-import androidx.compose.foundation.layout.fillMaxSize+import androidx.compose.foundation.layout.aspectRatioimport androidx.compose.material3.MaterialThemeimport androidx.compose.runtime.Composableimport androidx.compose.runtime.mutableFloatStateOf@@ -46,7 +46,8 @@ fun RadarViewCompose(items: List<OrbitalPos>,azimElev: Pair<Float, Float>,shouldShowSweep: Boolean,- shouldUseCompass: Boolean+ shouldUseCompass: Boolean,+ modifier: Modifier = Modifier) {val context = LocalContext.currentval view = LocalView.current@@ -128,7 +129,7 @@ fun RadarViewCompose(// }// }- Canvas(modifier = Modifier.fillMaxSize()) {+ Canvas(modifier = modifier.aspectRatio(1f)) {val radius = (size.minDimension / 2f) * 0.95fif (!trackCreated.value) {trackPath.value = createTrackPath(items, radius)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 a07a850a..c12a9f42 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@@ -10,7 +10,6 @@ import androidx.compose.foundation.lazy.grid.GridCellsimport androidx.compose.foundation.lazy.grid.LazyVerticalGridimport androidx.compose.foundation.lazy.grid.itemsIndexedimport androidx.compose.material3.Checkbox-import androidx.compose.material3.HorizontalDividerimport androidx.compose.material3.MaterialThemeimport androidx.compose.material3.Textimport androidx.compose.runtime.Composable@@ -50,7 +49,6 @@ fun MultiTypesDialog(horizontalArrangement = Arrangement.spacedBy(1.dp),verticalArrangement = Arrangement.spacedBy(1.dp)) {- item { HorizontalDivider(color = MaterialTheme.colorScheme.surface) }itemsIndexed(allTypes) { index, item ->Row(verticalAlignment = Alignment.CenterVertically,@@ -78,7 +76,6 @@ fun MultiTypesDialog()}}- item { HorizontalDivider(color = MaterialTheme.colorScheme.surface) }}}}diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/satellites/SatellitesScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/satellites/SatellitesScreen.ktindex 40ced428..c512f9dc 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/satellites/SatellitesScreen.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/satellites/SatellitesScreen.kt@@ -1,8 +1,6 @@package com.rtbishop.look4sat.presentation.satellites-import androidx.compose.foundation.MarqueeSpacingimport androidx.compose.foundation.background-import androidx.compose.foundation.basicMarqueeimport androidx.compose.foundation.clickableimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Box@@ -51,6 +49,7 @@ import com.rtbishop.look4sat.presentation.common.CardLoadingIndicatorimport com.rtbishop.look4sat.presentation.common.IconCardimport com.rtbishop.look4sat.presentation.common.InfoDialogimport com.rtbishop.look4sat.presentation.common.TopBar+import com.rtbishop.look4sat.presentation.common.infiniteMarqueeimport com.rtbishop.look4sat.presentation.common.isVerticalLayoutimport com.rtbishop.look4sat.presentation.common.layoutPadding@@ -198,7 +197,8 @@ private fun TypeCard(types: List<String>, onClick: () -> Unit, modifier: ModifiefontWeight = FontWeight.Medium,modifier = Modifier.weight(1f)- .basicMarquee(iterations = Int.MAX_VALUE, spacing = MarqueeSpacing(16.dp))+ .padding(end = 6.dp)+ .infiniteMarquee())}}diff --git a/domain/src/main/java/com/rtbishop/look4sat/domain/source/Sources.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/source/Sources.ktindex 7c1466ab..252d43e0 100644--- a/domain/src/main/java/com/rtbishop/look4sat/domain/source/Sources.kt+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/source/Sources.kt@@ -6,6 +6,7 @@ object Sources {"All" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=active&FORMAT=csv","Amsat" to "https://amsat.org/tle/current/nasabare.txt","Amateur" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=amateur&FORMAT=csv",+ "Brightest" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=visual&FORMAT=csv","Classified" to "https://www.mmccants.org/tles/classfd.zip","Cubesat" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=cubesat&FORMAT=csv","Education" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=education&FORMAT=csv",