Add files via upload

fevieira27 · May 14, 2022 · b78dbae · b78dbae
1 parent 57ffc1f
commit b78dbae
Show file tree

Hide file tree

Showing 5 changed files with 165 additions and 94 deletions.
diff --git a/resources/jsonData.xml b/resources/jsonData.xml
@@ -58,6 +58,8 @@
     20= atmospheric pressure type
     21= has checks
     22= AOD color for minute hand
+    23= WatchFace Version check
+    24= Date Format toggle
     
     **Icons**
 

diff --git a/resources/resource/fonts/Checker.bmfc b/resources/resource/fonts/Checker.bmfc
@@ -0,0 +1,59 @@
+# AngelCode Bitmap Font Generator configuration file
+fileVersion=1
+
+# font settings
+fontName=Checkerboard
+fontFile=../Checkerboard.ttf
+charSet=2
+fontSize=-50
+aa=1
+scaleH=100
+useSmoothing=1
+isBold=0
+isItalic=0
+useUnicode=1
+disableBoxChars=1
+outputInvalidCharGlyph=1
+dontIncludeKerningPairs=0
+useHinting=0
+renderFromOutline=1
+useClearType=0
+autoFitNumPages=0
+autoFitFontSizeMin=0
+autoFitFontSizeMax=0
+
+# character alignment
+paddingDown=0
+paddingUp=0
+paddingRight=0
+paddingLeft=0
+spacingHoriz=1
+spacingVert=1
+useFixedHeight=0
+forceZero=0
+widthPaddingFactor=0.00
+
+# output file
+outWidth=50
+outHeight=50
+outBitDepth=8
+fontDescFormat=0
+fourChnlPacked=0
+textureFormat=png
+textureCompression=0
+alphaChnl=0
+redChnl=0
+greenChnl=0
+blueChnl=0
+invA=0
+invR=0
+invG=0
+invB=0
+
+# outline
+outlineThickness=0
+
+# selected chars
+chars=64
+
+# imported icon images
diff --git a/source/AnalogSettingsView.mc b/source/AnalogSettingsView.mc
@@ -242,8 +242,6 @@ class DrawableMenuTitle extends WatchUi.Drawable {
         } else {
         	mIndex=Storage.getValue(2);
         }        
-
-        //System.println(dc.getWidth());
 
         var appIcon = Application.loadResource(Rez.Drawables.LauncherIcon);        
         var bitmapWidth = appIcon.getWidth();

diff --git a/source/AnalogView.mc b/source/AnalogView.mc
@@ -29,7 +29,7 @@ class AnalogView extends WatchUi.WatchFace
     function initialize() {
 
         WatchFace.initialize();
-        var currentVersion=401;
+        var currentVersion=403;
 
         if (Storage.getValue(23)==null or Storage.getValue(23)<currentVersion){
             Storage.setValue(23,currentVersion);
@@ -158,8 +158,6 @@ class AnalogView extends WatchUi.WatchFace
         width = targetDc.getWidth();
         height = targetDc.getHeight();
 
-        //System.println(width);
-
         if(inLowPower and canBurnIn) {
         	if (dc has :setAntiAlias) {
         		dc.setAntiAlias(false);
@@ -217,7 +215,7 @@ class AnalogView extends WatchUi.WatchFace
                 if(Toybox.Weather.getCurrentConditions() != null) {
                     var cond = Toybox.Weather.getCurrentConditions();
                     if (Storage.getValue(3)==false){ // Hide Garmin Logo
-                        if (cond.condition!=null){
+                        if (cond.condition!=null and cond.condition instanceof Number){
                             MtbA.drawWeatherIcon(dc, position[18], position[22], position[19], width, cond.condition);
                         }
                         //Draw Temperature Text
@@ -227,7 +225,7 @@ class AnalogView extends WatchUi.WatchFace
                             MtbA.drawLocation(dc, width/2, position[6], width*0.60, dc.getFontHeight(Graphics.FONT_TINY), Storage.getValue(7), cond);
                         }
                     } else { // Show Garmin Logo
-                        if (cond.condition!=null){
+                        if (cond.condition!=null and cond.condition instanceof Number){
                             MtbA.drawWeatherIcon(dc, position[18], position[20], position[19], width, cond.condition);
                         }
                         //Draw Temperature Text