Merge pull request #39 from robster7674/pr/audio-tts

Audio & TTS improvements

Author: ctqvva

Common/src/main/java/tk/glucodata/Notify.java

@@ -157,12 +157,15 @@ private static final class AlertSoundHandle {
         private static final long SOUND_FADE_IN_MS = 1_200L;
         private static final int SOUND_FADE_STEPS = 8;
         private static final float SOUND_START_VOLUME = 0.12f;
+        // Hard floor: sound must never accidentally go silent even if profile logic has a bug
+        private static final float MIN_PLAY_VOLUME = 0.3f;
 
         private final Ringtone ringtone;
         private final MediaPlayer mediaPlayer;
         private final String title;
         private boolean released = false;
         private int playGeneration = 0;
+        private float maxVolume = 1.0f;
 
         AlertSoundHandle(Ringtone ringtone, MediaPlayer mediaPlayer, String title) {
             this.ringtone = ringtone;
@@ -178,6 +181,10 @@ String getTitle() {
             return (title != null && !title.isEmpty()) ? title : "alert sound";
         }
 
+        synchronized void setMaxVolume(float vol) {
+            maxVolume = Math.max(MIN_PLAY_VOLUME, Math.min(1.0f, vol));
+        }
+
         private synchronized void setVolume(float volume) {
             if (released) {
                 return;
@@ -206,7 +213,7 @@ private void scheduleFadeIn(int generation) {
                         }
                     }
                     final float progress = (float) finalStep / (float) SOUND_FADE_STEPS;
-                    setVolume(SOUND_START_VOLUME + ((1.0f - SOUND_START_VOLUME) * progress));
+                    setVolume(SOUND_START_VOLUME + ((maxVolume - SOUND_START_VOLUME) * progress));
                 }, delayMs, TimeUnit.MILLISECONDS);
             }
         }
@@ -520,8 +527,7 @@ Ringtone mkring(String uristr, int kind, boolean disturb) {
         var ring = setring(uristr, defaults[kind]);
         if (android.os.Build.VERSION.SDK_INT >= 21) {
             try {
-                // Use ALARM stream only if disturb=true AND USEALARM is enabled
-                boolean useAlarmStream = (!AlertType.Companion.isLegacyOnlyId(kind) && getUSEALARM() && disturb);
+                boolean useAlarmStream = (!AlertType.Companion.isLegacyOnlyId(kind) && disturb);
                 ring.setAudioAttributes(useAlarmStream ? ScanNfcV.audioattributes : notification_audio);
             } catch (Throwable e) {
                 Log.stack(LOG_ID, "mkring", e);
@@ -1725,10 +1731,7 @@ private synchronized void playringhier(AlertSoundHandle soundHandle, int duratio
                 final CurrentDisplaySource.Snapshot current = resolveNotificationCurrentSnapshot();
                 if (current != null) {
                     SuperGattCallback.talker.speak(current.getPrimaryStr(),
-                            getUSEALARM() ? ScanNfcV.audioattributes : notification_audio);
-                    // Applic.scheduler.schedule( () -> SuperGattCallback.talker.speak(glu.value,
-                    // getUSEALARM()?ScanNfcV.audioattributes:notification_audio), 50,
-                    // TimeUnit.MILLISECONDS);
+                            disturb ? ScanNfcV.audioattributes : notification_audio);
                 }
             }
         }
@@ -1812,7 +1815,7 @@ private synchronized void playringhier(AlertSoundHandle soundHandle, int duratio
                         if (current != null) {
                             Applic.scheduler.schedule(
                                     () -> SuperGattCallback.talker.speak(current.getPrimaryStr(),
-                                            getUSEALARM() ? ScanNfcV.audioattributes : notification_audio),
+                                            disturb ? ScanNfcV.audioattributes : notification_audio),
                                     300, TimeUnit.MILLISECONDS);
                         } else
                             doTurnFocusoff();
@@ -1858,6 +1861,7 @@ private synchronized void playringhier(AlertSoundHandle soundHandle, int duratio
         if (sound) {
             if (doplaysound[0] && hasSoundHandle) {
                 if (soundHandle != null) {
+                    soundHandle.setMaxVolume(soundVolumeForProfile(resolvedHapticProfile));
                     soundHandle.play();
                 } else if (doLog) {
                     Log.w(LOG_ID, "playringhier: sound handle is null");
@@ -1938,6 +1942,17 @@ private String getHapticProfile(int kind) {
         }
     }
 
+    // SOFT=0.4, STEADY=0.7, STRONG/ESCALATING=1.0 — matches the old dead getVolumeFromProfile() intent.
+    // Never returns below AlertSoundHandle.MIN_PLAY_VOLUME (enforced again in setMaxVolume as a safety net).
+    private static float soundVolumeForProfile(String profile) {
+        if (profile == null) return 1.0f;
+        switch (profile.toUpperCase()) {
+            case "SOFT":      case "LOW":      return 0.4f;
+            case "STEADY":    case "MEDIUM":   return 0.7f;
+            default:                           return 1.0f;
+        }
+    }
+
     void mksound(int kind) {
         String ringUri = null;
         try {
@@ -1970,8 +1985,7 @@ void mksound(int kind) {
         final boolean sound = p.getBoolean("alert_" + kind + "_sound", defSound);
         final boolean vibration = p.getBoolean("alert_" + kind + "_vibration", defVibrate);
 
-        final boolean dist = isWearable || getalarmdisturb(kind); // DND might need Prefs too, but keeping Natives for
-                                                                  // now
+        final boolean dist = isWearable || p.getBoolean("alert_" + kind + "_dnd", getalarmdisturb(kind));
         final boolean useAlarmStream = shouldUseAlarmAudioStream(kind, dist);
         final AlertSoundHandle soundHandle = sound ? buildAlertSoundHandle(ringUri, kind, useAlarmStream) : null;
 

Common/src/main/java/tk/glucodata/SpeakSchedule.kt

@@ -0,0 +1,55 @@
+package tk.glucodata
+
+import android.content.Context
+import java.util.Calendar
+
+object SpeakSchedule {
+    private const val PREFS = "tk.glucodata_preferences"
+    private const val KEY_ENABLED = "voice_schedule_enabled"
+    private const val KEY_START = "voice_schedule_start_minutes"
+    private const val KEY_END = "voice_schedule_end_minutes"
+
+    private const val DEFAULT_START = 0        // 00:00
+    private const val DEFAULT_END = 22 * 60    // 22:00
+
+    private fun prefs(context: Context) =
+        context.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
+
+    fun isEnabled(context: Context): Boolean =
+        prefs(context).getBoolean(KEY_ENABLED, false)
+
+    fun setEnabled(context: Context, enabled: Boolean) {
+        prefs(context).edit().putBoolean(KEY_ENABLED, enabled).apply()
+    }
+
+    fun getStartMinutes(context: Context): Int =
+        prefs(context).getInt(KEY_START, DEFAULT_START)
+
+    fun getEndMinutes(context: Context): Int =
+        prefs(context).getInt(KEY_END, DEFAULT_END)
+
+    fun setStartMinutes(context: Context, minutes: Int) {
+        prefs(context).edit().putInt(KEY_START, minutes.coerceIn(0, 1439)).apply()
+    }
+
+    fun setEndMinutes(context: Context, minutes: Int) {
+        prefs(context).edit().putInt(KEY_END, minutes.coerceIn(0, 1440)).apply()
+    }
+
+    fun isWithinSchedule(context: Context): Boolean {
+        if (!isEnabled(context)) return true
+        val cal = Calendar.getInstance()
+        val nowMinutes = cal.get(Calendar.HOUR_OF_DAY) * 60 + cal.get(Calendar.MINUTE)
+        val start = getStartMinutes(context)
+        val end = getEndMinutes(context)
+        if (start == end) return true // equal = all day, no restriction
+        return if (start < end) nowMinutes in start until end
+        else nowMinutes >= start || nowMinutes < end // spans midnight
+    }
+
+    fun formatMinutes(minutes: Int): String {
+        val h = (minutes / 60).coerceIn(0, 23)
+        val m = (minutes % 60).coerceIn(0, 59)
+        return String.format("%02d:%02d", h, m)
+    }
+}