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

Fixed AOS timer reset issue. Fixed my brain logic as well.

Browse Source
This commit is contained in:
Arty Bishop committed 2019-11-25 09:35:45 +00:00
1 parent e44379f43e
commit cd83cb6109
1 file changed
+24 -28
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/rtbishop/lookingsat/ui/SkyFragment.kt
+24 -28
View File
@@ -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 = false
override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
@@ -167,42 +168,37 @@ class SkyFragment : Fragment() {
progressBar.isIndeterminate = false
progressBar.visibility = View.INVISIBLE
recViewFuture.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()
}
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
)
}
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
)
}
(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)
}