Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Added minor fixes to EntriesDialog and passes view
Arty Bishopae53e5dc354a
diff --git a/app/build.gradle.kts b/app/build.gradle.ktsindex b9855790..ad1fa175 100644--- a/app/build.gradle.kts+++ b/app/build.gradle.kts@@ -24,13 +24,19 @@ android {compose = true}buildTypes {+ debug {+ applicationIdSuffix = ".debug"+ versionNameSuffix = "-debug"+ }release {isMinifyEnabled = trueisShrinkResources = trueproguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")}}- composeOptions { kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get() }+ composeOptions {+ kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()+ }}dependencies {diff --git a/app/src/main/java/com/rtbishop/look4sat/MainActivity.kt b/app/src/main/java/com/rtbishop/look4sat/MainActivity.ktindex 0418b3e2..040f5892 100644--- a/app/src/main/java/com/rtbishop/look4sat/MainActivity.kt+++ b/app/src/main/java/com/rtbishop/look4sat/MainActivity.kt@@ -19,7 +19,6 @@ package com.rtbishop.look4satimport android.content.Contextimport android.content.res.Configuration-import android.os.Buildimport android.os.Bundleimport android.util.DisplayMetricsimport androidx.activity.ComponentActivity@@ -38,9 +37,7 @@ class MainActivity : ComponentActivity() {override fun attachBaseContext(newBase: Context?) {val newConfig = Configuration(newBase?.resources?.configuration).apply {- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {- densityDpi = DisplayMetrics.DENSITY_DEVICE_STABLE- }+ densityDpi = DisplayMetrics.DENSITY_DEVICE_STABLEfontScale = 1.0f}applyOverrideConfiguration(newConfig)diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/MainScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/MainScreen.ktindex a341b11e..c95f9310 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/MainScreen.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/MainScreen.kt@@ -11,6 +11,7 @@ import androidx.compose.runtime.Composableimport androidx.compose.ui.Modifierimport androidx.compose.ui.res.painterResourceimport androidx.compose.ui.unit.dp+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.lifecycle.viewmodel.compose.viewModelimport androidx.navigation.NavControllerimport androidx.navigation.NavHostController@@ -71,7 +72,7 @@ private fun MainNavGraph(navController: NavHostController) {composable(Screen.Entries.route) {val viewModel = viewModel(EntriesViewModel::class.java, factory = EntriesViewModel.Factory)val navToPasses = { navController.navigate(Screen.Passes.route) }- EntriesScreen(viewModel.uiState.value, navToPasses)+ EntriesScreen(viewModel.uiState.collectAsStateWithLifecycle().value, navToPasses)}composable(Screen.Passes.route) {val viewModel = viewModel(PassesViewModel::class.java, factory = PassesViewModel.Factory)diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/MainTheme.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/MainTheme.ktindex 78233777..4f39cd7a 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/MainTheme.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/MainTheme.kt@@ -1,11 +1,14 @@package com.rtbishop.look4sat.presentation+import androidx.compose.foundation.ExperimentalFoundationApi+import androidx.compose.foundation.LocalOverscrollConfigurationimport androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material3.MaterialThemeimport androidx.compose.material3.Shapesimport androidx.compose.material3.Typographyimport androidx.compose.material3.lightColorSchemeimport androidx.compose.runtime.Composable+import androidx.compose.runtime.CompositionLocalProviderimport androidx.compose.ui.graphics.Colorimport androidx.compose.ui.text.TextStyleimport androidx.compose.ui.text.font.FontFamily@@ -13,6 +16,7 @@ import androidx.compose.ui.text.font.FontWeightimport androidx.compose.ui.unit.dpimport androidx.compose.ui.unit.sp+@OptIn(ExperimentalFoundationApi::class)@Composablefun MainTheme(// darkTheme: Boolean = isSystemInDarkTheme(),@@ -35,7 +39,9 @@ fun MainTheme(// ViewCompat.getWindowInsetsController(view)?.isAppearanceLightStatusBars = darkTheme// }// }- MaterialTheme(colorScheme = colors, typography = typography, content = content, shapes = shapes)+ MaterialTheme(colorScheme = colors, typography = typography, shapes = shapes) {+ CompositionLocalProvider(LocalOverscrollConfiguration.provides(null), content = content)+ }}private val accentYellow = Color(0xFFFFE082)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 8d4057c2..e1ba9976 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,8 +3,9 @@ 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.fillMaxHeight+import androidx.compose.foundation.layout.heightInimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.lazy.grid.GridCellsimport androidx.compose.foundation.lazy.grid.LazyVerticalGrid@@ -12,15 +13,17 @@ import androidx.compose.foundation.lazy.grid.itemsIndexedimport androidx.compose.material3.ElevatedCardimport androidx.compose.material3.MaterialThemeimport androidx.compose.material3.RadioButton-import androidx.compose.material3.Surfaceimport androidx.compose.material3.Textimport 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.spimport androidx.compose.ui.window.Dialogimport com.rtbishop.look4sat.presentation.MainTheme@@ -33,28 +36,35 @@ private fun TypeDialogPreview() {@Composablefun TypesDialog(items: List<String>, selected: String, dismiss: () -> Unit, select: (String) -> Unit) {- val clickAction = { type: String ->- select(type)- dismiss()- }+ val height = LocalConfiguration.current.screenHeightDpDialog(onDismissRequest = { dismiss() }) {- ElevatedCard(modifier = Modifier.fillMaxHeight(0.80f)) {- LazyVerticalGrid(- columns = GridCells.Adaptive(160.dp),- modifier = Modifier.background(MaterialTheme.colorScheme.background),- horizontalArrangement = Arrangement.spacedBy(1.dp),- verticalArrangement = Arrangement.spacedBy(1.dp)+ ElevatedCard {+ Column(+ horizontalAlignment = Alignment.CenterHorizontally,+ modifier = Modifier.heightIn(max = height.times(0.80).dp)) {- itemsIndexed(items) { index, item ->- Surface {+ 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 { clickAction(item) }) {+ .clickable { select(item) }) {Text(- text = "$index).",- modifier = Modifier.padding(start = 12.dp, end = 6.dp),+ text = "$index - ",+ modifier = Modifier.padding(start = 12.dp),fontWeight = FontWeight.Normal,color = MaterialTheme.colorScheme.secondary)@@ -65,7 +75,11 @@ fun TypesDialog(items: List<String>, selected: String, dismiss: () -> Unit, selemaxLines = 1,overflow = TextOverflow.Ellipsis)- RadioButton(selected = item == selected, onClick = null, modifier = Modifier.padding(8.dp))+ RadioButton(+ selected = item == selected,+ onClick = null,+ modifier = Modifier.padding(start = 8.dp, top = 8.dp, end = 12.dp, bottom = 8.dp)+ )}}}diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesViewModel.ktindex 70ca2949..618c4083 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesViewModel.kt@@ -17,8 +17,6 @@*/package com.rtbishop.look4sat.presentation.entries-import androidx.compose.runtime.State-import androidx.compose.runtime.mutableStateOfimport androidx.lifecycle.ViewModelimport androidx.lifecycle.ViewModelProviderimport androidx.lifecycle.viewModelScope@@ -27,12 +25,14 @@ import androidx.lifecycle.viewmodel.viewModelFactoryimport com.rtbishop.look4sat.MainApplicationimport com.rtbishop.look4sat.domain.repository.ISelectionRepoimport kotlinx.coroutines.delay+import kotlinx.coroutines.flow.MutableStateFlow+import kotlinx.coroutines.flow.StateFlowimport kotlinx.coroutines.launchclass EntriesViewModel(private val selectionRepo: ISelectionRepo) : ViewModel() {private val defaultType = "All"- private val _uiState = mutableStateOf(+ private val _uiState = MutableStateFlow(EntriesState(isDialogShown = false,isLoading = true,@@ -42,7 +42,7 @@ class EntriesViewModel(private val selectionRepo: ISelectionRepo) : ViewModel()takeAction = ::handleAction))- val uiState: State<EntriesState> = _uiState+ val uiState: StateFlow<EntriesState> = _uiStateinit {viewModelScope.launch {@@ -80,7 +80,7 @@ class EntriesViewModel(private val selectionRepo: ISelectionRepo) : ViewModel()private fun selectType(type: String) = viewModelScope.launch {selectionRepo.setType(type)- _uiState.value = _uiState.value.copy(currentType = type)+ _uiState.value = _uiState.value.copy(currentType = type, isDialogShown = false)}private fun toggleTypesDialog() {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 270c3112..9b1d9629 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@@ -32,6 +32,7 @@ import androidx.compose.ui.tooling.preview.Previewimport androidx.compose.ui.unit.dpimport androidx.compose.ui.unit.spimport com.rtbishop.look4sat.R+import com.rtbishop.look4sat.domain.predict.DeepSpaceObjectimport com.rtbishop.look4sat.domain.predict.NearEarthObjectimport com.rtbishop.look4sat.domain.predict.OrbitalDataimport com.rtbishop.look4sat.domain.predict.OrbitalPass@@ -53,8 +54,7 @@ fun PassesScreen(uiState: PassesState, navToRadar: (Int, Long) -> Unit) {})val toggleDialog = { uiState.takeAction(PassesAction.ToggleFilterDialog) }if (uiState.isDialogShown) {- FilterDialog(uiState.hours, uiState.elevation, uiState.modes, toggleDialog- ) { hours, elevation, modes ->+ FilterDialog(uiState.hours, uiState.elevation, uiState.modes, toggleDialog) { hours, elevation, modes ->uiState.takeAction(PassesAction.ApplyFilter(hours, elevation, modes))}}@@ -71,9 +71,20 @@ fun PassesScreen(uiState: PassesState, navToRadar: (Int, Long) -> Unit) {@Preview(showBackground = true)@Composable-private fun PassPreview() {+private fun DeepSpacePassPreview() {val data = OrbitalData(- "Satellite", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 45000, 0.0+ "Satellite", 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 45000, 0.0+ )+ val satellite = DeepSpaceObject(data)+ val pass = OrbitalPass(1L, 0.0, 10L, 180.0, 850, 45.0, satellite, 0.5f)+ MainTheme { Pass(pass = pass, { _, _ -> }) }+}++@Preview(showBackground = true)+@Composable+private fun NearEarthPassPreview() {+ val data = OrbitalData(+ "Satellite", 0.0, 15.0, 0.0, 0.0, 0.0, 0.0, 0.0, 45000, 0.0)val satellite = NearEarthObject(data)val pass = OrbitalPass(1L, 0.0, 10L, 180.0, 850, 45.0, satellite, 0.5f)@@ -146,27 +157,28 @@ private fun Pass(modifier = Modifier.weight(1f))}- Row(- verticalAlignment = Alignment.CenterVertically,- horizontalArrangement = Arrangement.SpaceBetween,- modifier = Modifier.fillMaxWidth()- ) {- val deepTime = stringResource(id = R.string.pass_placeholder)- Text(- text = if (pass.isDeepSpace) deepTime else sdf.format(Date(pass.aosTime)),- fontSize = 15.sp- )- LinearProgressIndicator(- progress = if (pass.isDeepSpace) 1f else pass.progress,- modifier = modifier- .fillMaxWidth(0.75f)- .padding(top = 3.dp),- trackColor = MaterialTheme.colorScheme.inverseSurface- )- Text(- text = if (pass.isDeepSpace) deepTime else sdf.format(Date(pass.losTime)),- fontSize = 15.sp- )+ if (!pass.isDeepSpace) {+ Row(+ verticalAlignment = Alignment.CenterVertically,+ horizontalArrangement = Arrangement.SpaceBetween,+ modifier = Modifier.fillMaxWidth()+ ) {+ Text(+ text = sdf.format(Date(pass.aosTime)),+ fontSize = 15.sp+ )+ LinearProgressIndicator(+ progress = pass.progress,+ modifier = modifier+ .fillMaxWidth(0.75f)+ .padding(top = 3.dp),+ trackColor = MaterialTheme.colorScheme.inverseSurface+ )+ Text(+ text = sdf.format(Date(pass.losTime)),+ fontSize = 15.sp+ )+ }}}}diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex 56574e5a..512cb636 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -1,5 +1,5 @@[versions]-android-gradle-plugin = "8.1.2"+android-gradle-plugin = "8.1.3"google-ksp = "1.9.10-1.0.13"kotlin = "1.9.10"@@ -13,14 +13,14 @@ versionName = "3.1.3"androidx-core-ktx = "1.12.0"androidx-core-splashscreen = "1.0.1"-androidx-room = "2.5.2"+androidx-room = "2.6.0"-compose = "1.5.3"+compose = "1.5.4"compose-activity = "1.8.0"compose-compiler = "1.5.3"compose-lifecycle = "2.6.2"compose-material3 = "1.1.2"-compose-navigation = "2.7.4"+compose-navigation = "2.7.5"other-coroutines = "1.7.3"other-json = "20230618"