stawros/Garmin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: DataCache & State domain fixes

Browse source
This commit is contained in:
Piotr Dec 2024-07-30 19:50:24 +02:00
parent af2b3cce5c
commit 6f3643a2b4
Signed by: stawros
GPG key ID: F89F27AD8F881A91
2 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/src/main/java/eu/ztsh/garmin/data/DataCache.kt
View file

@ -38,24 +38,7 @@ class DataCache {
// Merge states
fun update(state: State) {
if (state.lineArrows != null) {
stateCache.lineArrows = state.lineArrows
}
if (state.lineOutlines != null) {
state.lineOutlines = state.lineOutlines
}
if (state.direction != null) {
stateCache.direction = state.direction
}
if (state.distance != null) {
stateCache.distance = state.distance
}
if (state.speed != null) {
stateCache.speed = state.speed
}
if (state.arrival != null) {
stateCache.arrival = state.arrival
}
stateCache.merge(state)
}
// maneuver

21
app/src/main/java/eu/ztsh/garmin/data/Model.kt
View file

@ -112,6 +112,27 @@ class State {
var flag: Boolean? = null
var control: Boolean? = null
fun merge(other: State) {
if (other.lineArrows != null) {
this.lineArrows = other.lineArrows
}
if (other.lineOutlines != null) {
this.lineOutlines = other.lineOutlines
}
if (other.direction != null) {
this.direction = other.direction
}
if (other.distance != null) {
this.distance = other.distance
}
if (other.speed != null) {
this.speed = other.speed
}
if (other.arrival != null) {
this.arrival = other.arrival
}
}
}
class Direction {