From e7f9b33f8c472fa71f98e668a54e7e2b05fcf8c8 Mon Sep 17 00:00:00 2001 From: gavine99 Date: Sat, 26 Apr 2025 06:22:27 +1000 Subject: [PATCH] change "am" to "a m" and "pm" to "p m" as fix for speech engines that pronounce "am" and "pm" as words rather than the individual letters --- .../java/com/moez/QKSMS/manager/SpeakManager.kt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/domain/src/main/java/com/moez/QKSMS/manager/SpeakManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/SpeakManager.kt index adac8728..ba8bce61 100644 --- a/domain/src/main/java/com/moez/QKSMS/manager/SpeakManager.kt +++ b/domain/src/main/java/com/moez/QKSMS/manager/SpeakManager.kt @@ -172,13 +172,22 @@ class SpeakManager() { lastWeekCheck.timeInMillis = date lastWeekCheck.add(Calendar.DATE, 7) + val timeWithSplitAmPmForSpeech = getFormatter("h:mm a").format(date).let { + if (it.length < 2) it + else when (it.substring((it.length - 2))) { + "AM" -> "${it.substring(0, (it.length - 2))}A M" + "PM" -> "${it.substring(0, (it.length - 2))}P M" + else -> it // locales that don't use am/pm + } + } + return when { (then.get(Calendar.DATE) == now.get(Calendar.DATE)) -> StringBuilder() // today (yesterdayCheck.get(Calendar.DATE) == now.get(Calendar.DATE)) -> StringBuilder("yesterday") // yesterday (lastWeekCheck.get(Calendar.DATE) > now.get(Calendar.DATE)) -> StringBuilder("on ").append(getFormatter("EEEE").format(date)) // during last week (then.get(Calendar.YEAR) == now.get(Calendar.YEAR)) -> StringBuilder("on ").append(getFormatter("MMMM d").format(date)) // this year else -> StringBuilder("on").append(getFormatter("MMMM d yyyy").format(date)) // otherwise - }.append(" at ").append(getFormatter("h:mm a").format(date)).toString() + }.append(" at ").append(timeWithSplitAmPmForSpeech).toString() } // toggle is used to stop and not repeat if a sessionId of the same name is currently being read aloud @@ -260,7 +269,7 @@ class SpeakManager() { // more than 1 recipient if (conversation.recipients.count() > 1) - utterance.append("Group SMS ") + utterance.append("Group S M S ") // message sender if (conversationLastSms.isMe())