merge n fix

app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java

@@ -446,26 +446,26 @@ public class LoopPlugin extends PluginBase implements LoopInterface {
                             rxBus.send(new EventNewNotification(carbreqlocal));
                         }
                         if (sp.getBoolean(R.string.key_ns_create_announcements_from_carbs_req, false)) {
-                            NSUpload.uploadError(resultAfterConstraints.getCarbsRequiredText());
+                            nsUpload.uploadError(resultAfterConstraints.getCarbsRequiredText());
                         }
                         if (sp.getBoolean(R.string.key_raise_notifications_as_android_notifications, false)){
                             Intent intentAction5m = new Intent(context, CarbSuggestionReceiver.class);
                             intentAction5m.putExtra("ignoreDuration", 5);
                             PendingIntent pendingIntent5m = PendingIntent.getBroadcast(context, 1, intentAction5m, PendingIntent.FLAG_UPDATE_CURRENT);
                             NotificationCompat.Action actionIgnore5m = new
-                                    NotificationCompat.Action(R.drawable.ic_notif_aaps, sp.getString(R.string.ignore5m,"Ignore 5m"), pendingIntent5m);
+                                    NotificationCompat.Action(R.drawable.ic_notif_aaps, resourceHelper.gs(R.string.ignore5m,"Ignore 5m"), pendingIntent5m);
 
                             Intent intentAction15m = new Intent(context, CarbSuggestionReceiver.class);
                             intentAction15m.putExtra("ignoreDuration", 15);
                             PendingIntent pendingIntent15m = PendingIntent.getBroadcast(context, 1, intentAction15m, PendingIntent.FLAG_UPDATE_CURRENT);
                             NotificationCompat.Action actionIgnore15m = new
-                                    NotificationCompat.Action(R.drawable.ic_notif_aaps, sp.getString(R.string.ignore15m,"Ignore 15m"), pendingIntent15m);
+                                    NotificationCompat.Action(R.drawable.ic_notif_aaps, resourceHelper.gs(R.string.ignore15m,"Ignore 15m"), pendingIntent15m);
 
                             Intent intentAction30m = new Intent(context, CarbSuggestionReceiver.class);
                             intentAction30m.putExtra("ignoreDuration", 30);
                             PendingIntent pendingIntent30m = PendingIntent.getBroadcast(context, 1, intentAction30m, PendingIntent.FLAG_UPDATE_CURRENT);
                             NotificationCompat.Action actionIgnore30m = new
-                                    NotificationCompat.Action(R.drawable.ic_notif_aaps, sp.getString(R.string.ignore30m,"Ignore 30m"), pendingIntent30m);
+                                    NotificationCompat.Action(R.drawable.ic_notif_aaps,  resourceHelper.gs(R.string.ignore30m,"Ignore 30m"), pendingIntent30m);
 
                             NotificationCompat.Builder builder = new NotificationCompat.Builder(context, CHANNEL_ID);
                             builder.setSmallIcon(R.drawable.notif_icon)

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt

@@ -748,15 +748,17 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         }
 
         val lastRun = loopPlugin.lastRun
-        if (config.APS && lastRun?.constraintsProcessed != null && lastRun?.constraintsProcessed.carbsReq > 0) {
+        if (config.APS && lastRun?.constraintsProcessed != null) {
-            overview_cob?.text = cobText + " *" + lastRun?.constraintsProcessed.carbsReq + " "+R.string.required+"*"
+            if (lastRun.constraintsProcessed!!.carbsReq > 0) {
-            if (!carbAnimation.isRunning)
+                overview_cob?.text = cobText + " | " + lastRun.constraintsProcessed!!.carbsReq + " " + resourceHelper.gs(R.string.required)
-                carbAnimation.start()
+                if (!carbAnimation.isRunning)
-        } else {
+                    carbAnimation.start()
-            overview_cob?.text = cobText
+            } else {
-            if (carbAnimation.isRunning)
+                overview_cob?.text = cobText
-                carbAnimation.stop()
+                if (carbAnimation.isRunning)
-            carbAnimation.selectDrawable(0);
+                    carbAnimation.stop()
+                carbAnimation.selectDrawable(0);
+            }
         }
 
         val predictionsAvailable = if (config.APS) lastRun?.request?.hasPredictions == true else config.NSCLIENT

app/src/main/jniLibs/README.md

@@ -0,0 +1 @@
+# danars-support-lib

app/src/main/res/values/strings.xml

@@ -789,6 +789,7 @@
     <string name="ns_create_announcements_from_carbs_req_title">Create announcements from carbs required alerts</string>
     <string name="ns_create_announcements_from_errors_summary">Create Nightscout announcement for error dialogs and local alerts (also viewable in Careportal under Treatments)</string>
     <string name="ns_create_announcements_from_carbs_req_summary">Create Nightscout announcements for carbs required alerts</string>
+    <string name="key_ns_create_announcements_from_carbs_req" translatable="false">ns_create_announcements_from_carbs_req</string>
     <string name="eversense_shortname" translatable="false">EVR</string>
     <string name="wear_predictions_summary">Show the predictions on the watchface.</string>
     <string name="wear_predictions_title">Predictions</string>