fenix/Simple-Clock
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Clock.git synced 2025-06-05 22:19:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

properly handle stopwatch lap sorting at device rotation too

Browse Source
This commit is contained in:
tibbi
2018-04-11 15:05:56 +02:00
parent 33940b6879
commit bbc3704dd7
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/kotlin/com/simplemobiletools/clock/fragments/StopwatchFragment.kt
View File

@ -33,6 +33,7 @@ class StopwatchFragment : Fragment() {
private val LAP_TICKS = "lap_ticks" private val LAP_TICKS = "lap_ticks"
private val CURRENT_LAP = "current_lap" private val CURRENT_LAP = "current_lap"
private val LAPS = "laps" private val LAPS = "laps"
private val SORTING = "sorting"
private val updateHandler = Handler() private val updateHandler = Handler()
private var uptimeAtStart = 0L private var uptimeAtStart = 0L
@ -150,6 +151,7 @@ class StopwatchFragment : Fragment() {
putInt(CURRENT_TICKS, currentTicks) putInt(CURRENT_TICKS, currentTicks)
putInt(LAP_TICKS, lapTicks) putInt(LAP_TICKS, lapTicks)
putInt(CURRENT_LAP, currentLap) putInt(CURRENT_LAP, currentLap)
putInt(SORTING, sorting)
putString(LAPS, Gson().toJson(laps)) putString(LAPS, Gson().toJson(laps))
super.onSaveInstanceState(this) super.onSaveInstanceState(this)
} }
@ -163,10 +165,15 @@ class StopwatchFragment : Fragment() {
currentTicks = getInt(CURRENT_TICKS, 0) currentTicks = getInt(CURRENT_TICKS, 0)
lapTicks = getInt(LAP_TICKS, 0) lapTicks = getInt(LAP_TICKS, 0)
currentLap = getInt(CURRENT_LAP, 0) currentLap = getInt(CURRENT_LAP, 0)
sorting = getInt(SORTING, SORT_BY_LAP or SORT_DESCENDING)
val lapsToken = object : TypeToken<List<Lap>>() {}.type val lapsToken = object : TypeToken<List<Lap>>() {}.type
laps = Gson().fromJson<ArrayList<Lap>>(getString(LAPS), lapsToken) laps = Gson().fromJson<ArrayList<Lap>>(getString(LAPS), lapsToken)
updateLaps()
if (laps.isNotEmpty()) {
view.stopwatch_sorting_indicators_holder.beVisibleIf(laps.isNotEmpty())
updateSorting()
}
if (isRunning) { if (isRunning) {
uptimeAtStart = SystemClock.uptimeMillis() - currentTicks * UPDATE_INTERVAL uptimeAtStart = SystemClock.uptimeMillis() - currentTicks * UPDATE_INTERVAL
@ -250,7 +257,10 @@ class StopwatchFragment : Fragment() {
} else { } else {
clickedValue or SORT_DESCENDING clickedValue or SORT_DESCENDING
} }
updateSorting()
}
private fun updateSorting() {
updateSortingIndicators() updateSortingIndicators()
Lap.sorting = sorting Lap.sorting = sorting
updateLaps() updateLaps()