caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #1064 from jotomo/purple-pony

Browse source 
Update prediction colors to match NS.
This commit is contained in:
Milos Kozak 2018-06-01 13:57:20 +02:00 committed by GitHub
commit 96fb4323f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,12 +2,16 @@
<resources> <resources>
<color name="prediction">#ff00ff</color> <color name="prediction">#ff00ff</color>
<color name="basal">#00ffff</color> <color name="basal">#00ffff</color>
<!-- IOB, bolus, COB, carbs, UAM and ZT are synchronised with NS,
see lib/plugins/openaps.js, function getForecastPoints in NS -->
<color name="iob">#1e88e5</color> <color name="iob">#1e88e5</color>
<color name="bolus">#1ea3e5</color> <color name="bolus">#1ea3e5</color>
<color name="cob">#FFFB8C00</color> <color name="cob">#FB8C00</color>
<color name="carbs">#FFFB8C00</color> <color name="carbs">#fb8c00</color>
<color name="uam">#c9bd60</color> <color name="uam">#ff89ff</color>
<color name="zt">#00d2d2</color> <color name="zt">#b601b6</color>
<color name="ratio">#FFFFFF</color> <color name="ratio">#FFFFFF</color>
<color name="devslopepos">#FFFFFF00</color> <color name="devslopepos">#FFFFFF00</color>
<color name="devslopeneg">#FFFF00FF</color> <color name="devslopeneg">#FFFF00FF</color>

2
app/src/test/java/info/nightscout/androidaps/plugins/Source/SourceNSClientPluginTest.java
View file

@ -15,6 +15,6 @@ public class SourceNSClientPluginTest {
@Test @Test
public void advancedFilteringSupported() { public void advancedFilteringSupported() {
Assert.assertEquals(true, SourceNSClientPlugin.getPlugin().advancedFilteringSupported()); Assert.assertEquals(false, SourceNSClientPlugin.getPlugin().advancedFilteringSupported());
} }
} }