Merge branch 'master' of https://github.com/NightscoutFoundation/xDrip

jamorham · jamorham · commit 1283a139e90f · 2025-08-08T12:06:06.000Z
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Notifications.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Notifications.java
@@ -69,6 +69,7 @@ public class Notifications extends IntentService {
     //public static boolean bg_vibrate;
    // public static boolean bg_lights;
    // public static boolean bg_sound;
+    public static boolean compact_persistent_notification;
     public static boolean bg_sound_in_silent;
     public static String bg_notification_sound;
 
@@ -171,6 +172,7 @@ public void ReadPerfs(Context context) {
         smart_snoozing = prefs.getBoolean("smart_snoozing", true);
         smart_alerting = prefs.getBoolean("smart_alerting", true);
         bg_ongoing = prefs.getBoolean("run_service_in_foreground", false);
+        compact_persistent_notification = Pref.getBooleanDefaultFalse("compact_persistent_notification");
     }
 
 /*
@@ -309,7 +311,7 @@ private boolean notificationSetter(Context context) {
         final long start = end - (60000 * 60 * 3) - (60000 * 10);
         BgGraphBuilder bgGraphBuilder = new BgGraphBuilder(context, start, end);
         //BgGraphBuilder bgGraphBuilder = new BgGraphBuilder(context);
-        if (bg_ongoing && (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)) {
+        if (bg_ongoing) {
             bgOngoingNotification(bgGraphBuilder);
         }
         if (prefs.getLong("alerts_disabled_until", 0) > new Date().getTime()) {
@@ -600,42 +602,42 @@ public synchronized Notification createOngoingNotification(BgGraphBuilder bgGrap
         }
         b.setOngoing(Pref.getBoolean("use_proper_ongoing", true));
         try {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                b.setGroup("xDrip ongoing");
-            }
+            b.setGroup("xDrip ongoing");
         } catch (Exception e) {
             //
         }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            b.setVisibility(Pref.getBooleanDefaultFalse("public_notifications") ? Notification.VISIBILITY_PUBLIC : Notification.VISIBILITY_PRIVATE);
-            b.setCategory(NotificationCompat.CATEGORY_STATUS);
-        }
+        b.setVisibility(Pref.getBooleanDefaultFalse("public_notifications") ? Notification.VISIBILITY_PUBLIC : Notification.VISIBILITY_PRIVATE);
+        b.setCategory(NotificationCompat.CATEGORY_STATUS);
         if (Pref.getBooleanDefaultFalse("high_priority_notifications")) {
             b.setPriority(Notification.PRIORITY_HIGH);
         }
         final BestGlucose.DisplayGlucose dg = (use_best_glucose) ? BestGlucose.getDisplayGlucose() : null;
         final boolean use_color_in_notification = false; // could be preference option
         final SpannableString titleString = new SpannableString(lastReading == null ? "BG Reading Unavailable" : (dg != null) ? (dg.spannableString(dg.unitized + " " + dg.delta_arrow,use_color_in_notification))
                 : (lastReading.displayValue(mContext) + " " + lastReading.slopeArrow()));
-        b.setContentTitle(titleString)
-                .setContentText("xDrip Data collection service is running.")
-                .setSmallIcon(R.drawable.ic_action_communication_invert_colors_on)
-                .setUsesChronometer(false);
+        if (!compact_persistent_notification) {
+            b.setContentTitle(titleString)
+                    .setContentText("xDrip Data collection service is running.")
+                    .setSmallIcon(R.drawable.ic_action_communication_invert_colors_on)
+                    .setUsesChronometer(false);
+        } else {
+            b.setSmallIcon(R.drawable.ic_action_communication_invert_colors_on)
+                    .setUsesChronometer(false);
+        }
 
         Bitmap numberIcon = null;
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            // in case the graphic crashes the system-ui we wont do it immediately after reboot so the
-            // user has a chance to disable the feature
-            if (SystemClock.uptimeMillis() > Constants.MINUTE_IN_MS * 15) {
-                if (NumberGraphic.numberIconEnabled()) {
-                    if ((dg != null) && (!dg.isStale())) {
-                        final Bitmap icon_bitmap = NumberGraphic.getSmallIconBitmap(dg.unitized);
-                        if (icon_bitmap != null) b.setSmallIcon(Icon.createWithBitmap(icon_bitmap));
-
-                    }
+        // in case the graphic crashes the system-ui we wont do it immediately after reboot so the
+        // user has a chance to disable the feature
+        if (SystemClock.uptimeMillis() > Constants.MINUTE_IN_MS * 15) {
+            if (NumberGraphic.numberIconEnabled()) {
+                if ((dg != null) && (!dg.isStale())) {
+                    final Bitmap icon_bitmap = NumberGraphic.getSmallIconBitmap(dg.unitized);
+                    if (icon_bitmap != null) b.setSmallIcon(Icon.createWithBitmap(icon_bitmap));
                 }
+            }
 
+            if (!compact_persistent_notification) {
                 if (NumberGraphic.largeWithArrowEnabled()) {
                     if ((dg != null) && (!dg.isStale())) {
                         numberIcon = NumberGraphic.getLargeWithArrowBitmap(dg.unitized, dg.delta_arrow);
@@ -649,26 +651,26 @@ public synchronized Notification createOngoingNotification(BgGraphBuilder bgGrap
         }
 
         if (lastReading != null) {
+            if (!compact_persistent_notification) {
 
-            b.setWhen(lastReading.timestamp);
-            b.setShowWhen(true);
+                b.setWhen(lastReading.timestamp);
+                b.setShowWhen(true);
 
-            final SpannableString deltaString = new SpannableString("Delta: " + ((dg != null) ? (dg.spannableString(dg.unitized_delta + (dg.from_plugin ? " "+context.getString(R.string.p_in_circle) : "")))
-                    : bgGraphBuilder.unitizedDeltaString(true, true)));
+                final SpannableString deltaString = new SpannableString("Delta: " + ((dg != null) ? (dg.spannableString(dg.unitized_delta + (dg.from_plugin ? " " + context.getString(R.string.p_in_circle) : "")))
+                        : bgGraphBuilder.unitizedDeltaString(true, true)));
 
-            b.setContentText(deltaString);
+                b.setContentText(deltaString);
 
-            notifiationBitmap = new BgSparklineBuilder(mContext)
-                    .setBgGraphBuilder(bgGraphBuilder)
-                    .showHighLine()
-                    .showLowLine()
-                    .setStart(System.currentTimeMillis() - 60000 * 60 * 3)
-                    .showAxes(true)
-                    .setBackgroundColor(getCol(X.color_notification_chart_background))
-                    .setShowFiltered(DexCollectionType.hasFiltered() && Pref.getBooleanDefaultFalse("show_filtered_curve"))
-                    .build();
+                notifiationBitmap = new BgSparklineBuilder(mContext)
+                        .setBgGraphBuilder(bgGraphBuilder)
+                        .showHighLine()
+                        .showLowLine()
+                        .setStart(System.currentTimeMillis() - 60000 * 60 * 3)
+                        .showAxes(true)
+                        .setBackgroundColor(getCol(X.color_notification_chart_background))
+                        .setShowFiltered(DexCollectionType.hasFiltered() && Pref.getBooleanDefaultFalse("show_filtered_curve"))
+                        .build();
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                 Notification.DecoratedCustomViewStyle customViewStyle = new Notification.DecoratedCustomViewStyle();
 
                 iconBitmap = numberIcon != null ? numberIcon : new BgSparklineBuilder(mContext)
@@ -693,29 +695,12 @@ public synchronized Notification createOngoingNotification(BgGraphBuilder bgGrap
                 b.setStyle(customViewStyle)
                         .setCustomContentView(collapsedViews)
                         .setCustomBigContentView(expandedViews);
-            } else {
-                iconBitmap = numberIcon != null ? numberIcon : new BgSparklineBuilder(mContext)
-                        .setHeight(64)
-                        .setWidth(64)
-                        .setStart(System.currentTimeMillis() - 60000 * 60 * 3)
-                        .setBgGraphBuilder(bgGraphBuilder)
-                        .setBackgroundColor(getCol(X.color_notification_chart_background))
-                        .build();
-                b.setLargeIcon(iconBitmap);
-
-                Notification.BigPictureStyle bigPictureStyle = new Notification.BigPictureStyle();
-                bigPictureStyle.bigPicture(notifiationBitmap)
-                        .setSummaryText(deltaString)
-                        .setBigContentTitle(titleString);
-                b.setStyle(bigPictureStyle);
             }
         }
 
         b.setContentIntent(resultPendingIntent);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT_WATCH) {
-            b.setLocalOnly(true);
-            b.setOnlyAlertOnce(true);
-        }
+        b.setLocalOnly(true);
+        b.setOnlyAlertOnce(true);
         // strips channel ID if disabled
         return XdripNotification.build(b);
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -273,6 +273,9 @@
     <string name="dexcom_transmitter_id">Dexcom Transmitter ID</string>
     <string name="run_collector_in_foreground">Run Collector in foreground</string>
     <string name="shows_a_persistent_notification">Shows a persistent notification graph, visible on lock-screen and prevents Android killing the service.</string>
+    <string name="title_collector_in_foreground">Collector in foreground</string>
+    <string name="summary_compact_ongoing_notification">Enable to hide the graph in the notification and display only the current glucose value.</string>
+    <string name="title_compact_ongoing_notification">Compact Persistent Notification</string>
     <string name="list_of_receivers">List of receivers</string>
     <string name="extra_tags_for_logging">Extra tags for logging</string>
     <string name="extra_tags_dialog_message">The tags entered here will be logged into xDrip. Format is tag:level. Level can be v,d,i. For example bgreading:i,DexCollectionService:v. These tags will be logged with low priority to Error and event list.</string>
diff --git a/app/src/main/res/xml/pref_advanced_settings.xml b/app/src/main/res/xml/pref_advanced_settings.xml
@@ -1536,11 +1536,20 @@
                 android:key="xdrip_other_misc_extra_screen"
                 android:summary=""
                 android:title="@string/title_Other_misc_options">
-                <CheckBoxPreference
-                    android:defaultValue="true"
-                    android:key="run_service_in_foreground"
-                    android:summary="@string/shows_a_persistent_notification"
-                    android:title="@string/run_collector_in_foreground" />
+                <PreferenceScreen
+                    android:key="collector_in_foreground"
+                    android:title="@string/title_collector_in_foreground">
+                    <CheckBoxPreference
+                        android:defaultValue="true"
+                        android:key="run_service_in_foreground"
+                        android:summary="@string/shows_a_persistent_notification"
+                        android:title="@string/run_collector_in_foreground" />
+                    <CheckBoxPreference
+                        android:defaultValue="false"
+                        android:key="compact_persistent_notification"
+                        android:summary="@string/summary_compact_ongoing_notification"
+                        android:title="@string/title_compact_ongoing_notification" />
+                </PreferenceScreen>
                 <CheckBoxPreference
                     android:defaultValue="false"
                     android:dependency="engineering_mode"
