caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

extract color resources

Browse source
This commit is contained in:
Milos Kozak 2017-06-05 15:34:22 +02:00
parent e0a6db22a2
commit 7c7638a7a1
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -304,9 +304,9 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
} }
}); });
*/ */
bgGraph.getGridLabelRenderer().setGridColor(Color.rgb(0x75, 0x75, 0x75)); bgGraph.getGridLabelRenderer().setGridColor(MainApp.sResources.getColor(R.color.graphgrid));
bgGraph.getGridLabelRenderer().reloadStyles(); bgGraph.getGridLabelRenderer().reloadStyles();
iobGraph.getGridLabelRenderer().setGridColor(Color.rgb(0x75, 0x75, 0x75)); iobGraph.getGridLabelRenderer().setGridColor(MainApp.sResources.getColor(R.color.graphgrid));
iobGraph.getGridLabelRenderer().reloadStyles(); iobGraph.getGridLabelRenderer().reloadStyles();
iobGraph.getGridLabelRenderer().setHorizontalLabelsVisible(false); iobGraph.getGridLabelRenderer().setHorizontalLabelsVisible(false);
bgGraph.getGridLabelRenderer().setLabelVerticalWidth(50); bgGraph.getGridLabelRenderer().setLabelVerticalWidth(50);
@ -1215,15 +1215,15 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
endTime = toTime; endTime = toTime;
} }
// **** HIGH and LOW targets graph **** // **** Area ****
DoubleDataPoint[] areaDataPoints = new DoubleDataPoint[]{ DoubleDataPoint[] areaDataPoints = new DoubleDataPoint[]{
new DoubleDataPoint(fromTime, lowLine, highLine), new DoubleDataPoint(fromTime, lowLine, highLine),
new DoubleDataPoint(endTime, lowLine, highLine) new DoubleDataPoint(endTime, lowLine, highLine)
}; };
bgGraph.addSeries(areaSeries = new AreaGraphSeries<>(areaDataPoints)); areaSeries = new AreaGraphSeries<>(areaDataPoints);
areaSeries.setColor(0); areaSeries.setColor(0);
areaSeries.setDrawBackground(true); areaSeries.setDrawBackground(true);
areaSeries.setBackgroundColor(Color.argb(40, 0, 255, 0)); areaSeries.setBackgroundColor(MainApp.sResources.getColor(R.color.inrangebackground));
// set manual x bounds to have nice steps // set manual x bounds to have nice steps
bgGraph.getViewport().setMaxX(endTime); bgGraph.getViewport().setMaxX(endTime);
@ -1236,6 +1236,8 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
iobGraph.getViewport().setXAxisBoundsManual(true); iobGraph.getViewport().setXAxisBoundsManual(true);
iobGraph.getGridLabelRenderer().setLabelFormatter(new TimeAsXAxisLabelFormatter(getActivity(), "HH")); iobGraph.getGridLabelRenderer().setLabelFormatter(new TimeAsXAxisLabelFormatter(getActivity(), "HH"));
iobGraph.getGridLabelRenderer().setNumHorizontalLabels(7); // only 7 because of the space iobGraph.getGridLabelRenderer().setNumHorizontalLabels(7); // only 7 because of the space
bgGraph.onDataChanged(false, false);
iobGraph.onDataChanged(false, false);
} }
@ -1315,14 +1317,14 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
baseBasal = baseBasalArray.toArray(baseBasal); baseBasal = baseBasalArray.toArray(baseBasal);
baseBasalsSeries = new LineGraphSeries<>(baseBasal); baseBasalsSeries = new LineGraphSeries<>(baseBasal);
baseBasalsSeries.setDrawBackground(true); baseBasalsSeries.setDrawBackground(true);
baseBasalsSeries.setBackgroundColor(Color.argb(200, 0x3F, 0x51, 0xB5)); baseBasalsSeries.setBackgroundColor(MainApp.sResources.getColor(R.color.basebasal));
baseBasalsSeries.setThickness(0); baseBasalsSeries.setThickness(0);
DataPoint[] tempBasal = new DataPoint[tempBasalArray.size()]; DataPoint[] tempBasal = new DataPoint[tempBasalArray.size()];
tempBasal = tempBasalArray.toArray(tempBasal); tempBasal = tempBasalArray.toArray(tempBasal);
tempBasalsSeries = new LineGraphSeries<>(tempBasal); tempBasalsSeries = new LineGraphSeries<>(tempBasal);
tempBasalsSeries.setDrawBackground(true); tempBasalsSeries.setDrawBackground(true);
tempBasalsSeries.setBackgroundColor(Color.argb(200, 0x03, 0xA9, 0xF4)); tempBasalsSeries.setBackgroundColor(MainApp.sResources.getColor(R.color.tempbasal));
tempBasalsSeries.setThickness(0); tempBasalsSeries.setThickness(0);
DataPoint[] basalLine = new DataPoint[basalLineArray.size()]; DataPoint[] basalLine = new DataPoint[basalLineArray.size()];
@ -1511,6 +1513,9 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
bgGraph.getSecondScale().getSeries().clear(); bgGraph.getSecondScale().getSeries().clear();
bgGraph.removeAllSeries(); bgGraph.removeAllSeries();
// **** Area ***
bgGraph.addSeries(areaSeries);
// **** BG graph **** // **** BG graph ****
if (bgSeries != null) { if (bgSeries != null) {

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

@ -11,6 +11,10 @@
<color name="tabBgColor">#f0003f59</color> <color name="tabBgColor">#f0003f59</color>
<color name="tabBgColorSelected">#FF33B5E5</color> <color name="tabBgColorSelected">#FF33B5E5</color>
<color name="deviations">#FF0000</color> <color name="deviations">#FF0000</color>
<color name="inrangebackground">#2800FF00</color>
<color name="basebasal">#C83F51B5</color>
<color name="tempbasal">#C803A9F4</color>
<color name="graphgrid">#757575</color>
<color name="updating">#50ffffff</color> <color name="updating">#50ffffff</color>
<color name="defaultbackground">#424242</color> <color name="defaultbackground">#424242</color>