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 e82642e0a1..5737731567 100644 --- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/CustomWatchface.kt +++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/CustomWatchface.kt @@ -164,8 +164,8 @@ class CustomWatchface : BaseWatchFace() { .takeIf { it.matches(Regex("E{1,4}")) } ?: "E" monthFormat = json.optString(MONTHFORMAT.key, "MMM") .takeIf { it.matches(Regex("M{1,4}")) } ?: "MMM" - binding.dayName.text = dateUtil.dayNameString(dayNameFormat) // Update daynName and month according to format on cwf loading - binding.month.text = dateUtil.monthString(monthFormat) + binding.dayName.text = dateUtil.dayNameString(dayNameFormat).substringBeforeLast(".") // Update daynName and month according to format on cwf loading + binding.month.text = dateUtil.monthString(monthFormat).substringBeforeLast(".") bgColor = when (singleBg.sgvLevel) { 1L -> highColor 0L -> midColor diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/utils/BaseWatchFace.kt b/wear/src/main/java/info/nightscout/androidaps/watchfaces/utils/BaseWatchFace.kt index 97820a23f5..be755229ce 100644 --- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/utils/BaseWatchFace.kt +++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/utils/BaseWatchFace.kt @@ -373,9 +373,9 @@ abstract class BaseWatchFace : WatchFace() { binding.hour?.text = dateUtil.hourString() binding.minute?.text = dateUtil.minuteString() binding.dateTime?.visibility = sp.getBoolean(R.string.key_show_date, false).toVisibility() - binding.dayName?.text = dateUtil.dayNameString(dayNameFormat) + binding.dayName?.text = dateUtil.dayNameString(dayNameFormat).substringBeforeLast(".") binding.day?.text = dateUtil.dayString() - binding.month?.text = dateUtil.monthString(monthFormat) + binding.month?.text = dateUtil.monthString(monthFormat).substringBeforeLast(".") binding.timePeriod?.visibility = android.text.format.DateFormat.is24HourFormat(this).not().toVisibility() binding.timePeriod?.text = dateUtil.amPm() if (showSecond)