v5 ready

dieghernan · Apr 16, 2017 · 9eae42e · 9eae42e
1 parent 13b83a0
commit 9eae42e
Show file tree

Hide file tree

Showing 11 changed files with 1,153 additions and 334 deletions.
diff --git a/package.json b/package.json
@@ -16,28 +16,45 @@
             "ForegroundColor",
             "BackgroundColor",
             "WeatherTemp",
-            "WeatherCond",
+            "WeatherCondDay",
             "WeatherUnit",
             "Lang",
-            "DateFormat"
+            "DateFormat",
+            "WeatherCondNight",
+            "HourSunset",
+            "HourSunrise",
+            "NightTheme",
+            "BackgroundColorNight",
+            "ForegroundColorNight",
+            "UpSlider",
+            "DisplayTemp",
+            "EmailPMKEY",
+            "PINPMKEY",
+            "WeatherProv"
         ],
         "projectType": "native",
         "resources": {
             "media": [
                 {
-                    "file": "images/menu_icon_spanish_text_watch.png",
-                    "menuIcon": true,
-                    "name": "iconmenu",
+                    "characterRegex": "[a-z]",
+                    "file": "fonts/ConsSymb.ttf",
+                    "name": "FONT_SYMBOL_16",
                     "targetPlatforms": null,
-                    "type": "bitmap"
+                    "type": "font"
                 },
                 {
-                    "characterRegex": "[a-z ]",
-                    "file": "fonts/weatherfontcustom.ttf",
-                    "name": "FONT_WEATHERFONT_24",
+                    "file": "fonts/weatherfontcustom2.ttf",
+                    "name": "FONT_WICON_26",
                     "targetPlatforms": null,
                     "type": "font"
                 },
+                {
+                    "file": "images/menu_icon_spanish_text_watch.png",
+                    "menuIcon": true,
+                    "name": "iconmenu",
+                    "targetPlatforms": null,
+                    "type": "bitmap"
+                },
                 {
                     "characterRegex": "[a-z' UV\u00f6\u00fc]",
                     "file": "fonts/Gotham Light.otf",
@@ -62,6 +79,12 @@
                     "trackingAdjust": -2,
                     "type": "font"
                 },
+                {
+                    "file": "fonts/Gotham Light.otf",
+                    "name": "FONT_GLIGHT_16",
+                    "targetPlatforms": null,
+                    "type": "font"
+                },
                 {
                     "characterRegex": "[a-z' UV\u00f6\u00fc]",
                     "file": "fonts/Gotham Bold.otf",
@@ -85,6 +108,12 @@
                     "targetPlatforms": null,
                     "trackingAdjust": -1,
                     "type": "font"
+                },
+                {
+                    "file": "fonts/Gotham Bold.otf",
+                    "name": "FONT_GBOLD_16",
+                    "targetPlatforms": null,
+                    "type": "font"
                 }
             ]
         },
@@ -100,5 +129,5 @@
             "watchface": true
         }
     },
-    "version": "4.0.0"
+    "version": "5.0.0"
 }
diff --git a/resources/fonts/ConsSymb.ttf b/resources/fonts/ConsSymb.ttf
diff --git a/resources/fonts/weatherfontcustom.ttf → resources/fonts/weatherfontcustom2.ttf b/resources/fonts/weatherfontcustom.ttf → resources/fonts/weatherfontcustom2.ttf
diff --git a/src/c/iconmap.c b/src/c/iconmap.c
diff --git a/src/c/iconmap.h b/src/c/iconmap.h