Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Applied user elevation color thresholds to the radar page (#253)
atsunatsu5e39c945b236
diff --git a/app/src/main/java/com/rtbishop/look4sat/MainScreen.kt b/app/src/main/java/com/rtbishop/look4sat/MainScreen.ktindex 46a0d042..45e1f83c 100644--- a/app/src/main/java/com/rtbishop/look4sat/MainScreen.kt+++ b/app/src/main/java/com/rtbishop/look4sat/MainScreen.kt@@ -99,29 +99,43 @@ fun NavRoot(deeplink: String? = null) {// Reverse: outgoing slides out to the right, incoming drifts in from the leftval popTransition = slideInHorizontally(tween(300)) { -it / 3 } togetherWithslideOutHorizontally(tween(300)) { it }- NavDisplay(- modifier = Modifier.fillMaxSize(),- backStack = rootBackStack,- onBack = navigateBack,- transitionSpec = { pushTransition },- popTransitionSpec = { popTransition },- predictivePopTransitionSpec = { popTransition },- entryDecorators = listOf(- rememberSaveableStateHolderNavEntryDecorator(),- rememberViewModelStoreNavEntryDecorator()- ),- entryProvider = entryProvider {- entry<Screen.Passes> { MainScreen(navigateToRadar = navigateToRadar) }- entry<RadarDestination> {- Surface(- modifier = Modifier.fillMaxSize(),- color = MaterialTheme.colorScheme.background- ) {- RadarDestination(navigateUp = navigateBack)+ // Elevation color thresholds must be provided at the root level so that BOTH+ // the tab content (MainScreen) and the root-level RadarDestination see the+ // user's custom thresholds. RadarDestination is a sibling entry of MainScreen+ // in this NavDisplay, so a provider inside MainScreen never reaches it.+ val context = LocalContext.current+ val container = (context.applicationContext as IContainerProvider).getMainContainer()+ val otherSettings by container.settingsRepo.otherSettings.collectAsStateWithLifecycle()+ CompositionLocalProvider(+ LocalElevationThresholds provides ElevationThresholds(+ low = otherSettings.lowElevation,+ high = otherSettings.highElevation+ )+ ) {+ NavDisplay(+ modifier = Modifier.fillMaxSize(),+ backStack = rootBackStack,+ onBack = navigateBack,+ transitionSpec = { pushTransition },+ popTransitionSpec = { popTransition },+ predictivePopTransitionSpec = { popTransition },+ entryDecorators = listOf(+ rememberSaveableStateHolderNavEntryDecorator(),+ rememberViewModelStoreNavEntryDecorator()+ ),+ entryProvider = entryProvider {+ entry<Screen.Passes> { MainScreen(navigateToRadar = navigateToRadar) }+ entry<RadarDestination> {+ Surface(+ modifier = Modifier.fillMaxSize(),+ color = MaterialTheme.colorScheme.background+ ) {+ RadarDestination(navigateUp = navigateBack)+ }}}- }- )+ )+ }}@Composable@@ -129,7 +143,6 @@ private fun MainScreen(navigateToRadar: () -> Unit = {}) {val context = LocalContext.currentval container = (context.applicationContext as IContainerProvider).getMainContainer()val trackingState by container.radioTrackingService.state.collectAsStateWithLifecycle()- val otherSettings by container.settingsRepo.otherSettings.collectAsStateWithLifecycle()val backStack = rememberNavBackStack(Screen.Passes)val currentKey = backStack.lastOrNull()@@ -139,88 +152,81 @@ private fun MainScreen(navigateToRadar: () -> Unit = {}) {val navItems =listOf(Screen.Satellites, Screen.Passes, Screen.Status, Screen.Map, Screen.Settings)- CompositionLocalProvider(- LocalElevationThresholds provides ElevationThresholds(- low = otherSettings.lowElevation,- high = otherSettings.highElevation- )+ NavigationSuiteScaffold(+ navigationSuiteItems = {+ navItems.forEach { screen ->+ val isSelected = when (currentKey) {+ is Screen.Satellites -> screen is Screen.Satellites+ is Screen.Passes -> screen is Screen.Passes+ is Screen.Status -> screen is Screen.Status+ is Screen.Map -> screen is Screen.Map+ is Screen.Settings -> screen is Screen.Settings+ else -> false+ }+ item(+ icon = {+ Icon(+ painter = painterResource(screen.iconResId),+ contentDescription = stringResource(screen.titleResId)+ )+ },+ label = { Text(stringResource(screen.titleResId)) },+ selected = isSelected,+ onClick = {+ if (isSelected) return@item+ while (backStack.size > 1) backStack.removeAt(backStack.size - 1)+ if (screen !is Screen.Passes) backStack.add(screen)+ }+ )+ }+ },+ navigationSuiteColors = NavigationSuiteDefaults.colors(+ navigationRailContainerColor = MaterialTheme.colorScheme.surfaceContainer+ ),+ layoutType = when {+ !hasEnoughHeight() && hasEnoughWidth() -> NavigationSuiteType.NavigationRail+ !hasEnoughWidth() -> NavigationSuiteType.ShortNavigationBarCompact+ else -> NavigationSuiteType.ShortNavigationBarMedium+ }) {- NavigationSuiteScaffold(- navigationSuiteItems = {- navItems.forEach { screen ->- val isSelected = when (currentKey) {- is Screen.Satellites -> screen is Screen.Satellites- is Screen.Passes -> screen is Screen.Passes- is Screen.Status -> screen is Screen.Status- is Screen.Map -> screen is Screen.Map- is Screen.Settings -> screen is Screen.Settings- else -> false+ Column {+ NavDisplay(+ backStack = backStack,+ modifier = Modifier.weight(1f),+ onBack = navigateBack,+ transitionSpec = { fadeTransition },+ popTransitionSpec = { fadeTransition },+ predictivePopTransitionSpec = { fadeTransition },+ entryDecorators = listOf(+ rememberSaveableStateHolderNavEntryDecorator(),+ rememberViewModelStoreNavEntryDecorator()+ ),+ entryProvider = entryProvider {+ entry<Screen.Satellites> {+ SatellitesDestination(navigateUp = navigateBack)}- item(- icon = {- Icon(- painter = painterResource(screen.iconResId),- contentDescription = stringResource(screen.titleResId)- )- },- label = { Text(stringResource(screen.titleResId)) },- selected = isSelected,- onClick = {- if (isSelected) return@item- while (backStack.size > 1) backStack.removeAt(backStack.size - 1)- if (screen !is Screen.Passes) backStack.add(screen)+ entry<Screen.Passes> {+ PassesDestination { catNum, aosTime ->+ container.satelliteRepo.selectPass(catNum, aosTime)+ navigateToRadar()}- )+ }+ entry<Screen.Status> { SatStatusDestination() }+ entry<Screen.Map> { MapDestination() }+ entry<Screen.Settings> { SettingsDestination() }}- },- navigationSuiteColors = NavigationSuiteDefaults.colors(- navigationRailContainerColor = MaterialTheme.colorScheme.surfaceContainer- ),- layoutType = when {- !hasEnoughHeight() && hasEnoughWidth() -> NavigationSuiteType.NavigationRail- !hasEnoughWidth() -> NavigationSuiteType.ShortNavigationBarCompact- else -> NavigationSuiteType.ShortNavigationBarMedium- }- ) {- Column {- NavDisplay(- backStack = backStack,- modifier = Modifier.weight(1f),- onBack = navigateBack,- transitionSpec = { fadeTransition },- popTransitionSpec = { fadeTransition },- predictivePopTransitionSpec = { fadeTransition },- entryDecorators = listOf(- rememberSaveableStateHolderNavEntryDecorator(),- rememberViewModelStoreNavEntryDecorator()- ),- entryProvider = entryProvider {- entry<Screen.Satellites> {- SatellitesDestination(navigateUp = navigateBack)- }- entry<Screen.Passes> {- PassesDestination { catNum, aosTime ->- container.satelliteRepo.selectPass(catNum, aosTime)- navigateToRadar()- }+ )+ if (trackingState.isActive) {+ TrackingBanner(+ state = trackingState,+ onClick = {+ val pass = trackingState.currentPass+ if (pass != null) {+ container.satelliteRepo.selectPass(pass.catNum, pass.aosTime)+ navigateToRadar()}- entry<Screen.Status> { SatStatusDestination() }- entry<Screen.Map> { MapDestination() }- entry<Screen.Settings> { SettingsDestination() }})- if (trackingState.isActive) {- TrackingBanner(- state = trackingState,- onClick = {- val pass = trackingState.currentPass- if (pass != null) {- container.satelliteRepo.selectPass(pass.catNum, pass.aosTime)- navigateToRadar()- }- }- )- }}}}