From 60137b003e08fafb8c74119a582b03cb82bdab72 Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Fri, 25 Dec 2015 18:24:19 -0700 Subject: [PATCH] Minor tweaks, remove BT always shown --- appinfo.json | 1 + resources/images/menu.png | Bin 225 -> 400 bytes src/main.c | 16 ++++++++-------- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/appinfo.json b/appinfo.json index 56754b1..3ebef28 100644 --- a/appinfo.json +++ b/appinfo.json @@ -25,6 +25,7 @@ "file": "images/menu.png", "menuIcon": true, "name": "MENU_IMAGE", + "targetPlatforms": null, "type": "png" }, { diff --git a/resources/images/menu.png b/resources/images/menu.png index 2071856482732e67ed4995e61baf65a09e370943..b3616e1bfa5ed81f3b5597fc34c0040cbd38521f 100644 GIT binary patch delta 358 zcmV-s0h#{c0gwZb7#j!%0001T4d0Xi000JJOGiWi{{a60|De66laW9le+(J{7A=i! z-8BFJ0Ub$1K~zY`y_Q*y#2^erUo4IY+%d};i}{$eraKE;ldAxAk&(l$#f=_7NYAQXhh1MJs^kd$)C zO!BkOjNv{#NqpucDb>p7fAK6~DcKK2%5gO{`rf$ckB2~=$s{63%U42)}J%gwYI z2B2fV0pNOiY3^yu-TekMRp+6+4cK2r)LZPjvZX{@4>FoTjE9}3!YB&8o8`Maz79A9 zwioY)fGQW~1XS;#5bK9Huzpap?V5-8eI17Ytxs+Dq=Z*X>z)$-K+Z?*iB-;-)(y5% zu|wRqfW~(0JD#p~klH_2_a9ZgVw=?ujE&>B`S$?+0Z%!^j}77&-v9sr07*qoM6N<$ Ef|63A+yDRo delta 209 zcmbQh{E%^iL_H%j0|SG{Vc+XOiY>q=#P$FG|3GHwq04nZiZRLC-G!lpRn`N@;Vkfo zEM{Qf76xHPhFNnYfP(BLp1!W^_qq8Q_1S)Hx>N)dO7wJb4B@zLd+Z>ugMmoH!+4ph zH*6BlP7y~r?#yvX+Bm(#_7sb3Lx}vNPfxv=WtQ*@8QM*X`OT9k@GHz_?^lCa!lzUm zd}k=Hy)c1W^4P@Y@QRK0Q#Wazc3)VsW|y<&RLvsh-Ros5Z>CFVdQ&MBb@ E0Nxlzp8x;= diff --git a/src/main.c b/src/main.c index 7b2d342..e8595eb 100644 --- a/src/main.c +++ b/src/main.c @@ -21,7 +21,7 @@ static void bg_update_proc(Layer *layer, GContext *ctx) { // Draw Background Rings GRect frame; - graphics_context_set_fill_color(ctx, GColorPictonBlue); + graphics_context_set_fill_color(ctx, GColorVividCerulean); graphics_fill_rect(ctx, layer_get_bounds(layer), 0, GCornerNone); // center dot @@ -72,7 +72,7 @@ static void hands_update_proc(Layer *layer, GContext *ctx) { graphics_context_set_fill_color(ctx, GColorBlack); graphics_fill_circle(ctx, second_point, SECOND_RADIUS); - if (false && bt_connected) { + if (bt_connected) { text_layer_set_text(s_bt_label, ""); } else { text_layer_set_text(s_bt_label, ""); @@ -110,10 +110,10 @@ static void window_load(Window *window) { layer_add_child(window_layer, s_fg_layer); // Day -#ifdef PBL_RECT - s_day_label = text_layer_create(GRect(57, 69, 30, 24)); -#else +#ifdef PBL_ROUND s_day_label = text_layer_create(GRect(75, 75, 30, 24)); +#else + s_day_label = text_layer_create(GRect(57, 69, 30, 24)); #endif text_layer_set_font(s_day_label, fonts_load_custom_font(resource_get_handle(RESOURCE_ID_FONT_24))); text_layer_set_text_alignment(s_day_label, GTextAlignmentCenter); @@ -123,10 +123,10 @@ static void window_load(Window *window) { layer_add_child(s_fg_layer, text_layer_get_layer(s_day_label)); // Missing phone -#ifdef PBL_RECT - s_bt_label = text_layer_create(GRect(10, 42, 52, 64)); -#else +#ifdef PBL_ROUND s_bt_label = text_layer_create(GRect(26, 50, 52, 64)); +#else + s_bt_label = text_layer_create(GRect(10, 42, 52, 64)); #endif text_layer_set_text_alignment(s_bt_label, GTextAlignmentCenter); text_layer_set_text(s_bt_label, "");