Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Now using the user defined updateFreq preference for views invalidation
Arty Bishopbeda26ac9982
diff --git a/app/src/main/java/com/rtbishop/lookingsat/MainViewModel.kt b/app/src/main/java/com/rtbishop/lookingsat/MainViewModel.ktindex a8bca96f..3628292b 100644--- a/app/src/main/java/com/rtbishop/lookingsat/MainViewModel.kt+++ b/app/src/main/java/com/rtbishop/lookingsat/MainViewModel.kt@@ -32,11 +32,13 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {private val defValueLoc = application.getString(R.string.def_gsp_loc)private val defValueHours = application.getString(R.string.def_hours_ahead)private val defValueMinEl = application.getString(R.string.def_min_el)+ private val defValueUpdateFreq = application.getString(R.string.def_update_freq)private val keyLat = application.getString(R.string.key_lat)private val keyLon = application.getString(R.string.key_lon)private val keyAlt = application.getString(R.string.key_alt)private val keyHours = application.getString(R.string.key_hours_ahead)private val keyMinEl = application.getString(R.string.key_min_el)+ private val keyUpdateFreq = application.getString(R.string.key_update_freq)private val tleMainListFileName = application.getString(R.string.tle_main_list_file_name)private val tleSelectionFileName = application.getString(R.string.tle_selection_file_name)private val app = application@@ -67,6 +69,8 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {var satPassList = emptyList<SatPass>()var tleMainList = loadTwoLineElementFile()var selectionList = loadSelectionList()+ val updateFreq+ get() = preferences.getString(keyUpdateFreq, defValueUpdateFreq)!!.toLong()fun updateGsp() {val lat = preferences.getString(keyLat, defValueLoc)!!.toDouble()diff --git a/app/src/main/java/com/rtbishop/lookingsat/ui/RadarFragment.kt b/app/src/main/java/com/rtbishop/lookingsat/ui/RadarFragment.ktindex 633682ab..e43fe56d 100644--- a/app/src/main/java/com/rtbishop/lookingsat/ui/RadarFragment.kt+++ b/app/src/main/java/com/rtbishop/lookingsat/ui/RadarFragment.kt@@ -26,7 +26,6 @@ import kotlin.math.sinclass RadarFragment : Fragment() {- private val delay = 2000Lprivate val service = Executors.newSingleThreadScheduledExecutor()private lateinit var viewModel: MainViewModel@@ -57,6 +56,7 @@ class RadarFragment : Fragment() {override fun onViewCreated(view: View, savedInstanceState: Bundle?) {super.onViewCreated(view, savedInstanceState)+ val delay = viewModel.updateFreqsatPass = arguments?.get("satPass") as SatPassmainActivity = activity as MainActivitymainActivity.supportActionBar?.title = satPass.tle.name@@ -69,7 +69,7 @@ class RadarFragment : Fragment() {radarAltitude = view.findViewById(R.id.radar_altitude)transNoFound = view.findViewById(R.id.radar_no_trans)- radarView = RadarView(mainActivity)+ radarView = RadarView(mainActivity, delay)radarSkyFrame.addView(radarView)service.scheduleAtFixedRate({ radarView.invalidate() }, 0, delay, TimeUnit.MILLISECONDS)@@ -94,7 +94,7 @@ class RadarFragment : Fragment() {}}- inner class RadarView(context: Context) : View(context) {+ inner class RadarView(context: Context, updateFreq: Long) : View(context) {private val radarSize = resources.displayMetrics.widthPixelsprivate val scale = resources.displayMetrics.density@@ -104,6 +104,7 @@ class RadarFragment : Fragment() {private val piDiv2 = Math.PI / 2.0private val txtSize = scale * 15private val center = 0f+ private val delay = updateFreqprivate val bmp: Bitmap = Bitmap.createBitmap(radarSize, radarSize, Bitmap.Config.ARGB_8888)private val mtrx: Matrix = Matrix().apply {diff --git a/app/src/main/java/com/rtbishop/lookingsat/ui/WorldMapFragment.kt b/app/src/main/java/com/rtbishop/lookingsat/ui/WorldMapFragment.ktindex 35e75c3f..5538bac3 100644--- a/app/src/main/java/com/rtbishop/lookingsat/ui/WorldMapFragment.kt+++ b/app/src/main/java/com/rtbishop/lookingsat/ui/WorldMapFragment.kt@@ -26,7 +26,6 @@ import kotlin.math.roundToIntclass WorldMapFragment : Fragment() {- private val delay = 3000Lprivate val service = Executors.newSingleThreadScheduledExecutor()private lateinit var viewModel: MainViewModel@@ -55,6 +54,7 @@ class WorldMapFragment : Fragment() {// fab = view.findViewById(R.id.worldmap_fab)// fab.setOnClickListener { showSelectSatDialog() }+ val delay = viewModel.updateFreqval tleString = arrayOf("METEOR-M2 2","1 44387U 19038A 19336.45319619 -.00000025 00000-0 80323-5 0 9996",@@ -71,8 +71,7 @@ class WorldMapFragment : Fragment() {trackView = TrackView(activity as MainActivity)mapFrame.addView(trackView)-- service.scheduleAtFixedRate({ trackView.invalidate() }, delay, delay, TimeUnit.MILLISECONDS)+ service.scheduleAtFixedRate({ trackView.invalidate() }, 0, delay, TimeUnit.MILLISECONDS)}// private fun showSelectSatDialog() {