show calculation cob progress on graph

app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/IobCobThread.java

@@ -24,6 +24,7 @@ import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.events.Event;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.plugins.IobCobCalculator.events.EventAutosensCalculationFinished;
+import info.nightscout.androidaps.plugins.IobCobCalculator.events.EventIobCalculationProgress;
 import info.nightscout.androidaps.plugins.OpenAPSSMB.SMBDefaults;
 import info.nightscout.androidaps.plugins.SensitivityAAPS.SensitivityAAPSPlugin;
 import info.nightscout.androidaps.plugins.SensitivityWeightedAverage.SensitivityWeightedAveragePlugin;
@@ -97,6 +98,8 @@ public class IobCobThread extends Thread {
                 AutosensData previous = autosensDataTable.get(prevDataTime);
                 // start from oldest to be able sub cob
                 for (int i = bucketed_data.size() - 4; i >= 0; i--) {
+                    MainApp.bus().post(new EventIobCalculationProgress(i + "/" + bucketed_data.size()));
+
                     if (iobCobCalculatorPlugin.stopCalculationTrigger) {
                         iobCobCalculatorPlugin.stopCalculationTrigger = false;
                         log.debug("Aborting calculation thread (trigger): " + from);
@@ -269,6 +272,7 @@ public class IobCobThread extends Thread {
             log.debug("Finishing calculation thread: " + from);
         } finally {
             mWakeLock.release();
+            MainApp.bus().post(new EventIobCalculationProgress(""));
         }
     }
 

app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/events/EventIobCalculationProgress.java

@@ -0,0 +1,11 @@
+package info.nightscout.androidaps.plugins.IobCobCalculator.events;
+
+import info.nightscout.androidaps.events.Event;
+
+public class EventIobCalculationProgress extends Event {
+    public String progress;
+
+    public EventIobCalculationProgress(String progress) {
+        this.progress = progress;
+    }
+}

app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java

@@ -5,7 +5,6 @@ import android.app.Activity;
 import android.app.NotificationManager;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.Color;
@@ -15,10 +14,8 @@ import android.os.Handler;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
-import android.support.v4.content.ContextCompat;
 import android.support.v4.content.res.ResourcesCompat;
 import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.CardView;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.PopupMenu;
 import android.support.v7.widget.RecyclerView;
@@ -33,7 +30,6 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.ImageButton;
@@ -52,8 +48,6 @@ import org.slf4j.LoggerFactory;
 import java.text.DecimalFormat;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.List;
-import java.util.Objects;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
@@ -97,9 +91,9 @@ import info.nightscout.androidaps.plugins.ConstraintsObjectives.ObjectivesPlugin
 import info.nightscout.androidaps.plugins.IobCobCalculator.AutosensData;
 import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.plugins.IobCobCalculator.events.EventAutosensCalculationFinished;
+import info.nightscout.androidaps.plugins.IobCobCalculator.events.EventIobCalculationProgress;
 import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
 import info.nightscout.androidaps.plugins.Loop.events.EventNewOpenLoopNotification;
-import info.nightscout.androidaps.plugins.NSClientInternal.broadcasts.BroadcastAckAlarm;
 import info.nightscout.androidaps.plugins.NSClientInternal.data.NSDeviceStatus;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.CalibrationDialog;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.ErrorHelperActivity;
@@ -108,10 +102,8 @@ import info.nightscout.androidaps.plugins.Overview.Dialogs.NewInsulinDialog;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.NewTreatmentDialog;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.WizardDialog;
 import info.nightscout.androidaps.plugins.Overview.activities.QuickWizardListActivity;
-import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventSetWakeLock;
 import info.nightscout.androidaps.plugins.Overview.graphData.GraphData;
-import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.notifications.NotificationRecyclerViewAdapter;
 import info.nightscout.androidaps.plugins.Overview.notifications.NotificationStore;
 import info.nightscout.androidaps.plugins.Source.SourceDexcomG5Plugin;
@@ -150,6 +142,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
     TextView pumpDeviceStatusView;
     TextView openapsDeviceStatusView;
     TextView uploaderDeviceStatusView;
+    TextView iobCalculationProgressView;
     LinearLayout loopStatusLayout;
     LinearLayout pumpStatusLayout;
     GraphView bgGraph;
@@ -245,6 +238,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             pumpDeviceStatusView = (TextView) view.findViewById(R.id.overview_pump);
             openapsDeviceStatusView = (TextView) view.findViewById(R.id.overview_openaps);
             uploaderDeviceStatusView = (TextView) view.findViewById(R.id.overview_uploader);
+            iobCalculationProgressView = (TextView) view.findViewById(R.id.overview_iobcalculationprogess);
             loopStatusLayout = (LinearLayout) view.findViewById(R.id.overview_looplayout);
             pumpStatusLayout = (LinearLayout) view.findViewById(R.id.overview_pumpstatuslayout);
 
@@ -911,15 +905,22 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             activity.runOnUiThread(() -> updatePumpStatus(s.textStatus()));
     }
 
+    @Subscribe
+    public void onStatusEvent(final EventIobCalculationProgress e) {
+        Activity activity = getActivity();
+        if (activity != null)
+            activity.runOnUiThread(() -> {
+                if (iobCalculationProgressView != null)
+                    iobCalculationProgressView.setText(e.progress);
+            });
+    }
+
     private void hideTempRecommendation() {
         Activity activity = getActivity();
         if (activity != null)
-            activity.runOnUiThread(new Runnable() {
+            activity.runOnUiThread(() -> {
-                @Override
+                if (acceptTempLayout != null)
-                public void run() {
+                    acceptTempLayout.setVisibility(View.GONE);
-                    if (acceptTempLayout != null)
-                        acceptTempLayout.setVisibility(View.GONE);
-                }
             });
     }
 

app/src/main/res/layout/activity_historybrowse.xml

@@ -96,6 +96,13 @@
                         android:paddingTop="5dp"
                         app:srcCompat="@drawable/ic_arrow_drop_down_white_24dp" />
 
+                    <TextView
+                        android:id="@+id/overview_iobcalculationprogess"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerInParent="true"
+                        android:textSize="15sp" />
+
                 </RelativeLayout>
 
                 <com.jjoe64.graphview.GraphView

app/src/main/res/layout/overview_fragment.xml

@@ -239,23 +239,30 @@
                 </LinearLayout>
 
                 <RelativeLayout
-                   android:layout_width="wrap_content"
+                    android:layout_width="wrap_content"
                     android:layout_height="0dp"
                     android:layout_weight="1">
 
-                <com.jjoe64.graphview.GraphView
+                    <com.jjoe64.graphview.GraphView
-                    android:id="@+id/overview_bggraph"
+                        android:id="@+id/overview_bggraph"
-                    android:layout_width="wrap_content"
+                        android:layout_width="wrap_content"
-                    android:layout_height="match_parent" />
+                        android:layout_height="match_parent" />
 
-                <ImageButton
+                    <ImageButton
-                    android:id="@+id/overview_chartMenuButton"
+                        android:id="@+id/overview_chartMenuButton"
-                    android:layout_width="30dp"
+                        android:layout_width="30dp"
-                    android:layout_height="wrap_content"
+                        android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
+                        android:layout_alignParentEnd="true"
-                    android:layout_alignParentTop="true"
+                        android:layout_alignParentTop="true"
-                    android:paddingTop="5dp"
+                        android:paddingTop="5dp"
-                    app:srcCompat="@drawable/ic_arrow_drop_down_white_24dp" />
+                        app:srcCompat="@drawable/ic_arrow_drop_down_white_24dp" />
+
+                    <TextView
+                        android:id="@+id/overview_iobcalculationprogess"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerInParent="true"
+                        android:textSize="15sp" />
 
                 </RelativeLayout>
 
@@ -299,8 +306,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingRight="5dp"
+                android:orientation="horizontal"
-                android:orientation="horizontal">
+                android:paddingRight="5dp">
 
                 <info.nightscout.utils.SingleClickButton
                     android:id="@+id/overview_treatmentbutton"

app/src/main/res/layout/overview_fragment_nsclient.xml

@@ -491,6 +491,13 @@
                         android:paddingTop="5dp"
                         app:srcCompat="@drawable/ic_arrow_drop_down_white_24dp" />
 
+                    <TextView
+                        android:id="@+id/overview_iobcalculationprogess"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerInParent="true"
+                        android:textSize="15sp" />
+
                 </RelativeLayout>
 
                 <com.jjoe64.graphview.GraphView

app/src/main/res/layout/overview_fragment_nsclient_tablet.xml

@@ -577,6 +577,13 @@
                             android:paddingTop="5dp"
                             app:srcCompat="@drawable/ic_arrow_drop_down_white_24dp" />
 
+                        <TextView
+                            android:id="@+id/overview_iobcalculationprogess"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerInParent="true"
+                            android:textSize="15sp" />
+
                     </RelativeLayout>
 
                     <com.jjoe64.graphview.GraphView

app/src/main/res/layout/overview_fragment_smallheight.xml

@@ -255,6 +255,13 @@
                         android:paddingTop="5dp"
                         app:srcCompat="@drawable/ic_arrow_drop_down_white_24dp" />
 
+                    <TextView
+                        android:id="@+id/overview_iobcalculationprogess"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerInParent="true"
+                        android:textSize="15sp" />
+
                 </RelativeLayout>
 
                 <com.jjoe64.graphview.GraphView