From 7b6d83ce3c1ff15b56e7c6bea71c5b3a3b39a853 Mon Sep 17 00:00:00 2001 From: Philoul Date: Mon, 4 Sep 2023 17:40:58 +0200 Subject: [PATCH 1/2] Wear CSW cleanup --- .../info/nightscout/rx/weardata/CustomWatchfaceFormat.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/weardata/CustomWatchfaceFormat.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/weardata/CustomWatchfaceFormat.kt index 6fefd4b26c..35a30a9f7f 100644 --- a/app-wear-shared/shared/src/main/java/info/nightscout/rx/weardata/CustomWatchfaceFormat.kt +++ b/app-wear-shared/shared/src/main/java/info/nightscout/rx/weardata/CustomWatchfaceFormat.kt @@ -148,7 +148,7 @@ enum class CwfMetadataKey(val key: String, @StringRes val label: Int, val isPref CWF_CREATED_AT("created_at", R.string.metadata_label_watchface_created_at, false), CWF_VERSION("cwf_version", R.string.metadata_label_plugin_version, false), CWF_AUTHOR_VERSION("author_version", R.string.metadata_label_watchface_name_version, false), - CWF_COMMENT("comment", R.string.metadata_label_watchface_infos, false), // label not planed to be used for CWF_COMMENT + CWF_COMMENT("comment", R.string.metadata_label_watchface_infos, false), CWF_AUTHORIZATION("cwf_authorization", R.string.metadata_label_watchface_authorization, false), CWF_PREF_WATCH_SHOW_DETAILED_IOB("key_show_detailed_iob", R.string.pref_show_detailed_iob, true), CWF_PREF_WATCH_SHOW_DETAILED_DELTA("key_show_detailed_delta", R.string.pref_show_detailed_delta, true), @@ -331,14 +331,12 @@ class ZipWatchfaceFormat { try { val outputStream = FileOutputStream(file) val zipOutputStream = ZipOutputStream(BufferedOutputStream(outputStream)) - - // Ajouter le fichier JSON au ZIP + val jsonEntry = ZipEntry(CWF_JSON_FILE) zipOutputStream.putNextEntry(jsonEntry) zipOutputStream.write(customWatchface.json.toByteArray()) zipOutputStream.closeEntry() - // Ajouter les fichiers divers au ZIP for (resData in customWatchface.resDatas) { val fileEntry = ZipEntry("${resData.key.fileName}.${resData.value.format.extension}") zipOutputStream.putNextEntry(fileEntry) From c17c53659dcc045ca20a35912008268cb0dadffc Mon Sep 17 00:00:00 2001 From: Philoul Date: Mon, 4 Sep 2023 17:41:37 +0200 Subject: [PATCH 2/2] Wear CSW Fix missing dial --- .../info/nightscout/androidaps/watchfaces/CustomWatchface.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c56e71f01b..dc4ae1ddfa 100644 --- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/CustomWatchface.kt +++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/CustomWatchface.kt @@ -444,7 +444,7 @@ class CustomWatchface : BaseWatchFace() { ViewKeys.COVER_PLATE.key, R.id.cover_plate, null, - null, + info.nightscout.shared.R.drawable.simplified_dial, ResFileMap.COVER_PLATE, ResFileMap.COVER_PLATE_HIGH, ResFileMap.COVER_PLATE_LOW