mirror of
https://github.com/rt-bishop/Look4Sat.git
synced 2026-10-02 03:15:37 +00:00
v4.0.2 - Custom data import by londre7, minor UI tweaks
This commit is contained in:
1 parent
13a79af27e
commit
ed71c8148b
8 files changed
+24
-27
No files matched your search
@@ -13,8 +13,8 @@ android {
|
||||
defaultConfig {
|
||||
applicationId = "com.rtbishop.look4sat"
|
||||
minSdk = 24
|
||||
versionCode = 401
|
||||
versionName = "4.0.1"
|
||||
versionCode = 402
|
||||
versionName = "4.0.2"
|
||||
}
|
||||
buildFeatures {
|
||||
compose = true
|
||||
|
||||
@@ -17,6 +17,9 @@
|
||||
*/
|
||||
package com.rtbishop.look4sat.presentation
|
||||
|
||||
import androidx.compose.animation.core.tween
|
||||
import androidx.compose.animation.fadeIn
|
||||
import androidx.compose.animation.fadeOut
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
@@ -76,7 +79,12 @@ fun MainScreen(navController: NavHostController = rememberNavController()) {
|
||||
else -> NavigationSuiteType.ShortNavigationBarMedium
|
||||
}
|
||||
) {
|
||||
NavHost(navController = navController, startDestination = startDestination) {
|
||||
NavHost(
|
||||
navController = navController,
|
||||
startDestination = startDestination,
|
||||
enterTransition = { fadeIn(animationSpec = tween(350)) },
|
||||
exitTransition = { fadeOut(animationSpec = tween(350)) }
|
||||
) {
|
||||
satellitesDestination { navController.navigateUp() }
|
||||
passesDestination { catNum: Int, aosTime: Long ->
|
||||
val radarRoute = "${Screen.Radar.route}?catNum=${catNum}&aosTime=${aosTime}"
|
||||
|
||||
@@ -163,6 +163,9 @@ private fun SettingsScreen(uiState: SettingsState) {
|
||||
uiState.sendDataSourcesAction(DataSourcesAction.SetUseCustomTransceivers(useCustomTransceivers))
|
||||
uiState.sendDataSourcesAction(DataSourcesAction.SetTransceiversUrl(transceiversUrl))
|
||||
}
|
||||
if (useCustomTle || useCustomTransceivers) {
|
||||
uiState.sendAction(SettingsAction.UpdateFromWeb)
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
@@ -124,9 +124,7 @@ class SettingsViewModel(
|
||||
}
|
||||
viewModelScope.launch {
|
||||
settingsRepo.dataSourcesSettings.collect { settings ->
|
||||
_uiState.update {
|
||||
it.copy(dataSourcesSettings = settings)
|
||||
}
|
||||
_uiState.update { it.copy(dataSourcesSettings = settings) }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user