Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Updated dependencies, added EntriesDialog tweaks
Arty Bishop08767c5589a3
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/components/Common.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/components/Common.ktindex f3689f92..cc7cce46 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/components/Common.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/components/Common.kt@@ -16,6 +16,7 @@ import androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.sizeimport androidx.compose.foundation.layout.widthimport androidx.compose.material3.ButtonDefaults+import androidx.compose.material3.CardDefaultsimport androidx.compose.material3.CircularProgressIndicatorimport androidx.compose.material3.ElevatedButtonimport androidx.compose.material3.ElevatedCard@@ -23,6 +24,8 @@ import androidx.compose.material3.Iconimport androidx.compose.material3.MaterialThemeimport androidx.compose.material3.Textimport androidx.compose.runtime.Composable+import androidx.compose.runtime.mutableStateOf+import androidx.compose.runtime.rememberimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.ui.graphics.vector.ImageVector@@ -37,6 +40,34 @@ import androidx.compose.ui.unit.spimport com.rtbishop.look4sat.Rimport com.rtbishop.look4sat.presentation.MainTheme+@Composable+@Preview(showBackground = true)+private fun TimerBarNewPreview() {+ MainTheme { TimerBarNew("88:88:88", "88:88:88") }+}++@Composable+fun TimerBarNew(aosTime: String, losTime: String) {+ val isAosSelected = remember { mutableStateOf(true) }+ val barHeightMod = Modifier.height(48.dp)+ val timerText = if (isAosSelected.value) aosTime else losTime+ Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) {+ CardAosLos(onClick = { isAosSelected.value = true }, iconId = R.drawable.ic_aos, isAosSelected.value)+ ElevatedCard(modifier = barHeightMod.weight(1f)) {+ Text(+ text = "T- $timerText",+ textAlign = TextAlign.Center,+ fontSize = 42.sp,+ fontWeight = FontWeight.Bold,+ color = MaterialTheme.colorScheme.primary,+ style = TextStyle(platformStyle = PlatformTextStyle(includeFontPadding = false)),+ modifier = Modifier.fillMaxSize()+ )+ }+ CardAosLos(onClick = { isAosSelected.value = false }, iconId = R.drawable.ic_los, isAosSelected.value.not())+ }+}+@Composable@Preview(showBackground = true)private fun TimerBarPreview() {@@ -104,6 +135,22 @@ fun CardIcon(onClick: () -> Unit, iconId: Int, description: String? = null) {}}+@Composable+fun CardAosLos(onClick: () -> Unit, iconId: Int, isAos: Boolean = true, description: String? = null) {+ val cardColors = if (isAos) {+ CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primary)+ } else {+ CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface)+ }+ val iconTint = if (isAos) MaterialTheme.colorScheme.surface else MaterialTheme.colorScheme.onSurface+ val clickableModifier = Modifier.clickable { onClick() }+ ElevatedCard(modifier = Modifier.size(48.dp), colors = cardColors) {+ Box(modifier = clickableModifier.fillMaxSize(), contentAlignment = Alignment.Center) {+ Icon(imageVector = ImageVector.vectorResource(iconId), tint = iconTint, contentDescription = description)+ }+ }+}+@Composablefun CardLoadingIndicator() {Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize()) {diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesDialog.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesDialog.ktindex e1ba9976..fc9793d4 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesDialog.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesDialog.kt@@ -3,28 +3,27 @@ package com.rtbishop.look4sat.presentation.entriesimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.clickableimport androidx.compose.foundation.layout.Arrangement-import androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.Row-import androidx.compose.foundation.layout.heightIn+import androidx.compose.foundation.layout.fillMaxHeightimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.lazy.grid.GridCellsimport androidx.compose.foundation.lazy.grid.LazyVerticalGridimport androidx.compose.foundation.lazy.grid.itemsIndexed-import androidx.compose.material3.ElevatedCard+import androidx.compose.material3.BottomSheetDefaults+import androidx.compose.material3.ExperimentalMaterial3Api+import androidx.compose.material3.HorizontalDividerimport androidx.compose.material3.MaterialTheme+import androidx.compose.material3.ModalBottomSheetimport androidx.compose.material3.RadioButtonimport androidx.compose.material3.Text+import androidx.compose.material3.rememberModalBottomSheetStateimport androidx.compose.runtime.Composableimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifier-import androidx.compose.ui.platform.LocalConfigurationimport androidx.compose.ui.text.font.FontWeight-import androidx.compose.ui.text.style.TextAlignimport androidx.compose.ui.text.style.TextOverflowimport androidx.compose.ui.tooling.preview.Previewimport androidx.compose.ui.unit.dp-import androidx.compose.ui.unit.sp-import androidx.compose.ui.window.Dialogimport com.rtbishop.look4sat.presentation.MainTheme@Preview(showBackground = true)@@ -34,56 +33,48 @@ private fun TypeDialogPreview() {MainTheme { TypesDialog(types, "All", {}) {} }}+@OptIn(ExperimentalMaterial3Api::class)@Composablefun TypesDialog(items: List<String>, selected: String, dismiss: () -> Unit, select: (String) -> Unit) {- val height = LocalConfiguration.current.screenHeightDp- Dialog(onDismissRequest = { dismiss() }) {- ElevatedCard {- Column(- horizontalAlignment = Alignment.CenterHorizontally,- modifier = Modifier.heightIn(max = height.times(0.80).dp)- ) {- Text(- text = "Select satellites type",- fontSize = 18.sp,- textAlign = TextAlign.Center,- color = MaterialTheme.colorScheme.primary,- modifier = Modifier.padding(top = 8.dp, bottom = 4.dp)- )- LazyVerticalGrid(- columns = GridCells.Adaptive(240.dp),- modifier = Modifier.background(MaterialTheme.colorScheme.background),- horizontalArrangement = Arrangement.spacedBy(1.dp),- verticalArrangement = Arrangement.spacedBy(1.dp)- ) {- itemsIndexed(items) { index, item ->- Row(- verticalAlignment = Alignment.CenterVertically,- modifier = Modifier- .background(MaterialTheme.colorScheme.surface)- .clickable { select(item) }) {- Text(- text = "$index - ",- modifier = Modifier.padding(start = 12.dp),- fontWeight = FontWeight.Normal,- color = MaterialTheme.colorScheme.secondary- )- Text(- text = item,- modifier = Modifier.weight(1f),- fontWeight = FontWeight.Medium,- maxLines = 1,- overflow = TextOverflow.Ellipsis- )- RadioButton(- selected = item == selected,- onClick = null,- modifier = Modifier.padding(start = 8.dp, top = 8.dp, end = 12.dp, bottom = 8.dp)- )- }- }+ ModalBottomSheet(+ onDismissRequest = { dismiss() },+ sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true),+ dragHandle = { BottomSheetDefaults.DragHandle() },+ modifier = Modifier.fillMaxHeight(0.80f)+ ) {+ LazyVerticalGrid(+ columns = GridCells.Adaptive(240.dp),+ modifier = Modifier.background(MaterialTheme.colorScheme.background),+ horizontalArrangement = Arrangement.spacedBy(1.dp),+ verticalArrangement = Arrangement.spacedBy(1.dp)+ ) {+ item { HorizontalDivider(thickness = 0.dp, color = MaterialTheme.colorScheme.surface) }+ itemsIndexed(items) { index, item ->+ Row(verticalAlignment = Alignment.CenterVertically,+ modifier = Modifier+ .background(MaterialTheme.colorScheme.surface)+ .clickable { select(item) }) {+ Text(+ text = "$index - ",+ modifier = Modifier.padding(start = 12.dp),+ fontWeight = FontWeight.Normal,+ color = MaterialTheme.colorScheme.secondary+ )+ Text(+ text = item,+ modifier = Modifier.weight(1f),+ fontWeight = FontWeight.Medium,+ maxLines = 1,+ overflow = TextOverflow.Ellipsis+ )+ RadioButton(+ selected = item == selected,+ onClick = null,+ modifier = Modifier.padding(start = 8.dp, top = 8.dp, end = 12.dp, bottom = 8.dp)+ )}}+ item { HorizontalDivider(thickness = 24.dp, 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 9b1d9629..ef4ad39a 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@@ -40,10 +40,12 @@ import com.rtbishop.look4sat.presentation.MainThemeimport com.rtbishop.look4sat.presentation.components.PullRefreshIndicatorimport com.rtbishop.look4sat.presentation.components.PullRefreshStateimport com.rtbishop.look4sat.presentation.components.TimerBar+import com.rtbishop.look4sat.presentation.components.TimerBarNewimport com.rtbishop.look4sat.presentation.components.pullRefreshimport com.rtbishop.look4sat.presentation.components.rememberPullRefreshStateimport java.text.SimpleDateFormat-import java.util.*+import java.util.Date+import java.util.Localeprivate val sdf = SimpleDateFormat("HH:mm:ss", Locale.ENGLISH)@@ -59,6 +61,7 @@ fun PassesScreen(uiState: PassesState, navToRadar: (Int, Long) -> Unit) {}}Column(modifier = Modifier.padding(6.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {+ TimerBarNew(aosTime = uiState.nextTime, losTime = uiState.nextTime)TimerBar(id = uiState.nextId,name = uiState.nextName,diff --git a/app/src/main/res/drawable/ic_aos.xml b/app/src/main/res/drawable/ic_aos.xmlnew file mode 100644index 00000000..9bfabd0b--- /dev/null+++ b/app/src/main/res/drawable/ic_aos.xml@@ -0,0 +1,9 @@+<vector xmlns:android="http://schemas.android.com/apk/res/android"+ android:width="24dp"+ android:height="24dp"+ android:viewportWidth="24"+ android:viewportHeight="24">+ <path+ android:fillColor="@android:color/white"+ android:pathData="M9,5v2h6.59L4,18.59L5.41,20L17,8.41V15h2V5H9z" />+</vector>diff --git a/app/src/main/res/drawable/ic_aos_new.xml b/app/src/main/res/drawable/ic_aos_new.xmlnew file mode 100644index 00000000..4065ebbc--- /dev/null+++ b/app/src/main/res/drawable/ic_aos_new.xml@@ -0,0 +1,9 @@+<vector xmlns:android="http://schemas.android.com/apk/res/android"+ android:width="24dp"+ android:height="24dp"+ android:viewportWidth="24"+ android:viewportHeight="24">+ <path+ android:fillColor="@android:color/white"+ android:pathData="M16,18H6V8h3v4.77L15.98,6 18,8.03 11.15,15H16v3z" />+</vector>diff --git a/app/src/main/res/drawable/ic_los.xml b/app/src/main/res/drawable/ic_los.xmlnew file mode 100644index 00000000..aec34f66--- /dev/null+++ b/app/src/main/res/drawable/ic_los.xml@@ -0,0 +1,9 @@+<vector xmlns:android="http://schemas.android.com/apk/res/android"+ android:width="24dp"+ android:height="24dp"+ android:viewportWidth="24"+ android:viewportHeight="24">+ <path+ android:fillColor="@android:color/white"+ android:pathData="M19,9h-2v6.59L5.41,4L4,5.41L15.59,17H9v2h10V9z" />+</vector>diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex 95909e46..0007c231 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -1,7 +1,7 @@[versions]-android-gradle-plugin = "8.2.0"-google-ksp = "1.9.21-1.0.15"-kotlin = "1.9.21"+android-gradle-plugin = "8.3.0"+google-ksp = "1.9.22-1.0.17"+kotlin = "1.9.22"jvmToolchain = "17"@@ -15,12 +15,12 @@ androidx-core-ktx = "1.12.0"androidx-core-splashscreen = "1.0.1"androidx-room = "2.6.1"-compose = "1.5.4"+compose = "1.6.2"compose-activity = "1.8.2"-compose-compiler = "1.5.6"-compose-lifecycle = "2.6.2"-compose-material3 = "1.1.2"-compose-navigation = "2.7.6"+compose-compiler = "1.5.10"+compose-lifecycle = "2.7.0"+compose-material3 = "1.2.0"+compose-navigation = "2.7.7"other-coroutines = "1.7.3"other-json = "20231013"diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.propertiesindex 847fae2e..41384758 100644--- a/gradle/wrapper/gradle-wrapper.properties+++ b/gradle/wrapper/gradle-wrapper.properties@@ -1,6 +1,6 @@#Fri Sep 01 22:09:30 BST 2023distributionBase=GRADLE_USER_HOMEdistributionPath=wrapper/dists-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zipzipStoreBase=GRADLE_USER_HOMEzipStorePath=wrapper/dists