caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

move targets from fragment to plugin

Browse source
This commit is contained in:
Milos Kozak 2016-08-10 23:27:26 +02:00
parent d2b01dcc32
commit d023e4ae32
4 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/info/nightscout/androidaps/Services/DataService.java
View file

@ -37,14 +37,12 @@ import info.nightscout.androidaps.events.EventNewBG;
import info.nightscout.androidaps.events.EventNewBasalProfile; import info.nightscout.androidaps.events.EventNewBasalProfile;
import info.nightscout.androidaps.events.EventTreatmentChange; import info.nightscout.androidaps.events.EventTreatmentChange;
import info.nightscout.androidaps.interfaces.PumpInterface; import info.nightscout.androidaps.interfaces.PumpInterface;
import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderFragment;
import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin; import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
import info.nightscout.androidaps.plugins.DanaR.History.DanaRNSHistorySync; import info.nightscout.androidaps.plugins.DanaR.History.DanaRNSHistorySync;
import info.nightscout.androidaps.plugins.Objectives.ObjectivesFragment;
import info.nightscout.androidaps.plugins.Objectives.ObjectivesPlugin; import info.nightscout.androidaps.plugins.Objectives.ObjectivesPlugin;
import info.nightscout.androidaps.plugins.Overview.OverviewFragment; import info.nightscout.androidaps.plugins.Overview.OverviewPlugin;
import info.nightscout.androidaps.plugins.SmsCommunicator.events.EventNewSMS;
import info.nightscout.androidaps.plugins.SmsCommunicator.SmsCommunicatorFragment; import info.nightscout.androidaps.plugins.SmsCommunicator.SmsCommunicatorFragment;
import info.nightscout.androidaps.plugins.SmsCommunicator.events.EventNewSMS;
import info.nightscout.androidaps.plugins.SourceNSClient.SourceNSClientFragment; import info.nightscout.androidaps.plugins.SourceNSClient.SourceNSClientFragment;
import info.nightscout.androidaps.plugins.SourceXdrip.SourceXdripFragment; import info.nightscout.androidaps.plugins.SourceXdrip.SourceXdripFragment;
import info.nightscout.androidaps.receivers.DataReceiver; import info.nightscout.androidaps.receivers.DataReceiver;
@ -200,12 +198,11 @@ public class DataService extends IntentService {
JSONObject settings = statusJson.getJSONObject("settings"); JSONObject settings = statusJson.getJSONObject("settings");
if (settings.has("thresholds")) { if (settings.has("thresholds")) {
JSONObject thresholds = settings.getJSONObject("thresholds"); JSONObject thresholds = settings.getJSONObject("thresholds");
OverviewFragment overviewFragment = (OverviewFragment) MainApp.getSpecificPlugin(OverviewFragment.class); if (thresholds.has("bgTargetTop")) {
if (overviewFragment != null && thresholds.has("bgTargetTop")) { OverviewPlugin.bgTargetHigh = thresholds.getDouble("bgTargetTop");
overviewFragment.bgTargetHigh = thresholds.getDouble("bgTargetTop");
} }
if (overviewFragment != null && thresholds.has("bgTargetBottom")) { if (thresholds.has("bgTargetBottom")) {
overviewFragment.bgTargetLow = thresholds.getDouble("bgTargetBottom"); OverviewPlugin.bgTargetLow = thresholds.getDouble("bgTargetBottom");
} }
} }
} }

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

@ -98,9 +98,6 @@ public class OverviewFragment extends Fragment {
private static Handler sHandler; private static Handler sHandler;
private static HandlerThread sHandlerThread; private static HandlerThread sHandlerThread;
public Double bgTargetLow = 80d;
public Double bgTargetHigh = 180d;
public OverviewFragment() { public OverviewFragment() {
super(); super();
if (sHandlerThread == null) { if (sHandlerThread == null) {
@ -419,8 +416,8 @@ public class OverviewFragment extends Fragment {
long toTime = calendar.getTimeInMillis() + 100000; // little bit more to avoid wrong rounding long toTime = calendar.getTimeInMillis() + 100000; // little bit more to avoid wrong rounding
long fromTime = toTime - hoursToFetch * 60 * 60 * 1000L; long fromTime = toTime - hoursToFetch * 60 * 60 * 1000L;
Double lowLine = NSProfile.fromMgdlToUnits(bgTargetLow, units); Double lowLine = NSProfile.fromMgdlToUnits(OverviewPlugin.bgTargetLow, units);
Double highLine = NSProfile.fromMgdlToUnits(bgTargetHigh, units); Double highLine = NSProfile.fromMgdlToUnits(OverviewPlugin.bgTargetHigh, units);
BarGraphSeries<DataPoint> basalsSeries = null; BarGraphSeries<DataPoint> basalsSeries = null;
LineGraphSeries<DataPoint> seriesLow = null; LineGraphSeries<DataPoint> seriesLow = null;

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

@ -9,6 +9,9 @@ import info.nightscout.androidaps.interfaces.PluginBase;
*/ */
public class OverviewPlugin implements PluginBase { public class OverviewPlugin implements PluginBase {
public static Double bgTargetLow = 80d;
public static Double bgTargetHigh = 180d;
@Override @Override
public String getFragmentClass() { public String getFragmentClass() {
return OverviewFragment.class.getName(); return OverviewFragment.class.getName();

4
app/src/main/res/values/colors.xml
View file

@ -20,7 +20,7 @@
<color name="colorAffectingIOB">#830400</color> <color name="colorAffectingIOB">#830400</color>
<color name="colorNotEnded">#190084</color> <color name="colorNotEnded">#190084</color>
<color name="colorPumpLabel">#FF478EFF</color> <color name="colorPumpLabel">#779ECB</color>
<color name="cardItemLabel">#779ECB</color> <color name="cardItemLabel">#FF478EFF</color>
</resources> </resources>