Skip to content

Satellite tracker and pass predictor for Android, inspired by Gpredict

Now triggering passes calculation on PassesFragment start

Arty Bishop0ba26d4d75bb
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt
index 857b18bb..d0d9e2f4 100644
--- a/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt
@@ -46,6 +46,7 @@ class SharedViewModel @Inject constructor(
private val _passes = MutableLiveData<Result<MutableList<SatPass>>>()
private var selectedEntries = emptyList<SatEntry>()
+ private var shouldTriggerCalculation = true
init {
if (prefsManager.isFirstLaunch()) {
@@ -53,15 +54,22 @@ class SharedViewModel @Inject constructor(
}
}
- fun setSelectedEntries(entries: List<SatEntry>) {
- selectedEntries = entries.filter { it.isSelected }
- }
-
fun getSources() = repository.getSources()
fun getEntries() = repository.getEntries()
fun getPasses(): LiveData<Result<MutableList<SatPass>>> = _passes
fun getTransmittersForSat(satId: Int) = repository.getTransmittersForSat(satId)
+ fun triggerCalculation() {
+ if (shouldTriggerCalculation) {
+ shouldTriggerCalculation = false
+ calculatePasses()
+ }
+ }
+
+ fun setSelectedEntries(entries: List<SatEntry>) {
+ selectedEntries = entries.filter { it.isSelected }
+ }
+
fun updateEntriesFromFile(uri: Uri) {
viewModelScope.launch {
repository.updateEntriesFromFile(uri)
@@ -85,6 +93,7 @@ class SharedViewModel @Inject constructor(
}
fun calculatePasses(dateNow: Date = Date(System.currentTimeMillis())) {
+ shouldTriggerCalculation = false
_passes.value = Result.InProgress
viewModelScope.launch(Dispatchers.Default) {
val passes = mutableListOf<SatPass>()
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PassesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PassesFragment.kt
index 03fe8661..8cc10dc2 100644
--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PassesFragment.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PassesFragment.kt
@@ -106,6 +106,7 @@ class PassesFragment : Fragment(R.layout.fragment_passes) {
}
passesAdapter.setShouldUseUTC(prefsManager.shouldUseUTC())
setTimerForPasses(passes)
+ viewModel.triggerCalculation()
}
private fun showSatPassPrefsDialog(hoursAhead: Int, minEl: Double) {