Made it compatible with other devices

.gitignore

@@ -1,4 +1,6 @@
-
-build/
-
+.project
+.settings/
 bin/
+.vscode/launch.json
+.vscode/tasks.json
+.vscode/settings.json

always-on-source/AlwaysOnDisplay.mc

@@ -3,14 +3,15 @@ using Toybox.System as Sys;
 using Toybox.Application as App;
 using Toybox.Time;
 using Toybox.Time.Gregorian;
+using Toybox.Application.Storage;
 
 // Draw time, line, date, battery.
 // Combine stripped down versions of ThickThinTime and DateLine.
 // Change vertical offset every minute to comply with burn-in protection requirements.
 class AlwaysOnDisplay extends Ui.Drawable {
 
 	private var mBurnInYOffsets;
-	private var mHoursFont, mMinutesFont, mSecondsFont, mDateFont, mBatteryFont;
+	private var mHoursFont, mMinutesFont, mSecondsFont, mDateFont, mBatteryFont, mTeslaFont;
 
 	// Wide rectangle: time should be moved up slightly to centre within available space.
 	private var mAdjustY = 0;
@@ -68,13 +69,18 @@ class AlwaysOnDisplay extends Ui.Drawable {
 		var dateFontOverride = Ui.loadResource(Rez.Strings.DATE_FONT_OVERRIDE);
 		var dateFont = (resourceMap.hasKey(dateFontOverride)) ? resourceMap[dateFontOverride] : rezFonts.AlwaysOnDateFont;
 		mDateFont = Ui.loadResource(dateFont);
+
+		if (Storage.getValue("Tesla") != null) {
+			mTeslaFont = Ui.loadResource(Rez.Fonts.IconsFont);
+		}
+
 	}
 
 	function draw(dc) {
 
 		// TIME.
 		var clockTime = Sys.getClockTime();
-		var formattedTime = App.getApp().getFormattedTime(clockTime.hour, clockTime.min);
+		var formattedTime = App.getApp().getFormattedTime(clockTime.hour, clockTime.min, clockTime.sec);
 		formattedTime[:amPm] = formattedTime[:amPm].toUpper();
 
 		// Change vertical offset every minute.
@@ -83,13 +89,14 @@ class AlwaysOnDisplay extends Ui.Drawable {
 		var hours = formattedTime[:hour];
 		var minutes = formattedTime[:min];
 		var amPmText = formattedTime[:amPm];
+		var colon = ":"; // SG Addition
 
 		var halfDCWidth = dc.getWidth() / 2;		
 
 		// Centre combined hours and minutes text (not the same as right-aligning hours and left-aligning minutes).
 		// Font has tabular figures (monospaced numbers) even across different weights, so does not matter which of hours or
 		// minutes font is used to calculate total width. 
-		var totalWidth = dc.getTextWidthInPixels(hours + minutes, mHoursFont);
+		var totalWidth = dc.getTextWidthInPixels(hours + colon + minutes, mHoursFont); // SG Added colon
 		var x = halfDCWidth - (totalWidth / 2);
 		var y = mTimeY + mAdjustY + burnInYOffset;
 
@@ -105,6 +112,16 @@ class AlwaysOnDisplay extends Ui.Drawable {
 		);
 		x += dc.getTextWidthInPixels(hours, mHoursFont);
 
+		// SG Addition - Colon.
+		dc.drawText(
+			x,
+			y,
+			mHoursFont,
+			colon,
+			Graphics.TEXT_JUSTIFY_LEFT | Graphics.TEXT_JUSTIFY_VCENTER
+		);
+		x += dc.getTextWidthInPixels(colon, mHoursFont);
+
 		// Minutes.
 		dc.drawText(
 			x,
@@ -128,7 +145,7 @@ class AlwaysOnDisplay extends Ui.Drawable {
 
 		// LINE.
 		y = mLineY + burnInYOffset;
-		dc.setPenWidth(/* mLineStroke */ 2);		
+		dc.setPenWidth(/* mLineStroke */ 1); // SG From 2 to 1
 		dc.drawLine(halfDCWidth - (mLineWidth / 2), y, halfDCWidth + (mLineWidth / 2), y);
 
 		// DATA.
@@ -181,22 +198,82 @@ class AlwaysOnDisplay extends Ui.Drawable {
 
 		// Date.
 		y = mDataY + burnInYOffset;	
-		dc.drawText(
-			mDataLeft,
-			y,
-			mDateFont,
-			Lang.format("$1$ $2$ $3$", [mDayOfWeekString, day, mMonthString]),
-			Graphics.TEXT_JUSTIFY_LEFT | Graphics.TEXT_JUSTIFY_VCENTER
-		);
+		if (Storage.getValue("Tesla") == null) {
+			dc.drawText(
+				mDataLeft,
+				y,
+				mDateFont,
+				Lang.format("$1$ $2$ $3$", [mDayOfWeekString, day, mMonthString]),
+				Graphics.TEXT_JUSTIFY_LEFT | Graphics.TEXT_JUSTIFY_VCENTER
+			);
 
-		// Battery.
-		var battery = Math.floor(Sys.getSystemStats().battery);
-		dc.drawText(
-			dc.getWidth() - mDataLeft,
-			y,
-			mBatteryFont,
-			battery.format(INTEGER_FORMAT) + "%",
-			Graphics.TEXT_JUSTIFY_RIGHT | Graphics.TEXT_JUSTIFY_VCENTER
-		);
+			// Battery.
+			var battery = Math.floor(Sys.getSystemStats().battery);
+			dc.drawText(
+				dc.getWidth() - mDataLeft,
+				y,
+				mBatteryFont,
+				battery.format(INTEGER_FORMAT) + "%",
+				Graphics.TEXT_JUSTIFY_RIGHT | Graphics.TEXT_JUSTIFY_VCENTER
+			);
+		}
+		else {
+			dc.drawText(
+				mDataLeft,
+				y,
+				mDateFont,
+				Lang.format("$1$ $2$", [day, mMonthString]),
+				Graphics.TEXT_JUSTIFY_LEFT | Graphics.TEXT_JUSTIFY_VCENTER
+			);
+
+			// Batteries.
+			var watchBattery = Math.floor(Sys.getSystemStats().battery);
+
+			var teslaInfo = Storage.getValue("TeslaInfo");
+			if (teslaInfo == null) {
+				teslaInfo = {};
+			}
+			var chargingState = teslaInfo.get("ChargingState");
+			var error = teslaInfo.get("httpErrorTesla");
+
+			if (chargingState != null) {
+				if (chargingState.equals("Charging")) {
+					chargingState = 1;
+				} else if (chargingState.equals("Sleeping")) {
+					chargingState = 2;
+				} else {
+					chargingState = 0;
+				}
+			} else {
+				chargingState = 0;
+			}
+
+			var vehicleBattery = teslaInfo.get("BatteryLevel");
+			if (error != null && error != 200) {
+				vehicleBattery = error.toNumber().format(INTEGER_FORMAT);
+			} else if (vehicleBattery == null) {
+				vehicleBattery = "???";
+			} else {
+				vehicleBattery = vehicleBattery.toNumber().format(INTEGER_FORMAT) + "%" + (chargingState == 1 ? "+" : (chargingState == 2 ? "s" : ""));
+			}
+
+			var text = vehicleBattery + " " + watchBattery.format(INTEGER_FORMAT) + "%";
+			var widthText = dc.getTextWidthInPixels(text, mBatteryFont);
+
+			dc.drawText(
+				dc.getWidth() - mDataLeft - widthText,
+				y,
+				mTeslaFont,
+				"T",
+				Graphics.TEXT_JUSTIFY_RIGHT | Graphics.TEXT_JUSTIFY_VCENTER
+			);
+			dc.drawText(
+				dc.getWidth() - mDataLeft,
+				y,
+				mBatteryFont,
+				vehicleBattery + " " + watchBattery.format(INTEGER_FORMAT) + "%",
+				Graphics.TEXT_JUSTIFY_RIGHT | Graphics.TEXT_JUSTIFY_VCENTER
+			);
+		}
 	}
 }

manifest.xml

@@ -1,78 +1,20 @@
-<!-- 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="CrystalApp" id="bde5c058244911e8b4670ed5f89f718b" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="1.4.0" name="@Strings.AppName" type="watchface" version="2.5.0">
+<?xml version="1.0"?>
+<!-- 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="CrystalApp" id="0969495b-a01f-4078-bc0f-f038ec98844d" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="2.4.0" name="@Strings.AppName" type="watchface" version="2.21.0">
         <iq:products>
-            <iq:product id="approachs60"/>
-            <iq:product id="approachs62"/>
-            <iq:product id="d2air"/>
-            <iq:product id="d2bravo"/>
-            <iq:product id="d2bravo_titanium"/>
-            <iq:product id="d2charlie"/>
-            <iq:product id="d2delta"/>
-            <iq:product id="d2deltapx"/>
-            <iq:product id="d2deltas"/>
-            <iq:product id="descentmk1"/>
-            <iq:product id="descentmk2"/>
-            <iq:product id="fenix3"/>
-            <iq:product id="fenix3_hr"/>
-            <iq:product id="fenix5"/>
-            <iq:product id="fenix5plus"/>
-            <iq:product id="fenix5s"/>
-            <iq:product id="fenix5splus"/>
-            <iq:product id="fenix5x"/>
-            <iq:product id="fenix5xplus"/>
-            <iq:product id="fenix6"/>
-            <iq:product id="fenix6pro"/>
-            <iq:product id="fenix6s"/>
-            <iq:product id="fenix6spro"/>
-            <iq:product id="fenix6xpro"/>
-            <iq:product id="fenixchronos"/>
-            <iq:product id="fr230"/>
-            <iq:product id="fr235"/>
-            <iq:product id="fr245"/>
-            <iq:product id="fr245m"/>
-            <iq:product id="fr45"/>
-            <iq:product id="fr630"/>
-            <iq:product id="fr645"/>
-            <iq:product id="fr645m"/>
-            <iq:product id="fr735xt"/>
-            <iq:product id="fr745"/>
-            <iq:product id="fr920xt"/>
-            <iq:product id="fr935"/>
-            <iq:product id="fr945"/>
-            <iq:product id="garminswim2"/>
-            <iq:product id="legacyherocaptainmarvel"/>
-            <iq:product id="legacyherofirstavenger"/>
-            <iq:product id="legacysagadarthvader"/>
-            <iq:product id="legacysagarey"/>
-            <iq:product id="marqadventurer"/>
-            <iq:product id="marqathlete"/>
-            <iq:product id="marqaviator"/>
-            <iq:product id="marqcaptain"/>
-            <iq:product id="marqcommander"/>
-            <iq:product id="marqdriver"/>
-            <iq:product id="marqexpedition"/>
-            <iq:product id="marqgolfer"/>
-            <iq:product id="venu"/>
-            <iq:product id="venu2"/>
-            <iq:product id="venu2s"/>
-            <iq:product id="venud"/>
-            <iq:product id="venusq"/>
-            <iq:product id="venusqm"/>
-            <iq:product id="vivoactive"/>
-            <iq:product id="vivoactive3"/>
-            <iq:product id="vivoactive3d"/>
-            <iq:product id="vivoactive3m"/>
-            <iq:product id="vivoactive3mlte"/>
-            <iq:product id="vivoactive4"/>
+            <iq:product id="fenix7spro"/>
+            <iq:product id="venu2plus"/>
             <iq:product id="vivoactive4s"/>
-            <iq:product id="vivoactive_hr"/>
-            <iq:product id="vivolife"/>
+            <iq:product id="vivoactive5"/>
         </iq:products>
         <iq:permissions>
             <iq:uses-permission id="Background"/>
             <iq:uses-permission id="Communications"/>
+            <iq:uses-permission id="ComplicationSubscriber"/>
             <iq:uses-permission id="Positioning"/>
             <iq:uses-permission id="SensorHistory"/>
+            <iq:uses-permission id="UserProfile"/>
         </iq:permissions>
         <iq:languages>
             <iq:language>ces</iq:language>
@@ -99,4 +41,4 @@
         </iq:languages>
         <iq:barrels/>
     </iq:application>
-</iq:manifest>
+</iq:manifest>