diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/weardata/EventData.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/weardata/EventData.kt index 4bfb867ef9..16e80764af 100644 --- a/app-wear-shared/shared/src/main/java/info/nightscout/rx/weardata/EventData.kt +++ b/app-wear-shared/shared/src/main/java/info/nightscout/rx/weardata/EventData.kt @@ -1,6 +1,7 @@ package info.nightscout.rx.weardata import info.nightscout.rx.events.Event +import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json import kotlinx.serialization.protobuf.ProtoBuf diff --git a/core/main/src/main/res/drawable/ic_watch.xml b/core/main/src/main/res/drawable/ic_watch.xml index bd2628f464..3f12b9288d 100644 --- a/core/main/src/main/res/drawable/ic_watch.xml +++ b/core/main/src/main/res/drawable/ic_watch.xml @@ -1,6 +1,6 @@ rxBus.send(EventMobileDataToWear(EventData.ActionSetCustomWatchface(cwf))) } - } binding.exportCustom.setOnClickListener { wearPlugin.savedCustomWatchface?.let { importExportPrefs.exportCustomWatchface(it) } ?: apply { rxBus.send(EventMobileToWear(EventData.ActionrequestCustomWatchface(true)))} @@ -106,11 +103,9 @@ class WearFragment : DaggerFragment() { _binding ?: return wearPlugin.savedCustomWatchface?.let { binding.customName.text = rh.gs(R.string.wear_custom_watchface, it.metadata[CustomWatchfaceMetadataKey.CWF_NAME]) - binding.sendCustom.visibility = View.VISIBLE binding.coverChart.setImageDrawable(it.drawableDatas[CustomWatchfaceDrawableDataKey.CUSTOM_WATCHFACE]?.toDrawable(resources)) } ?:apply { binding.customName.text = rh.gs(R.string.wear_custom_watchface, rh.gs(info.nightscout.shared.R.string.wear_default_watchface)) - binding.sendCustom.visibility = View.INVISIBLE binding.coverChart.setImageDrawable(null) } binding.connectedDevice.text = wearPlugin.connectedDevice diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/CustomWatchface.kt b/wear/src/main/java/info/nightscout/androidaps/watchfaces/CustomWatchface.kt index f556f6f114..42eaf43606 100644 --- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/CustomWatchface.kt +++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/CustomWatchface.kt @@ -186,7 +186,7 @@ class CustomWatchface : BaseWatchFace() { private fun defaultWatchface(): EventData.ActionSetCustomWatchface { val metadata = JSONObject() .put(CustomWatchfaceMetadataKey.CWF_NAME.key, getString(info.nightscout.shared.R.string.wear_default_watchface)) - .put(CustomWatchfaceMetadataKey.CWF_FILENAME.key, getString(R.string.wear_default_watchface)) + .put(CustomWatchfaceMetadataKey.CWF_FILENAME.key, getString(info.nightscout.shared.R.string.wear_default_watchface)) .put(CustomWatchfaceMetadataKey.CWF_AUTHOR.key, "Philoul") .put(CustomWatchfaceMetadataKey.CWF_CREATED_AT.key, dateUtil.dateString(dateUtil.now())) .put(CustomWatchfaceMetadataKey.CWF_VERSION.key, CUSTOM_VERSION)