Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Fixed AOS timer reset issue. Fixed my brain logic as well.
Arty Bishopcd83cb610988
diff --git a/app/src/main/java/com/rtbishop/lookingsat/ui/SkyFragment.kt b/app/src/main/java/com/rtbishop/lookingsat/ui/SkyFragment.ktindex 632793e9..824ff836 100644--- a/app/src/main/java/com/rtbishop/lookingsat/ui/SkyFragment.kt+++ b/app/src/main/java/com/rtbishop/lookingsat/ui/SkyFragment.kt@@ -37,7 +37,8 @@ class SkyFragment : Fragment() {private lateinit var tleMainList: List<TLE>private lateinit var selectedSatMap: MutableMap<TLE, Boolean>private lateinit var satPassPrefs: SatPassPrefs- private var aosTimer: CountDownTimer? = null+ private lateinit var aosTimer: CountDownTimer+ private var isTimerSet: Boolean = falseoverride fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?@@ -167,42 +168,37 @@ class SkyFragment : Fragment() {progressBar.isIndeterminate = falseprogressBar.visibility = View.INVISIBLErecViewFuture.visibility = View.VISIBLE- if (satPassList.isEmpty()) {- resetTimer()- } else {- setTimer(satPassList[0].pass.startTime.time)- }+ if (satPassList.isNotEmpty()) setTimer(satPassList.first().pass.startTime.time)+ else resetTimer()}}private fun setTimer(passTime: Long) {- if (aosTimer == null) {- val totalMillis = passTime.minus(System.currentTimeMillis())- aosTimer = object : CountDownTimer(totalMillis, 1000) {- override fun onFinish() {- Toast.makeText(activity, "Time is up!", Toast.LENGTH_SHORT).show()- this.cancel()- }+ if (isTimerSet) resetTimer()+ val totalMillis = passTime.minus(System.currentTimeMillis())+ aosTimer = object : CountDownTimer(totalMillis, 1000) {+ override fun onFinish() {+ Toast.makeText(activity, "Time is up!", Toast.LENGTH_SHORT).show()+ this.cancel()+ }- override fun onTick(millisUntilFinished: Long) {- timeToAos.text = String.format(- getString(R.string.pattern_aos),- TimeUnit.MILLISECONDS.toHours(millisUntilFinished) % 60,- TimeUnit.MILLISECONDS.toMinutes(millisUntilFinished) % 60,- TimeUnit.MILLISECONDS.toSeconds(millisUntilFinished) % 60- )- }+ override fun onTick(millisUntilFinished: Long) {+ timeToAos.text = String.format(+ getString(R.string.pattern_aos),+ TimeUnit.MILLISECONDS.toHours(millisUntilFinished) % 60,+ TimeUnit.MILLISECONDS.toMinutes(millisUntilFinished) % 60,+ TimeUnit.MILLISECONDS.toSeconds(millisUntilFinished) % 60+ )}- (aosTimer as CountDownTimer).start()- } else {- resetTimer()}+ aosTimer.start()+ isTimerSet = true}private fun resetTimer() {- if (aosTimer != null) {- (aosTimer as CountDownTimer).cancel()- aosTimer = null+ if (isTimerSet) {+ aosTimer.cancel()+ isTimerSet = false}timeToAos.text = String.format(getString(R.string.pattern_aos), 0, 0, 0)}