blank menus #7

Fix using Meiguro's function to check version.
NitroG42 · Jan 24, 2016 · 03119ab · 03119ab
1 parent 2be991c
commit 03119ab
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/appinfo.json b/appinfo.json
@@ -11,17 +11,17 @@
             {
                 "file": "images/menu_icon.png",
                 "name": "IMAGE_MENU_ICON",
-                "type": "png"
+                "type": "bitmap"
             },
             {
                 "file": "images/logo_splash.png",
                 "name": "IMAGE_LOGO_SPLASH",
-                "type": "png"
+                "type": "bitmap"
             },
             {
                 "file": "images/tile_splash.png",
                 "name": "IMAGE_TILE_SPLASH",
-                "type": "png"
+                "type": "bitmap"
             },
             {
                 "file": "fonts/UbuntuMono-Regular.ttf",
@@ -32,12 +32,12 @@
                 "file": "images/todoist.png",
                 "menuIcon": true,
                 "name": "IMAGES_TODOIST_PNG",
-                "type": "png"
+                "type": "bitmap"
             },
             {
                 "file": "images/checkmark.png",
                 "name": "IMAGES_CHECKMARK_PNG",
-                "type": "png"
+                "type": "bitmap"
             }
         ]
     },
@@ -49,7 +49,7 @@
     ],
     "uuid": "30025c65-8dab-40cf-9f47-c75c708799af",
     "versionCode": 1,
-    "versionLabel": "2.0",
+    "versionLabel": "2.1",
     "watchapp": {
         "hiddenApp": false,
         "watchface": false

diff --git a/src/app.js b/src/app.js
@@ -3,6 +3,7 @@ var appKey = '4EBM';
 var UI = require('ui');
 var Vector2 = require('vector2');
 var Ajax = require('ajax');
+var Platform = require('platform');
 
 var TODOIST_API_URL = 'https://todoist.com/API/v6/sync?';
 
@@ -27,6 +28,20 @@ var token;
 var seq_no = 0;
 var seq_no_global = 0;
 
+function loadColors() {
+  if(Pebble.getActiveWatchInfo && Platform.version() !== 'aplite') {
+      textColor = 'lightGray';
+      textHightLightColor = 'white';
+      menuColor = 'black';
+      highlightColor = 'darkCandyAppleRed';
+  } else { //aplite
+      textColor = 'black';
+      textHightLightColor = 'white';
+      menuColor = 'white';
+      highlightColor = 'black';
+  }
+}
+
 function displayMessage(title, subtitle) {
   var card = new UI.Card();
   card.title(title);
@@ -404,4 +419,5 @@ function loadProjects() {
   }
 }
 token = localStorage.getItem(appKey);
+loadColors();
 loadProjects();