From 5e597f03d0c7fa1a451a3cb63e57670edf19e56e Mon Sep 17 00:00:00 2001 From: Roumen Georgiev Date: Tue, 5 Dec 2017 09:23:57 +0200 Subject: [PATCH 1/4] Added profile's target BG in NSClient mode --- .../androidaps/plugins/Overview/OverviewFragment.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java index 8e3c2cb29e..29d6f9c75f 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java @@ -976,7 +976,13 @@ public class OverviewFragment extends Fragment implements View.OnClickListener, tempTargetView.setVisibility(View.VISIBLE); } if ((Config.NSCLIENT || Config.G5UPLOADER) && tempTarget == null) { - tempTargetView.setVisibility(View.GONE); + //tempTargetView.setVisibility(View.GONE); + tempTargetView.setTextColor(Color.WHITE); + tempTargetView.setBackgroundColor(MainApp.sResources.getColor(R.color.tempTargetDisabledBackground)); + if(Profile.toTargetRangeString(profile.getTargetLow(), profile.getTargetHigh(), units, units) != null) { + tempTargetView.setText(Profile.toTargetRangeString(profile.getTargetLow(), profile.getTargetHigh(), units, units)); + } else tempTargetView.setText(getContext().getString(R.string.temptarget)); + tempTargetView.setVisibility(View.VISIBLE); } // **** Temp button **** From 1d8dd5e35e40dd4bba85a46918ec4b0e8efb837f Mon Sep 17 00:00:00 2001 From: Roumen Georgiev Date: Thu, 7 Dec 2017 17:11:54 +0200 Subject: [PATCH 2/4] removing the whole if() statement --- .../androidaps/plugins/Overview/OverviewFragment.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java index 29d6f9c75f..344804cf7f 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java @@ -975,15 +975,6 @@ public class OverviewFragment extends Fragment implements View.OnClickListener, tempTargetView.setText(Profile.toTargetRangeString(profile.getTargetLow(), profile.getTargetHigh(), units, units)); tempTargetView.setVisibility(View.VISIBLE); } - if ((Config.NSCLIENT || Config.G5UPLOADER) && tempTarget == null) { - //tempTargetView.setVisibility(View.GONE); - tempTargetView.setTextColor(Color.WHITE); - tempTargetView.setBackgroundColor(MainApp.sResources.getColor(R.color.tempTargetDisabledBackground)); - if(Profile.toTargetRangeString(profile.getTargetLow(), profile.getTargetHigh(), units, units) != null) { - tempTargetView.setText(Profile.toTargetRangeString(profile.getTargetLow(), profile.getTargetHigh(), units, units)); - } else tempTargetView.setText(getContext().getString(R.string.temptarget)); - tempTargetView.setVisibility(View.VISIBLE); - } // **** Temp button **** if (acceptTempLayout != null) { From 874915e7b412fb3c046492d6a46b4c8a6b0ed8d6 Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Thu, 7 Dec 2017 12:30:58 +0100 Subject: [PATCH 3/4] adapt wear actions to command queue --- .../androidaps/plugins/Wear/ActionStringHandler.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java index 6511cedbdf..da01d2103e 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java @@ -3,6 +3,7 @@ package info.nightscout.androidaps.plugins.Wear; import android.os.Handler; import android.os.HandlerThread; import android.support.annotation.NonNull; +import android.view.View; import java.text.DateFormat; import java.text.DecimalFormat; @@ -296,11 +297,10 @@ public class ActionStringHandler { rMessage += MainApp.instance().getString(R.string.pumpbusy); } else { rMessage += "trying to fetch data from pump."; - Handler handler = new Handler(handlerThread.getLooper()); - handler.post(new Runnable() { + + ConfigBuilderPlugin.getCommandQueue().loadHistory(RecordTypes.RECORD_TYPE_DAILY, new Callback() { @Override public void run() { - ((DanaRInterface) pump).loadHistory(RecordTypes.RECORD_TYPE_DAILY); List dummies = new LinkedList(); List historyList = getTDDList(dummies); if (isOldData(historyList)) { @@ -308,8 +308,8 @@ public class ActionStringHandler { } else { sendStatusmessage("TDD", generateTDDMessage(historyList, dummies)); } - } - }); + } + }); } } else { // if up to date: prepare, send (check if CPP is activated -> add CPP stats) From 21f91b9b29168c02c4abacf56e8f86e424a1e9eb Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Fri, 8 Dec 2017 14:58:13 +0100 Subject: [PATCH 4/4] remove unused imports --- .../androidaps/plugins/Wear/ActionStringHandler.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java index da01d2103e..db94fbe740 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java @@ -1,9 +1,7 @@ package info.nightscout.androidaps.plugins.Wear; -import android.os.Handler; import android.os.HandlerThread; import android.support.annotation.NonNull; -import android.view.View; import java.text.DateFormat; import java.text.DecimalFormat; @@ -27,7 +25,6 @@ import info.nightscout.androidaps.db.ProfileSwitch; import info.nightscout.androidaps.db.Source; import info.nightscout.androidaps.db.TempTarget; import info.nightscout.androidaps.interfaces.APSInterface; -import info.nightscout.androidaps.interfaces.DanaRInterface; import info.nightscout.androidaps.interfaces.PluginBase; import info.nightscout.androidaps.interfaces.ProfileInterface; import info.nightscout.androidaps.interfaces.PumpInterface;