twilights indicator fix

okdar · Mar 6, 2022 · 1c5b39f · 1c5b39f
1 parent 53abe15
commit 1c5b39f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.3.1 (March 6, 2022)
+* small bugfix for twilights indicator
+
 # 1.3.0 (Jan 29, 2022)
 * added sunrise, sunset and civil twilights (powered by https://github.com/haraldh/SunCalc library)
 

diff --git a/manifest.xml b/manifest.xml
@@ -1,5 +1,5 @@
 <!-- This is a generated file. It is highly recommended that you DO NOT edit this file. --><iq:manifest xmlns:iq="http://www.garmin.com/xml/connectiq" version="3">
-    <iq:application entry="SmartArcsTripApp" id="547fb49c0626476280e1121801561e5c" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watchface" version="1.3.0">
+    <iq:application entry="SmartArcsTripApp" id="547fb49c0626476280e1121801561e5c" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watchface" version="1.3.1">
         <iq:products>
             <iq:product id="d2air"/>
             <iq:product id="d2charlie"/>

diff --git a/manifest.xml.prod b/manifest.xml.prod
@@ -1,5 +1,5 @@
 <!-- This is a generated file. It is highly recommended that you DO NOT edit this file. --><iq:manifest xmlns:iq="http://www.garmin.com/xml/connectiq" version="3">
-    <iq:application entry="SmartArcsTripApp" id="547fb49c0626476280e1121801561e5c" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watchface" version="1.3.0">
+    <iq:application entry="SmartArcsTripApp" id="547fb49c0626476280e1121801561e5c" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watchface" version="1.3.1">
         <iq:products>
             <iq:product id="d2air"/>
             <iq:product id="d2charlie"/>

diff --git a/source/SmartArcsTripView.mc b/source/SmartArcsTripView.mc
@@ -1015,13 +1015,21 @@ class SmartArcsTripView extends WatchUi.WatchFace {
         //draw sunrise
         if (sunriseColor != offSettingFlag) {
 	        dc.setColor(sunriseColor, Graphics.COLOR_TRANSPARENT);
-			dc.drawArc(screenRadius, screenRadius, screenRadius - 17, Graphics.ARC_CLOCKWISE, sunriseStartAngle, sunriseEndAngle);
+	        if (sunriseStartAngle > sunriseEndAngle) {
+				dc.drawArc(screenRadius, screenRadius, screenRadius - 17, Graphics.ARC_CLOCKWISE, sunriseStartAngle, sunriseEndAngle);
+			} else {
+				dc.drawArc(screenRadius, screenRadius, screenRadius - 17, Graphics.ARC_COUNTER_CLOCKWISE, sunriseStartAngle, sunriseEndAngle);
+			}
 		}
 
         //draw sunset
         if (sunsetColor != offSettingFlag) {
 	        dc.setColor(sunsetColor, Graphics.COLOR_TRANSPARENT);
-			dc.drawArc(screenRadius, screenRadius, screenRadius - 13, Graphics.ARC_CLOCKWISE, sunsetStartAngle, sunsetEndAngle);
+	        if (sunsetStartAngle > sunsetEndAngle) {
+				dc.drawArc(screenRadius, screenRadius, screenRadius - 13, Graphics.ARC_CLOCKWISE, sunsetStartAngle, sunsetEndAngle);
+			} else {
+				dc.drawArc(screenRadius, screenRadius, screenRadius - 13, Graphics.ARC_COUNTER_CLOCKWISE, sunsetStartAngle, sunsetEndAngle);
+			}
 		}
 	}