Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Created separate ViewModel for EntriesFragment.kt
Arty Bishopf370aef0a769
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.ktindex 50423beb..4fe76583 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt@@ -17,13 +17,10 @@*/package com.rtbishop.look4sat.ui-import android.net.Uriimport androidx.lifecycle.*import com.github.amsacode.predict4java.Satelliteimport com.rtbishop.look4sat.data.model.Result-import com.rtbishop.look4sat.data.model.SatItemimport com.rtbishop.look4sat.data.model.SatPass-import com.rtbishop.look4sat.data.model.TleSourceimport com.rtbishop.look4sat.data.repository.PrefsRepoimport com.rtbishop.look4sat.data.repository.SatelliteRepoimport com.rtbishop.look4sat.utility.getPredictor@@ -31,12 +28,10 @@ import dagger.hilt.android.lifecycle.HiltViewModelimport kotlinx.coroutines.Dispatchersimport kotlinx.coroutines.FlowPreviewimport kotlinx.coroutines.delay-import kotlinx.coroutines.flow.*+import kotlinx.coroutines.flow.MutableStateFlowimport kotlinx.coroutines.launch-import timber.log.Timberimport java.util.*import javax.inject.Inject-import kotlin.system.measureTimeMillis@FlowPreview@HiltViewModel@@ -45,47 +40,16 @@ class SharedViewModel @Inject constructor(private val satelliteRepo: SatelliteRepo,) : ViewModel() {- private val satDataState = MutableSharedFlow<Result<List<SatItem>>>(replay = 0)- private val satDataFlow = satelliteRepo.satDataFlow.map { Result.Success(it) }- val satData = flowOf(satDataState, satDataFlow).flattenMerge().asLiveData()-private val _passes = MutableStateFlow<Result<MutableList<SatPass>>>(Result.InProgress)val passes: LiveData<Result<MutableList<SatPass>>> = _passes.asLiveData()init {if (prefsRepo.isFirstLaunch()) {- updateSatDataFromSources()prefsRepo.setFirstLaunchDone()}calculatePasses()}- fun updateSatDataFromFile(uri: Uri) {- viewModelScope.launch {- satDataState.emit(Result.InProgress)- try {- satelliteRepo.updateSatDataFromFile(uri)- } catch (exception: Exception) {- satDataState.emit(Result.Error(exception))- }- }- }-- fun updateSatDataFromSources(sources: List<TleSource> = prefsRepo.loadTleSources()) {- viewModelScope.launch {- satDataState.emit(Result.InProgress)- val updateMillis = measureTimeMillis {- try {- satelliteRepo.updateSatDataFromWeb(sources)- prefsRepo.saveTleSources(sources)- } catch (exception: Exception) {- satDataState.emit(Result.Error(exception))- }- }- Timber.d("Update from WEB took $updateMillis ms")- }- }-fun getAppTimer() = liveData {while (true) {emit(System.currentTimeMillis())@@ -93,7 +57,6 @@ class SharedViewModel @Inject constructor(}}- fun getSources() = prefsRepo.loadTleSources()fun getTransmittersForSat(satId: Int) = satelliteRepo.getTransmittersForSat(satId).asLiveData()fun calculatePasses(dateNow: Date = Date(System.currentTimeMillis())) {@@ -108,15 +71,6 @@ class SharedViewModel @Inject constructor(}}- fun updateItemsSelection(items: List<SatItem>) {- _passes.value = Result.InProgress- viewModelScope.launch {- val selectedEntries = items.filter { it.isSelected }.map { it.catNum }- satelliteRepo.updateEntriesSelection(selectedEntries)- calculatePasses()- }- }-private fun getPasses(satellite: Satellite, dateNow: Date): MutableList<SatPass> {val predictor = satellite.getPredictor(prefsRepo.getStationPosition())val passes = predictor.getPasses(dateNow, prefsRepo.getHoursAhead(), true)diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesFragment.ktindex 4b516582..16c5b436 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesFragment.kt@@ -21,7 +21,7 @@ import android.os.Bundleimport android.view.Viewimport androidx.activity.result.contract.ActivityResultContractsimport androidx.fragment.app.Fragment-import androidx.fragment.app.activityViewModels+import androidx.fragment.app.viewModelsimport androidx.navigation.findNavControllerimport androidx.navigation.fragment.findNavControllerimport androidx.recyclerview.widget.LinearLayoutManager@@ -30,7 +30,6 @@ import com.rtbishop.look4sat.Rimport com.rtbishop.look4sat.data.model.Resultimport com.rtbishop.look4sat.data.model.TleSourceimport com.rtbishop.look4sat.databinding.FragmentEntriesBinding-import com.rtbishop.look4sat.ui.SharedViewModelimport com.rtbishop.look4sat.utility.RecyclerDividerimport com.rtbishop.look4sat.utility.getNavResultimport com.rtbishop.look4sat.utility.navigateSafe@@ -42,7 +41,7 @@ import kotlinx.coroutines.FlowPreview@AndroidEntryPointclass EntriesFragment : Fragment(R.layout.fragment_entries) {- private val viewModel: SharedViewModel by activityViewModels()+ private val viewModel: EntriesViewModel by viewModels()private val filePicker =registerForActivityResult(ActivityResultContracts.GetContent()) { uri ->uri?.let { viewModel.updateSatDataFromFile(uri) }diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesViewModel.ktnew file mode 100644index 00000000..97ce79f9--- /dev/null+++ b/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesViewModel.kt@@ -0,0 +1,83 @@+/*+ * Look4Sat. Amateur radio satellite tracker and pass predictor.+ * Copyright (C) 2019-2021 Arty Bishop ([email protected])+ *+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU General Public License as published by+ * the Free Software Foundation, either version 3 of the License, or+ * (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU General Public License for more details.+ *+ * You should have received a copy of the GNU General Public License+ * along with this program. If not, see <https://www.gnu.org/licenses/>.+ */+package com.rtbishop.look4sat.ui.entriesScreen++import android.net.Uri+import androidx.lifecycle.ViewModel+import androidx.lifecycle.asLiveData+import androidx.lifecycle.viewModelScope+import com.rtbishop.look4sat.data.model.Result+import com.rtbishop.look4sat.data.model.SatItem+import com.rtbishop.look4sat.data.model.TleSource+import com.rtbishop.look4sat.data.repository.PrefsRepo+import com.rtbishop.look4sat.data.repository.SatelliteRepo+import dagger.hilt.android.lifecycle.HiltViewModel+import kotlinx.coroutines.FlowPreview+import kotlinx.coroutines.flow.MutableSharedFlow+import kotlinx.coroutines.flow.flattenMerge+import kotlinx.coroutines.flow.flowOf+import kotlinx.coroutines.flow.map+import kotlinx.coroutines.launch+import timber.log.Timber+import javax.inject.Inject+import kotlin.system.measureTimeMillis++@FlowPreview+@HiltViewModel+class EntriesViewModel @Inject constructor(+ private val prefsRepo: PrefsRepo,+ private val satelliteRepo: SatelliteRepo+) : ViewModel() {++ private val satDataState = MutableSharedFlow<Result<List<SatItem>>>(replay = 0)+ private val satDataFlow = satelliteRepo.satDataFlow.map { Result.Success(it) }+ val satData = flowOf(satDataState, satDataFlow).flattenMerge().asLiveData()++ fun updateSatDataFromFile(uri: Uri) {+ viewModelScope.launch {+ satDataState.emit(Result.InProgress)+ try {+ satelliteRepo.updateSatDataFromFile(uri)+ } catch (exception: Exception) {+ satDataState.emit(Result.Error(exception))+ }+ }+ }++ fun updateSatDataFromSources(sources: List<TleSource> = prefsRepo.loadTleSources()) {+ viewModelScope.launch {+ satDataState.emit(Result.InProgress)+ val updateMillis = measureTimeMillis {+ try {+ satelliteRepo.updateSatDataFromWeb(sources)+ prefsRepo.saveTleSources(sources)+ } catch (exception: Exception) {+ satDataState.emit(Result.Error(exception))+ }+ }+ Timber.d("Update from WEB took $updateMillis ms")+ }+ }++ fun updateItemsSelection(items: List<SatItem>) {+ viewModelScope.launch {+ val selectedEntries = items.filter { it.isSelected }.map { it.catNum }+ satelliteRepo.updateEntriesSelection(selectedEntries)+ }+ }+}\ No newline at end of file