caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Wear CWF Simplify DynPref Usage

Browse source
This commit is contained in:
Philoul 2023-10-16 09:02:47 +02:00
parent ded1603b2a
commit f046fa94c6
1 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
wear/src/main/kotlin/app/aaps/wear/watchfaces/CustomWatchface.kt
View file

@ -156,15 +156,13 @@ class CustomWatchface : BaseWatchFace() {
if (!resDataMap.isEquals(it.customWatchfaceData.resDatas) || jsonString != it.customWatchfaceData.json) { if (!resDataMap.isEquals(it.customWatchfaceData.resDatas) || jsonString != it.customWatchfaceData.json) {
resDataMap = it.customWatchfaceData.resDatas resDataMap = it.customWatchfaceData.resDatas
jsonString = it.customWatchfaceData.json jsonString = it.customWatchfaceData.json
dynPref(json.optJSONObject((DYNPREF.key))) DynProvider.init(this, json)
FontMap.init(this) FontMap.init(this)
ViewMap.init(this) ViewMap.init(this)
TrendArrowMap.init(this) TrendArrowMap.init(this)
DynProvider.init(json.optJSONObject(DYNDATA.key))
} }
if (checkPref()) { if (checkPref()) {
dynPref(json.optJSONObject((DYNPREF.key))) DynProvider.init(this, json)
DynProvider.init(json.optJSONObject(DYNDATA.key))
} }
/* /*
valPref.forEach {s, value -> valPref.forEach {s, value ->
@ -502,7 +500,7 @@ class CustomWatchface : BaseWatchFace() {
left = (viewJson.optInt(LEFTMARGIN.key) * cwf.zoomFactor).toInt() left = (viewJson.optInt(LEFTMARGIN.key) * cwf.zoomFactor).toInt()
top = (viewJson.optInt(TOPMARGIN.key) * cwf.zoomFactor).toInt() top = (viewJson.optInt(TOPMARGIN.key) * cwf.zoomFactor).toInt()
val params = FrameLayout.LayoutParams(width, height) val params = FrameLayout.LayoutParams(width, height)
dynData = DynProvider.getDyn(cwf, viewJson.optString(DYNDATA.key), width, height, key) dynData = DynProvider.getDyn(cwf, viewJson.optString(DYNDATA.key), viewJson.optString(DYNPREF.key), width, height, key)
val topOffset = if (viewJson.optBoolean(TOPOFFSET.key, false)) dynData?.getTopOffset() ?: 0 else 0 val topOffset = if (viewJson.optBoolean(TOPOFFSET.key, false)) dynData?.getTopOffset() ?: 0 else 0
val topOffsetTwin = ((twinView?.let { if (it.visibility != View.VISIBLE) viewJson.optInt(TOPOFFSETTWINHIDDEN.key,0) else 0 } ?: 0 ) * cwf.zoomFactor).toInt() val topOffsetTwin = ((twinView?.let { if (it.visibility != View.VISIBLE) viewJson.optInt(TOPOFFSETTWINHIDDEN.key,0) else 0 } ?: 0 ) * cwf.zoomFactor).toInt()
params.topMargin = top + topOffset + topOffsetTwin params.topMargin = top + topOffset + topOffsetTwin
@ -820,20 +818,35 @@ class CustomWatchface : BaseWatchFace() {
} }
companion object { companion object {
val dynData = mutableMapOf<String, DynProvider>() val dynData = mutableMapOf<String, DynProvider>()
var dynJson: JSONObject? = null var dynJson: JSONObject? = null
fun init(dynJson: JSONObject?) { fun init(cwf: CustomWatchface, json: JSONObject?) {
this.dynJson = dynJson cwf.dynPref(json?.optJSONObject((DYNPREF.key)))
this.dynJson = json?.optJSONObject((DYNDATA.key))
dynData.clear() dynData.clear()
} }
fun getDyn(cwf: CustomWatchface, key: String, width: Int, height: Int, defaultViewKey: String): DynProvider? = dynData["${defaultViewKey}_$key"] fun getDyn(cwf: CustomWatchface, key: String, keyPref: String, width: Int, height: Int, defaultViewKey: String): DynProvider? {
?: dynJson?.optJSONObject(key)?.let { dynJson -> if (dynData[defaultViewKey] != null)
return dynData[defaultViewKey]
cwf.dynPref[keyPref]?.let { dynPref ->
ValueMap.fromKey(dynPref.optString(VALUEKEY.key, defaultViewKey)).let { valueMap ->
DynProvider(cwf, dynPref, valueMap, width, height).also { it.load() }
}
}?.also { dynData[defaultViewKey] = it }
if (dynData[defaultViewKey] != null)
return dynData[defaultViewKey]
dynJson?.optJSONObject(key)?.let { dynJson ->
ValueMap.fromKey(dynJson.optString(VALUEKEY.key, defaultViewKey)).let { valueMap -> ValueMap.fromKey(dynJson.optString(VALUEKEY.key, defaultViewKey)).let { valueMap ->
DynProvider(cwf, dynJson, valueMap, width, height).also { it.load() } DynProvider(cwf, dynJson, valueMap, width, height).also { it.load() }
} }
}?.also { dynData["${defaultViewKey}_$key"] = it } }?.also { dynData[defaultViewKey] = it }
return dynData[defaultViewKey]
}
private fun parseDataRange(json: JSONObject?, defaultData: DataRange) = private fun parseDataRange(json: JSONObject?, defaultData: DataRange) =
json?.let { json?.let {