Merge remote-tracking branch 'origin/dev2' into combo-v2

* origin/dev2: (26 commits)
  add getPreferenceId to food plugin
  preferences update
  use DateUtil#agoString
  use DateUtil#untilString
  timeframe strings
  Show remaining time of TT
  NSTreatments NPE fix
  Cleanup.
  Revert "Debug: wider thread column in log to improve readability."
  Disable event logging by default.
  Log summary after 10s, then every 60s.
  Log receivers of event.
  Log source of event.
  Debug: wider thread column in log to improve readability.
  Better log messages for events.
  Group events in type hierarchy related to the LoopPlugin.
  Remove dead NSPingAck class.
  Let event classes extend Event(UpdageGui) classes.
  Add base event class.
  Log posted events.
  ...

app/build.gradle

@@ -153,6 +153,7 @@ dependencies {
     compile('com.github.tony19:logback-android-classic:1.1.1-6') {
         exclude group: 'com.google.android', module: 'android'
     }
+    compile 'org.apache.commons:commons-lang3:3.6'
     compile 'org.slf4j:slf4j-api:1.7.12'
     compile 'com.jjoe64:graphview:4.0.1'
     compile 'com.joanzapata.iconify:android-iconify-fontawesome:2.1.1'

app/src/main/java/com/squareup/otto/LoggingBus.java

@@ -0,0 +1,87 @@
+package com.squareup.otto;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import info.nightscout.androidaps.events.Event;
+
+/** Logs events has they're being posted to and dispatched from the event bus.
+ *
+ * A summary of event-receiver calls that occurred so far is logged
+ * after 10s (after startup) and then again every 60s.
+ * */
+public class LoggingBus extends Bus {
+    private static Logger log = LoggerFactory.getLogger(LoggingBus.class);
+
+    private static long everyMinute = System.currentTimeMillis() + 10 * 1000;
+    private Map<String, Set<String>> event2Receiver = new HashMap<>();
+
+    public LoggingBus(ThreadEnforcer enforcer) {
+        super(enforcer);
+    }
+
+    @Override
+    public void post(Object event) {
+        if (event instanceof DeadEvent) {
+            log.debug("Event has no receiver: " + ((DeadEvent) event).event + ", source: " + ((DeadEvent) event).source);
+            return;
+        }
+
+        if (!(event instanceof Event)) {
+            log.error("Posted event not an event class: " + event.getClass());
+        }
+
+        log.debug("<<< " + event);
+        try {
+            StackTraceElement caller = new Throwable().getStackTrace()[1];
+            String className = caller.getClassName();
+            className = className.substring(className.lastIndexOf(".") + 1);
+            log.debug("    source: " + className + "." + caller.getMethodName() + ":" + caller.getLineNumber());
+        } catch (RuntimeException e) {
+            log.debug("    source: <unknown>");
+        }
+
+        super.post(event);
+    }
+
+    @Override
+    protected void dispatch(Object event, EventHandler wrapper) {
+        try {
+            log.debug(">>> " + event);
+            Field methodField = wrapper.getClass().getDeclaredField("method");
+            methodField.setAccessible(true);
+            Method targetMethod = (Method) methodField.get(wrapper);
+            String className = targetMethod.getDeclaringClass().getSimpleName();
+            String methodName = targetMethod.getName();
+            String receiverMethod = className + "." + methodName;
+            log.debug("    receiver: " + receiverMethod);
+
+            String key = event.getClass().getSimpleName();
+            if (!event2Receiver.containsKey(key)) event2Receiver.put(key, new HashSet<String>());
+            event2Receiver.get(key).add(receiverMethod);
+        } catch (ReflectiveOperationException e) {
+            log.debug("    receiver: <unknown>");
+        }
+
+        if (everyMinute < System.currentTimeMillis()) {
+            log.debug("***************** Event -> receiver pairings seen so far ****************");
+            for (Map.Entry<String, Set<String>> stringSetEntry : event2Receiver.entrySet()) {
+                log.debug("  " + stringSetEntry.getKey());
+                for (String s : stringSetEntry.getValue()) {
+                    log.debug("    -> " + s);
+                }
+            }
+            log.debug("*************************************************************************");
+            everyMinute = System.currentTimeMillis() + 60 * 1000;
+        }
+
+        super.dispatch(event, wrapper);
+    }
+}

app/src/main/java/info/nightscout/androidaps/Config.java

@@ -9,14 +9,10 @@ public class Config {
     // MAIN FUCTIONALITY
     public static final boolean APS = BuildConfig.APS;
     // PLUGINS
-    public static final boolean OPENAPSENABLED = APS;
-    public static final boolean LOOPENABLED = APS;
-
     public static final boolean NSCLIENT = BuildConfig.NSCLIENTOLNY;
 
     public static final boolean COMBO = true && BuildConfig.PUMPDRIVERS;
     public static final boolean DANAR = true && BuildConfig.PUMPDRIVERS;
-    public static final boolean DANARv2 = true && BuildConfig.PUMPDRIVERS;
 
     public static final boolean ACTION = !BuildConfig.NSCLIENTOLNY;
     public static final boolean VIRTUALPUMP = !BuildConfig.NSCLIENTOLNY;
@@ -27,8 +23,6 @@ public class Config {
     public static final boolean SMSCOMMUNICATORENABLED = !BuildConfig.NSCLIENTOLNY;
 
 
-    public static final boolean ALLPREFERENCES = !BuildConfig.NSCLIENTOLNY;
-
     public static final boolean detailedLog = true;
     public static final boolean logFunctionCalls = true;
     public static final boolean logIncommingData = true;
@@ -41,6 +35,7 @@ public class Config {
     public static final boolean logPumpActions = true;
     public static final boolean logCongigBuilderActions = true;
     public static final boolean logAutosensData = false;
+    public static final boolean logEvents = false;
 
     // DanaR specific
     public static final boolean logDanaBTComm = true;

app/src/main/java/info/nightscout/androidaps/MainActivity.java

@@ -336,6 +336,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
                                     @Override
                                     public void run() {
                                         Intent i = new Intent(v.getContext(), PreferencesActivity.class);
+                                        i.putExtra("id", -1);
                                         startActivity(i);
                                     }
                                 }, null);

app/src/main/java/info/nightscout/androidaps/MainApp.java

@@ -14,6 +14,7 @@ import com.crashlytics.android.answers.CustomEvent;
 import com.crashlytics.android.core.CrashlyticsCore;
 import com.j256.ormlite.android.apptools.OpenHelperManager;
 import com.squareup.otto.Bus;
+import com.squareup.otto.LoggingBus;
 import com.squareup.otto.ThreadEnforcer;
 
 import org.slf4j.Logger;
@@ -27,11 +28,12 @@ import info.nightscout.androidaps.interfaces.InsulinInterface;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.Actions.ActionsFragment;
-import info.nightscout.androidaps.plugins.Careportal.CareportalFragment;
+import info.nightscout.androidaps.plugins.Careportal.CareportalPlugin;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderFragment;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ConstraintsObjectives.ObjectivesPlugin;
 import info.nightscout.androidaps.plugins.ConstraintsSafety.SafetyPlugin;
+import info.nightscout.androidaps.plugins.Food.FoodPlugin;
 import info.nightscout.androidaps.plugins.Insulin.InsulinFastactingPlugin;
 import info.nightscout.androidaps.plugins.Insulin.InsulinFastactingProlongedPlugin;
 import info.nightscout.androidaps.plugins.Insulin.InsulinOrefFreePeakPlugin;
@@ -69,7 +71,7 @@ import info.nightscout.androidaps.plugins.SourceMM640g.SourceMM640gPlugin;
 import info.nightscout.androidaps.plugins.SourceNSClient.SourceNSClientPlugin;
 import info.nightscout.androidaps.plugins.SourceXdrip.SourceXdripPlugin;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.plugins.Wear.WearFragment;
+import info.nightscout.androidaps.plugins.Wear.WearPlugin;
 import info.nightscout.androidaps.plugins.XDripStatusline.StatuslinePlugin;
 import info.nightscout.androidaps.receivers.DataReceiver;
 import info.nightscout.androidaps.receivers.KeepAliveReceiver;
@@ -106,7 +108,8 @@ public class MainApp extends Application {
         log.info("Version: " + BuildConfig.VERSION_NAME);
         log.info("BuildVersion: " + BuildConfig.BUILDVERSION);
 
-        sBus = new Bus(ThreadEnforcer.ANY);
+        sBus = Config.logEvents ? new LoggingBus(ThreadEnforcer.ANY) : new Bus(ThreadEnforcer.ANY);
+
         sInstance = this;
         sResources = getResources();
 
@@ -131,12 +134,12 @@ public class MainApp extends Application {
             if (Config.DANAR) pluginsList.add(DanaRv2Plugin.getPlugin());
             if (Config.DANAR) pluginsList.add(DanaRSPlugin.getPlugin());
             if (Config.COMBO) pluginsList.add(ComboPlugin.getPlugin());
-            pluginsList.add(CareportalFragment.getPlugin());
+            pluginsList.add(CareportalPlugin.getPlugin());
             if (Config.MDI) pluginsList.add(MDIPlugin.getPlugin());
-            if (Config.VIRTUALPUMP) pluginsList.add(VirtualPumpPlugin.getInstance());
+            if (Config.VIRTUALPUMP) pluginsList.add(VirtualPumpPlugin.getPlugin());
-            if (Config.LOOPENABLED) pluginsList.add(LoopPlugin.getPlugin());
+            if (Config.APS) pluginsList.add(LoopPlugin.getPlugin());
-            if (Config.OPENAPSENABLED) pluginsList.add(OpenAPSMAPlugin.getPlugin());
+            if (Config.APS) pluginsList.add(OpenAPSMAPlugin.getPlugin());
-            if (Config.OPENAPSENABLED) pluginsList.add(OpenAPSAMAPlugin.getPlugin());
+            if (Config.APS) pluginsList.add(OpenAPSAMAPlugin.getPlugin());
             pluginsList.add(NSProfilePlugin.getPlugin());
             if (Config.OTHERPROFILES) pluginsList.add(SimpleProfilePlugin.getPlugin());
             if (Config.OTHERPROFILES) pluginsList.add(LocalProfileFragment.getPlugin());
@@ -153,9 +156,10 @@ public class MainApp extends Application {
             if (!Config.NSCLIENT)
                 pluginsList.add(SourceGlimpPlugin.getPlugin());
             if (Config.SMSCOMMUNICATORENABLED) pluginsList.add(SmsCommunicatorPlugin.getPlugin());
+            pluginsList.add(FoodPlugin.getPlugin());
 
-            pluginsList.add(WearFragment.getPlugin(this));
+            pluginsList.add(WearPlugin.initPlugin(this));
-            pluginsList.add(StatuslinePlugin.getPlugin(this));
+            pluginsList.add(StatuslinePlugin.initPlugin(this));
             pluginsList.add(new PersistentNotificationPlugin(this));
             pluginsList.add(NSClientInternalPlugin.getPlugin());
 
@@ -188,6 +192,9 @@ public class MainApp extends Application {
         lbm.registerReceiver(dataReceiver, new IntentFilter(Intents.ACTION_NEW_TREATMENT));
         lbm.registerReceiver(dataReceiver, new IntentFilter(Intents.ACTION_CHANGED_TREATMENT));
         lbm.registerReceiver(dataReceiver, new IntentFilter(Intents.ACTION_REMOVED_TREATMENT));
+        lbm.registerReceiver(dataReceiver, new IntentFilter(Intents.ACTION_NEW_FOOD));
+        lbm.registerReceiver(dataReceiver, new IntentFilter(Intents.ACTION_CHANGED_FOOD));
+        lbm.registerReceiver(dataReceiver, new IntentFilter(Intents.ACTION_REMOVED_FOOD));
         lbm.registerReceiver(dataReceiver, new IntentFilter(Intents.ACTION_NEW_SGV));
         lbm.registerReceiver(dataReceiver, new IntentFilter(Intents.ACTION_NEW_PROFILE));
         lbm.registerReceiver(dataReceiver, new IntentFilter(Intents.ACTION_NEW_STATUS));
@@ -208,12 +215,6 @@ public class MainApp extends Application {
     private void startKeepAliveService() {
         if (keepAliveReceiver == null) {
             keepAliveReceiver = new KeepAliveReceiver();
-            if (Config.DANAR) {
-                startService(new Intent(this, DanaRExecutionService.class));
-                startService(new Intent(this, DanaRKoreanExecutionService.class));
-                startService(new Intent(this, DanaRv2ExecutionService.class));
-                startService(new Intent(this, DanaRSService.class));
-            }
             keepAliveReceiver.setAlarm(this);
         }
     }

app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java

@@ -1,5 +1,6 @@
 package info.nightscout.androidaps;
 
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.EditTextPreference;
@@ -15,19 +16,24 @@ import android.text.TextUtils;
 import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.events.EventRefreshGui;
 import info.nightscout.androidaps.interfaces.PluginBase;
+import info.nightscout.androidaps.plugins.Careportal.CareportalPlugin;
+import info.nightscout.androidaps.plugins.ConstraintsSafety.SafetyPlugin;
 import info.nightscout.androidaps.plugins.Insulin.InsulinOrefFreePeakPlugin;
+import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
+import info.nightscout.androidaps.plugins.NSClientInternal.NSClientInternalPlugin;
+import info.nightscout.androidaps.plugins.OpenAPSAMA.OpenAPSAMAPlugin;
+import info.nightscout.androidaps.plugins.OpenAPSMA.OpenAPSMAPlugin;
 import info.nightscout.androidaps.plugins.PumpCombo.ComboPlugin;
 import info.nightscout.androidaps.plugins.PumpDanaR.BluetoothDevicePreference;
 import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
 import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSClientInternalPlugin;
-import info.nightscout.androidaps.plugins.OpenAPSAMA.OpenAPSAMAPlugin;
 import info.nightscout.androidaps.plugins.PumpDanaRS.DanaRSPlugin;
 import info.nightscout.androidaps.plugins.PumpDanaRv2.DanaRv2Plugin;
 import info.nightscout.androidaps.plugins.PumpVirtual.VirtualPumpPlugin;
 import info.nightscout.androidaps.plugins.SensitivityAAPS.SensitivityAAPSPlugin;
 import info.nightscout.androidaps.plugins.SensitivityOref0.SensitivityOref0Plugin;
 import info.nightscout.androidaps.plugins.SensitivityWeightedAverage.SensitivityWeightedAveragePlugin;
+import info.nightscout.androidaps.plugins.SmsCommunicator.SmsCommunicatorPlugin;
 import info.nightscout.androidaps.plugins.Wear.WearPlugin;
 import info.nightscout.androidaps.plugins.XDripStatusline.StatuslinePlugin;
 import info.nightscout.utils.LocaleHelper;
@@ -41,6 +47,7 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         myPreferenceFragment = new MyPreferenceFragment();
+        myPreferenceFragment.setCaller(getIntent());
         getFragmentManager().beginTransaction().replace(android.R.id.content, myPreferenceFragment).commit();
         PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener(this);
     }
@@ -77,8 +84,7 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
             } else if (editTextPref.getText() != null && !editTextPref.getText().equals("")) {
                 ((EditTextPreference) pref).setDialogMessage(editTextPref.getDialogMessage());
                 pref.setSummary(editTextPref.getText());
-            }
+            } else if (pref.getKey().contains("smscommunicator_allowednumbers") && TextUtils.isEmpty(editTextPref.getText().toString().trim())) {
-            else if(pref.getKey().contains("smscommunicator_allowednumbers") && TextUtils.isEmpty(editTextPref.getText().toString().trim())){
                 pref.setSummary(MainApp.sResources.getString(R.string.smscommunicator_allowednumbers_summary));
             }
         }
@@ -100,91 +106,79 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
     }
 
     public static class MyPreferenceFragment extends PreferenceFragment {
+        Intent caller;
+
+        public void setCaller(Intent i) {
+            caller = i;
+        }
+
+        void addPreferencesFromResourceIfEnabled(PluginBase p, int type) {
+            if (p.isEnabled(type) && p.getPreferencesId() != -1)
+                addPreferencesFromResource(p.getPreferencesId());
+        }
+
         @Override
         public void onCreate(final Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
-            if (Config.ALLPREFERENCES) {
+
+            Integer id = caller.getIntExtra("id", -1);
+
+            if (id != -1) {
+                addPreferencesFromResource(id);
+            } else {
+                if (!Config.NSCLIENT) {
                     addPreferencesFromResource(R.xml.pref_password);
                 }
                 addPreferencesFromResource(R.xml.pref_age);
                 addPreferencesFromResource(R.xml.pref_language);
-            if (Config.ALLPREFERENCES) {
+
+                if (!Config.NSCLIENT) {
                     addPreferencesFromResource(R.xml.pref_quickwizard);
                 }
-            addPreferencesFromResource(R.xml.pref_careportal);
+                addPreferencesFromResourceIfEnabled(CareportalPlugin.getPlugin(), PluginBase.GENERAL);
-            if (Config.ALLPREFERENCES) {
+                addPreferencesFromResourceIfEnabled(SafetyPlugin.getPlugin(), PluginBase.CONSTRAINTS);
-                addPreferencesFromResource(R.xml.pref_treatments);
+                if (Config.APS) {
+                    addPreferencesFromResourceIfEnabled(LoopPlugin.getPlugin(), PluginBase.LOOP);
+                    addPreferencesFromResourceIfEnabled(OpenAPSMAPlugin.getPlugin(), PluginBase.APS);
+                    addPreferencesFromResourceIfEnabled(OpenAPSAMAPlugin.getPlugin(), PluginBase.APS);
                 }
-            if (Config.APS)
+
-                addPreferencesFromResource(R.xml.pref_closedmode);
+                addPreferencesFromResourceIfEnabled(SensitivityAAPSPlugin.getPlugin(), PluginBase.SENSITIVITY);
-            if (Config.OPENAPSENABLED) {
+                addPreferencesFromResourceIfEnabled(SensitivityWeightedAveragePlugin.getPlugin(), PluginBase.SENSITIVITY);
-                addPreferencesFromResource(R.xml.pref_openapsma);
+                addPreferencesFromResourceIfEnabled(SensitivityOref0Plugin.getPlugin(), PluginBase.SENSITIVITY);
-                if (MainApp.getSpecificPlugin(OpenAPSAMAPlugin.class) != null && MainApp.getSpecificPlugin(OpenAPSAMAPlugin.class).isEnabled(PluginBase.APS))
+
-                    addPreferencesFromResource(R.xml.pref_openapsama);
+                if (!Config.NSCLIENT) {
-            }
-            if (MainApp.getSpecificPlugin(SensitivityAAPSPlugin.class) != null && MainApp.getSpecificPlugin(SensitivityAAPSPlugin.class).isEnabled(PluginBase.SENSITIVITY)
-                    || MainApp.getSpecificPlugin(SensitivityWeightedAveragePlugin.class) != null && MainApp.getSpecificPlugin(SensitivityWeightedAveragePlugin.class).isEnabled(PluginBase.SENSITIVITY))
-                addPreferencesFromResource(R.xml.pref_absorption_aaps);
-            if (MainApp.getSpecificPlugin(SensitivityOref0Plugin.class) != null && MainApp.getSpecificPlugin(SensitivityOref0Plugin.class).isEnabled(PluginBase.SENSITIVITY))
-                addPreferencesFromResource(R.xml.pref_absorption_oref0);
-            if (Config.ALLPREFERENCES) {
                     addPreferencesFromResource(R.xml.pref_profile);
                 }
+
                 if (Config.DANAR) {
-                DanaRPlugin danaRPlugin = MainApp.getSpecificPlugin(DanaRPlugin.class);
+                    addPreferencesFromResourceIfEnabled(DanaRPlugin.getPlugin(), PluginBase.PUMP);
-                DanaRKoreanPlugin danaRKoreanPlugin = MainApp.getSpecificPlugin(DanaRKoreanPlugin.class);
+                    addPreferencesFromResourceIfEnabled(DanaRKoreanPlugin.getPlugin(), PluginBase.PUMP);
-                DanaRv2Plugin danaRv2Plugin = MainApp.getSpecificPlugin(DanaRv2Plugin.class);
+                    addPreferencesFromResourceIfEnabled(DanaRv2Plugin.getPlugin(), PluginBase.PUMP);
-                DanaRSPlugin danaRSPlugin = MainApp.getSpecificPlugin(DanaRSPlugin.class);
+                    addPreferencesFromResourceIfEnabled(DanaRSPlugin.getPlugin(), PluginBase.PUMP);
-                if (danaRPlugin.isEnabled(PluginBase.PUMP)) {
+
-                    addPreferencesFromResource(R.xml.pref_danar);
+                    if (DanaRPlugin.getPlugin().isEnabled(PluginBase.PROFILE)
-                }
+                            || DanaRKoreanPlugin.getPlugin().isEnabled(PluginBase.PROFILE)
-                if (danaRKoreanPlugin.isEnabled(PluginBase.PUMP)) {
+                            || DanaRv2Plugin.getPlugin().isEnabled(PluginBase.PROFILE)
-                    addPreferencesFromResource(R.xml.pref_danarkorean);
+                            || DanaRSPlugin.getPlugin().isEnabled(PluginBase.PROFILE)) {
-                }
-                if (danaRv2Plugin != null && danaRv2Plugin.isEnabled(PluginBase.PUMP)) {
-                    addPreferencesFromResource(R.xml.pref_danarv2);
-                }
-                if (danaRSPlugin != null && danaRSPlugin.isEnabled(PluginBase.PUMP)) {
-                    addPreferencesFromResource(R.xml.pref_danars);
-                }
-                if (danaRPlugin.isEnabled(PluginBase.PROFILE) || danaRKoreanPlugin.isEnabled(PluginBase.PROFILE) || danaRv2Plugin != null && danaRv2Plugin.isEnabled(PluginBase.PROFILE)) {
                         addPreferencesFromResource(R.xml.pref_danarprofile);
                     }
                 }
-            if (Config.COMBO) {
-                ComboPlugin comboPlugin = MainApp.getSpecificPlugin(ComboPlugin.class);
-                if (comboPlugin.isEnabled(PluginBase.PUMP)) {
-                    addPreferencesFromResource(R.xml.pref_combo);
-                }
-            }
-            VirtualPumpPlugin virtualPumpPlugin = MainApp.getSpecificPlugin(VirtualPumpPlugin.class);
-            if (virtualPumpPlugin != null && virtualPumpPlugin.isEnabled(PluginBase.PUMP)) {
-                addPreferencesFromResource(R.xml.pref_virtualpump);
-            }
-            InsulinOrefFreePeakPlugin insulinOrefFreePeakPlugin = MainApp.getSpecificPlugin(InsulinOrefFreePeakPlugin.class);
-            if (insulinOrefFreePeakPlugin.isEnabled(PluginBase.INSULIN)) {
-                addPreferencesFromResource(R.xml.pref_insulinoreffreepeak);
-            }
 
-            NSClientInternalPlugin nsClientInternalPlugin = MainApp.getSpecificPlugin(NSClientInternalPlugin.class);
+                addPreferencesFromResourceIfEnabled(VirtualPumpPlugin.getPlugin(), PluginBase.PUMP);
-            if (nsClientInternalPlugin != null && nsClientInternalPlugin.isEnabled(PluginBase.GENERAL)) {
+
-                addPreferencesFromResource(R.xml.pref_nsclientinternal);
+                addPreferencesFromResourceIfEnabled(InsulinOrefFreePeakPlugin.getPlugin(), PluginBase.INSULIN);
-            }
+
-            if (Config.SMSCOMMUNICATORENABLED)
+                addPreferencesFromResourceIfEnabled(NSClientInternalPlugin.getPlugin(), PluginBase.GENERAL);
-                addPreferencesFromResource(R.xml.pref_smscommunicator);
+                addPreferencesFromResourceIfEnabled(SmsCommunicatorPlugin.getPlugin(), PluginBase.GENERAL);
-            if (Config.ALLPREFERENCES) {
+
+                if (!Config.NSCLIENT) {
                     addPreferencesFromResource(R.xml.pref_others);
                 }
                 addPreferencesFromResource(R.xml.pref_advanced);
 
-            WearPlugin wearPlugin = MainApp.getSpecificPlugin(WearPlugin.class);
+                addPreferencesFromResourceIfEnabled(WearPlugin.getPlugin(), PluginBase.GENERAL);
-            if (wearPlugin != null && wearPlugin.isEnabled(PluginBase.GENERAL)) {
+                addPreferencesFromResourceIfEnabled(StatuslinePlugin.getPlugin(), PluginBase.GENERAL);
-                addPreferencesFromResource(R.xml.pref_wear);
-            }
-
-            StatuslinePlugin statuslinePlugin = MainApp.getSpecificPlugin(StatuslinePlugin.class);
-            if (statuslinePlugin != null && statuslinePlugin.isEnabled(PluginBase.GENERAL)) {
-                addPreferencesFromResource(R.xml.pref_xdripstatus);
             }
 
             initSummary(getPreferenceScreen());

app/src/main/java/info/nightscout/androidaps/Services/DataService.java

@@ -116,6 +116,9 @@ public class DataService extends IntentService {
                             Intents.ACTION_REMOVED_TREATMENT.equals(action) ||
                             Intents.ACTION_NEW_STATUS.equals(action) ||
                             Intents.ACTION_NEW_DEVICESTATUS.equals(action) ||
+                            Intents.ACTION_NEW_FOOD.equals(action) ||
+                            Intents.ACTION_CHANGED_FOOD.equals(action) ||
+                            Intents.ACTION_REMOVED_FOOD.equals(action) ||
                             Intents.ACTION_NEW_CAL.equals(action) ||
                             Intents.ACTION_NEW_MBG.equals(action))
                     ) {
@@ -413,6 +416,56 @@ public class DataService extends IntentService {
                 log.error("Unhandled exception", e);
             }
         }
+
+        if (intent.getAction().equals(Intents.ACTION_NEW_FOOD) || intent.getAction().equals(Intents.ACTION_CHANGED_FOOD)) {
+            try {
+                if (bundles.containsKey("food")) {
+                    String trstring = bundles.getString("food");
+                    handleAddChangeFoodRecord(new JSONObject(trstring));
+                }
+                if (bundles.containsKey("foods")) {
+                    String trstring = bundles.getString("foods");
+                    JSONArray jsonArray = new JSONArray(trstring);
+                    for (int i = 0; i < jsonArray.length(); i++) {
+                        JSONObject trJson = jsonArray.getJSONObject(i);
+                        handleAddChangeFoodRecord(trJson);
+                    }
+                }
+            } catch (Exception e) {
+                log.error("Unhandled exception", e);
+            }
+        }
+
+        if (intent.getAction().equals(Intents.ACTION_REMOVED_FOOD)) {
+            try {
+                if (bundles.containsKey("food")) {
+                    String trstring = bundles.getString("food");
+                    JSONObject trJson = new JSONObject(trstring);
+                    String _id = trJson.getString("_id");
+                    handleRemovedFoodRecord(_id);
+                }
+
+                if (bundles.containsKey("foods")) {
+                    String trstring = bundles.getString("foods");
+                    JSONArray jsonArray = new JSONArray(trstring);
+                    for (int i = 0; i < jsonArray.length(); i++) {
+                        JSONObject trJson = jsonArray.getJSONObject(i);
+                        String _id = trJson.getString("_id");
+                        handleRemovedFoodRecord(_id);
+                    }
+                }
+            } catch (Exception e) {
+                log.error("Unhandled exception", e);
+            }
+        }
+    }
+
+    private void handleRemovedFoodRecord(String _id) {
+        MainApp.getDbHelper().foodHelper.deleteFoodById(_id);
+    }
+
+    public void handleAddChangeFoodRecord(JSONObject trJson) throws JSONException {
+        MainApp.getDbHelper().foodHelper.createFoodFromJsonIfNotExists(trJson);
     }
 
     private void handleRemovedRecordFromNS(String _id) {

app/src/main/java/info/nightscout/androidaps/db/FoodHelper.java

@@ -87,6 +87,8 @@ public class FoodHelper {
                         log.debug("FOOD: Updating record by _id: " + old.toString());
                         scheduleFoodChange();
                         return true;
+                    } else {
+                        return false;
                     }
                 }
             }

app/src/main/java/info/nightscout/androidaps/events/Event.java

@@ -0,0 +1,16 @@
+package info.nightscout.androidaps.events;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/** Base class for all events posted on the event bus. */
+public abstract class Event {
+    static {
+        ReflectionToStringBuilder.setDefaultStyle(ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public String toString() {
+        return ReflectionToStringBuilder.toString(this);
+    }
+}

app/src/main/java/info/nightscout/androidaps/events/EventAppExit.java

@@ -3,5 +3,5 @@ package info.nightscout.androidaps.events;
 /**
  * Created by mike on 07.07.2016.
  */
-public class EventAppExit {
+public class EventAppExit extends Event {
 }

app/src/main/java/info/nightscout/androidaps/events/EventBolusRequested.java

@@ -4,7 +4,7 @@ package info.nightscout.androidaps.events;
  * Created by adrian on 07/02/17.
  */
 
-public class EventBolusRequested {
+public class EventBolusRequested extends Event {
     private double amount;
 
     public EventBolusRequested (double amount){

app/src/main/java/info/nightscout/androidaps/events/EventCareportalEventChange.java

@@ -4,5 +4,5 @@ package info.nightscout.androidaps.events;
  * Created by mike on 25.05.2017.
  */
 
-public class EventCareportalEventChange {
+public class EventCareportalEventChange extends Event {
 }

app/src/main/java/info/nightscout/androidaps/events/EventConfigBuilderChange.java

@@ -4,5 +4,5 @@ package info.nightscout.androidaps.events;
  * Created by mike on 17.02.2017.
  */
 
-public class EventConfigBuilderChange {
+public class EventConfigBuilderChange extends Event {
 }

app/src/main/java/info/nightscout/androidaps/events/EventExtendedBolusChange.java

@@ -4,5 +4,5 @@ package info.nightscout.androidaps.events;
  * Created by mike on 15.05.2017.
  */
 
-public class EventExtendedBolusChange {
+public class EventExtendedBolusChange extends Event {
 }

app/src/main/java/info/nightscout/androidaps/events/EventFoodDatabaseChanged.java

@@ -4,5 +4,5 @@ package info.nightscout.androidaps.events;
  * Created by mike on 20.09.2017.
  */
 
-public class EventFoodDatabaseChanged {
+public class EventFoodDatabaseChanged extends Event {
 }

app/src/main/java/info/nightscout/androidaps/events/EventInitializationChanged.java

@@ -4,5 +4,5 @@ package info.nightscout.androidaps.events;
  * Created by mike on 13.12.2016.
  */
 
-public class EventInitializationChanged {
+public class EventInitializationChanged extends Event {
 }

app/src/main/java/info/nightscout/androidaps/events/EventLoop.java

@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.events;
+
+/** Supeclass for all events concerned with input or output into or from the LoopPlugin. */
+public abstract class EventLoop extends Event {
+}

app/src/main/java/info/nightscout/androidaps/events/EventNewBG.java

@@ -3,5 +3,5 @@ package info.nightscout.androidaps.events;
 /**
  * Created by mike on 05.06.2016.
  */
-public class EventNewBG {
+public class EventNewBG extends EventLoop {
 }

app/src/main/java/info/nightscout/androidaps/events/EventNewBasalProfile.java

@@ -3,5 +3,5 @@ package info.nightscout.androidaps.events;
 /**
  * Created by mike on 04.06.2016.
  */
-public class EventNewBasalProfile {
+public class EventNewBasalProfile extends Event {
 }

app/src/main/java/info/nightscout/androidaps/events/EventPreferenceChange.java

@@ -5,7 +5,7 @@ import info.nightscout.androidaps.MainApp;
 /**
  * Created by mike on 19.06.2016.
  */
-public class EventPreferenceChange {
+public class EventPreferenceChange extends Event {
     public String changedKey;
     public EventPreferenceChange(String key) {
         changedKey = key;

app/src/main/java/info/nightscout/androidaps/events/EventProfileSwitchChange.java

@@ -4,5 +4,5 @@ package info.nightscout.androidaps.events;
  * Created by mike on 02.06.2017.
  */
 
-public class EventProfileSwitchChange {
+public class EventProfileSwitchChange extends Event {
 }

app/src/main/java/info/nightscout/androidaps/events/EventPumpStatusChanged.java

@@ -7,7 +7,7 @@ import info.nightscout.androidaps.R;
  * Created by mike on 19.02.2017.
  */
 
-public class EventPumpStatusChanged {
+public class EventPumpStatusChanged extends Event {
     public static final int CONNECTING = 0;
     public static final int CONNECTED = 1;
     public static final int PERFORMING = 2;

app/src/main/java/info/nightscout/androidaps/events/EventRefreshGui.java

@@ -3,5 +3,5 @@ package info.nightscout.androidaps.events;
 /**
  * Created by mike on 13.06.2016.
  */
-public class EventRefreshGui {
+public class EventRefreshGui extends Event {
 }

app/src/main/java/info/nightscout/androidaps/events/EventRefreshOverview.java

@@ -4,7 +4,7 @@ package info.nightscout.androidaps.events;
  * Created by mike on 16.06.2017.
  */
 
-public class EventRefreshOverview {
+public class EventRefreshOverview extends Event {
     public String from;
 
     public EventRefreshOverview(String from) {

app/src/main/java/info/nightscout/androidaps/events/EventReloadProfileSwitchData.java

@@ -4,5 +4,5 @@ package info.nightscout.androidaps.events;
  * Created by mike on 12.06.2017.
  */
 
-public class EventReloadProfileSwitchData {
+public class EventReloadProfileSwitchData extends Event {
 }

app/src/main/java/info/nightscout/androidaps/events/EventReloadTempBasalData.java

@@ -4,5 +4,5 @@ package info.nightscout.androidaps.events;
  * Created by mike on 29.05.2017.
  */
 
-public class EventReloadTempBasalData {
+public class EventReloadTempBasalData extends Event {
 }

app/src/main/java/info/nightscout/androidaps/events/EventReloadTreatmentData.java

@@ -4,7 +4,7 @@ package info.nightscout.androidaps.events;
  * Created by mike on 29.05.2017.
  */
 
-public class EventReloadTreatmentData {
+public class EventReloadTreatmentData extends Event {
     public Object next;
 
     public EventReloadTreatmentData(Object next) {

app/src/main/java/info/nightscout/androidaps/events/EventTempBasalChange.java

@@ -3,5 +3,5 @@ package info.nightscout.androidaps.events;
 /**
  * Created by mike on 05.06.2016.
  */
-public class EventTempBasalChange {
+public class EventTempBasalChange extends EventLoop {
 }

app/src/main/java/info/nightscout/androidaps/events/EventTempTargetChange.java

@@ -4,5 +4,5 @@ package info.nightscout.androidaps.events;
  * Created by mike on 13.01.2017.
  */
 
-public class EventTempTargetChange {
+public class EventTempTargetChange extends Event {
 }

app/src/main/java/info/nightscout/androidaps/events/EventTreatmentChange.java

@@ -3,5 +3,5 @@ package info.nightscout.androidaps.events;
 /**
  * Created by mike on 04.06.2016.
  */
-public class EventTreatmentChange {
+public class EventTreatmentChange extends EventLoop {
 }

app/src/main/java/info/nightscout/androidaps/events/EventUpdateGui.java

@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.events;
+
+/** Base class for events to update the UI, mostly a specific tab. */
+public abstract class EventUpdateGui extends Event {
+}

app/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.java

@@ -30,4 +30,5 @@ public interface PluginBase {
     boolean showInList(int type);
     void setFragmentEnabled(int type, boolean fragmentEnabled);
     void setFragmentVisible(int type, boolean fragmentVisible);
+    int getPreferencesId();
 }

app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsPlugin.java

@@ -74,4 +74,9 @@ public class ActionsPlugin implements PluginBase {
         if (type == GENERAL) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
 }

app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalFragment.java

@@ -26,8 +26,6 @@ import info.nightscout.androidaps.plugins.Overview.OverviewFragment;
 
 public class CareportalFragment extends SubscriberFragment implements View.OnClickListener {
 
-    static CareportalPlugin careportalPlugin;
-
     TextView iage;
     TextView cage;
     TextView sage;
@@ -37,13 +35,6 @@ public class CareportalFragment extends SubscriberFragment implements View.OnCli
     LinearLayout butonsLayout;
     View noProfileView;
 
-    static public CareportalPlugin getPlugin() {
-        if (careportalPlugin == null) {
-            careportalPlugin = new CareportalPlugin();
-        }
-        return careportalPlugin;
-    }
-
     //                                                    date,bg,insulin,carbs,prebolus,duration,percent,absolute,profile,split,temptarget
     public static final OptionsToShow BGCHECK = new OptionsToShow(R.id.careportal_bgcheck, R.string.careportal_bgcheck).date().bg();
     public static final OptionsToShow SNACKBOLUS = new OptionsToShow(R.id.careportal_snackbolus, R.string.careportal_snackbolus).date().bg().insulin().carbs().prebolus();

app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalPlugin.java

@@ -10,6 +10,15 @@ public class CareportalPlugin implements PluginBase {
     private boolean fragmentEnabled = true;
     private boolean fragmentVisible = true;
 
+    static CareportalPlugin careportalPlugin;
+
+    static public CareportalPlugin getPlugin() {
+        if (careportalPlugin == null) {
+            careportalPlugin = new CareportalPlugin();
+        }
+        return careportalPlugin;
+    }
+
     @Override
     public int getType() {
         return PluginBase.GENERAL;
@@ -71,4 +80,9 @@ public class CareportalPlugin implements PluginBase {
         if (type == GENERAL) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_careportal;
+    }
+
 }

app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java

@@ -138,6 +138,7 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
+        if (options==null) return null;
         getDialog().setTitle(getString(options.eventName));
         setStyle(DialogFragment.STYLE_NORMAL, getTheme());
         View view = inflater.inflate(R.layout.careportal_newnstreatment_dialog, container, false);

app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java

@@ -2,6 +2,7 @@ package info.nightscout.androidaps.plugins.ConfigBuilder;
 
 
 import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
@@ -10,6 +11,7 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListAdapter;
 import android.widget.ListView;
@@ -22,6 +24,7 @@ import com.crashlytics.android.answers.CustomEvent;
 import java.util.ArrayList;
 
 import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.PreferencesActivity;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.events.EventConfigBuilderChange;
 import info.nightscout.androidaps.events.EventRefreshGui;
@@ -194,7 +197,7 @@ public class ConfigBuilderFragment extends Fragment {
         public PluginCustomAdapter(Context context, int textViewResourceId,
                                    ArrayList<PluginBase> pluginList, int type) {
             super(context, textViewResourceId, pluginList);
-            this.pluginList = new ArrayList<PluginBase>();
+            this.pluginList = new ArrayList<>();
             this.pluginList.addAll(pluginList);
             this.type = type;
         }
@@ -203,12 +206,14 @@ public class ConfigBuilderFragment extends Fragment {
             TextView name;
             CheckBox checkboxEnabled;
             CheckBox checkboxVisible;
+            ImageView settings;
         }
 
         @Override
         public View getView(int position, View view, ViewGroup parent) {
 
             PluginViewHolder holder = null;
+            PluginBase plugin = pluginList.get(position);
 
             if (view == null) {
                 view = LayoutInflater.from(parent.getContext()).inflate(R.layout.configbuilder_simpleitem, null);
@@ -217,6 +222,13 @@ public class ConfigBuilderFragment extends Fragment {
                 holder.name = (TextView) view.findViewById(R.id.configbuilder_simpleitem_name);
                 holder.checkboxEnabled = (CheckBox) view.findViewById(R.id.configbuilder_simpleitem_checkboxenabled);
                 holder.checkboxVisible = (CheckBox) view.findViewById(R.id.configbuilder_simpleitem_checkboxvisible);
+                holder.settings = (ImageView) view.findViewById(R.id.configbuilder_simpleitem_settings);
+
+                if (plugin.isEnabled(type) && plugin.getPreferencesId() != -1)
+                    holder.settings.setVisibility(View.VISIBLE);
+                else
+                    holder.settings.setVisibility(View.INVISIBLE);
+
                 view.setTag(holder);
 
                 holder.checkboxEnabled.setOnClickListener(new View.OnClickListener() {
@@ -244,17 +256,31 @@ public class ConfigBuilderFragment extends Fragment {
                         getPlugin().logPluginStatus();
                     }
                 });
+
+                holder.settings.setOnClickListener(new View.OnClickListener() {
+                    public void onClick(View v) {
+                        final PluginBase plugin = (PluginBase) v.getTag();
+                        PasswordProtection.QueryPassword(getContext(), R.string.settings_password, "settings_password", new Runnable() {
+                            @Override
+                            public void run() {
+                                Intent i = new Intent(getContext(), PreferencesActivity.class);
+                                i.putExtra("id", plugin.getPreferencesId());
+                                startActivity(i);
+                            }
+                        }, null);
+                    }
+                });
             } else {
                 holder = (PluginViewHolder) view.getTag();
             }
 
-            PluginBase plugin = pluginList.get(position);
             holder.name.setText(plugin.getName());
             holder.checkboxEnabled.setChecked(plugin.isEnabled(type));
             holder.checkboxVisible.setChecked(plugin.isVisibleInTabs(type));
             holder.name.setTag(plugin);
             holder.checkboxEnabled.setTag(plugin);
             holder.checkboxVisible.setTag(plugin);
+            holder.settings.setTag(plugin);
 
             if (!plugin.canBeHidden(type)) {
                 holder.checkboxEnabled.setEnabled(false);

app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java

@@ -146,6 +146,11 @@ public class ConfigBuilderPlugin implements PluginBase, PumpInterface, Constrain
         // Always visible
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
     public void initialize() {
         pluginList = MainApp.getPluginsList();
         loadSettings();
@@ -301,7 +306,7 @@ public class ConfigBuilderPlugin implements PluginBase, PumpInterface, Constrain
         pluginsInCategory = MainApp.getSpecificPluginsList(PluginBase.PUMP);
         activePump = (PumpInterface) getTheOneEnabledInArray(pluginsInCategory, PluginBase.PUMP);
         if (activePump == null)
-            activePump = VirtualPumpPlugin.getInstance(); // for NSClient build
+            activePump = VirtualPumpPlugin.getPlugin(); // for NSClient build
         if (Config.logConfigBuilder)
             log.debug("Selected pump interface: " + ((PluginBase) activePump).getName());
         for (PluginBase p : pluginsInCategory) {

app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/ObjectivesPlugin.java

@@ -104,6 +104,11 @@ public class ObjectivesPlugin implements PluginBase, ConstraintsInterface {
         if (type == CONSTRAINTS) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
     class Objective {
         Integer num;
         String objective;

app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsSafety/SafetyPlugin.java

@@ -86,6 +86,11 @@ public class SafetyPlugin implements PluginBase, ConstraintsInterface {
     public void setFragmentVisible(int type, boolean fragmentVisible) {
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_safety;
+    }
+
     @Override
     public boolean isLoopEnabled() {
         return MainApp.getConfigBuilder().getPumpDescription().isTempBasalCapable;

app/src/main/java/info/nightscout/androidaps/plugins/Food/FoodFragment.java

@@ -0,0 +1,315 @@
+package info.nightscout.androidaps.plugins.Food;
+
+import android.app.Activity;
+import android.content.DialogInterface;
+import android.graphics.Paint;
+import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.crashlytics.android.Crashlytics;
+import com.squareup.otto.Subscribe;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.db.Food;
+import info.nightscout.androidaps.events.EventFoodDatabaseChanged;
+import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
+import info.nightscout.utils.NSUpload;
+import info.nightscout.utils.SpinnerHelper;
+
+/**
+ * Created by mike on 16.10.2017.
+ */
+
+public class FoodFragment extends SubscriberFragment {
+    private static Logger log = LoggerFactory.getLogger(FoodFragment.class);
+
+    EditText filter;
+    ImageView clearFilter;
+    SpinnerHelper category;
+    SpinnerHelper subcategory;
+    RecyclerView recyclerView;
+
+    List<Food> unfiltered;
+    List<Food> filtered;
+    ArrayList<CharSequence> categories;
+    ArrayList<CharSequence> subcategories;
+
+    final String EMPTY = MainApp.sResources.getString(R.string.none);
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        try {
+            View view = inflater.inflate(R.layout.food_fragment, container, false);
+
+            filter = (EditText) view.findViewById(R.id.food_filter);
+            clearFilter = (ImageView) view.findViewById(R.id.food_clearfilter);
+            category = new SpinnerHelper(view.findViewById(R.id.food_category));
+            subcategory = new SpinnerHelper(view.findViewById(R.id.food_subcategory));
+            recyclerView = (RecyclerView) view.findViewById(R.id.food_recyclerview);
+            recyclerView.setHasFixedSize(true);
+            LinearLayoutManager llm = new LinearLayoutManager(view.getContext());
+            recyclerView.setLayoutManager(llm);
+
+            clearFilter.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    filter.setText("");
+                    category.setSelection(0);
+                    subcategory.setSelection(0);
+                    filterData();
+                }
+            });
+
+            category.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+                @Override
+                public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                    fillSubcategories();
+                    filterData();
+                }
+
+                @Override
+                public void onNothingSelected(AdapterView<?> parent) {
+                    fillSubcategories();
+                    filterData();
+                }
+            });
+
+            subcategory.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+                @Override
+                public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                    filterData();
+                }
+
+                @Override
+                public void onNothingSelected(AdapterView<?> parent) {
+                    filterData();
+                }
+            });
+
+            filter.addTextChangedListener(new TextWatcher() {
+                @Override
+                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                }
+
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    filterData();
+                }
+
+                @Override
+                public void afterTextChanged(Editable s) {
+                }
+            });
+
+            RecyclerViewAdapter adapter = new RecyclerViewAdapter(MainApp.getDbHelper().foodHelper.getFoodData());
+            recyclerView.setAdapter(adapter);
+
+            loadData();
+            fillCategories();
+            fillSubcategories();
+            filterData();
+            return view;
+        } catch (Exception e) {
+            Crashlytics.logException(e);
+        }
+
+        return null;
+    }
+
+    @Subscribe
+    @SuppressWarnings("unused")
+    public void onStatusEvent(final EventFoodDatabaseChanged ev) {
+        loadData();
+        filterData();
+    }
+
+    void loadData() {
+        unfiltered = MainApp.getDbHelper().foodHelper.getFoodData();
+    }
+
+    void fillCategories() {
+        categories = new ArrayList<>();
+
+        for (Food f : unfiltered) {
+            if (f.category != null && !f.category.equals(""))
+                categories.add(f.category);
+        }
+
+        // make it unique
+        categories = new ArrayList<>(new HashSet<>(categories));
+
+        categories.add(0, MainApp.sResources.getString(R.string.none));
+
+        ArrayAdapter<CharSequence> adapterCategories = new ArrayAdapter<>(getContext(),
+                R.layout.spinner_centered, categories);
+        category.setAdapter(adapterCategories);
+    }
+
+    void fillSubcategories() {
+        String categoryFilter = category.getSelectedItem().toString();
+        subcategories = new ArrayList<>();
+
+        if (!categoryFilter.equals(EMPTY)) {
+            for (Food f : unfiltered) {
+                if (f.category != null && f.category.equals(categoryFilter))
+                    if (f.subcategory != null && !f.subcategory.equals(""))
+                        subcategories.add(f.subcategory);
+            }
+        }
+
+        // make it unique
+        subcategories = new ArrayList<>(new HashSet<>(subcategories));
+
+        subcategories.add(0, MainApp.sResources.getString(R.string.none));
+
+        ArrayAdapter<CharSequence> adapterSubcategories = new ArrayAdapter<>(getContext(),
+                R.layout.spinner_centered, subcategories);
+        subcategory.setAdapter(adapterSubcategories);
+    }
+
+    void filterData() {
+        String textFilter = filter.getText().toString();
+        String categoryFilter = category.getSelectedItem().toString();
+        String subcategoryFilter = subcategory.getSelectedItem().toString();
+
+        filtered = new ArrayList<>();
+
+        for (Food f : unfiltered) {
+            if (f.name == null || f.category == null || f.subcategory == null)
+                continue;
+
+            if (!subcategoryFilter.equals(EMPTY) && !f.subcategory.equals(subcategoryFilter))
+                continue;
+            if (!categoryFilter.equals(EMPTY) && !f.category.equals(categoryFilter))
+                continue;
+            if (!textFilter.equals("") && !f.name.toLowerCase().contains(textFilter.toLowerCase()))
+                continue;
+            filtered.add(f);
+        }
+
+        updateGUI();
+    }
+
+    @Override
+    protected void updateGUI() {
+        Activity activity = getActivity();
+        if (activity != null)
+            activity.runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    recyclerView.swapAdapter(new FoodFragment.RecyclerViewAdapter(filtered), true);
+                }
+            });
+    }
+
+    public class RecyclerViewAdapter extends RecyclerView.Adapter<RecyclerViewAdapter.FoodsViewHolder> {
+
+        List<Food> foodList;
+
+        RecyclerViewAdapter(List<Food> foodList) {
+            this.foodList = foodList;
+        }
+
+        @Override
+        public FoodsViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewType) {
+            View v = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.food_item, viewGroup, false);
+            return new FoodsViewHolder(v);
+        }
+
+        @Override
+        public void onBindViewHolder(FoodsViewHolder holder, int position) {
+            Food food = foodList.get(position);
+            holder.ns.setVisibility(food._id != null ? View.VISIBLE : View.GONE);
+            holder.name.setText(food.name);
+            holder.portion.setText(food.portion + food.units);
+            holder.carbs.setText(food.carbs + MainApp.sResources.getString(R.string.shortgramm));
+            holder.fat.setText(MainApp.sResources.getString(R.string.shortfat) + ": " + food.fat + MainApp.sResources.getString(R.string.shortgramm));
+            if (food.fat == 0)
+                holder.fat.setVisibility(View.INVISIBLE);
+            holder.protein.setText(MainApp.sResources.getString(R.string.shortprotein) + ": " + food.protein + MainApp.sResources.getString(R.string.shortgramm));
+            if (food.protein == 0)
+                holder.protein.setVisibility(View.INVISIBLE);
+            holder.energy.setText(MainApp.sResources.getString(R.string.shortenergy) + ": " + food.energy + MainApp.sResources.getString(R.string.shortkilojoul));
+            if (food.energy == 0)
+                holder.energy.setVisibility(View.INVISIBLE);
+            holder.remove.setTag(food);
+        }
+
+        @Override
+        public int getItemCount() {
+            return foodList.size();
+        }
+
+        class FoodsViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
+            TextView name;
+            TextView portion;
+            TextView carbs;
+            TextView fat;
+            TextView protein;
+            TextView energy;
+            TextView ns;
+            TextView remove;
+
+            FoodsViewHolder(View itemView) {
+                super(itemView);
+                name = (TextView) itemView.findViewById(R.id.food_name);
+                portion = (TextView) itemView.findViewById(R.id.food_portion);
+                carbs = (TextView) itemView.findViewById(R.id.food_carbs);
+                fat = (TextView) itemView.findViewById(R.id.food_fat);
+                protein = (TextView) itemView.findViewById(R.id.food_protein);
+                energy = (TextView) itemView.findViewById(R.id.food_energy);
+                ns = (TextView) itemView.findViewById(R.id.ns_sign);
+                remove = (TextView) itemView.findViewById(R.id.food_remove);
+                remove.setOnClickListener(this);
+                remove.setPaintFlags(remove.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
+            }
+
+            @Override
+            public void onClick(View v) {
+                final Food food = (Food) v.getTag();
+                switch (v.getId()) {
+
+                    case R.id.food_remove:
+                        AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+                        builder.setTitle(MainApp.sResources.getString(R.string.confirmation));
+                        builder.setMessage(MainApp.sResources.getString(R.string.removerecord) + "\n" + food.name);
+                        builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int id) {
+                                final String _id = food._id;
+                                if (_id != null && !_id.equals("")) {
+                                    NSUpload.removeFoodFromNS(_id);
+                                }
+                                MainApp.getDbHelper().foodHelper.delete(food);
+                            }
+                        });
+                        builder.setNegativeButton(MainApp.sResources.getString(R.string.cancel), null);
+                        builder.show();
+                        break;
+
+                }
+            }
+        }
+    }
+
+}

app/src/main/java/info/nightscout/androidaps/plugins/Food/FoodPlugin.java

@@ -0,0 +1,85 @@
+package info.nightscout.androidaps.plugins.Food;
+
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.interfaces.PluginBase;
+
+/**
+ * Created by mike on 05.08.2016.
+ */
+public class FoodPlugin implements PluginBase {
+    private boolean fragmentEnabled = true;
+    private boolean fragmentVisible = false;
+
+    private static FoodPlugin plugin = null;
+
+    public static FoodPlugin getPlugin() {
+        if (plugin == null)
+            plugin = new FoodPlugin();
+        return plugin;
+    }
+
+    @Override
+    public String getFragmentClass() {
+        return FoodFragment.class.getName();
+    }
+
+    @Override
+    public int getType() {
+        return PluginBase.GENERAL;
+    }
+
+    @Override
+    public String getName() {
+        return MainApp.instance().getString(R.string.food);
+    }
+
+    @Override
+    public String getNameShort() {
+        // use long name as fallback (not visible in tabs)
+        return getName();
+    }
+
+
+    @Override
+    public boolean isEnabled(int type) {
+        return type == GENERAL && fragmentEnabled;
+    }
+
+    @Override
+    public boolean isVisibleInTabs(int type) {
+        return type == GENERAL && fragmentVisible;
+    }
+
+    @Override
+    public boolean canBeHidden(int type) {
+        return true;
+    }
+
+    @Override
+    public boolean hasFragment() {
+        return true;
+    }
+
+    @Override
+    public boolean showInList(int type) {
+        return true;
+    }
+
+    @Override
+    public void setFragmentEnabled(int type, boolean fragmentEnabled) {
+        if (type == GENERAL) this.fragmentEnabled = fragmentEnabled;
+    }
+
+    @Override
+    public void setFragmentVisible(int type, boolean fragmentVisible) {
+        if (type == GENERAL) this.fragmentVisible = fragmentVisible;
+    }
+
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
+
+}

app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinFastactingPlugin.java

@@ -80,6 +80,11 @@ public class InsulinFastactingPlugin implements PluginBase, InsulinInterface {
         if (type == INSULIN) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
     // Insulin interface
     @Override
     public int getId() {

app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinFastactingProlongedPlugin.java

@@ -80,6 +80,11 @@ public class InsulinFastactingProlongedPlugin implements PluginBase, InsulinInte
         if (type == INSULIN) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
     // Insulin interface
     @Override
     public int getId() {

app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefFreePeakPlugin.java

@@ -68,6 +68,11 @@ public class InsulinOrefFreePeakPlugin extends InsulinOrefBasePlugin {
         if (type == INSULIN) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_insulinoreffreepeak;
+    }
+
     @Override
     int getPeak() {
         return SP.getInt(R.string.key_insulin_oref_peak, DEFAULT_PEAK);

app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefRapidActingPlugin.java

@@ -67,6 +67,11 @@ public class InsulinOrefRapidActingPlugin extends InsulinOrefBasePlugin {
         if (type == INSULIN) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
     @Override
     int getPeak() {
         return PEAK;

app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefUltraRapidActingPlugin.java

@@ -67,6 +67,11 @@ public class InsulinOrefUltraRapidActingPlugin extends InsulinOrefBasePlugin {
         if (type == INSULIN) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
     @Override
     int getPeak() {
         return PEAK;

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

@@ -126,6 +126,11 @@ public class IobCobCalculatorPlugin implements PluginBase {
 
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
     IobCobCalculatorPlugin() {
         MainApp.bus().register(this);
         if (sHandlerThread == null) {

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

@@ -1,8 +1,10 @@
 package info.nightscout.androidaps.plugins.IobCobCalculator.events;
 
+import info.nightscout.androidaps.events.EventLoop;
+
 /**
  * Created by mike on 30.04.2017.
  */
 
-public class EventAutosensCalculationFinished {
+public class EventAutosensCalculationFinished extends EventLoop {
 }

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

@@ -1,10 +1,12 @@
 package info.nightscout.androidaps.plugins.IobCobCalculator.events;
 
+import info.nightscout.androidaps.events.Event;
+
 /**
  * Created by mike on 26.04.2017.
  */
 
-public class EventNewHistoryData {
+public class EventNewHistoryData extends Event {
     public long time = 0;
 
     public EventNewHistoryData(long time) {

app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java

@@ -148,6 +148,11 @@ public class LoopPlugin implements PluginBase {
         if (type == LOOP) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_closedmode;
+    }
+
     @Subscribe
     public void onStatusEvent(final EventTreatmentChange ev) {
         invoke("EventTreatmentChange", true);

app/src/main/java/info/nightscout/androidaps/plugins/Loop/events/EventLoopSetLastRunGui.java

@@ -1,9 +1,11 @@
 package info.nightscout.androidaps.plugins.Loop.events;
 
+import info.nightscout.androidaps.events.EventUpdateGui;
+
 /**
  * Created by mike on 05.08.2016.
  */
-public class EventLoopSetLastRunGui {
+public class EventLoopSetLastRunGui extends EventUpdateGui {
     public String text = null;
 
     public EventLoopSetLastRunGui(String text) {

app/src/main/java/info/nightscout/androidaps/plugins/Loop/events/EventLoopUpdateGui.java

@@ -1,7 +1,9 @@
 package info.nightscout.androidaps.plugins.Loop.events;
 
+import info.nightscout.androidaps.events.EventUpdateGui;
+
 /**
  * Created by mike on 05.08.2016.
  */
-public class EventLoopUpdateGui {
+public class EventLoopUpdateGui extends EventUpdateGui {
 }

app/src/main/java/info/nightscout/androidaps/plugins/Loop/events/EventNewOpenLoopNotification.java

@@ -1,7 +1,9 @@
 package info.nightscout.androidaps.plugins.Loop.events;
 
+import info.nightscout.androidaps.events.Event;
+
 /**
  * Created by mike on 07.08.2016.
  */
-public class EventNewOpenLoopNotification {
+public class EventNewOpenLoopNotification extends Event {
 }

app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/NSClientInternalPlugin.java

@@ -135,6 +135,11 @@ public class NSClientInternalPlugin implements PluginBase {
         if (type == GENERAL) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_nsclientinternal;
+    }
+
     private ServiceConnection mConnection = new ServiceConnection() {
 
         public void onServiceDisconnected(ComponentName name) {

app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/acks/NSAddAck.java

@@ -7,14 +7,14 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.events.Event;
 import info.nightscout.androidaps.plugins.NSClientInternal.events.EventNSClientRestart;
-import info.nightscout.androidaps.plugins.NSClientInternal.services.NSClientService;
 import io.socket.client.Ack;
 
 /**
  * Created by mike on 29.12.2015.
  */
-public class NSAddAck implements Ack {
+public class NSAddAck extends Event implements Ack {
     private static Logger log = LoggerFactory.getLogger(NSAddAck.class);
     public String _id = null;
     public String nsClientID = null;

app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/acks/NSAuthAck.java

@@ -3,13 +3,14 @@ package info.nightscout.androidaps.plugins.NSClientInternal.acks;
 import org.json.JSONObject;
 
 import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.events.Event;
 import info.nightscout.androidaps.plugins.NSClientInternal.events.EventNSClientNewLog;
 import io.socket.client.Ack;
 
 /**
  * Created by mike on 02.01.2016.
  */
-public class NSAuthAck implements Ack{
+public class NSAuthAck extends Event implements Ack{
     public boolean read = false;
     public boolean write = false;
     public boolean write_treatment = false;

app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/acks/NSPingAck.java

@@ -1,44 +0,0 @@
-package info.nightscout.androidaps.plugins.NSClientInternal.acks;
-
-import android.os.SystemClock;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.socket.client.Ack;
-
-/**
- * Created by mike on 29.12.2015.
- */
-public class NSPingAck  implements Ack {
-    private static Logger log = LoggerFactory.getLogger(NSPingAck.class);
-
-    public long mills = 0;
-    public boolean received = false;
-    public boolean auth_received = false;
-    public boolean read = false;
-    public boolean write = false;
-    public boolean write_treatment = false;
-
-    public void call(Object...args) {
-        JSONObject response = (JSONObject)args[0];
-        mills = response.optLong("mills");
-        if (response.has("authorization")) {
-            auth_received = true;
-            try {
-                JSONObject authorization = response.getJSONObject("authorization");
-                read = authorization.optBoolean("read");
-                write = authorization.optBoolean("write");
-                write_treatment = authorization.optBoolean("write_treatment");
-            } catch (JSONException e) {
-                log.error("Unhandled exception", e);
-            }
-        }
-        received = true;
-        synchronized(this) {
-            this.notify();
-        }
-    }
-}

app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/acks/NSUpdateAck.java

@@ -6,12 +6,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.events.Event;
 import io.socket.client.Ack;
 
 /**
  * Created by mike on 21.02.2016.
  */
-public class NSUpdateAck implements Ack {
+public class NSUpdateAck extends Event implements Ack {
     private static Logger log = LoggerFactory.getLogger(NSUpdateAck.class);
     public boolean result = false;
     public String _id = null;

app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/events/EventNSClientNewLog.java

@@ -1,19 +1,15 @@
 package info.nightscout.androidaps.plugins.NSClientInternal.events;
 
-import android.text.Html;
-import android.text.Spanned;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import info.nightscout.androidaps.events.Event;
+
 /**
  * Created by mike on 15.02.2017.
  */
 
-public class EventNSClientNewLog {
+public class EventNSClientNewLog extends Event {
     public Date date = new Date();
     public String action;
     public String logText;

app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/events/EventNSClientRestart.java

@@ -1,8 +1,10 @@
 package info.nightscout.androidaps.plugins.NSClientInternal.events;
 
+import info.nightscout.androidaps.events.Event;
+
 /**
  * Created by mike on 15.02.2017.
  */
 
-public class EventNSClientRestart {
+public class EventNSClientRestart extends Event {
 }

app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/events/EventNSClientStatus.java

@@ -1,9 +1,11 @@
 package info.nightscout.androidaps.plugins.NSClientInternal.events;
 
+import info.nightscout.androidaps.events.Event;
+
 /**
  * Created by mike on 02.01.2016.
  */
-public class EventNSClientStatus {
+public class EventNSClientStatus extends Event {
     public String status = "";
 
     public EventNSClientStatus(String status) {

app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/events/EventNSClientUpdateGUI.java

@@ -1,8 +1,10 @@
 package info.nightscout.androidaps.plugins.NSClientInternal.events;
 
+import info.nightscout.androidaps.events.EventUpdateGui;
+
 /**
  * Created by mike on 17.02.2017.
  */
 
-public class EventNSClientUpdateGUI {
+public class EventNSClientUpdateGUI extends EventUpdateGui {
 }

app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAPlugin.java

@@ -103,6 +103,11 @@ public class OpenAPSAMAPlugin implements PluginBase, APSInterface {
         if (type == APS) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_openapsama;
+    }
+
     @Override
     public void setFragmentEnabled(int type, boolean fragmentEnabled) {
         if (type == APS) this.fragmentEnabled = fragmentEnabled;

app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAPlugin.java

@@ -101,6 +101,11 @@ public class OpenAPSMAPlugin implements PluginBase, APSInterface {
         if (type == APS) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_openapsma;
+    }
+
     @Override
     public void setFragmentEnabled(int type, boolean fragmentEnabled) {
         if (type == APS) this.fragmentEnabled = fragmentEnabled;

app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/events/EventOpenAPSUpdateGui.java

@@ -1,7 +1,9 @@
 package info.nightscout.androidaps.plugins.OpenAPSMA.events;
 
+import info.nightscout.androidaps.events.EventUpdateGui;
+
 /**
  * Created by mike on 05.08.2016.
  */
-public class EventOpenAPSUpdateGui {
+public class EventOpenAPSUpdateGui extends EventUpdateGui {
 }

app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/events/EventOpenAPSUpdateResultGui.java

@@ -1,9 +1,11 @@
 package info.nightscout.androidaps.plugins.OpenAPSMA.events;
 
+import info.nightscout.androidaps.events.EventUpdateGui;
+
 /**
  * Created by mike on 05.08.2016.
  */
-public class EventOpenAPSUpdateResultGui {
+public class EventOpenAPSUpdateResultGui extends EventUpdateGui {
     public String text = null;
 
     public EventOpenAPSUpdateResultGui(String text) {

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

@@ -37,9 +37,7 @@ import com.crashlytics.android.Crashlytics;
 import com.crashlytics.android.answers.Answers;
 import com.crashlytics.android.answers.CustomEvent;
 import com.jjoe64.graphview.GraphView;
-import com.jjoe64.graphview.LabelFormatter;
 import com.jjoe64.graphview.ValueDependentColor;
-import com.jjoe64.graphview.Viewport;
 import com.jjoe64.graphview.series.BarGraphSeries;
 import com.jjoe64.graphview.series.DataPoint;
 import com.jjoe64.graphview.series.LineGraphSeries;
@@ -55,7 +53,6 @@ import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.Executors;
@@ -77,11 +74,9 @@ import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.DatabaseHelper;
 import info.nightscout.androidaps.db.ExtendedBolus;
-import info.nightscout.androidaps.db.ProfileSwitch;
 import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.db.TempTarget;
 import info.nightscout.androidaps.db.TemporaryBasal;
-import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.events.EventCareportalEventChange;
 import info.nightscout.androidaps.events.EventExtendedBolusChange;
 import info.nightscout.androidaps.events.EventInitializationChanged;
@@ -100,7 +95,6 @@ import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 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.BasalData;
 import info.nightscout.androidaps.plugins.IobCobCalculator.events.EventAutosensCalculationFinished;
 import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
 import info.nightscout.androidaps.plugins.Loop.events.EventNewOpenLoopNotification;
@@ -114,11 +108,8 @@ import info.nightscout.androidaps.plugins.Overview.Dialogs.WizardDialog;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventSetWakeLock;
-import info.nightscout.androidaps.plugins.Overview.graphExtensions.AreaGraphSeries;
+import info.nightscout.androidaps.plugins.Overview.graphData.GraphData;
-import info.nightscout.androidaps.plugins.Overview.graphExtensions.DataPointWithLabelInterface;
-import info.nightscout.androidaps.plugins.Overview.graphExtensions.DoubleDataPoint;
 import info.nightscout.androidaps.plugins.Overview.graphExtensions.FixedLineGraphSeries;
-import info.nightscout.androidaps.plugins.Overview.graphExtensions.PointsWithLabelGraphSeries;
 import info.nightscout.androidaps.plugins.Overview.graphExtensions.TimeAsXAxisLabelFormatter;
 import info.nightscout.androidaps.plugins.SourceXdrip.SourceXdripPlugin;
 import info.nightscout.androidaps.plugins.Treatments.fragments.ProfileViewerDialog;
@@ -128,7 +119,6 @@ import info.nightscout.utils.DecimalFormatter;
 import info.nightscout.utils.NSUpload;
 import info.nightscout.utils.OKDialog;
 import info.nightscout.utils.Profiler;
-import info.nightscout.utils.Round;
 import info.nightscout.utils.SP;
 import info.nightscout.utils.ToastUtils;
 
@@ -939,8 +929,8 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             return;
         }
 
-        Double lowLine = SP.getDouble("low_mark", 0d);
+        double lowLine = SP.getDouble("low_mark", 0d);
-        Double highLine = SP.getDouble("high_mark", 0d);
+        double highLine = SP.getDouble("high_mark", 0d);
 
         //Start with updating the BG as it is unaffected by loop.
         // **** BG value ****
@@ -1007,7 +997,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             tempTargetView.setTextColor(Color.BLACK);
             tempTargetView.setBackgroundColor(MainApp.sResources.getColor(R.color.tempTargetBackground));
             tempTargetView.setVisibility(View.VISIBLE);
-            tempTargetView.setText(Profile.toTargetRangeString(tempTarget.low, tempTarget.high, Constants.MGDL, units));
+            tempTargetView.setText(Profile.toTargetRangeString(tempTarget.low, tempTarget.high, Constants.MGDL, units) + " " + DateUtil.untilString(tempTarget.end()));
         } else {
             tempTargetView.setTextColor(Color.WHITE);
             tempTargetView.setBackgroundColor(MainApp.sResources.getColor(R.color.tempTargetDisabledBackground));
@@ -1249,7 +1239,6 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         }
 
         // ****** GRAPH *******
-        //log.debug("updateGUI checkpoint 1");
 
         // allign to hours
         Calendar calendar = Calendar.getInstance();
@@ -1278,464 +1267,82 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             endTime = toTime;
         }
 
-        LineGraphSeries<DataPoint> basalsLineSeries = null;
-        LineGraphSeries<DataPoint> absoluteBasalsLineSeries = null;
-        LineGraphSeries<DataPoint> baseBasalsSeries = null;
-        LineGraphSeries<DataPoint> tempBasalsSeries = null;
-        AreaGraphSeries<DoubleDataPoint> areaSeries;
-        LineGraphSeries<DataPoint> seriesNow, seriesNow2;
-
-        // **** TEMP BASALS graph ****
-        Double maxBasalValueFound = 0d;
 
         long now = System.currentTimeMillis();
-        if (pump.getPumpDescription().isTempBasalCapable && showBasalsView.isChecked()) {
-            List<DataPoint> baseBasalArray = new ArrayList<>();
-            List<DataPoint> tempBasalArray = new ArrayList<>();
-            List<DataPoint> basalLineArray = new ArrayList<>();
-            List<DataPoint> absoluteBasalLineArray = new ArrayList<>();
-            double lastLineBasal = 0;
-            double lastAbsoluteLineBasal = 0;
-            double lastBaseBasal = 0;
-            double lastTempBasal = 0;
-            for (long time = fromTime; time < now; time += 60 * 1000L) {
-                BasalData basalData = IobCobCalculatorPlugin.getBasalData(time);
-                double baseBasalValue = basalData.basal;
-                double absoluteLineValue = baseBasalValue;
-                double tempBasalValue = 0;
-                double basal = 0d;
-                if (basalData.isTempBasalRunning) {
-                    absoluteLineValue = tempBasalValue = basalData.tempBasalAbsolute;
-                    if (tempBasalValue != lastTempBasal) {
-                        tempBasalArray.add(new DataPoint(time, lastTempBasal));
-                        tempBasalArray.add(new DataPoint(time, basal = tempBasalValue));
-                    }
-                    if (lastBaseBasal != 0d) {
-                        baseBasalArray.add(new DataPoint(time, lastBaseBasal));
-                        baseBasalArray.add(new DataPoint(time, 0d));
-                        lastBaseBasal = 0d;
-                    }
-                } else {
-                    if (baseBasalValue != lastBaseBasal) {
-                        baseBasalArray.add(new DataPoint(time, lastBaseBasal));
-                        baseBasalArray.add(new DataPoint(time, basal = baseBasalValue));
-                        lastBaseBasal = baseBasalValue;
-                    }
-                    if (lastTempBasal != 0) {
-                        tempBasalArray.add(new DataPoint(time, lastTempBasal));
-                        tempBasalArray.add(new DataPoint(time, 0d));
-                    }
-                }
-
-                if (baseBasalValue != lastLineBasal) {
-                    basalLineArray.add(new DataPoint(time, lastLineBasal));
-                    basalLineArray.add(new DataPoint(time, baseBasalValue));
-                }
-                if (absoluteLineValue != lastAbsoluteLineBasal) {
-                    absoluteBasalLineArray.add(new DataPoint(time, lastAbsoluteLineBasal));
-                    absoluteBasalLineArray.add(new DataPoint(time, basal));
-                }
-
-                lastAbsoluteLineBasal = absoluteLineValue;
-                lastLineBasal = baseBasalValue;
-                lastTempBasal = tempBasalValue;
-                maxBasalValueFound = Math.max(maxBasalValueFound, basal);
-            }
-            basalLineArray.add(new DataPoint(now, lastLineBasal));
-            baseBasalArray.add(new DataPoint(now, lastBaseBasal));
-            tempBasalArray.add(new DataPoint(now, lastTempBasal));
-            absoluteBasalLineArray.add(new DataPoint(now, lastAbsoluteLineBasal));
-
-            DataPoint[] baseBasal = new DataPoint[baseBasalArray.size()];
-            baseBasal = baseBasalArray.toArray(baseBasal);
-            baseBasalsSeries = new LineGraphSeries<>(baseBasal);
-            baseBasalsSeries.setDrawBackground(true);
-            baseBasalsSeries.setBackgroundColor(MainApp.sResources.getColor(R.color.basebasal));
-            baseBasalsSeries.setThickness(0);
-
-            DataPoint[] tempBasal = new DataPoint[tempBasalArray.size()];
-            tempBasal = tempBasalArray.toArray(tempBasal);
-            tempBasalsSeries = new LineGraphSeries<>(tempBasal);
-            tempBasalsSeries.setDrawBackground(true);
-            tempBasalsSeries.setBackgroundColor(MainApp.sResources.getColor(R.color.tempbasal));
-            tempBasalsSeries.setThickness(0);
-
-            DataPoint[] basalLine = new DataPoint[basalLineArray.size()];
-            basalLine = basalLineArray.toArray(basalLine);
-            basalsLineSeries = new LineGraphSeries<>(basalLine);
-            Paint paint = new Paint();
-            paint.setStyle(Paint.Style.STROKE);
-            paint.setStrokeWidth(2);
-            paint.setPathEffect(new DashPathEffect(new float[]{2, 4}, 0));
-            paint.setColor(MainApp.sResources.getColor(R.color.basal));
-            basalsLineSeries.setCustomPaint(paint);
-
-            DataPoint[] absoluteBasalLine = new DataPoint[absoluteBasalLineArray.size()];
-            absoluteBasalLine = absoluteBasalLineArray.toArray(absoluteBasalLine);
-            absoluteBasalsLineSeries = new LineGraphSeries<>(absoluteBasalLine);
-            Paint absolutePaint = new Paint();
-            absolutePaint.setStyle(Paint.Style.STROKE);
-            absolutePaint.setStrokeWidth(4);
-            absolutePaint.setColor(MainApp.sResources.getColor(R.color.basal));
-            absoluteBasalsLineSeries.setCustomPaint(absolutePaint);
-        }
-
-        //log.debug("updateGUI checkpoint 2");
-
-        // **** IOB COB DEV graph ****
-        class DeviationDataPoint extends DataPoint {
-            public int color;
-
-            public DeviationDataPoint(double x, double y, int color) {
-                super(x, y);
-                this.color = color;
-            }
-        }
-        FixedLineGraphSeries<DataPoint> iobSeries;
-        FixedLineGraphSeries<DataPoint> cobSeries;
-        BarGraphSeries<DeviationDataPoint> devSeries;
-        LineGraphSeries<DataPoint> ratioSeries;
-        Double maxIobValueFound = 0d;
-        Double maxCobValueFound = 0d;
-        Double maxDevValueFound = 0d;
-        Double maxRatioValueFound = 0d;
-
-        if (showIobView.isChecked() || showCobView.isChecked() || showDeviationsView.isChecked() || showRatiosView.isChecked()) {
-            //Date start = new Date();
-            List<DataPoint> iobArray = new ArrayList<>();
-            List<DataPoint> cobArray = new ArrayList<>();
-            List<DeviationDataPoint> devArray = new ArrayList<>();
-            List<DataPoint> ratioArray = new ArrayList<>();
-            double lastIob = 0;
-            int lastCob = 0;
-            for (long time = fromTime; time <= now; time += 5 * 60 * 1000L) {
-                if (showIobView.isChecked()) {
-                    double iob = IobCobCalculatorPlugin.calculateFromTreatmentsAndTempsSynchronized(time).iob;
-                    if (Math.abs(lastIob - iob) > 0.02) {
-                        if (Math.abs(lastIob - iob) > 0.2)
-                            iobArray.add(new DataPoint(time, lastIob));
-                        iobArray.add(new DataPoint(time, iob));
-                        maxIobValueFound = Math.max(maxIobValueFound, Math.abs(iob));
-                        lastIob = iob;
-                    }
-                }
-                if (showCobView.isChecked() || showDeviationsView.isChecked() || showRatiosView.isChecked()) {
-                    AutosensData autosensData = IobCobCalculatorPlugin.getAutosensData(time);
-                    if (autosensData != null && showCobView.isChecked()) {
-                        int cob = (int) autosensData.cob;
-                        if (cob != lastCob) {
-                            if (autosensData.carbsFromBolus > 0)
-                                cobArray.add(new DataPoint(time, lastCob));
-                            cobArray.add(new DataPoint(time, cob));
-                            maxCobValueFound = Math.max(maxCobValueFound, cob);
-                            lastCob = cob;
-                        }
-                    }
-                    if (autosensData != null && showDeviationsView.isChecked()) {
-                        int color = Color.BLACK; // "="
-                        if (autosensData.pastSensitivity.equals("C")) color = Color.GRAY;
-                        if (autosensData.pastSensitivity.equals("+")) color = Color.GREEN;
-                        if (autosensData.pastSensitivity.equals("-")) color = Color.RED;
-                        devArray.add(new DeviationDataPoint(time, autosensData.deviation, color));
-                        maxDevValueFound = Math.max(maxDevValueFound, Math.abs(autosensData.deviation));
-                    }
-                    if (autosensData != null && showRatiosView.isChecked()) {
-                        ratioArray.add(new DataPoint(time, autosensData.autosensRatio));
-                        maxRatioValueFound = Math.max(maxRatioValueFound, Math.abs(autosensData.autosensRatio));
-                    }
-                }
-            }
-            //Profiler.log(log, "IOB processed", start);
-            DataPoint[] iobData = new DataPoint[iobArray.size()];
-            iobData = iobArray.toArray(iobData);
-            iobSeries = new FixedLineGraphSeries<>(iobData);
-            iobSeries.setDrawBackground(true);
-            iobSeries.setBackgroundColor(0x80FFFFFF & MainApp.sResources.getColor(R.color.iob)); //50%
-            iobSeries.setColor(MainApp.sResources.getColor(R.color.iob));
-            iobSeries.setThickness(3);
-
-
-            Double maxByScale = null;
-            int graphsToShow = 0;
-            if (showIobView.isChecked()) {
-                if (maxByScale == null) maxByScale = maxIobValueFound;
-                graphsToShow++;
-            }
-            if (showCobView.isChecked()) {
-                if (maxByScale == null) maxByScale = maxCobValueFound;
-                graphsToShow++;
-            }
-            if (showDeviationsView.isChecked()) {
-                if (maxByScale == null) maxByScale = maxDevValueFound;
-                graphsToShow++;
-            }
-            if (showRatiosView.isChecked()) {
-                if (maxByScale == null) maxByScale = maxRatioValueFound;
-                graphsToShow++;
-            }
-
-            if (graphsToShow > 1) {
-                if (!maxByScale.equals(maxCobValueFound)) {
-                    List<DataPoint> cobArrayRescaled = new ArrayList<>();
-                    for (int ci = 0; ci < cobArray.size(); ci++) {
-                        cobArrayRescaled.add(new DataPoint(cobArray.get(ci).getX(), cobArray.get(ci).getY() * maxByScale / maxCobValueFound / 2));
-                    }
-                    cobArray = cobArrayRescaled;
-                }
-                if (!maxByScale.equals(maxDevValueFound)) {
-                    List<DeviationDataPoint> devArrayRescaled = new ArrayList<>();
-                    for (int ci = 0; ci < devArray.size(); ci++) {
-                        devArrayRescaled.add(new DeviationDataPoint(devArray.get(ci).getX(), devArray.get(ci).getY() * maxByScale / maxDevValueFound, devArray.get(ci).color));
-                    }
-                    devArray = devArrayRescaled;
-                }
-                if (!maxByScale.equals(maxRatioValueFound)) {
-                    List<DataPoint> ratioArrayRescaled = new ArrayList<>();
-                    for (int ci = 0; ci < ratioArray.size(); ci++) {
-                        ratioArrayRescaled.add(new DataPoint(ratioArray.get(ci).getX(), (ratioArray.get(ci).getY() - 1) * maxByScale / maxRatioValueFound));
-                    }
-                    ratioArray = ratioArrayRescaled;
-                }
-            }
-
-            // COB
-            DataPoint[] cobData = new DataPoint[cobArray.size()];
-            cobData = cobArray.toArray(cobData);
-            cobSeries = new FixedLineGraphSeries<>(cobData);
-            cobSeries.setDrawBackground(true);
-            cobSeries.setBackgroundColor(0xB0FFFFFF & MainApp.sResources.getColor(R.color.cob)); //50%
-            cobSeries.setColor(MainApp.sResources.getColor(R.color.cob));
-            cobSeries.setThickness(3);
-
-            // DEVIATIONS
-            DeviationDataPoint[] devData = new DeviationDataPoint[devArray.size()];
-            devData = devArray.toArray(devData);
-            devSeries = new BarGraphSeries<>(devData);
-            devSeries.setValueDependentColor(new ValueDependentColor<DeviationDataPoint>() {
-                @Override
-                public int get(DeviationDataPoint data) {
-                    return data.color;
-                }
-            });
-
-            // RATIOS
-            DataPoint[] ratioData = new DataPoint[ratioArray.size()];
-            ratioData = ratioArray.toArray(ratioData);
-            ratioSeries = new LineGraphSeries<>(ratioData);
-            ratioSeries.setColor(MainApp.sResources.getColor(R.color.ratio));
-            ratioSeries.setThickness(3);
 
+        // 2nd graph
+        // remove old data
         iobGraph.getSeries().clear();
 
-            if (showIobView.isChecked() && iobData.length > 0) {
+        GraphData secondGraphData = new GraphData();
-                addSeriesWithoutInvalidate(iobSeries, iobGraph);
+
-            }
+        boolean useIobForScale = false;
-            if (showCobView.isChecked() && cobData.length > 0) {
+        boolean useCobForScale = false;
-                addSeriesWithoutInvalidate(cobSeries, iobGraph);
+        boolean useDevForScale = false;
-            }
+        boolean useRatioForScale = false;
-            if (showDeviationsView.isChecked() && devData.length > 0) {
+
-                addSeriesWithoutInvalidate(devSeries, iobGraph);
+        if (showIobView.isChecked()) {
-            }
+            useIobForScale = true;
-            if (showRatiosView.isChecked() && ratioData.length > 0) {
+        } else if (showCobView.isChecked()) {
-                addSeriesWithoutInvalidate(ratioSeries, iobGraph);
+            useCobForScale = true;
+        } else if (showDeviationsView.isChecked()) {
+            useDevForScale = true;
+        } else if (showRatiosView.isChecked()) {
+            useRatioForScale = true;
         }
+
+        if (showIobView.isChecked())
+            secondGraphData.addIob(iobGraph, fromTime, now, useIobForScale, 1d);
+        if (showCobView.isChecked())
+            secondGraphData.addCob(iobGraph, fromTime, now, useCobForScale, useCobForScale ? 1d : 0.5d);
+        if (showDeviationsView.isChecked())
+            secondGraphData.addDeviations(iobGraph, fromTime, now, useDevForScale, 1d);
+        if (showRatiosView.isChecked())
+            secondGraphData.addRatio(iobGraph, fromTime, now, useRatioForScale, 1d);
+
+        if (showIobView.isChecked() || showCobView.isChecked() || showDeviationsView.isChecked() || showRatiosView.isChecked()) {
             iobGraph.setVisibility(View.VISIBLE);
         } else {
             iobGraph.setVisibility(View.GONE);
         }
-        //log.debug("updateGUI checkpoint 3");
 
         // remove old data from graph
-        bgGraph.getSecondScale().getSeries().clear();
         bgGraph.getSeries().clear();
-        //log.debug("updateGUI checkpoint 4");
 
-        // **** Area ****
+        GraphData graphData = new GraphData();
-        DoubleDataPoint[] areaDataPoints = new DoubleDataPoint[]{
+
-                new DoubleDataPoint(fromTime, lowLine, highLine),
+        // **** In range Area ****
-                new DoubleDataPoint(endTime, lowLine, highLine)
+        graphData.addInRangeArea(bgGraph, fromTime, endTime, lowLine, highLine);
-        };
+
-        areaSeries = new AreaGraphSeries<>(areaDataPoints);
+        // **** BG ****
-        addSeriesWithoutInvalidate(areaSeries, bgGraph);
+        if (showPrediction)
-        areaSeries.setColor(0);
+            graphData.addBgReadings(bgGraph, fromTime, toTime, lowLine, highLine, (DetermineBasalResultAMA) finalLastRun.constraintsProcessed);
-        areaSeries.setDrawBackground(true);
+        else
-        areaSeries.setBackgroundColor(MainApp.sResources.getColor(R.color.inrangebackground));
+            graphData.addBgReadings(bgGraph, fromTime, toTime, lowLine, highLine, null);
 
         // set manual x bounds to have nice steps
-        bgGraph.getViewport().setMaxX(endTime);
+        graphData.formatAxis(bgGraph, fromTime, endTime);
-        bgGraph.getViewport().setMinX(fromTime);
+        secondGraphData.formatAxis(iobGraph, fromTime, endTime);
-        bgGraph.getViewport().setXAxisBoundsManual(true);
-        bgGraph.getGridLabelRenderer().setLabelFormatter(new TimeAsXAxisLabelFormatter(getActivity(), "HH"));
-        bgGraph.getGridLabelRenderer().setNumHorizontalLabels(7); // only 7 because of the space
-        iobGraph.getViewport().setMaxX(endTime);
-        iobGraph.getViewport().setMinX(fromTime);
-        iobGraph.getViewport().setXAxisBoundsManual(true);
-        iobGraph.getGridLabelRenderer().setLabelFormatter(new TimeAsXAxisLabelFormatter(getActivity(), "HH"));
-        iobGraph.getGridLabelRenderer().setNumHorizontalLabels(7); // only 7 because of the space
 
-        //log.debug("updateGUI checkpoint 5");
-        // **** BG graph ****
-        List<BgReading> bgReadingsArray = MainApp.getDbHelper().getBgreadingsDataFromTime(fromTime, true);
-        List<DataPointWithLabelInterface> bgListArray = new ArrayList<>();
-
-        if (bgReadingsArray.size() == 0) {
-            return;
-        }
-
-        Iterator<BgReading> it = bgReadingsArray.iterator();
-        Double maxBgValue = 0d;
-        while (it.hasNext()) {
-            BgReading bg = it.next();
-            if (bg.value > maxBgValue) maxBgValue = bg.value;
-            bgListArray.add(bg);
-        }
-        if (showPrediction) {
-            DetermineBasalResultAMA amaResult = (DetermineBasalResultAMA) finalLastRun.constraintsProcessed;
-            List<BgReading> predArray = amaResult.getPredictions();
-            bgListArray.addAll(predArray);
-        }
-
-        maxBgValue = Profile.fromMgdlToUnits(maxBgValue, units);
-        maxBgValue = units.equals(Constants.MGDL) ? Round.roundTo(maxBgValue, 40d) + 80 : Round.roundTo(maxBgValue, 2d) + 4;
-        if (highLine > maxBgValue) maxBgValue = highLine;
-        Integer numOfVertLines = units.equals(Constants.MGDL) ? (int) (maxBgValue / 40 + 1) : (int) (maxBgValue / 2 + 1);
-
-        DataPointWithLabelInterface[] bg = new DataPointWithLabelInterface[bgListArray.size()];
-        bg = bgListArray.toArray(bg);
-
-        if (bg.length > 0) {
-            addSeriesWithoutInvalidate(new PointsWithLabelGraphSeries<>(bg), bgGraph);
-        }
-
-        //log.debug("updateGUI checkpoint 6");
         // Treatments
-        List<DataPointWithLabelInterface> filteredTreatments = new ArrayList<>();
+        graphData.addTreatments(bgGraph, fromTime, endTime);
 
-        List<Treatment> treatments = MainApp.getConfigBuilder().getTreatmentsFromHistory();
+        // add basal data
-
-        for (int tx = 0; tx < treatments.size(); tx++) {
-            Treatment t = treatments.get(tx);
-            if (t.getX() < fromTime || t.getX() > endTime) continue;
-            t.setY(getNearestBg((long) t.getX(), bgReadingsArray));
-            filteredTreatments.add(t);
-        }
-
-        //log.debug("updateGUI checkpoint 7");
-        // ProfileSwitch
-        List<ProfileSwitch> profileSwitches = MainApp.getConfigBuilder().getProfileSwitchesFromHistory().getList();
-
-        for (int tx = 0; tx < profileSwitches.size(); tx++) {
-            DataPointWithLabelInterface t = profileSwitches.get(tx);
-            if (t.getX() < fromTime || t.getX() > endTime) continue;
-            filteredTreatments.add(t);
-        }
-
-        //log.debug("updateGUI checkpoint 8");
-        // Extended bolus
-        if (!pump.isFakingTempsByExtendedBoluses()) {
-            List<ExtendedBolus> extendedBoluses = MainApp.getConfigBuilder().getExtendedBolusesFromHistory().getList();
-
-            for (int tx = 0; tx < extendedBoluses.size(); tx++) {
-                DataPointWithLabelInterface t = extendedBoluses.get(tx);
-                if (t.getX() + t.getDuration() < fromTime || t.getX() > endTime) continue;
-                if (t.getDuration() == 0) continue;
-                t.setY(getNearestBg((long) t.getX(), bgReadingsArray));
-                filteredTreatments.add(t);
-            }
-        }
-
-        //log.debug("updateGUI checkpoint 9");
-        // Careportal
-        List<CareportalEvent> careportalEvents = MainApp.getDbHelper().getCareportalEventsFromTime(fromTime, true);
-
-        for (int tx = 0; tx < careportalEvents.size(); tx++) {
-            DataPointWithLabelInterface t = careportalEvents.get(tx);
-            if (t.getX() + t.getDuration() < fromTime || t.getX() > endTime) continue;
-            t.setY(getNearestBg((long) t.getX(), bgReadingsArray));
-            filteredTreatments.add(t);
-        }
-
-        DataPointWithLabelInterface[] treatmentsArray = new DataPointWithLabelInterface[filteredTreatments.size()];
-        treatmentsArray = filteredTreatments.toArray(treatmentsArray);
-        if (treatmentsArray.length > 0) {
-            addSeriesWithoutInvalidate(new PointsWithLabelGraphSeries<>(treatmentsArray), bgGraph);
-        }
-        //log.debug("updateGUI checkpoint 10");
-
-        // set manual y bounds to have nice steps
-        bgGraph.getViewport().setMaxY(maxBgValue);
-        bgGraph.getViewport().setMinY(0);
-        bgGraph.getViewport().setYAxisBoundsManual(true);
-        bgGraph.getGridLabelRenderer().setNumVerticalLabels(numOfVertLines);
-
-        // set second scale
         if (pump.getPumpDescription().isTempBasalCapable && showBasalsView.isChecked()) {
-            bgGraph.getSecondScale().setMinY(0);
+            graphData.addBasals(bgGraph, fromTime, now, lowLine / graphData.maxY / 1.2d);
-            bgGraph.getSecondScale().setMaxY(maxBgValue / lowLine * maxBasalValueFound * 1.2d);
-            bgGraph.getSecondScale().addSeries(baseBasalsSeries);
-            bgGraph.getSecondScale().addSeries(tempBasalsSeries);
-            bgGraph.getSecondScale().addSeries(basalsLineSeries);
-            bgGraph.getSecondScale().addSeries(absoluteBasalsLineSeries);
-        }
-        bgGraph.getSecondScale().setLabelFormatter(new LabelFormatter() {
-            @Override
-            public String formatLabel(double value, boolean isValueX) {
-                return "";
         }
 
-            @Override
-            public void setViewport(Viewport viewport) {
-
-            }
-        });
-
-        //log.debug("updateGUI checkpoint 11");
         // **** NOW line ****
-        DataPoint[] nowPoints = new DataPoint[]{
+        graphData.addNowLine(bgGraph, now);
-                new DataPoint(now, 0),
+        secondGraphData.addNowLine(iobGraph, now);
-                new DataPoint(now, maxBgValue)
+
-        };
+        // finaly enforce drawing of graphs
-        addSeriesWithoutInvalidate(seriesNow = new LineGraphSeries<>(nowPoints), bgGraph);
-        seriesNow.setDrawDataPoints(false);
-        DataPoint[] nowPoints2 = new DataPoint[]{
-                new DataPoint(now, 0),
-                new DataPoint(now, maxIobValueFound)
-        };
-        addSeriesWithoutInvalidate(seriesNow2 = new LineGraphSeries<>(nowPoints2), iobGraph);
-        seriesNow2.setDrawDataPoints(false);
-        //seriesNow.setThickness(1);
-        // custom paint to make a dotted line
-        Paint paint = new Paint();
-        paint.setStyle(Paint.Style.STROKE);
-        paint.setStrokeWidth(2);
-        paint.setPathEffect(new DashPathEffect(new float[]{10, 20}, 0));
-        paint.setColor(Color.WHITE);
-        seriesNow.setCustomPaint(paint);
-        seriesNow2.setCustomPaint(paint);
         bgGraph.onDataChanged(false, false);
         iobGraph.onDataChanged(false, false);
 
         Profiler.log(log, from, updateGUIStart);
     }
 
-    public double getNearestBg(long date, List<BgReading> bgReadingsArray) {
-        double bg = 0;
-        String units = MainApp.getConfigBuilder().getProfileUnits();
-        for (int r = bgReadingsArray.size() - 1; r >= 0; r--) {
-            BgReading reading = bgReadingsArray.get(r);
-            if (reading.date > date) continue;
-            bg = Profile.fromMgdlToUnits(reading.value, units);
-            break;
-        }
-        return bg;
-    }
-
-    void addSeriesWithoutInvalidate(Series s, GraphView graph) {
-        s.onGraphViewAttached(graph);
-        graph.getSeries().add(s);
-    }
-
-
     //Notifications
     static class RecyclerViewAdapter extends RecyclerView.Adapter<RecyclerViewAdapter.NotificationsViewHolder> {
 

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

@@ -103,6 +103,11 @@ public class OverviewPlugin implements PluginBase {
         // Always visible
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
     @Override
     public int getType() {
         return PluginBase.GENERAL;

app/src/main/java/info/nightscout/androidaps/plugins/Overview/events/EventDismissBolusprogressIfRunning.java

@@ -1,12 +1,13 @@
 package info.nightscout.androidaps.plugins.Overview.events;
 
 import info.nightscout.androidaps.data.PumpEnactResult;
+import info.nightscout.androidaps.events.Event;
 
 /**
  * Created by adrian on 20/02/17.
  */
 
-public class EventDismissBolusprogressIfRunning {
+public class EventDismissBolusprogressIfRunning extends Event {
     public final PumpEnactResult result;
 
     public EventDismissBolusprogressIfRunning(PumpEnactResult result) {

app/src/main/java/info/nightscout/androidaps/plugins/Overview/events/EventDismissNotification.java

@@ -1,10 +1,12 @@
 package info.nightscout.androidaps.plugins.Overview.events;
 
+import info.nightscout.androidaps.events.Event;
+
 /**
  * Created by mike on 03.12.2016.
  */
 
-public class EventDismissNotification {
+public class EventDismissNotification extends Event {
     public int id;
 
     public EventDismissNotification(int did) {

app/src/main/java/info/nightscout/androidaps/plugins/Overview/events/EventNewNotification.java

@@ -1,12 +1,13 @@
 package info.nightscout.androidaps.plugins.Overview.events;
 
+import info.nightscout.androidaps.events.Event;
 import info.nightscout.androidaps.plugins.Overview.Notification;
 
 /**
  * Created by mike on 03.12.2016.
  */
 
-public class EventNewNotification {
+public class EventNewNotification extends Event {
     public Notification notification;
 
     public EventNewNotification(Notification n) {

app/src/main/java/info/nightscout/androidaps/plugins/Overview/events/EventOverviewBolusProgress.java

@@ -4,8 +4,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.db.Treatment;
+import info.nightscout.androidaps.events.Event;
 
-public class EventOverviewBolusProgress {
+public class EventOverviewBolusProgress extends Event {
     private static Logger log = LoggerFactory.getLogger(EventOverviewBolusProgress.class);
     public String status = "";
     public Treatment t = null;

app/src/main/java/info/nightscout/androidaps/plugins/Overview/events/EventQuickWizardChange.java

@@ -1,8 +1,10 @@
 package info.nightscout.androidaps.plugins.Overview.events;
 
+import info.nightscout.androidaps.events.Event;
+
 /**
  * Created by mike on 20.10.2016.
  */
 
-public class EventQuickWizardChange {
+public class EventQuickWizardChange extends Event {
 }

app/src/main/java/info/nightscout/androidaps/plugins/Overview/events/EventSetWakeLock.java

@@ -1,10 +1,12 @@
 package info.nightscout.androidaps.plugins.Overview.events;
 
+import info.nightscout.androidaps.events.Event;
+
 /**
  * Created by mike on 02.07.2017.
  */
 
-public class EventSetWakeLock {
+public class EventSetWakeLock extends Event {
     public boolean lock = false;
 
     public EventSetWakeLock(boolean val) {

app/src/main/java/info/nightscout/androidaps/plugins/Overview/graphData/GraphData.java

@@ -0,0 +1,467 @@
+package info.nightscout.androidaps.plugins.Overview.graphData;
+
+import android.graphics.Color;
+import android.graphics.DashPathEffect;
+import android.graphics.Paint;
+
+import com.jjoe64.graphview.GraphView;
+import com.jjoe64.graphview.ValueDependentColor;
+import com.jjoe64.graphview.series.BarGraphSeries;
+import com.jjoe64.graphview.series.DataPoint;
+import com.jjoe64.graphview.series.LineGraphSeries;
+import com.jjoe64.graphview.series.Series;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import info.nightscout.androidaps.Constants;
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.data.Profile;
+import info.nightscout.androidaps.db.BgReading;
+import info.nightscout.androidaps.db.CareportalEvent;
+import info.nightscout.androidaps.db.ExtendedBolus;
+import info.nightscout.androidaps.db.ProfileSwitch;
+import info.nightscout.androidaps.db.Treatment;
+import info.nightscout.androidaps.plugins.IobCobCalculator.AutosensData;
+import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin;
+import info.nightscout.androidaps.plugins.IobCobCalculator.events.BasalData;
+import info.nightscout.androidaps.plugins.OpenAPSAMA.DetermineBasalResultAMA;
+import info.nightscout.androidaps.plugins.Overview.graphExtensions.AreaGraphSeries;
+import info.nightscout.androidaps.plugins.Overview.graphExtensions.DataPointWithLabelInterface;
+import info.nightscout.androidaps.plugins.Overview.graphExtensions.DoubleDataPoint;
+import info.nightscout.androidaps.plugins.Overview.graphExtensions.FixedLineGraphSeries;
+import info.nightscout.androidaps.plugins.Overview.graphExtensions.PointsWithLabelGraphSeries;
+import info.nightscout.androidaps.plugins.Overview.graphExtensions.Scale;
+import info.nightscout.androidaps.plugins.Overview.graphExtensions.ScaledDataPoint;
+import info.nightscout.androidaps.plugins.Overview.graphExtensions.TimeAsXAxisLabelFormatter;
+import info.nightscout.utils.Round;
+
+/**
+ * Created by mike on 18.10.2017.
+ */
+
+public class GraphData {
+
+    public GraphData() {
+        units = MainApp.getConfigBuilder().getProfileUnits();
+    }
+
+    public double maxY = 0;
+    private List<BgReading> bgReadingsArray;
+    private String units;
+
+    public void addBgReadings(GraphView bgGraph, long fromTime, long toTime, double lowLine, double highLine, DetermineBasalResultAMA amaResult) {
+        double maxBgValue = 0d;
+        bgReadingsArray = MainApp.getDbHelper().getBgreadingsDataFromTime(fromTime, true);
+        List<DataPointWithLabelInterface> bgListArray = new ArrayList<>();
+
+        if (bgReadingsArray.size() == 0) {
+            return;
+        }
+
+        Iterator<BgReading> it = bgReadingsArray.iterator();
+        while (it.hasNext()) {
+            BgReading bg = it.next();
+            if (bg.value > maxBgValue) maxBgValue = bg.value;
+            bgListArray.add(bg);
+        }
+        if (amaResult != null) {
+            List<BgReading> predArray = amaResult.getPredictions();
+            bgListArray.addAll(predArray);
+        }
+
+        maxBgValue = Profile.fromMgdlToUnits(maxBgValue, units);
+        maxBgValue = units.equals(Constants.MGDL) ? Round.roundTo(maxBgValue, 40d) + 80 : Round.roundTo(maxBgValue, 2d) + 4;
+        if (highLine > maxBgValue) maxBgValue = highLine;
+        int numOfVertLines = units.equals(Constants.MGDL) ? (int) (maxBgValue / 40 + 1) : (int) (maxBgValue / 2 + 1);
+
+        DataPointWithLabelInterface[] bg = new DataPointWithLabelInterface[bgListArray.size()];
+        bg = bgListArray.toArray(bg);
+
+        if (bg.length > 0) {
+            addSeriesWithoutInvalidate(bgGraph, new PointsWithLabelGraphSeries<>(bg));
+        }
+
+        maxY = maxBgValue;
+        // set manual y bounds to have nice steps
+        bgGraph.getViewport().setMaxY(maxY);
+        bgGraph.getViewport().setMinY(0);
+        bgGraph.getViewport().setYAxisBoundsManual(true);
+        bgGraph.getGridLabelRenderer().setNumVerticalLabels(numOfVertLines);
+
+    }
+
+    public void addInRangeArea(GraphView bgGraph, long fromTime, long toTime, double lowLine, double highLine) {
+        AreaGraphSeries<DoubleDataPoint> inRangeAreaSeries;
+
+        DoubleDataPoint[] inRangeAreaDataPoints = new DoubleDataPoint[]{
+                new DoubleDataPoint(fromTime, lowLine, highLine),
+                new DoubleDataPoint(toTime, lowLine, highLine)
+        };
+        inRangeAreaSeries = new AreaGraphSeries<>(inRangeAreaDataPoints);
+        addSeriesWithoutInvalidate(bgGraph, inRangeAreaSeries);
+        inRangeAreaSeries.setColor(0);
+        inRangeAreaSeries.setDrawBackground(true);
+        inRangeAreaSeries.setBackgroundColor(MainApp.sResources.getColor(R.color.inrangebackground));
+    }
+
+    // scale in % of vertical size (like 0.3)
+    public void addBasals(GraphView bgGraph, long fromTime, long toTime, double scale) {
+        LineGraphSeries<ScaledDataPoint> basalsLineSeries;
+        LineGraphSeries<ScaledDataPoint> absoluteBasalsLineSeries;
+        LineGraphSeries<ScaledDataPoint> baseBasalsSeries;
+        LineGraphSeries<ScaledDataPoint> tempBasalsSeries;
+
+        double maxBasalValueFound = 0d;
+        Scale basalScale = new Scale();
+
+        List<ScaledDataPoint> baseBasalArray = new ArrayList<>();
+        List<ScaledDataPoint> tempBasalArray = new ArrayList<>();
+        List<ScaledDataPoint> basalLineArray = new ArrayList<>();
+        List<ScaledDataPoint> absoluteBasalLineArray = new ArrayList<>();
+        double lastLineBasal = 0;
+        double lastAbsoluteLineBasal = 0;
+        double lastBaseBasal = 0;
+        double lastTempBasal = 0;
+        for (long time = fromTime; time < toTime; time += 60 * 1000L) {
+            BasalData basalData = IobCobCalculatorPlugin.getBasalData(time);
+            double baseBasalValue = basalData.basal;
+            double absoluteLineValue = baseBasalValue;
+            double tempBasalValue = 0;
+            double basal = 0d;
+            if (basalData.isTempBasalRunning) {
+                absoluteLineValue = tempBasalValue = basalData.tempBasalAbsolute;
+                if (tempBasalValue != lastTempBasal) {
+                    tempBasalArray.add(new ScaledDataPoint(time, lastTempBasal, basalScale));
+                    tempBasalArray.add(new ScaledDataPoint(time, basal = tempBasalValue, basalScale));
+                }
+                if (lastBaseBasal != 0d) {
+                    baseBasalArray.add(new ScaledDataPoint(time, lastBaseBasal, basalScale));
+                    baseBasalArray.add(new ScaledDataPoint(time, 0d, basalScale));
+                    lastBaseBasal = 0d;
+                }
+            } else {
+                if (baseBasalValue != lastBaseBasal) {
+                    baseBasalArray.add(new ScaledDataPoint(time, lastBaseBasal, basalScale));
+                    baseBasalArray.add(new ScaledDataPoint(time, basal = baseBasalValue, basalScale));
+                    lastBaseBasal = baseBasalValue;
+                }
+                if (lastTempBasal != 0) {
+                    tempBasalArray.add(new ScaledDataPoint(time, lastTempBasal, basalScale));
+                    tempBasalArray.add(new ScaledDataPoint(time, 0d, basalScale));
+                }
+            }
+
+            if (baseBasalValue != lastLineBasal) {
+                basalLineArray.add(new ScaledDataPoint(time, lastLineBasal, basalScale));
+                basalLineArray.add(new ScaledDataPoint(time, baseBasalValue, basalScale));
+            }
+            if (absoluteLineValue != lastAbsoluteLineBasal) {
+                absoluteBasalLineArray.add(new ScaledDataPoint(time, lastAbsoluteLineBasal, basalScale));
+                absoluteBasalLineArray.add(new ScaledDataPoint(time, basal, basalScale));
+            }
+
+            lastAbsoluteLineBasal = absoluteLineValue;
+            lastLineBasal = baseBasalValue;
+            lastTempBasal = tempBasalValue;
+            maxBasalValueFound = Math.max(maxBasalValueFound, basal);
+        }
+
+        basalLineArray.add(new ScaledDataPoint(toTime, lastLineBasal, basalScale));
+        baseBasalArray.add(new ScaledDataPoint(toTime, lastBaseBasal, basalScale));
+        tempBasalArray.add(new ScaledDataPoint(toTime, lastTempBasal, basalScale));
+        absoluteBasalLineArray.add(new ScaledDataPoint(toTime, lastAbsoluteLineBasal, basalScale));
+
+        ScaledDataPoint[] baseBasal = new ScaledDataPoint[baseBasalArray.size()];
+        baseBasal = baseBasalArray.toArray(baseBasal);
+        baseBasalsSeries = new LineGraphSeries<>(baseBasal);
+        baseBasalsSeries.setDrawBackground(true);
+        baseBasalsSeries.setBackgroundColor(MainApp.sResources.getColor(R.color.basebasal));
+        baseBasalsSeries.setThickness(0);
+
+        ScaledDataPoint[] tempBasal = new ScaledDataPoint[tempBasalArray.size()];
+        tempBasal = tempBasalArray.toArray(tempBasal);
+        tempBasalsSeries = new LineGraphSeries<>(tempBasal);
+        tempBasalsSeries.setDrawBackground(true);
+        tempBasalsSeries.setBackgroundColor(MainApp.sResources.getColor(R.color.tempbasal));
+        tempBasalsSeries.setThickness(0);
+
+        ScaledDataPoint[] basalLine = new ScaledDataPoint[basalLineArray.size()];
+        basalLine = basalLineArray.toArray(basalLine);
+        basalsLineSeries = new LineGraphSeries<>(basalLine);
+        Paint paint = new Paint();
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(2);
+        paint.setPathEffect(new DashPathEffect(new float[]{2, 4}, 0));
+        paint.setColor(MainApp.sResources.getColor(R.color.basal));
+        basalsLineSeries.setCustomPaint(paint);
+
+        ScaledDataPoint[] absoluteBasalLine = new ScaledDataPoint[absoluteBasalLineArray.size()];
+        absoluteBasalLine = absoluteBasalLineArray.toArray(absoluteBasalLine);
+        absoluteBasalsLineSeries = new LineGraphSeries<>(absoluteBasalLine);
+        Paint absolutePaint = new Paint();
+        absolutePaint.setStyle(Paint.Style.STROKE);
+        absolutePaint.setStrokeWidth(4);
+        absolutePaint.setColor(MainApp.sResources.getColor(R.color.basal));
+        absoluteBasalsLineSeries.setCustomPaint(absolutePaint);
+
+        basalScale.setMultiplier(maxY * scale / maxBasalValueFound);
+
+        addSeriesWithoutInvalidate(bgGraph, baseBasalsSeries);
+        addSeriesWithoutInvalidate(bgGraph, tempBasalsSeries);
+        addSeriesWithoutInvalidate(bgGraph, basalsLineSeries);
+        addSeriesWithoutInvalidate(bgGraph, absoluteBasalsLineSeries);
+    }
+
+    public void addTreatments(GraphView bgGraph, long fromTime, long endTime) {
+        List<DataPointWithLabelInterface> filteredTreatments = new ArrayList<>();
+
+        List<Treatment> treatments = MainApp.getConfigBuilder().getTreatmentsFromHistory();
+
+        for (int tx = 0; tx < treatments.size(); tx++) {
+            Treatment t = treatments.get(tx);
+            if (t.getX() < fromTime || t.getX() > endTime) continue;
+            t.setY(getNearestBg((long) t.getX()));
+            filteredTreatments.add(t);
+        }
+
+        // ProfileSwitch
+        List<ProfileSwitch> profileSwitches = MainApp.getConfigBuilder().getProfileSwitchesFromHistory().getList();
+
+        for (int tx = 0; tx < profileSwitches.size(); tx++) {
+            DataPointWithLabelInterface t = profileSwitches.get(tx);
+            if (t.getX() < fromTime || t.getX() > endTime) continue;
+            filteredTreatments.add(t);
+        }
+
+        // Extended bolus
+        if (!MainApp.getConfigBuilder().isFakingTempsByExtendedBoluses()) {
+            List<ExtendedBolus> extendedBoluses = MainApp.getConfigBuilder().getExtendedBolusesFromHistory().getList();
+
+            for (int tx = 0; tx < extendedBoluses.size(); tx++) {
+                DataPointWithLabelInterface t = extendedBoluses.get(tx);
+                if (t.getX() + t.getDuration() < fromTime || t.getX() > endTime) continue;
+                if (t.getDuration() == 0) continue;
+                t.setY(getNearestBg((long) t.getX()));
+                filteredTreatments.add(t);
+            }
+        }
+
+        // Careportal
+        List<CareportalEvent> careportalEvents = MainApp.getDbHelper().getCareportalEventsFromTime(fromTime, true);
+
+        for (int tx = 0; tx < careportalEvents.size(); tx++) {
+            DataPointWithLabelInterface t = careportalEvents.get(tx);
+            if (t.getX() + t.getDuration() < fromTime || t.getX() > endTime) continue;
+            t.setY(getNearestBg((long) t.getX()));
+            filteredTreatments.add(t);
+        }
+
+        DataPointWithLabelInterface[] treatmentsArray = new DataPointWithLabelInterface[filteredTreatments.size()];
+        treatmentsArray = filteredTreatments.toArray(treatmentsArray);
+        if (treatmentsArray.length > 0) {
+            addSeriesWithoutInvalidate(bgGraph, new PointsWithLabelGraphSeries<>(treatmentsArray));
+        }
+    }
+
+    double getNearestBg(long date) {
+        double bg = 0;
+        for (int r = bgReadingsArray.size() - 1; r >= 0; r--) {
+            BgReading reading = bgReadingsArray.get(r);
+            if (reading.date > date) continue;
+            bg = Profile.fromMgdlToUnits(reading.value, units);
+            break;
+        }
+        return bg;
+    }
+
+    // scale in % of vertical size (like 0.3)
+    public void addIob(GraphView graph, long fromTime, long toTime, boolean useForScale, double scale) {
+        FixedLineGraphSeries<ScaledDataPoint> iobSeries;
+        List<ScaledDataPoint> iobArray = new ArrayList<>();
+        Double maxIobValueFound = 0d;
+        double lastIob = 0;
+        Scale iobScale = new Scale();
+
+        for (long time = fromTime; time <= toTime; time += 5 * 60 * 1000L) {
+            double iob = IobCobCalculatorPlugin.calculateFromTreatmentsAndTempsSynchronized(time).iob;
+            if (Math.abs(lastIob - iob) > 0.02) {
+                if (Math.abs(lastIob - iob) > 0.2)
+                    iobArray.add(new ScaledDataPoint(time, lastIob, iobScale));
+                iobArray.add(new ScaledDataPoint(time, iob, iobScale));
+                maxIobValueFound = Math.max(maxIobValueFound, Math.abs(iob));
+                lastIob = iob;
+            }
+        }
+
+        ScaledDataPoint[] iobData = new ScaledDataPoint[iobArray.size()];
+        iobData = iobArray.toArray(iobData);
+        iobSeries = new FixedLineGraphSeries<>(iobData);
+        iobSeries.setDrawBackground(true);
+        iobSeries.setBackgroundColor(0x80FFFFFF & MainApp.sResources.getColor(R.color.iob)); //50%
+        iobSeries.setColor(MainApp.sResources.getColor(R.color.iob));
+        iobSeries.setThickness(3);
+
+        if (useForScale)
+            maxY = maxIobValueFound;
+
+        iobScale.setMultiplier(maxY * scale / maxIobValueFound);
+
+        addSeriesWithoutInvalidate(graph, iobSeries);
+    }
+
+    // scale in % of vertical size (like 0.3)
+    public void addCob(GraphView graph, long fromTime, long toTime, boolean useForScale, double scale) {
+        FixedLineGraphSeries<ScaledDataPoint> cobSeries;
+        List<ScaledDataPoint> cobArray = new ArrayList<>();
+        Double maxCobValueFound = 0d;
+        int lastCob = 0;
+        Scale cobScale = new Scale();
+
+        for (long time = fromTime; time <= toTime; time += 5 * 60 * 1000L) {
+            AutosensData autosensData = IobCobCalculatorPlugin.getAutosensData(time);
+            if (autosensData != null) {
+                int cob = (int) autosensData.cob;
+                if (cob != lastCob) {
+                    if (autosensData.carbsFromBolus > 0)
+                        cobArray.add(new ScaledDataPoint(time, lastCob, cobScale));
+                    cobArray.add(new ScaledDataPoint(time, cob, cobScale));
+                    maxCobValueFound = Math.max(maxCobValueFound, cob);
+                    lastCob = cob;
+                }
+            }
+        }
+
+        // COB
+        ScaledDataPoint[] cobData = new ScaledDataPoint[cobArray.size()];
+        cobData = cobArray.toArray(cobData);
+        cobSeries = new FixedLineGraphSeries<>(cobData);
+        cobSeries.setDrawBackground(true);
+        cobSeries.setBackgroundColor(0xB0FFFFFF & MainApp.sResources.getColor(R.color.cob)); //50%
+        cobSeries.setColor(MainApp.sResources.getColor(R.color.cob));
+        cobSeries.setThickness(3);
+
+        if (useForScale)
+            maxY = maxCobValueFound;
+
+        cobScale.setMultiplier(maxY * scale / maxCobValueFound);
+
+        addSeriesWithoutInvalidate(graph, cobSeries);
+    }
+
+    // scale in % of vertical size (like 0.3)
+    public void addDeviations(GraphView graph, long fromTime, long toTime, boolean useForScale, double scale) {
+        class DeviationDataPoint extends ScaledDataPoint {
+            public int color;
+
+            public DeviationDataPoint(double x, double y, int color, Scale scale) {
+                super(x, y, scale);
+                this.color = color;
+            }
+        }
+
+        BarGraphSeries<DeviationDataPoint> devSeries;
+        List<DeviationDataPoint> devArray = new ArrayList<>();
+        Double maxDevValueFound = 0d;
+        Scale devScale = new Scale();
+
+        for (long time = fromTime; time <= toTime; time += 5 * 60 * 1000L) {
+            AutosensData autosensData = IobCobCalculatorPlugin.getAutosensData(time);
+            if (autosensData != null) {
+                int color = Color.BLACK; // "="
+                if (autosensData.pastSensitivity.equals("C")) color = Color.GRAY;
+                if (autosensData.pastSensitivity.equals("+")) color = Color.GREEN;
+                if (autosensData.pastSensitivity.equals("-")) color = Color.RED;
+                devArray.add(new DeviationDataPoint(time, autosensData.deviation, color, devScale));
+                maxDevValueFound = Math.max(maxDevValueFound, Math.abs(autosensData.deviation));
+            }
+        }
+
+        // DEVIATIONS
+        DeviationDataPoint[] devData = new DeviationDataPoint[devArray.size()];
+        devData = devArray.toArray(devData);
+        devSeries = new BarGraphSeries<>(devData);
+        devSeries.setValueDependentColor(new ValueDependentColor<DeviationDataPoint>() {
+            @Override
+            public int get(DeviationDataPoint data) {
+                return data.color;
+            }
+        });
+
+        if (useForScale)
+            maxY = maxDevValueFound;
+
+        devScale.setMultiplier(maxY * scale / maxDevValueFound);
+
+        addSeriesWithoutInvalidate(graph, devSeries);
+    }
+
+    // scale in % of vertical size (like 0.3)
+    public void addRatio(GraphView graph, long fromTime, long toTime, boolean useForScale, double scale) {
+        LineGraphSeries<DataPoint> ratioSeries;
+        List<DataPoint> ratioArray = new ArrayList<>();
+        Double maxRatioValueFound = 0d;
+        Scale ratioScale = new Scale(-1d);
+
+        for (long time = fromTime; time <= toTime; time += 5 * 60 * 1000L) {
+            AutosensData autosensData = IobCobCalculatorPlugin.getAutosensData(time);
+            if (autosensData != null) {
+                ratioArray.add(new DataPoint(time, autosensData.autosensRatio));
+                maxRatioValueFound = Math.max(maxRatioValueFound, Math.abs(autosensData.autosensRatio));
+            }
+        }
+
+        // RATIOS
+        DataPoint[] ratioData = new DataPoint[ratioArray.size()];
+        ratioData = ratioArray.toArray(ratioData);
+        ratioSeries = new LineGraphSeries<>(ratioData);
+        ratioSeries.setColor(MainApp.sResources.getColor(R.color.ratio));
+        ratioSeries.setThickness(3);
+
+        if (useForScale)
+            maxY = maxRatioValueFound;
+
+        ratioScale.setMultiplier(maxY * scale / maxRatioValueFound);
+
+        addSeriesWithoutInvalidate(graph, ratioSeries);
+    }
+
+    // scale in % of vertical size (like 0.3)
+    public void addNowLine(GraphView graph, long now) {
+        LineGraphSeries<DataPoint> seriesNow;
+        DataPoint[] nowPoints = new DataPoint[]{
+                new DataPoint(now, 0),
+                new DataPoint(now, maxY)
+        };
+
+        seriesNow = new LineGraphSeries<>(nowPoints);
+        seriesNow.setDrawDataPoints(false);
+        // custom paint to make a dotted line
+        Paint paint = new Paint();
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(2);
+        paint.setPathEffect(new DashPathEffect(new float[]{10, 20}, 0));
+        paint.setColor(Color.WHITE);
+        seriesNow.setCustomPaint(paint);
+
+        addSeriesWithoutInvalidate(graph, seriesNow);
+    }
+
+    public void formatAxis(GraphView graph, long fromTime, long endTime) {
+        graph.getViewport().setMaxX(endTime);
+        graph.getViewport().setMinX(fromTime);
+        graph.getViewport().setXAxisBoundsManual(true);
+        graph.getGridLabelRenderer().setLabelFormatter(new TimeAsXAxisLabelFormatter("HH"));
+        graph.getGridLabelRenderer().setNumHorizontalLabels(7); // only 7 because of the space
+    }
+
+    private void addSeriesWithoutInvalidate(GraphView bgGraph, Series s) {
+        if (!s.isEmpty()) {
+            s.onGraphViewAttached(bgGraph);
+            bgGraph.getSeries().add(s);
+        }
+    }
+
+}

app/src/main/java/info/nightscout/androidaps/plugins/Overview/graphExtensions/Scale.java

@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.plugins.Overview.graphExtensions;
+
+/**
+ * Created by mike on 18.10.2017.
+ */
+
+public class Scale {
+    private double multiplier;
+    private double shift;
+
+    public Scale() {
+        shift = 0;
+    }
+
+    public Scale(double shift) {
+        this.shift = shift;
+    }
+
+    public void setMultiplier(double value) {
+        this.multiplier = value;
+    }
+
+    public double transform(double original) {
+        return original * multiplier + shift;
+    }
+
+    public double getShift() {
+        return shift;
+    }
+}

app/src/main/java/info/nightscout/androidaps/plugins/Overview/graphExtensions/ScaledDataPoint.java

@@ -0,0 +1,46 @@
+package info.nightscout.androidaps.plugins.Overview.graphExtensions;
+
+import com.jjoe64.graphview.series.DataPointInterface;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Created by mike on 18.10.2017.
+ */
+
+public class ScaledDataPoint implements DataPointInterface, Serializable {
+    private static final long serialVersionUID=1428263342645L;
+
+    private double x;
+    private double y;
+
+    private Scale scale;
+
+    public ScaledDataPoint(double x, double y, Scale scale) {
+        this.x=x;
+        this.y=y;
+        this.scale = scale;
+    }
+
+    public ScaledDataPoint(Date x, double y, Scale scale) {
+        this.x = x.getTime();
+        this.y = y;
+        this.scale = scale;
+    }
+
+    @Override
+    public double getX() {
+        return x;
+    }
+
+    @Override
+    public double getY() {
+        return scale.transform(y);
+    }
+
+    @Override
+    public String toString() {
+        return "["+x+"/"+y+"]";
+    }
+}

app/src/main/java/info/nightscout/androidaps/plugins/Overview/graphExtensions/TimeAsXAxisLabelFormatter.java

@@ -15,7 +15,7 @@ public class TimeAsXAxisLabelFormatter extends DefaultLabelFormatter {
 
     protected final String mFormat;
 
-    public TimeAsXAxisLabelFormatter(Context context, String format) {
+    public TimeAsXAxisLabelFormatter(String format) {
         mFormat = format;
     }
 

app/src/main/java/info/nightscout/androidaps/plugins/Persistentnotification/PersistentNotificationPlugin.java

@@ -208,6 +208,11 @@ public class PersistentNotificationPlugin implements PluginBase {
         //no visible fragment
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
     private String deltastring(double deltaMGDL, double deltaMMOL, String units) {
         String deltastring = "";
         if (deltaMGDL >= 0) {

app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfilePlugin.java

@@ -119,6 +119,11 @@ public class CircadianPercentageProfilePlugin implements PluginBase, ProfileInte
         if (type == PROFILE) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
     void storeSettings() {
         if (Config.logPrefsChange)
             log.debug("Storing settings");

app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfilePlugin.java

@@ -108,6 +108,11 @@ public class LocalProfilePlugin implements PluginBase, ProfileInterface {
         if (type == PROFILE) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
     public void storeSettings() {
         SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(MainApp.instance().getApplicationContext());
         SharedPreferences.Editor editor = settings.edit();

app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfilePlugin.java

@@ -104,6 +104,11 @@ public class NSProfilePlugin implements PluginBase, ProfileInterface {
         if (type == PROFILE) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
     @Override
     public int getType() {
         return PluginBase.PROFILE;

app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/events/EventNSProfileUpdateGUI.java

@@ -1,7 +1,9 @@
 package info.nightscout.androidaps.plugins.ProfileNS.events;
 
+import info.nightscout.androidaps.events.EventUpdateGui;
+
 /**
  * Created by mike on 05.08.2016.
  */
-public class EventNSProfileUpdateGUI {
+public class EventNSProfileUpdateGUI extends EventUpdateGui {
 }

app/src/main/java/info/nightscout/androidaps/plugins/ProfileSimple/SimpleProfilePlugin.java

@@ -111,6 +111,11 @@ public class SimpleProfilePlugin implements PluginBase, ProfileInterface {
         if (type == PROFILE) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
     public void storeSettings() {
         if (Config.logPrefsChange)
             log.debug("Storing settings");

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRFragment.java

@@ -226,7 +226,7 @@ public class DanaRFragment extends SubscriberFragment {
                         Long agoMsec = System.currentTimeMillis() - pump.lastBolusTime.getTime();
                         double agoHours = agoMsec / 60d / 60d / 1000d;
                         if (agoHours < 6) // max 6h back
-                            lastBolusView.setText(DateUtil.timeString(pump.lastBolusTime) + " (" + DecimalFormatter.to1Decimal(agoHours) + " " + MainApp.sResources.getString(R.string.hoursago) + ") " + DecimalFormatter.to2Decimal(DanaRPump.getInstance().lastBolusAmount) + " U");
+                            lastBolusView.setText(DateUtil.timeString(pump.lastBolusTime) + " " + DateUtil.sinceString(pump.lastBolusTime.getTime()) +  " " + DecimalFormatter.to2Decimal(DanaRPump.getInstance().lastBolusAmount) + " U");
                         else lastBolusView.setText("");
                     }
 

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java

@@ -217,6 +217,11 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
             fragmentPumpVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_danar;
+    }
+
     @Override
     public boolean isFakingTempsByExtendedBoluses() {
         return useExtendedBoluses;

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/events/EventDanaRBolusStart.java

@@ -1,7 +1,9 @@
 package info.nightscout.androidaps.plugins.PumpDanaR.events;
 
+import info.nightscout.androidaps.events.Event;
+
 /**
  * Created by mike on 03.08.2016.
  */
-public class EventDanaRBolusStart {
+public class EventDanaRBolusStart extends Event {
 }

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/events/EventDanaRNewStatus.java

@@ -1,7 +1,9 @@
 package info.nightscout.androidaps.plugins.PumpDanaR.events;
 
+import info.nightscout.androidaps.events.Event;
+
 /**
  * Created by mike on 08.07.2016.
  */
-public class EventDanaRNewStatus {
+public class EventDanaRNewStatus extends Event {
 }

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/events/EventDanaRSyncStatus.java

@@ -1,9 +1,11 @@
 package info.nightscout.androidaps.plugins.PumpDanaR.events;
 
+import info.nightscout.androidaps.events.Event;
+
 /**
  * Created by mike on 20.07.2016.
  */
-public class EventDanaRSyncStatus {
+public class EventDanaRSyncStatus extends Event {
     public String message;
 
     public EventDanaRSyncStatus() {

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java

@@ -219,6 +219,11 @@ public class DanaRKoreanPlugin implements PluginBase, PumpInterface, DanaRInterf
             this.fragmentPumpVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_danarkorean;
+    }
+
     @Override
     public boolean isFakingTempsByExtendedBoluses() {
         return useExtendedBoluses;

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/DanaRSPlugin.java

@@ -137,6 +137,11 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface,
             this.fragmentPumpVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_danars;
+    }
+
     static boolean fragmentPumpEnabled = false;
     static boolean fragmentProfileEnabled = false;
     static boolean fragmentPumpVisible = false;

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java

@@ -204,6 +204,11 @@ public class DanaRv2Plugin implements PluginBase, PumpInterface, DanaRInterface,
             this.fragmentPumpVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_danarv2;
+    }
+
     @Override
     public boolean isFakingTempsByExtendedBoluses() {
         return false;

app/src/main/java/info/nightscout/androidaps/plugins/PumpMDI/MDIPlugin.java

@@ -99,6 +99,11 @@ public class MDIPlugin implements PluginBase, PumpInterface {
         if (type == PUMP) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
     @Override
     public int getType() {
         return PluginBase.PUMP;

app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpFragment.java

@@ -79,7 +79,7 @@ public class VirtualPumpFragment extends SubscriberFragment {
             activity.runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
-                    VirtualPumpPlugin virtualPump = VirtualPumpPlugin.getInstance();
+                    VirtualPumpPlugin virtualPump = VirtualPumpPlugin.getPlugin();
                     basaBasalRateView.setText(virtualPump.getBaseBasalRate() + "U");
                     if (MainApp.getConfigBuilder().isTempBasalInProgress()) {
                         tempBasalView.setText(MainApp.getConfigBuilder().getTempBasalFromHistory(System.currentTimeMillis()).toStringFull());

app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java

@@ -64,12 +64,12 @@ public class VirtualPumpPlugin implements PluginBase, PumpInterface {
         return fromNSAreCommingFakedExtendedBoluses;
     }
 
-    private static VirtualPumpPlugin instance = null;
+    private static VirtualPumpPlugin plugin = null;
-    public static VirtualPumpPlugin getInstance() {
+    public static VirtualPumpPlugin getPlugin() {
         loadFakingStatus();
-        if (instance == null)
+        if (plugin == null)
-            instance = new VirtualPumpPlugin();
+            plugin = new VirtualPumpPlugin();
-        return instance;
+        return plugin;
     }
 
     private VirtualPumpPlugin() {
@@ -154,6 +154,11 @@ public class VirtualPumpPlugin implements PluginBase, PumpInterface {
         if (type == PUMP) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_virtualpump;
+    }
+
     @Override
     public int getType() {
         return PluginBase.PUMP;

app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/events/EventVirtualPumpUpdateGui.java

@@ -1,7 +1,9 @@
 package info.nightscout.androidaps.plugins.PumpVirtual.events;
 
+import info.nightscout.androidaps.events.EventUpdateGui;
+
 /**
  * Created by mike on 05.08.2016.
  */
-public class EventVirtualPumpUpdateGui {
+public class EventVirtualPumpUpdateGui extends EventUpdateGui {
 }

app/src/main/java/info/nightscout/androidaps/plugins/SensitivityAAPS/SensitivityAAPSPlugin.java

@@ -96,6 +96,11 @@ public class SensitivityAAPSPlugin implements PluginBase, SensitivityInterface{
         if (type == SENSITIVITY) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_absorption_aaps;
+    }
+
 
     @Override
     public AutosensResult detectSensitivity(long fromTime, long toTime) {

app/src/main/java/info/nightscout/androidaps/plugins/SensitivityOref0/SensitivityOref0Plugin.java

@@ -94,6 +94,11 @@ public class SensitivityOref0Plugin implements PluginBase, SensitivityInterface
         if (type == SENSITIVITY) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_absorption_oref0;
+    }
+
 
     @Override
     public AutosensResult detectSensitivity(long fromTime, long toTime) {

app/src/main/java/info/nightscout/androidaps/plugins/SensitivityWeightedAverage/SensitivityWeightedAveragePlugin.java

@@ -93,6 +93,11 @@ public class SensitivityWeightedAveragePlugin implements PluginBase, Sensitivity
         if (type == SENSITIVITY) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_absorption_aaps;
+    }
+
 
     @Override
     public AutosensResult detectSensitivity(long fromTime, long toTime) {