caspervk/AndroidAPS
1
Code Releases Activity

Load CustomWatchface in dedicated function (for future updates)

Browse source
This commit is contained in:
Philoul 2023-08-08 12:21:26 +02:00
parent 363877175b
commit dd24dd5051
1 changed files with 4 additions and 3 deletions

7
plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearFragment.kt
View file

@ -16,6 +16,7 @@ import info.nightscout.rx.events.EventMobileDataToWear
import info.nightscout.rx.events.EventMobileToWear import info.nightscout.rx.events.EventMobileToWear
import info.nightscout.rx.events.EventWearUpdateGui import info.nightscout.rx.events.EventWearUpdateGui
import info.nightscout.rx.logging.AAPSLogger import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.rx.weardata.CustomWatchfaceData
import info.nightscout.rx.weardata.CustomWatchfaceDrawableDataKey import info.nightscout.rx.weardata.CustomWatchfaceDrawableDataKey
import info.nightscout.rx.weardata.CustomWatchfaceMetadataKey import info.nightscout.rx.weardata.CustomWatchfaceMetadataKey
import info.nightscout.rx.weardata.EventData import info.nightscout.rx.weardata.EventData
@ -78,7 +79,7 @@ class WearFragment : DaggerFragment() {
.toObservable(EventWearUpdateGui::class.java) .toObservable(EventWearUpdateGui::class.java)
.observeOn(aapsSchedulers.main) .observeOn(aapsSchedulers.main)
.subscribe({ .subscribe({
it.customWatchfaceData?.let { wearPlugin.savedCustomWatchface = it } it.customWatchfaceData?.let { loadCustom(it) }
if (it.exportFile) if (it.exportFile)
ToastUtils.okToast(activity, rh.gs(R.string.wear_new_custom_watchface_exported)) ToastUtils.okToast(activity, rh.gs(R.string.wear_new_custom_watchface_exported))
updateGui() updateGui()
@ -113,7 +114,7 @@ class WearFragment : DaggerFragment() {
binding.customWatchfaceLayout.visibility = (wearPlugin.connectedDevice != rh.gs(R.string.no_watch_connected)).toVisibility() binding.customWatchfaceLayout.visibility = (wearPlugin.connectedDevice != rh.gs(R.string.no_watch_connected)).toVisibility()
} }
private fun loadCustom(cwf: EventData.ActionSetCustomWatchface) { private fun loadCustom(cwf: CustomWatchfaceData) {
wearPlugin.savedCustomWatchface = cwf.customWatchfaceData wearPlugin.savedCustomWatchface = cwf
} }
} }