From d4c8d0f96d13f19427403d61a2eef23a51db2589 Mon Sep 17 00:00:00 2001
From: Navid <Navid200@users.noreply.github.com>
Date: Fri, 19 Jan 2024 15:28:23 -0500
Subject: [PATCH 1/3] Alert Settings cleanup

---
 app/src/main/res/values/strings.xml         |  1 +
 app/src/main/res/xml/pref_notifications.xml | 82 ++++++++++++---------
 2 files changed, 47 insertions(+), 36 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f270876906..1327aa7986 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1479,6 +1479,7 @@
     <string name="summary_notification_channels_grouping">Whether notifications should be grouped together. Incompatible with \'Number Item in Notification Area\' option</string>
     <string name="title_notification_channels_grouping">Group notifications together</string>
     <string name="summary_delay_ascending_3min">For ascending volume profile, delay the start of the alert sound by 3 minutes. The vibration (if enabled) starts as soon as the alert triggers regardless of this setting.</string>
+    <string name="title_ascending_volume">Ascending Volume settings</string>
     <string name="title_delay_ascending_3min">Delay Ascending Volume</string>
     <string name="summary_play_sound_for_initial_calibration">Play sound when Initial Calibration is requested</string>
     <string name="title_play_sound_for_initial_calibration">Initial Alert</string>
diff --git a/app/src/main/res/xml/pref_notifications.xml b/app/src/main/res/xml/pref_notifications.xml
index 2ce07f3d94..222f8ecbb0 100644
--- a/app/src/main/res/xml/pref_notifications.xml
+++ b/app/src/main/res/xml/pref_notifications.xml
@@ -93,44 +93,54 @@
                     android:summary="@string/create_shortcut"
                     android:title="@string/shortcut_to_bg_alerts" />
 
-                <CheckBoxPreference
-                    android:defaultValue="false"
-                    android:key="disable_alerts_stale_data"
-                    android:summary="@string/suppress_alerts_missed_readings"
-                    android:title="@string/suppress_alerts_if_missed_readings" />
-                <EditTextPreference
-                    android:defaultValue="15"
-                    android:dependency="disable_alerts_stale_data"
-                    android:inputType="number"
-                    android:key="disable_alerts_stale_data_minutes"
-                    android:summary="@string/suppress_alerts_after"
-                    android:title="@string/suppress_alerts_after" />
-
-                <CheckBoxPreference
-                    android:defaultValue="false"
-                    android:key="use_notification_channels"
-                    android:summary="@string/summary_use_notification_channels"
-                    android:title="@string/title_use_notification_channels" />
-
-                <CheckBoxPreference
-                    android:defaultValue="false"
-                    android:dependency="use_notification_channels"
-                    android:key="ongoing_notification_channel"
-                    android:summary="@string/summary_ongoing_notification_channel"
-                    android:title="@string/title_ongoing_notification_channel" />
+                <PreferenceScreen
+                    android:key="suppress_alerts_screen"
+                    android:title="@string/suppress_alerts_if_missed_readings">
+                    <CheckBoxPreference
+                        android:defaultValue="false"
+                        android:key="disable_alerts_stale_data"
+                        android:summary="@string/suppress_alerts_missed_readings"
+                        android:title="@string/suppress_alerts_if_missed_readings" />
+                    <EditTextPreference
+                        android:defaultValue="15"
+                        android:dependency="disable_alerts_stale_data"
+                        android:inputType="number"
+                        android:key="disable_alerts_stale_data_minutes"
+                        android:summary="@string/suppress_alerts_after"
+                        android:title="@string/suppress_alerts_after" />
+                </PreferenceScreen>
 
-                <CheckBoxPreference
-                    android:defaultValue="false"
-                    android:dependency="use_notification_channels"
-                    android:key="notification_channels_grouping"
-                    android:summary="@string/summary_notification_channels_grouping"
-                    android:title="@string/title_notification_channels_grouping" />
+                <PreferenceScreen
+                    android:key="Notification_Channels_screen"
+                    android:title="@string/title_use_notification_channels">
+                    <CheckBoxPreference
+                        android:defaultValue="false"
+                        android:key="use_notification_channels"
+                        android:summary="@string/summary_use_notification_channels"
+                        android:title="@string/title_use_notification_channels" />
+                    <CheckBoxPreference
+                        android:defaultValue="false"
+                        android:dependency="use_notification_channels"
+                        android:key="ongoing_notification_channel"
+                        android:summary="@string/summary_ongoing_notification_channel"
+                        android:title="@string/title_ongoing_notification_channel" />
+                    <CheckBoxPreference
+                        android:defaultValue="false"
+                        android:dependency="use_notification_channels"
+                        android:key="notification_channels_grouping"
+                        android:summary="@string/summary_notification_channels_grouping"
+                        android:title="@string/title_notification_channels_grouping" />
+                </PreferenceScreen>
 
-                <CheckBoxPreference
-                    android:defaultValue="true"
-                    android:key="delay_ascending_3min"
-                    android:summary="@string/summary_delay_ascending_3min"
-                    android:title="@string/title_delay_ascending_3min" />
+                <PreferenceScreen
+                    android:key="ascending_volume_settings"
+                    android:title="@string/title_ascending_volume">
+                    <CheckBoxPreference
+                        android:defaultValue="true"
+                        android:key="delay_ascending_3min"
+                        android:summary="@string/summary_delay_ascending_3min"
+                        android:title="@string/title_delay_ascending_3min" />
+                </PreferenceScreen>
 
             </PreferenceScreen>
 

From 9dcc16a68f8abb6818fe8b1cd06731f8c430a943 Mon Sep 17 00:00:00 2001
From: Navid <Navid200@users.noreply.github.com>
Date: Wed, 10 Apr 2024 23:45:29 -0400
Subject: [PATCH 2/3] Ascend to medium

---
 .../eveningoutpost/dexdrip/utilitymodels/AlertPlayer.java    | 3 +++
 app/src/main/res/values/strings.xml                          | 2 ++
 app/src/main/res/xml/pref_notifications.xml                  | 5 +++++
 3 files changed, 10 insertions(+)

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/AlertPlayer.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/AlertPlayer.java
index 86c63652a7..9ddd04ba7d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/AlertPlayer.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/AlertPlayer.java
@@ -554,6 +554,9 @@ protected void VibrateNotifyMakeNoise(Context context, AlertType alert, String b
             }
             volumeFrac = Math.max(volumeFrac, 0); // Limit volumeFrac to values greater than and equal to 0
             volumeFrac = Math.min(volumeFrac, 1); // Limit volumeFrac to values less than and equal to 1
+            if (Pref.getBooleanDefaultFalse("ascending_volume_to_medium")) { // If ascending_volume_to_medium is enabled
+                volumeFrac = Math.min(volumeFrac, (float) 0.7); // Clamp the ascending volume at the medium level.
+            }
             if (profile == ALERT_PROFILE_MEDIUM) {
                 volumeFrac = (float) 0.7;
             }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 90d3f601f0..16991739b5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1494,6 +1494,8 @@
     <string name="summary_delay_ascending_3min">For ascending volume profile, delay the start of the alert sound by 3 minutes. The vibration (if enabled) starts as soon as the alert triggers regardless of this setting.</string>
     <string name="title_ascending_volume">Ascending Volume settings</string>
     <string name="title_delay_ascending_3min">Delay Ascending Volume</string>
+    <string name="summary_ascending_volume_to_medium">When enabled, ascending volume profile will ascend to medium volume instead of maximum</string>
+    <string name="title_ascending_volume_to_medium">Ascend to medium</string>
     <string name="summary_play_sound_for_initial_calibration">Play sound when Initial Calibration is requested</string>
     <string name="title_play_sound_for_initial_calibration">Initial Alert</string>
     <string name="category_noisy_readings">Noisy Readings</string>
diff --git a/app/src/main/res/xml/pref_notifications.xml b/app/src/main/res/xml/pref_notifications.xml
index aa4e47e3ed..587c470d52 100644
--- a/app/src/main/res/xml/pref_notifications.xml
+++ b/app/src/main/res/xml/pref_notifications.xml
@@ -140,6 +140,11 @@
                         android:key="delay_ascending_3min"
                         android:summary="@string/summary_delay_ascending_3min"
                         android:title="@string/title_delay_ascending_3min" />
+                    <CheckBoxPreference
+                        android:defaultValue="false"
+                        android:key="ascending_volume_to_medium"
+                        android:summary="@string/summary_ascending_volume_to_medium"
+                        android:title="@string/title_ascending_volume_to_medium" />
                 </PreferenceScreen>
 
             </PreferenceScreen>

From 79a4d3b2f81bc3e0cb97181bc0a2f128058fdf9f Mon Sep 17 00:00:00 2001
From: Navid <Navid200@users.noreply.github.com>
Date: Thu, 11 Apr 2024 00:05:04 -0400
Subject: [PATCH 3/3] Correct High profile

---
 .../com/eveningoutpost/dexdrip/utilitymodels/AlertPlayer.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/AlertPlayer.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/AlertPlayer.java
index 9ddd04ba7d..5a168db92d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/AlertPlayer.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/AlertPlayer.java
@@ -554,7 +554,7 @@ protected void VibrateNotifyMakeNoise(Context context, AlertType alert, String b
             }
             volumeFrac = Math.max(volumeFrac, 0); // Limit volumeFrac to values greater than and equal to 0
             volumeFrac = Math.min(volumeFrac, 1); // Limit volumeFrac to values less than and equal to 1
-            if (Pref.getBooleanDefaultFalse("ascending_volume_to_medium")) { // If ascending_volume_to_medium is enabled
+            if (Pref.getBooleanDefaultFalse("ascending_volume_to_medium") && profile == ALERT_PROFILE_ASCENDING) { // If ascending volume profile is chosen and ascending_volume_to_medium is enabled
                 volumeFrac = Math.min(volumeFrac, (float) 0.7); // Clamp the ascending volume at the medium level.
             }
             if (profile == ALERT_PROFILE_MEDIUM) {