mckero/Look4Sat-BA7OPF
1
0 Fork 0
mirror of https://github.com/atsunatsu/Look4Sat.git synced 2026-10-03 11:17:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dependencies update, code cleanup

Browse Source
This commit is contained in:
Arty Bishop committed 2022-01-26 19:15:44 +00:00
1 parent 608b7e9311
commit 794d132086
10 files changed
+28 -27
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesFragment.kt
+3 -2
View File
@@ -62,9 +62,9 @@ class EntriesFragment : Fragment(R.layout.fragment_entries) {
entriesMode.setOnClickListener { showModesDialog() }
entriesSelectAll.setOnClickListener { viewModel.selectCurrentItems() }
}
viewModel.satData.observe(viewLifecycleOwner, { satData ->
viewModel.satData.observe(viewLifecycleOwner) { satData ->
handleSatData(satData, binding, adapter)
})
}
}
private fun handleSatData(
@@ -88,6 +88,7 @@ class EntriesFragment : Fragment(R.layout.fragment_entries) {
val message = getString(R.string.entries_update_error)
Snackbar.make(requireView(), message, Snackbar.LENGTH_SHORT).show()
}
DataState.Handled -> {}
}
}
app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapFragment.kt
+9 -7
View File
@@ -38,9 +38,11 @@ import org.osmdroid.tileprovider.tilesource.TileSourceFactory
import org.osmdroid.util.GeoPoint
import org.osmdroid.views.CustomZoomButtonsController
import org.osmdroid.views.MapView
import org.osmdroid.views.overlay.*
import org.osmdroid.views.overlay.FolderOverlay
import org.osmdroid.views.overlay.Marker
import org.osmdroid.views.overlay.Polygon
import org.osmdroid.views.overlay.Polyline
import timber.log.Timber
import java.util.*
import javax.inject.Inject
@AndroidEntryPoint
@@ -91,11 +93,11 @@ 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) })
viewModel.satFootprint.observe(viewLifecycleOwner, { renderSatFootprint(it, binding) })
viewModel.mapData.observe(viewLifecycleOwner, { renderSatData(it, binding) })
viewModel.stationPosLiveData.observe(viewLifecycleOwner) { renderStationPos(it, binding) }
viewModel.satPositions.observe(viewLifecycleOwner) { renderSatPositions(it, binding) }
viewModel.satTrack.observe(viewLifecycleOwner) { renderSatTrack(it, binding) }
viewModel.satFootprint.observe(viewLifecycleOwner) { renderSatFootprint(it, binding) }
viewModel.mapData.observe(viewLifecycleOwner) { renderSatData(it, binding) }
}
private fun renderStationPos(stationPos: GeoPos, binding: FragmentMapBinding) {
app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesFragment.kt
+2 -3
View File
@@ -35,7 +35,6 @@ import com.rtbishop.look4sat.presentation.getNavResult
import com.rtbishop.look4sat.presentation.navigateSafe
import com.rtbishop.look4sat.presentation.toTimerString
import dagger.hilt.android.AndroidEntryPoint
import java.util.*
@AndroidEntryPoint
class PassesFragment : Fragment(R.layout.fragment_passes), PassesAdapter.PassesClickListener {
@@ -75,9 +74,9 @@ class PassesFragment : Fragment(R.layout.fragment_passes), PassesAdapter.PassesC
passesSettings.setOnClickListener { findNavController().navigate(R.id.nav_settings) }
passesFab.setOnClickListener { findNavController().navigate(R.id.nav_satellites) }
}
passesViewModel.passes.observe(viewLifecycleOwner, { passesResult ->
passesViewModel.passes.observe(viewLifecycleOwner) { passesResult ->
handleNewPasses(passesResult, adapter, binding)
})
}
getNavResult<Pair<Int, Double>>(R.id.nav_passes, "prefs") { prefs ->
passesViewModel.forceCalculation(prefs.first, prefs.second)
}
app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.kt
+6 -6
View File
@@ -78,12 +78,12 @@ class RadarFragment : Fragment(R.layout.fragment_radar) {
setScanning(preferences.getShowSweep())
}
binding.radarCard.addView(radarView)
viewModel.radarData.observe(viewLifecycleOwner, { passData ->
viewModel.radarData.observe(viewLifecycleOwner) { passData ->
radarView?.setPosition(passData.satPos)
radarView?.setPositions(passData.satTrack)
setPassText(pass, passData.satPos, binding)
})
viewModel.transmitters.observe(viewLifecycleOwner, { list ->
}
viewModel.transmitters.observe(viewLifecycleOwner) { list ->
if (list.isNotEmpty()) {
transmittersAdapter.submitList(list)
binding.radarRecyclerMsg.text = getString(R.string.trans_data)
@@ -91,14 +91,14 @@ class RadarFragment : Fragment(R.layout.fragment_radar) {
binding.radarRecyclerMsg.text = getString(R.string.trans_no_data)
}
radarView?.invalidate()
})
viewModel.orientation.observe(viewLifecycleOwner, { orientation ->
}
viewModel.orientation.observe(viewLifecycleOwner) { orientation ->
radarView?.setOrientation(
orientation.first,
orientation.second,
orientation.third
)
})
}
binding.radarMap.setOnClickListener {
val bundle = bundleOf("catNum" to pass.catNum)
findNavController().navigateSafe(R.id.action_radar_to_map, bundle)