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

properly restore laps at device rotation

Browse Source
This commit is contained in:
tibbi 2018-04-11 14:50:46 +02:00
parent a7a148e57c
commit 33940b6879
1 changed files with 12 additions and 0 deletions
Show Stats 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

@ -10,6 +10,8 @@ import android.support.v4.app.Fragment
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
import com.simplemobiletools.clock.R import com.simplemobiletools.clock.R
import com.simplemobiletools.clock.activities.SimpleActivity import com.simplemobiletools.clock.activities.SimpleActivity
import com.simplemobiletools.clock.adapters.StopwatchAdapter import com.simplemobiletools.clock.adapters.StopwatchAdapter
@ -29,6 +31,8 @@ class StopwatchFragment : Fragment() {
private val TOTAL_TICKS = "total_ticks" private val TOTAL_TICKS = "total_ticks"
private val CURRENT_TICKS = "current_ticks" private val CURRENT_TICKS = "current_ticks"
private val LAP_TICKS = "lap_ticks" private val LAP_TICKS = "lap_ticks"
private val CURRENT_LAP = "current_lap"
private val LAPS = "laps"
private val updateHandler = Handler() private val updateHandler = Handler()
private var uptimeAtStart = 0L private var uptimeAtStart = 0L
@ -145,6 +149,8 @@ class StopwatchFragment : Fragment() {
putInt(TOTAL_TICKS, totalTicks) putInt(TOTAL_TICKS, totalTicks)
putInt(CURRENT_TICKS, currentTicks) putInt(CURRENT_TICKS, currentTicks)
putInt(LAP_TICKS, lapTicks) putInt(LAP_TICKS, lapTicks)
putInt(CURRENT_LAP, currentLap)
putString(LAPS, Gson().toJson(laps))
super.onSaveInstanceState(this) super.onSaveInstanceState(this)
} }
} }
@ -156,6 +162,12 @@ class StopwatchFragment : Fragment() {
totalTicks = getInt(TOTAL_TICKS, 0) totalTicks = getInt(TOTAL_TICKS, 0)
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)
val lapsToken = object : TypeToken<List<Lap>>() {}.type
laps = Gson().fromJson<ArrayList<Lap>>(getString(LAPS), lapsToken)
updateLaps()
if (isRunning) { if (isRunning) {
uptimeAtStart = SystemClock.uptimeMillis() - currentTicks * UPDATE_INTERVAL uptimeAtStart = SystemClock.uptimeMillis() - currentTicks * UPDATE_INTERVAL
updateStopwatchState(false) updateStopwatchState(false)