Remove support for Edge 530 and vívoactive HR

Author: maca88

Source/SmartBikeLights

@@ -12,7 +12,6 @@
             <iq:product id="edge1030bontrager"/>
             <iq:product id="edge1030plus"/>
             <iq:product id="edge520plus"/>
-            <iq:product id="edge530"/>
             <iq:product id="edge820"/>
             <iq:product id="edge830"/>
             <iq:product id="edge_1000"/>
@@ -60,7 +59,6 @@
             <iq:product id="vivoactive3mlte"/>
             <iq:product id="vivoactive4"/>
             <iq:product id="vivoactive4s"/>
-            <iq:product id="vivoactive_hr"/>
         </iq:products>
         <iq:permissions>
             <iq:uses-permission id="Positioning"/>

Source/manifest.xml

@@ -1,6 +1,6 @@
 project.manifest = manifest.xml
-#excludeBase=deviceNetwork;polygons;dataField
-excludeBase=testNetwork;polygons;dataField
+#excludeBase=deviceNetwork;polygons;dataField;monochromeScreen
+excludeBase=testNetwork;polygons;dataField;monochromeScreen
 
 base.sourcePath = source;SmartBikeLights/Source/SmartBikeLights/source-common
 
@@ -16,6 +16,5 @@ base.excludeAnnotations = $(rectangle.excludeAnnotations)
 # Rectangle non touch screen devices
 edge_520.excludeAnnotations = $(rectangleNonTouchScreen)
 edge520plus.excludeAnnotations = $(rectangleNonTouchScreen)
-edge530.excludeAnnotations = $(rectangleNonTouchScreen)
 venusq.excludeAnnotations = $(rectangleNonTouchScreen)
 venusqm.excludeAnnotations = $(rectangleNonTouchScreen)

Source/monkey.jungle

@@ -1,11 +1,11 @@
 <resources>
-    <!-- Format [[:colorScreen:, :titleFont:, :titleFontTopPadding:, :displayOffsetX:]
-        :colorScreen: = true / false
+    <!-- Format [[:separatorWidth:, :titleFont:, :titleFontTopPadding:, :displayOffsetX:]
+        :separatorWidth: = Number
         :titleFont: = 0-8
         :titleFontTopPadding: = Number
         :displayOffsetX: = Number
     -->
-    <jsonData id="Settings">[true, 2, 0, 0]</jsonData>
+    <jsonData id="Settings">[2, 2, 0, 0]</jsonData>
     <!-- Simulator -->
     <jsonData id="FontTopPaddings">[290495474803212675]</jsonData>
 </resources>

Source/resources-rectangle-200x265/data.xml

@@ -1,11 +1,11 @@
 <resources>
-    <!-- Format [[:colorScreen:, :titleFont:, :titleFontTopPadding:]
-        :colorScreen: = true / false
+    <!-- Format [[:separatorWidth:, :titleFont:, :titleFontTopPadding:]
+        :separatorWidth: = Number
         :titleFont: = 0-8
         :titleFontTopPadding: = Number
         :displayOffsetX: = Number
     -->
-    <jsonData id="Settings">[true, 2, 2, 0]</jsonData>
+    <jsonData id="Settings">[2, 2, 2, 0]</jsonData>
     <!-- Simulator
     <jsonData id="FontTopPaddings">[290495474803212675]</jsonData>  -->
     <!-- Device -->

Source/resources-rectangle-240x400/data.xml

@@ -1,11 +1,11 @@
 <resources>
-    <!-- Format [[:colorScreen:, :titleFont:, :titleFontTopPadding:, :displayOffsetX:]
-        :colorScreen: = true / false
+    <!-- Format [[:separatorWidth:, :titleFont:, :titleFontTopPadding:, :displayOffsetX:]
+        :separatorWidth: = Number
         :titleFont: = 0-8
         :titleFontTopPadding: = Number
         :displayOffsetX: = Number
     -->
-    <jsonData id="Settings">[true, 2, 5, 0]</jsonData>
+    <jsonData id="Settings">[2, 2, 5, 0]</jsonData>
     <!-- Simulator -->
     <jsonData id="FontTopPaddings">[434610663688585732]</jsonData>
 </resources> 

Source/resources-rectangle-246x322/data.xml

@@ -1,10 +1,10 @@
 <resources>
-<!-- Format [[:colorScreen:, :titleFont:, :titleFontTopPadding:]
-        :colorScreen: = true / false
+    <!-- Format [[:separatorWidth:, :titleFont:, :titleFontTopPadding:]
+        :separatorWidth: = Number
         :titleFont: = 0-8
         :titleFontTopPadding: = Number
         :displayOffsetX: = Number
     -->
-    <jsonData id="Settings">[true, 2, 0, 0]</jsonData>
+    <jsonData id="Settings">[2, 2, 0, 0]</jsonData>
     <jsonData id="FontTopPaddings">[0]</jsonData>
 </resources>

Source/resources-rectangle-282x470/data.xml

@@ -67,9 +67,8 @@ class BikeLightsControlView extends BikeLightsView {
     function onPosition(info) {
         var position = info.position.toDegrees();
         var time = Gregorian.utcInfo(Time.now(), Time.FORMAT_SHORT);
-        var jd = getJD(time.year, time.month, time.day);
-        _sunriseTime = getSunriseSet(true, jd, position);
-        _sunsetTime = getSunriseSet(false, jd, position);
+        _sunriseTime = getSunriseSet(true, time, position);
+        _sunsetTime = getSunriseSet(false, time, position);
         WatchUi.requestUpdate();
     }
 
@@ -237,7 +236,7 @@ class BikeLightsControlView extends BikeLightsView {
     protected function preCalculate(dc, width, height) {
         var padding = 3;
         var settings = WatchUi.loadResource(Rez.JsonData.Settings);
-        _monochrome = !settings[0];
+        _separatorWidth = settings[0];
         _titleFont = settings[1];
         _titleTopPadding = settings[2];
         _offsetX = 0;