Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Added ability to toggle from pass view to map view #68
Arty Bishop8ef0d103e4aa
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapFragment.ktindex a79c0a96..5338254c 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapFragment.kt@@ -88,6 +88,7 @@ class MapFragment : Fragment(R.layout.fragment_map) {}private fun setupObservers(binding: FragmentMapBinding) {+ viewModel.selectDefaultSatellite(arguments?.getInt("catNum"))viewModel.stationPosLiveData.observe(viewLifecycleOwner, { renderStationPos(it, binding) })viewModel.satPositions.observe(viewLifecycleOwner, { renderSatPositions(it, binding) })viewModel.satTrack.observe(viewLifecycleOwner, { renderSatTrack(it, binding) })diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapViewModel.ktindex 6de82a3d..e7cea42b 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapViewModel.kt@@ -61,17 +61,6 @@ class MapViewModel @Inject constructor(private val _satPositions = MutableLiveData<Map<Satellite, GeoPos>>()val satPositions: LiveData<Map<Satellite, GeoPos>> = _satPositions- init {- viewModelScope.launch {- dataRepository.getSelectedSatellites().also { selectedSatellites ->- if (selectedSatellites.isNotEmpty()) {- allSatList = selectedSatellites- selectSatellite(selectedSatellites.first())- }- }- }- }-fun shouldUseTextLabels(): Boolean {return preferences.shouldUseTextLabels()}@@ -89,6 +78,21 @@ class MapViewModel @Inject constructor(}}+ fun selectDefaultSatellite(catnum: Int?) {+ viewModelScope.launch {+ dataRepository.getSelectedSatellites().also { satellites ->+ if (satellites.isNotEmpty()) {+ allSatList = satellites+ if (catnum == null) {+ selectSatellite(satellites.first())+ } else {+ satellites.find { it.params.catnum == catnum }?.let { selectSatellite(it) }+ }+ }+ }+ }+ }+fun selectSatellite(satellite: Satellite, updateFreq: Long = 2000) {selectedSat = satelliteviewModelScope.launch {diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.ktindex 51c6ab2c..757faaa5 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.kt@@ -19,6 +19,7 @@ package com.rtbishop.look4sat.presentation.radarScreenimport android.os.Bundleimport android.view.View+import androidx.core.os.bundleOfimport androidx.fragment.app.Fragmentimport androidx.fragment.app.viewModelsimport androidx.navigation.fragment.findNavController@@ -104,9 +105,13 @@ class RadarFragment : Fragment(R.layout.fragment_radar) {orientation.third)})+ binding.radarToMapButton.setOnClickListener {+ val bundle = bundleOf("catNum" to pass.catNum)+ findNavController().navigateSafe(R.id.action_radar_to_map, bundle)+ }}-// binding.addNotificationButton.setOnClickListener {+// binding.radarNotifyButton.setOnClickListener {// this.context?.let { context ->//// val choicesList = arrayOf(diff --git a/app/src/main/res/layout/fragment_radar.xml b/app/src/main/res/layout/fragment_radar.xmlindex 9365f6b2..83343eac 100644--- a/app/src/main/res/layout/fragment_radar.xml+++ b/app/src/main/res/layout/fragment_radar.xml@@ -77,7 +77,7 @@app:layout_constraintEnd_toEndOf="@+id/radar_frame" /><ImageButton- android:id="@+id/add_notification_button"+ android:id="@+id/radar_notify_button"android:layout_width="64dp"android:layout_height="48dp"android:layout_marginStart="4dp"@@ -86,10 +86,24 @@android:contentDescription="@string/placeholder"android:elevation="4dp"android:src="@drawable/ic_notification"+ android:visibility="invisible"app:layout_constraintBottom_toBottomOf="@+id/radar_bar"app:layout_constraintStart_toStartOf="@+id/radar_bar"app:layout_constraintTop_toTopOf="@+id/radar_bar"- app:tint="@color/greyLight"+ tools:ignore="DuplicateSpeakableTextCheck" />++ <ImageButton+ android:id="@+id/radar_to_map_button"+ android:layout_width="64dp"+ android:layout_height="48dp"+ android:layout_marginEnd="4dp"+ android:backgroundTint="@color/greyDark"+ android:contentDescription="@string/placeholder"+ android:elevation="4dp"+ android:src="@drawable/ic_nav_map"+ app:layout_constraintBottom_toBottomOf="@+id/radar_bar"+ app:layout_constraintEnd_toEndOf="@+id/radar_bar"+ app:layout_constraintTop_toTopOf="@+id/radar_bar"tools:ignore="DuplicateSpeakableTextCheck" /><androidx.recyclerview.widget.RecyclerViewdiff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xmlindex a9b16abb..31432bfd 100644--- a/app/src/main/res/navigation/nav_graph.xml+++ b/app/src/main/res/navigation/nav_graph.xml@@ -48,6 +48,13 @@app:popExitAnim="@anim/nav_default_pop_exit_anim"app:popUpTo="@id/nav_passes"app:popUpToInclusive="true" />+ <action+ android:id="@+id/action_radar_to_map"+ app:destination="@id/nav_map"+ app:enterAnim="@anim/nav_default_enter_anim"+ app:exitAnim="@anim/nav_default_exit_anim"+ app:popEnterAnim="@anim/nav_default_pop_enter_anim"+ app:popExitAnim="@anim/nav_default_pop_exit_anim" /></fragment><fragmentandroid:id="@+id/nav_map"